模具

src/application/mk/index.js

@@ -104,12 +104,19 @@ VXETable.formats.mixin({
         return '未审';
     },
     formatDateTime({ cellValue }) { // 日期时间格式化
+        
+        if(!cellValue){
+            return '';
+        }
         if (typeof (cellValue) == "number") {
             cellValue = new Date(cellValue * 1000);
         }
         return XEUtils.toDateString(cellValue, 'yyyy-MM-dd HH:mm:ss')
     },
     formatDate({ cellValue }) { // 日期格式化
+        if(!cellValue){
+            return '';
+        }
         if (typeof (cellValue) == "number") {
             cellValue = new Date(cellValue * 1000);
         }

src/application/mk/libs/function/funs.js

@@ -11,7 +11,7 @@ export default {
   },
 
 
-  formatDetailData({ data }) {
+  formatDetailData({ data, rules }) {
 
     if (data.create_time) {
       data.create_time = new Date(data.create_time * 1000);
@@ -21,6 +21,34 @@ export default {
     }
 
 
+
+    let feachRules = (rules) => {
+
+      rules.forEach(rule => { // 循环规则
+        if (rule.children && rule.children.length) {
+          feachRules(rule.children);
+        }
+        if (!rule.dataRule) {
+          return;
+        }
+        if (rule.field in data) { // 如果字段在数据中
+          let value = data[rule.field]; // 获取值   
+          if (rule.dataRule.type == "timestamp" && value) { // 如果是时间戳
+
+            data[rule.field] = new Date(value * 1000);
+
+          }
+        }
+      });
+    };
+    if (rules) {
+      feachRules(rules);
+    }
+
+
+
+
+
     return data;
 
   },
@@ -45,10 +73,16 @@ export default {
             item[rule.field] = parseFloat(value);
           }
           else if (rule.type == "timestamp") {
-            item[rule.field] = parseInt(new Date(value).getTime() / 1000);
+            if(value){
+              if(typeof(value) == 'string'){
+                item[rule.field] = parseInt(new Date(value).getTime() / 1000);
+              }
+            
+            }
+         
           }
           else if (rule.type == "bigint") {
-            if(typeof(item[rule.field]) == 'string'){
+            if (typeof (item[rule.field]) == 'string') {
               item[rule.field] = JSONbig.parse(`{"v":${item[rule.field]}}`).v;
             }
 

src/pages/Middle/Mes/MesStaff/MesStaff/Edit.vue

@@ -162,6 +162,9 @@ export default {
 
             name: [
               { required: true, message: '请输入员工姓名' }
+            ],
+            code: [
+              { required: true, message: '请输入工号' }
             ]
 
             // =============================== 表单校验 自动生成 End ===============================

src/pages/Middle/Mold/MoldOrder/Edit.vue

@@ -29,7 +29,7 @@
       <vxe-column field="production_type" title="布产类型" width="160"  :params="options_production_type"  formatter = 'formatEnum' 
         :edit-render="{ name: '$select',props:{options:options_production_type} }"></vxe-column> 
 
-      <vxe-column field="mold_master_uid" title="师傅" width="160" :params="editor_staff" formatter="formatRef"
+      <vxe-column field="mold_master_user_detail" title="师傅" width="160" :params="editor_staff" formatter="formatRef"
         :edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
         
         <vxe-column field="manufacture_cycle" title="制作周期" width="160"   formatter="formatDate"
@@ -176,7 +176,7 @@ export default {
         textField: "name",
         listdataFieldName: 'MesStaff',
         mapper: [
-          { fromField: "id", field: "mes_staff_id" }
+          { fromField: "id", field: "mold_master_uid" }
         ],
         dataUrl: `${BASE_URL.BASE_URL}/MesStaff/v1/mes/staff/list`
       },
@@ -214,7 +214,7 @@ export default {
       }).then(a => {
 
 
-        this.formOptions.data = this.$mk.formatDetailData({ data: a.data[this.detailDataFieldName] });
+        this.formOptions.data = this.$mk.formatDetailData({ data: a.data[this.detailDataFieldName],rules:this.formOptions.items });
 
         this.detailsData = JSON.parse(JSON.stringify(a.data[this.detailDataFieldName].order_molds || []));
 
@@ -328,6 +328,9 @@ export default {
             {field:'inlay_deep_hole_time',type:'timestamp'} ,
             {field:'update_uid',type:'bigint'} ,
             {field:'mold_id',type:'bigint'} ,
+            {field:'mold_master_uid',type:'bigint'} ,
+
+            
             {field:'create_uid',type:'bigint'} 
           ]
         });

src/pages/Middle/Mold/MoldProductionOrder/Edit.vue

@@ -190,7 +190,7 @@ export default {
       currentBeid: 0,
 
       uploadDefaultImg: null,
-      detailDataFieldName: "mold_scheme",
+      detailDataFieldName: "mold_production_order",
 
       actions: {
         get: `${BASE_URL.BASE_URL}/MoldProductionOrder/v1/mold/production/order/detail`,
@@ -220,11 +220,11 @@ export default {
         },
         // 表单项
         items: [ 
-          { field: 'order_code', title: '订单编号', span: 8, itemRender: { name: '$input' } },
 
+          { field: 'code', title: '编号', span: 8, itemRender: { name: '$input' } },
           {
             title: '订单', span: 8,
-            field: 'order_id',
+            field: 'mold_order',
             dataRule: {
               fromField: "id",
               saveField: "order_id" // 如果表单项存储的是对象，将从fromField中取得值保存到saveField
@@ -364,8 +364,9 @@ export default {
       }).then(a => {
 
 
-        this.formOptions.data = this.$mk.formatDetailData({ data: a.data[this.detailDataFieldName] });
+        this.formOptions.data = this.$mk.formatDetailData({ data: a.data[this.detailDataFieldName],rules:this.formOptions.items });
 
+        console.log(this.formOptions.data)
         this.detailsData = JSON.parse(JSON.stringify(a.data[this.detailDataFieldName].mold_production_order_component || []));
         this.detailsData2 = JSON.parse(JSON.stringify(a.data[this.detailDataFieldName].mold_production_order_component_processes || []));
 
@@ -471,13 +472,16 @@ export default {
         this.$mk.formatFormData({ data: postdata, rules: this.formOptions.items });
 
         postdata.mold_production_order_component = this.$mk.getPostFieldValue({
-          rowFilter: (row) => { return row.id || row.mold_id },
+          rowFilter: (row) => { return row.id || row.component_id },
           dataId: this.getDataId_BigInt(),
           list: this.detailsData,
           deletedList: this.deletedDetailsData,
           fieldName: 'production_id',
           dataRule: [
             { field: 'production_type', type: 'integer' },
+            { field: 'component_num', type: 'integer' },
+
+            
             { field: 'id', type: 'bigint' },
             { field: 'update_uid', type: 'bigint' },
             { field: 'create_uid', type: 'bigint' },
@@ -489,7 +493,7 @@ export default {
           ]
         });
         postdata.mold_production_order_component_processes = this.$mk.getPostFieldValue({
-          rowFilter: (row) => { return row.id || (row.mold_id && row.mes_processes_id) },
+          rowFilter: (row) => { return row.id || (row.component_id && row.mes_processes_id) },
           dataId: this.getDataId_BigInt(),
           list: this.detailsData2,
           deletedList: this.deletedDetailsData2,

src/pages/Middle/Mold/MoldProductionOrder/List.vue

@@ -63,13 +63,13 @@ export default {
         },
         // 搜索区配置
         searchRules: [ 
-          { key: "order_code", mode: "like" }
+          { key: "code", mode: "like" }
         ],
         //搜索区
         searchFormItems: [ // 子项
 
          
-          { field: 'order_code', title: '订单编码', span: 6, itemRender: { name: '$input', props: { placeholder: '请输入订单编码' } } }, 
+          { field: 'code', title: '编码', span: 6, itemRender: { name: '$input', props: { placeholder: '请输入编码' } } }, 
 
           {
             align: 'right', span: 4, itemRender: {  // 按钮列
@@ -94,7 +94,7 @@ export default {
             { title: '操作', slots: { default: 'op' }, width: 120 },
  
             
-            { field: 'order_code', sortable: true, title: '订单编码', width: 250 },
+            { field: 'code', sortable: true, title: '编码', width: 250 },
  
 
             { field: 'create_time', formatter: 'formatDate', width: 100, sortable: true, title: '创建时间', showHeaderOverflow: true }, // 创建时间

src/pages/Middle/Mold/MoldScheme/Edit.vue

@@ -29,7 +29,7 @@
             formatter='formatEnum'
             :edit-render="{ name: '$select', props: { options: options_production_type } }"></vxe-column>
 
-          <vxe-column field="process_uid" title="加工人员" width="160" :params="editor_staff" formatter="formatRef"
+          <vxe-column field="process_uid_info" title="加工人员" width="160" :params="editor_staff" formatter="formatRef"
             :edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
 
         </vxe-table>