From c7275bbdc1ff3bc201546c84e308f50822a65d16 Mon Sep 17 00:00:00 2001
From: xielue <gd_star@163.com>
Date: Sat, 17 Jun 2023 19:40:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=83=E4=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/application/mk/index.js                               | 2 +-
 .../Mes/MesProductionOrder/MesProductionOrder/List.vue    | 3 ++-
 .../Mes/MesProductionOrder/MesProductionOrder/voucher.vue | 8 +++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/application/mk/index.js b/src/application/mk/index.js
index 0cad340..c4e0cc3 100644
--- a/src/application/mk/index.js
+++ b/src/application/mk/index.js
@@ -125,7 +125,7 @@ VXETable.formats.mixin({
         return `<img src="${cellValue}">`;
     },
     formatEnum({ cellValue,column }) { // 格式化状态
-        if (!cellValue) return ''; 
+        if (cellValue == null) return ''; 
         if(!column.params) return '';
         for(let i =0;i<column.params.length;i++){
             if(column.params[i].value == cellValue){
diff --git a/src/pages/Middle/Mes/MesProductionOrder/MesProductionOrder/List.vue b/src/pages/Middle/Mes/MesProductionOrder/MesProductionOrder/List.vue
index c05663f..50ce0da 100644
--- a/src/pages/Middle/Mes/MesProductionOrder/MesProductionOrder/List.vue
+++ b/src/pages/Middle/Mes/MesProductionOrder/MesProductionOrder/List.vue
@@ -90,10 +90,11 @@ export default {
             { title: '操作', slots: { default: 'op' }, width: 120 },
 
             { field: 'production_number', sortable: true, title: '单据编码', width: 250 }, // 编码
+            { field: 'audit_status',  params:[{label:"已审批",value:1},{label:"未审批",value:0}] , formatter: 'formatEnum', width: 160, sortable: true, title: '审批状态', showHeaderOverflow: true }, // 审批状态
             { field: 'create_time', formatter: 'formatDate', width: 160, sortable: true, title: '单据日期', showHeaderOverflow: true }, // 创建时间
             { field: 'create_time', formatter: 'formatDate', width: 160, sortable: true, title: '创建时间', showHeaderOverflow: true }, // 创建时间
             { field: 'update_time', formatter: 'formatDate', width: 160, sortable: true, title: '更新时间', showHeaderOverflow: true }, // 更新时间 
-
+            
           ]
         }
 
diff --git a/src/pages/Middle/Mes/MesProductionOrder/MesProductionOrder/voucher.vue b/src/pages/Middle/Mes/MesProductionOrder/MesProductionOrder/voucher.vue
index ce9f2c3..fd0e7f1 100644
--- a/src/pages/Middle/Mes/MesProductionOrder/MesProductionOrder/voucher.vue
+++ b/src/pages/Middle/Mes/MesProductionOrder/MesProductionOrder/voucher.vue
@@ -819,7 +819,7 @@ export default {
         }).then(a => {
            
           this.deletedDetailsData2 = [];
-          this.detailsData2 = a.data.ProductionOrderProcesses || [];
+          this.detailsData2 = JSON.parse(JSON.stringify(a.data.ProductionOrderProcesses || []));
 
           this.showProcesses = true;
         this.detailsDataInit2();
@@ -1007,14 +1007,16 @@ export default {
       var postdata = {
           insertList: [],
           updateList: [],
-          deleteList: this.deletedDetailsData
+          deleteList: this.deletedDetailsData2
         };
 
         ds.forEach(item => {
           delete item._X_ROW_KEY;
 
           item.production_order_id = this.getDataId_BigInt();
-          item.materials_id = this.$mk.toBigInt(this.currentRow.materials_id);
+          item.materials_id = this.$mk.toBigInt(this.currentRow.materials_id); 
+          item.step_id = this.$mk.toBigInt(item.step_id);
+          
           
           if (item.id) {
             item.id = this.$mk.toBigInt(item.id);