From 6dc256848e3ce2bf4e1129869645714c511f97a8 Mon Sep 17 00:00:00 2001
From: xielue <gd_star@163.com>
Date: Fri, 15 Sep 2023 23:18:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=85=B7bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/application/mk/libs/function/funs.js           | 12 ++++++++++++
 src/pages/Middle/Mold/MoldOrder/Edit.vue           |  2 +-
 .../Mold/MoldProductionOrder/ComponentDetail.vue   | 14 ++++++++------
 src/pages/Middle/Mold/MoldProductionOrder/Edit.vue |  5 ++++-
 src/pages/Middle/Mold/basic/settings.js            |  4 ++--
 5 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/src/application/mk/libs/function/funs.js b/src/application/mk/libs/function/funs.js
index 6d95441..1b92b8e 100644
--- a/src/application/mk/libs/function/funs.js
+++ b/src/application/mk/libs/function/funs.js
@@ -22,6 +22,18 @@ export default {
     return XEUtils.toDateString(cellValue, 'yyyy-MM-dd HH:mm:ss')
   },
 
+  formatEnum(cellValue, options ) { // 格式化状态
+    if (cellValue == null) return '';
+    
+    for (let i = 0; i < options.length; i++) {
+      if (options[i].value == cellValue) {
+        return '' + options[i].label + '';
+      }
+    }
+    return '';
+  },
+
+
   formatDetailData({ data, rules }) {
 
     if (data.create_time) {
diff --git a/src/pages/Middle/Mold/MoldOrder/Edit.vue b/src/pages/Middle/Mold/MoldOrder/Edit.vue
index aa62ca3..fbfc1e5 100644
--- a/src/pages/Middle/Mold/MoldOrder/Edit.vue
+++ b/src/pages/Middle/Mold/MoldOrder/Edit.vue
@@ -415,7 +415,7 @@ export default {
             { field: 'update_uid', type: 'bigint' },
             { field: 'mold_id', type: 'bigint' },
             { field: 'mold_master_uid', type: 'bigint' },
-
+            { field: 'manufacture_cycle', type: 'timestamp' }, 
 
             { field: 'create_uid', type: 'bigint' }
           ]
diff --git a/src/pages/Middle/Mold/MoldProductionOrder/ComponentDetail.vue b/src/pages/Middle/Mold/MoldProductionOrder/ComponentDetail.vue
index 3a242f8..0f329d4 100644
--- a/src/pages/Middle/Mold/MoldProductionOrder/ComponentDetail.vue
+++ b/src/pages/Middle/Mold/MoldProductionOrder/ComponentDetail.vue
@@ -9,8 +9,10 @@
         :edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
       <vxe-column field="component_num" title="部件数量" width="160"
         :edit-render="{ name: '$input', props: { type: 'number' } }"></vxe-column>
-      <vxe-column field="production_type" title="布产类型" width="160" :params="{ data: options_production_type }"
-        formatter='formatEnum' :edit-render="{}">
+      <vxe-column field="production_type" title="布产类型" width="160" :edit-render="{}">
+        <template #default="{ row }">
+          <span>{{ $mk.formatEnum(row.production_type, options_production_type) }}</span>
+        </template>
         <template #edit="{ row }">
           <vxe-select v-model="row.production_type" transfer>
             <vxe-option v-for="item in options_production_type" :key="item.value" :value="item.value"
@@ -43,7 +45,7 @@
 
 
       <vxe-column field="complete_type" title="完工人员类型" width="160" :params="{ data: options_user_type }"
-        formatter='formatEnum' :edit-render="{ name: '$select', props: { options: options_user_type } }"></vxe-column>
+        formatter='formatEnum'></vxe-column>
 
       <vxe-column field="remark" title="备注" width="160" :edit-render="{ name: '$input', props: {} }"></vxe-column>
 
@@ -552,7 +554,7 @@ export default {
           { field: 'component_num', type: 'integer' },
           { field: 'prepare_process_time', type: 'timestamp' },
           { field: 'plan_complete_time', type: 'timestamp' },
-          
+
           { field: 'id', type: 'bigint' },
           { field: 'update_uid', type: 'bigint' },
           { field: 'complete_uid', type: 'bigint' },
@@ -575,7 +577,7 @@ export default {
           { field: 'id', type: 'bigint' },
           { field: 'prepare_process_time', type: 'timestamp' },
           { field: 'plan_complete_time', type: 'timestamp' },
-          
+
 
           { field: 'send_uid', type: 'bigint' },
           { field: 'complete_uid', type: 'bigint' },
@@ -607,7 +609,7 @@ export default {
     },
     beforeEditEvent({ column, row }) {
       console.log(column, row);
-      if(this.readonly){
+      if (this.readonly) {
         return false;
       }
     },
diff --git a/src/pages/Middle/Mold/MoldProductionOrder/Edit.vue b/src/pages/Middle/Mold/MoldProductionOrder/Edit.vue
index 0bafac5..8196232 100644
--- a/src/pages/Middle/Mold/MoldProductionOrder/Edit.vue
+++ b/src/pages/Middle/Mold/MoldProductionOrder/Edit.vue
@@ -188,9 +188,12 @@ export default {
           { field: 'draw2D_time', dataRule: { type: 'timestamp' }, title: '出2D时间预计', span: 8, itemRender: { name: '$input', props: { type: 'date' } } },
           { field: 'draw3D_time', dataRule: { type: 'timestamp' }, title: '出3D时间预计', span: 8, itemRender: { name: '$input', props: { type: 'date' } } },
           { field: 'inlay_deep_hole_time', dataRule: { type: 'timestamp' }, title: '镶件深孔钻到厂日期预计', span: 8, itemRender: { name: '$input', props: { type: 'date' } } },
+          { field: 'horizontal_frame_time', dataRule: { type: 'timestamp' }, title: '横架到厂日期预计', span: 8, itemRender: { name: '$input', props: { type: 'date' } } },
+
+          
           { field: 'problem', title: '出现问题及建议反馈', span: 8, itemRender: { name: '$input', props: {} } },
           {
-              title: '模具师傅名称', span: 8,
+              title: '模具师傅', span: 8,
               field: 'mold_master_user_detail',
               dataRule: {
                 fromField: "id",
diff --git a/src/pages/Middle/Mold/basic/settings.js b/src/pages/Middle/Mold/basic/settings.js
index eed3e48..d083d89 100644
--- a/src/pages/Middle/Mold/basic/settings.js
+++ b/src/pages/Middle/Mold/basic/settings.js
@@ -1,9 +1,9 @@
 var config = {
 
-    options_production_type: [{ value: '1', label: '正常布产' }, { value: '2', label: '委托布产' }], 
+    options_production_type: [{ value: 1, label: '正常布产' }, { value: 2, label: '委托布产' }], 
     options_is_complete: [{ value: '0', label: '未完成' }, { value: '1', label: '已完成' }],
     options_is_send: [{ value: '0', label: '未发料' }, { value: '1', label: '已发料' }],
-    options_user_type: [{ value: '1', label: '管理员' }, { value: '2', label: '员工' }, { value: '3', label: '触控屏' }],
+    options_user_type: [{ value: 1, label: '管理员' }, { value: 2, label: '员工' }, { value: 3, label: '触控屏' }],
 
     printTemplate: { "panels": [{ "index": 0, "name": 1, "height": 296.6, "width": 210, "paperHeader": 97.5, "paperFooter": 810, "printElements": [{ "options": { "left": 3, "top": 25.5, "height": 16, "width": 198, "field": "order_code", "fontSize": 15, "title": "订单", "right": 162, "bottom": 26.5, "vCenter": 84, "hCenter": 18.5, "coordinateSync": false, "widthHeightSync": false, "qrCodeLevel": 0 }, "printElementType": { "title": "订单编号", "type": "text" } }, { "options": { "left": 3, "top": 9, "height": 16, "width": 198, "field": "code", "fontSize": 15, "title": "编号", "right": 164.25, "bottom": 26.5, "vCenter": 84.75, "hCenter": 18.5, "coordinateSync": false, "widthHeightSync": false, "qrCodeLevel": 0 }, "printElementType": { "title": "编号", "type": "text" } }, { "options": { "left": 232.5, "top": 27, "height": 16, "width": 280.5, "field": "mold_name", "fontSize": 15, "title": "模具", "coordinateSync": false, "widthHeightSync": false, "qrCodeLevel": 0, "right": 555, "bottom": 50.5, "vCenter": 453, "hCenter": 42.5 }, "printElementType": { "title": "模具", "type": "text" } }, { "options": { "left": 520.5, "top": 24, "height": 66, "width": 66, "field": "qrcode", "fontSize": 15, "fontWeight": "700", "textAlign": "center", "hideTitle": true, "title": "qrcode", "coordinateSync": false, "widthHeightSync": false, "textType": "qrcode", "qrCodeLevel": 0, "right": 588.75, "bottom": 90, "vCenter": 555.75, "hCenter": 57 }, "printElementType": { "title": "qrcode", "type": "text" } }, { "options": { "left": 4.5, "top": 43.5, "height": 16, "width": 198, "field": "draw_start_time", "fontSize": 15, "title": "画图时间", "right": 126, "bottom": 39.25, "vCenter": 66, "hCenter": 31.25, "coordinateSync": false, "widthHeightSync": false, "qrCodeLevel": 0 }, "printElementType": { "title": "画图时间", "type": "text" } }, { "options": { "left": 234, "top": 45, "height": 16, "width": 279, "field": "split_design_time", "fontSize": 15, "title": "分模设计时间", "right": 553.5, "bottom": 43, "vCenter": 393.75, "hCenter": 35, "coordinateSync": false, "widthHeightSync": false, "qrCodeLevel": 0 }, "printElementType": { "title": "分模设计时间", "type": "text" } }, { "options": { "left": 235.5, "top": 63, "height": 16, "width": 280.5, "field": "draw2D_time", "fontSize": 15, "title": "出2D时间", "right": 517.5, "bottom": 55.75, "vCenter": 377.25, "hCenter": 47.75, "coordinateSync": false, "widthHeightSync": false, "qrCodeLevel": 0 }, "printElementType": { "title": "出2D时间", "type": "text" } }, { "options": { "left": 4.5, "top": 63, "height": 16, "width": 198, "field": "draw_time", "fontSize": 15, "title": "出图时间", "right": 204, "bottom": 61, "vCenter": 105, "hCenter": 53, "coordinateSync": false, "widthHeightSync": false, "qrCodeLevel": 0 }, "printElementType": { "title": "出图时间", "type": "text" } }, { "options": { "left": 4.5, "top": 79.5, "height": 16, "width": 511.5, "field": "inlay_deep_hole_time", "fontSize": 15, "title": "镶件深孔钻到厂", "right": 517.5, "bottom": 79, "vCenter": 261.75, "hCenter": 71, "coordinateSync": false, "widthHeightSync": false, "qrCodeLevel": 0 }, "printElementType": { "title": "镶件深孔钻到厂", "type": "text" } }, { "options": { "left": 6, "top": 103.5, "height": 36, "width": 580.5, "tableFooterRepeat": "last", "field": "details", "tableHeaderRepeat": "first", "fields": [{ "field": "component_detail_name", "text": "部件" }, { "field": "process_detail_name", "text": "工序" }, { "field": "process_u_name", "text": "加工人员" }, { "field": "prepare_process_time", "text": "预备加工日期" }, { "field": "plan_complete_time", "text": "计划完成时间" }, { "field": "send_time", "text": "发料时间" }, { "field": "complete_time", "text": "实际完成时间" }, { "field": "remark", "text": "备注" }], "columns": [[{ "width": 150, "title": "部件", "field": "component_detail_name", "checked": true, "columnId": "component_detail_name", "fixed": false, "rowspan": 1, "colspan": 1, "align": "center", "tableColumnHeight": 30, "tableTextType": "text", "tableBarcodeMode": "CODE128A", "tableQRCodeLevel": 0 }, { "width": 150, "title": "工序", "field": "process_detail_name", "checked": true, "columnId": "process_detail_name", "fixed": false, "rowspan": 1, "colspan": 1, "align": "center", "tableColumnHeight": 30, "tableTextType": "text", "tableBarcodeMode": "CODE128A", "tableQRCodeLevel": 0 }, { "width": 150, "title": "加工人员", "field": "process_u_name", "checked": true, "columnId": "process_u_name", "fixed": false, "rowspan": 1, "colspan": 1, "align": "center", "tableColumnHeight": 30, "tableTextType": "text", "tableBarcodeMode": "CODE128A", "tableQRCodeLevel": 0 }, { "width": 150, "title": "预备加工日期", "field": "prepare_process_time", "checked": true, "columnId": "prepare_process_time", "fixed": false, "rowspan": 1, "colspan": 1, "align": "center", "tableColumnHeight": 30, "tableTextType": "text", "tableBarcodeMode": "CODE128A", "tableQRCodeLevel": 0 }, { "width": 150, "title": "计划完成时间", "field": "plan_complete_time", "checked": true, "columnId": "plan_complete_time", "fixed": false, "rowspan": 1, "colspan": 1, "align": "center", "tableColumnHeight": 30, "tableTextType": "text", "tableBarcodeMode": "CODE128A", "tableQRCodeLevel": 0 }, { "width": 150, "title": "发料时间", "field": "send_time", "checked": true, "columnId": "send_time", "fixed": false, "rowspan": 1, "colspan": 1, "align": "center", "tableColumnHeight": 30, "tableTextType": "text", "tableBarcodeMode": "CODE128A", "tableQRCodeLevel": 0 }, { "width": 150, "title": "实际完成时间", "field": "complete_time", "checked": true, "columnId": "complete_time", "fixed": false, "rowspan": 1, "colspan": 1, "align": "center", "tableColumnHeight": 30, "tableTextType": "text", "tableBarcodeMode": "CODE128A", "tableQRCodeLevel": 0 }, { "width": 150, "title": "备注", "field": "remark", "checked": true, "columnId": "remark", "fixed": false, "rowspan": 1, "colspan": 1, "align": "center", "tableColumnHeight": 30, "tableTextType": "text", "tableBarcodeMode": "CODE128A", "tableQRCodeLevel": 0 }]] }, "printElementType": { "title": "工序列表", "type": "table", "editable": true, "columnDisplayEditable": true, "columnDisplayIndexEditable": true, "columnTitleEditable": true, "columnResizable": true, "columnAlignEditable": true, "isEnableEditField": true, "isEnableContextMenu": true, "isEnableInsertRow": true, "isEnableDeleteRow": true, "isEnableInsertColumn": true, "isEnableDeleteColumn": true, "isEnableMergeCell": true } }], "paperNumberLeft": 571.5, "paperNumberTop": 817.5, "watermarkOptions": { "content": "", "rotate": 25, "timestamp": false, "format": "YYYY-MM-DD HH:mm" } }] }
 };