模具bug

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) {

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' }
           ]

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>
 

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",