From 9d019ae3e455a4e2f0e41dd6a8c2063a929034f3 Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Wed, 27 May 2026 20:45:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=B4=A8=E9=87=8F=E6=A3=80?=
 =?UTF-8?q?=E9=AA=8C=E7=BC=BA=E9=99=B7=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/basic-import/main.vue          |  1 +
 .../components/settlementAnomaly.vue          | 37 ++++++++++++++++++-
 .../productionTesting/productionQuality.vue   | 11 +++++-
 3 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/src/components/basic-import/main.vue b/src/components/basic-import/main.vue
index fede384a..b0d623f2 100644
--- a/src/components/basic-import/main.vue
+++ b/src/components/basic-import/main.vue
@@ -182,6 +182,7 @@ export default {
       });
     },
     uploadAfter(res, done, loading, column) {
+      this.$message.success('导入成功')
       this.closeDialog(true);
       done();
     },
diff --git a/src/views/oem/oemOrderSettlement/components/settlementAnomaly.vue b/src/views/oem/oemOrderSettlement/components/settlementAnomaly.vue
index c618ca23..024adb26 100644
--- a/src/views/oem/oemOrderSettlement/components/settlementAnomaly.vue
+++ b/src/views/oem/oemOrderSettlement/components/settlementAnomaly.vue
@@ -12,7 +12,7 @@
                     </el-form-item>
                     <el-form-item>
                         <el-button type="primary"  @click="settlementFnNum" v-if="permission.settlementAnomaly_settlement">结算</el-button>
-                        <!-- <el-button type="danger" @click="">无需结算</el-button> -->
+                        <el-button type="danger" @click="onSubmit">无需结算</el-button>
                     </el-form-item>
                 </el-form>
             </template>
@@ -49,7 +49,7 @@
 </template>
 <script>
 import settlementDailog from './SettlementDailog.vue'
-import {getStatement,calculate,matchStandard,updateData} from "@/api/outsourcingManagement/oemOrderSettlement"
+import {getStatement,calculate,matchStandard,updateData,noSettlementItem} from "@/api/outsourcingManagement/oemOrderSettlement"
 import { mapGetters } from 'vuex';
 export default {
     components: {
@@ -581,6 +581,39 @@ export default {
                 // 用户点击取消
             });
         },
+        onSubmit() {
+            // if (this.selectionList.length === 0) {
+            //     this.$message.warning('请选择至少一条数据');
+            //     return;
+            // }
+            if(this.data.length == 0){
+                this.$message.error('请先查询数据！')
+                return
+            }
+            this.$confirm('确认页面所有数据无需结算？', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning',
+            }).then(() => {
+                let params = {
+                    ...this.query,
+                    postPlatingStorageTimeStart:this.query && this.query.putStoreTime && this.query.putStoreTime[0],
+                    postPlatingStorageTimeEnd:this.query && this.query.putStoreTime && this.query.putStoreTime[1],
+                    memo:this.query && this.query.memo && typeof(this.query.memo) == 'object' && this.query.memo.length != 0 ? 
+                    this.query.memo.join(';') : this.query.memo && this.query.memo.indexOf(',') != -1 ? this.query.memo.split(',').join(';') : this.query.memo,
+                }
+                if(params.putStoreTime) delete params.putStoreTime;
+                console.log('params----------',params)
+                noSettlementItem(params).then(() => {
+                    this.$message.success('无需结算成功');
+                    this.onLoad();
+                }).catch(() => {
+                    // this.$message.error('无需结算失败');
+                });
+            }).catch(() => {
+                // 用户点击取消
+            });
+        },
         // 匹配标准工序代码
         handleMatch(){
             matchStandard().then(res =>{
diff --git a/src/views/productionTesting/productionQuality.vue b/src/views/productionTesting/productionQuality.vue
index 5e05ca07..d5175eb4 100644
--- a/src/views/productionTesting/productionQuality.vue
+++ b/src/views/productionTesting/productionQuality.vue
@@ -117,6 +117,7 @@
                 link
                 type="primary"
                 size="large"
+                v-if="showYD"
                 :title="'重新获取硬度检测值'"
                 >获取硬度检测值</el-button
               >
@@ -182,7 +183,8 @@
                   <!-- <el-input v-model="scope1.row.testType" 
                      :disabled="scope.row.checkUserRealName != null && scope.row.checkUserRealName != '' "
                   ></el-input> -->
-                  <el-select placeholder="请选择" v-model="scope1.row.testType">
+                  <el-select placeholder="请选择" v-model="scope1.row.testType"
+                  :disabled="scope.row.checkUserRealName != null && scope.row.checkUserRealName != '' ">
                     <el-option label="镀前" value="1"></el-option>
                     <el-option label="镀后" value="2"></el-option>
                   </el-select>
@@ -554,6 +556,7 @@ export default {
       firstInterval:null,
       secondInderval:null,
       form: {},
+      showYD:false,
       getDChyData:[],
       showDialog: false,
       page: {
@@ -1630,6 +1633,12 @@ export default {
         // }
         // res.data.data.wpItemList[0].item.name = '厚度检测'
         // res.data.data.wpItemList[0].checkUserRealName = null
+        let tmp = res.data.data.wpItemList.find(item => item.item.name == '厚度检测')
+        if(tmp){
+          this.showYD = true
+        }else{
+          this.showYD = false
+        }
         this.vxeTableData = res.data.data.wpItemList;
         console.log('this.vxeTableData', this.vxeTableData);
         this.vxeTableData.map(item => {