From daa130c577aa3baa18ac7b8f43c2b45c103646bb Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Thu, 28 May 2026 11:57:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/costStatistics/index.vue            | 28 ++++++++++++++++++-
 .../components/settlementAnomaly.vue          |  4 ++-
 .../productionTesting/productionQuality.vue   | 16 +++++++----
 .../ERecord/printDialog.vue                   |  2 +-
 4 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/src/views/costStatistics/index.vue b/src/views/costStatistics/index.vue
index 8e5a2143..d8960fba 100644
--- a/src/views/costStatistics/index.vue
+++ b/src/views/costStatistics/index.vue
@@ -117,7 +117,7 @@ export default {
         tip: false,
         simplePage: true,
         searchShow: true,
-        searchMenuSpan: 18,
+        searchMenuSpan: 12,
         searchIcon: true,
         searchIndex: 3,
         tree: false,
@@ -178,6 +178,18 @@ export default {
             overHidden: true,
             width:80,
           },
+          {
+            label:"交付中心",
+            prop:"jcId",
+            type:'select',
+            dicUrl:"/api/blade-system/dict/dictionary?code=workCenterJfCenter",
+            props:{
+              label:"dictValue",
+              value:"dictKey"
+            },
+            search: true,
+            width:110
+          },
           {
             label: '制造费用(元)',
             prop: 'productCost',
@@ -214,6 +226,15 @@ export default {
             sortable: 'custom',
             overHidden: true,
           },
+          {
+            label:'erp作业中心材料费用(元)',
+            prop:'erpWorkCenterMaterialCost',
+            search:false,
+            width: 180,
+            sortable: false,
+            sortable: 'custom',
+            overHidden: true,
+          },
           {
             label: '单位成本(元)',
             prop: 'unitCost',
@@ -586,7 +607,11 @@ export default {
         size:this.page.pageSize,
         ...this.query
       }).then(res =>{
+        res.data.data.records.map(item =>{
+          item.jcId = item.jcId != -1 ? item.jcId + '' : ''
+        })
         this.data = res.data.data.records
+        console.log('data---------',this.data)
         this.page.total = res.data.data.total
         this.loading = false
 
@@ -599,6 +624,7 @@ export default {
               workCenterId:this.data[0].workCenterId
             }).then(res =>{
               console.log('res---------',res)
+              
               this.detailData = res.data.data
               this.$refs.crud.setCurrentRow(this.data[0]);
               // this.handleCurrentRowChange(this.data[0]);
diff --git a/src/views/oem/oemOrderSettlement/components/settlementAnomaly.vue b/src/views/oem/oemOrderSettlement/components/settlementAnomaly.vue
index 024adb26..e827c9ef 100644
--- a/src/views/oem/oemOrderSettlement/components/settlementAnomaly.vue
+++ b/src/views/oem/oemOrderSettlement/components/settlementAnomaly.vue
@@ -566,7 +566,9 @@ export default {
                     price: this.form && this.form.price,
                     postPlatingStorageTimeStart:this.query && this.query.putStoreTime && this.query.putStoreTime.length != 0 && this.query.putStoreTime[0],
                     postPlatingStorageTimeEnd:this.query && this.query.putStoreTime && this.query.putStoreTime.length != 0 && this.query.putStoreTime[1],
-                    memo:this.query && this.query.memo && this.query.memo.length != 0 && this.query.memo.join(';'),
+                     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,
+                    // memo:this.query && this.query.memo && this.query.memo.length != 0 && this.query.memo.join(';'),
                 };
                 if(params.putStoreTime) delete params.putStoreTime;
 
diff --git a/src/views/productionTesting/productionQuality.vue b/src/views/productionTesting/productionQuality.vue
index 9dd9b510..70b3a25b 100644
--- a/src/views/productionTesting/productionQuality.vue
+++ b/src/views/productionTesting/productionQuality.vue
@@ -144,6 +144,7 @@
         :expand-row-keys="expandedRowKeys"
         @expand-change="handleExpandChange"
         :default-expand-all="false"
+        :cell-class-name="tableClassName"
       >
       <!--  && vxeTableData.find(item => item.item.name == '尺寸检测').wpItemDetailList &&
               vxeTableData.find(item => item.item.name == '尺寸检测').wpItemDetailList.length > 0 -->
@@ -442,7 +443,7 @@
           align="center"
         >
           <template #default="scope">
-            <el-input v-model="scope.row.testQty" :disabled=" scope.row.checkUserRealName != null && scope.row.checkUserRealName != '' "></el-input>
+            <el-input v-model="scope.row.testQty"  :disabled=" scope.row.checkUserRealName != null && scope.row.checkUserRealName != '' "></el-input>
           </template>
         </el-table-column>
         <el-table-column
@@ -1113,12 +1114,15 @@ export default {
       row.ruleSize = val && item && item.norms
       row.dueDate = val && item &&  item.dueDate
     },
-
+    tableClassName({ row, column, rowIndex, columnIndex }){
+      if(column.property === 'testQty'){
+        console.log('row.testQty=============',row.testQty)
+        if(row.testQty > this.dialogData.poQty * 0.01){
+          return 'high_td';
+        }
+      }
+    },
     cellClassName({ row, column, rowIndex, columnIndex }) {
-      console.log('row=============',row)
-      console.log('column=============',column)
-      console.log('rowIndex=============',rowIndex)
-      console.log('columnIndex=============',columnIndex)
       if(column.property == 'gaugeValue7'){
         if(row.codeStatus == true){
           return 'high_td';
diff --git a/src/views/qualityManagement/inspectionArchiving/ERecord/printDialog.vue b/src/views/qualityManagement/inspectionArchiving/ERecord/printDialog.vue
index 7a2c44ed..80527f73 100644
--- a/src/views/qualityManagement/inspectionArchiving/ERecord/printDialog.vue
+++ b/src/views/qualityManagement/inspectionArchiving/ERecord/printDialog.vue
@@ -638,7 +638,7 @@ export default {
           if (this.modelTwo[i].procedureSet.ppsName.indexOf('检验') != -1) {
             if (testWorkPlan == null) {
               testWorkPlan = this.modelTwo[i];
-              if (this.modelThree && this.modelThree.checkList) {
+              if (this.modelThree && this.modelThree.checkList && this.modelThree.checkList.length > 0) {
                 const item = this.modelThree.checkList.find(
                   (item) =>
                     item.testOrders.indexOf(testWorkPlan.orders + '-') != -1