模具

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

@@ -16,6 +16,11 @@ export default {
                     }
                     if (rule.field in data) { // 如果字段在数据中
                         let value = data[rule.field]; // 获取值  
+
+                        if (rule.dataRule.type == "object" && rule.dataRule.fromTextField) {  
+                            data[rule.dataRule.saveTextField] = value[rule.dataRule.fromTextField];
+                        }
+
                         if (rule.dataRule.fromField) {
                             value = value[rule.dataRule.fromField];
                         }
@@ -23,6 +28,8 @@ export default {
                         if (rule.dataRule.saveField) {
                             saveField = rule.dataRule.saveField;
                         }
+                       
+
                         if (rule.dataRule.type == "integer") { // 如果是整数
                             if(value == null){
                                 data[saveField] = null;

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

@@ -59,6 +59,13 @@ export default {
         if (!rule.dataRule) {
           return;
         }
+        
+        if (rule.dataRule.initType == "object" && data[rule.dataRule.idField]) { 
+
+          data[rule.field] = {id:data[rule.dataRule.idField],name:data[rule.dataRule.textField]}; 
+
+        }
+
         if (rule.field in data) { // 如果字段在数据中
           let value = data[rule.field]; // 获取值   
           if (rule.dataRule.type == "timestamp" && value) { // 如果是时间戳
@@ -66,7 +73,6 @@ export default {
             data[rule.field] = new Date(value * 1000);
 
           }
-
           if (rule.dataRule.isSelect) {
             if (value == 0) {
               data[rule.field] = null;

src/pages/Middle/Mold/MoldOrder/dataset.js

@@ -32,6 +32,9 @@ var dataset = {
     order_molds:{
         fields:[
             { field: 'id', type: 'bigint' },
+            { field: 'production_id', type: 'bigint' },
+
+            
             { field: 'production_type', type: 'integer' },
             { field: 'manufacture_cycle', type: 'timestamp' },
             { field: 'draw_start_time', type: 'timestamp' },

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

@@ -215,9 +215,23 @@ export default {
               }
             }
           },
+          {
+            title: '工程师傅', span: 6,
+            field: 'engineer_name',
+            dataRule: {
+              fromField: "id",
+              saveField: "engineer_uid" // 如果表单项存储的是对象，将从fromField中取得值保存到saveField
+            },
+            itemRender: {
+              name: 'MkFormInputShow', props: {
+                params: { 
+                }
+              }
+            }
+          },
           { field: 'customer_name', title: '客户名称', span: 6, itemRender: { name: '$input' } },
           {
-            field: 'progress', title: '进度', span: 12, itemRender: {
+            field: 'progress', title: '进度', span: 6, itemRender: {
               name: 'MkFormProgress', props: {
                 params: {
                   type: "line"
@@ -878,10 +892,17 @@ export default {
         tdata.mold_name = tdata.mold_detail.name || '';
       }
       for (let name in tdata) {
-        if (name.indexOf('_time') != -1 && tdata[name] && tdata[name].indexOf('T') != -1) {
+        
+        if (
+          (name.indexOf('_time') != -1 || name == 'manufacture_cycle')
+        
+        && tdata[name] && tdata[name].indexOf('T') != -1) {
           tdata[name] = tdata[name].split('T')[0];
         }
       }
+      tdata.project_man_name = tdata.engineer_name;
+      tdata.mold_master_name  = tdata.mold_master_user_detail.name;
+      
       tdata.qrcode = tdata.qr_code;
 
 

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

@@ -221,7 +221,36 @@ export default {
               }
             }
           },
-          
+          {
+            title: '工程师傅', span: 6,
+            field: 'engineer_detail',
+            dataRule: {
+              initType:'object', 
+
+              textField:'engineer_name',
+              idField:'engineer_uid',
+
+              
+              type:'object', 
+              fromTextField: "name", 
+              saveTextField: "engineer_name",
+
+
+              fromField: "id", 
+              saveField: "engineer_uid" // 如果表单项存储的是对象，将从fromField中取得值保存到saveField
+            },
+            itemRender: {
+              name: 'MkFormDataSelector', props: {
+                params: { 
+                  dataType: "object",
+                  valueField: "id",
+                  textField: "name",
+                  listdataFieldName: 'MesStaff',
+                  dataUrl: `${BASE_URL.BASE_URL}/MesStaff/v1/mes/staff/list`
+                }
+              }
+            }
+          },
           { field: 'customer_name', title: '客户名称', span: 6, itemRender: { name: '$input' } },
           {
             field: 'progress', title: '进度', span: 12, itemRender: {
@@ -776,9 +805,12 @@ export default {
         if (postdata.mold_master_uid) {
           postdata.mold_master_uid = this.$mk.toBigInt(postdata.mold_master_uid);
         }
+        if (postdata.engineer_uid) {
+          postdata.engineer_uid = this.$mk.toBigInt(postdata.engineer_uid);
+        }
 
 
-
+        
         postdata.mold_production_order_component = !this.isEdit ? [] : { insertList: [], deleteList: [], updateList: [] };
         postdata.mold_production_order_component_processes = !this.isEdit ? [] : { insertList: [], deleteList: [], updateList: [] };
 

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

@@ -169,8 +169,8 @@ export default {
 
 
             { slots: { default: 'column1' }, title: '查看详情', width: 120 },
-            { field: 'code', title: '编码', width: 100 },
+            { field: 'code', title: '编码', sortable: true,  width: 100 },
-            { field: 'mold_master_user_detail', formatter: 'formatRef', params: { dataType: "object", textField: "name" }, title: '模具师傅', width: 120 },
+            { field: 'mold_master_name',   sortable: true,  params: { dataType: "object", textField: "name" }, title: '模具师傅', width: 120 },
             { field: 'complete_time', formatter: 'formatDate', width: 130, sortable: true, title: '要求完成时间', showHeaderOverflow: true },
 
             //{ field: 'mold_order', formatter: 'formatRef', params: { dataType: "object", textField: "code" }, sortable: false, title: '订单编号', width: 120 },