模具

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

@@ -7,44 +7,48 @@ export default {
         let feachRules = (rules) => {
 
             rules.forEach(rule => { // 循环规则
-                if (rule.children && rule.children.length) {
+                try{
-                    feachRules(rule.children);
+                    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.fromField) {
-                        value = value[rule.dataRule.fromField];
                     }
-                    let saveField = rule.field;
+                    if (!rule.dataRule) {
-                    if (rule.dataRule.saveField) {
+                        return;
-                        saveField = rule.dataRule.saveField;
                     }
-                    if (rule.dataRule.type == "integer") { // 如果是整数
+                    if (rule.field in data) { // 如果字段在数据中
-                        data[saveField] = parseInt(value); // 转换为整数
+                        let value = data[rule.field]; // 获取值  
-                    }
+                        if (rule.dataRule.fromField) {
-                    else if (rule.dataRule.type == "number") { // 如果是整数
+                            value = value[rule.dataRule.fromField];
-                        data[saveField] = parseFloat(value); // 转换为整数
-                    }
-                    else if (rule.dataRule.type == "timestamp") { // 如果是时间戳
-                        data[saveField] = parseInt(new Date(value).getTime() / 1000); // 转换为时间戳
-                    }
-                    else if (rule.dataRule.type == "string") { // 如果是字符串
-                        if (data[saveField] === true) {
-                            data[saveField] = "true";
                         }
-                        else if (data[saveField] === false) {
+                        let saveField = rule.field;
-                            data[saveField] = "false";
+                        if (rule.dataRule.saveField) {
+                            saveField = rule.dataRule.saveField;
                         }
-                        else if (data[saveField]) {
+                        if (rule.dataRule.type == "integer") { // 如果是整数
-                            data[saveField] = value + "";
+                            data[saveField] = parseInt(value); // 转换为整数
+                        }
+                        else if (rule.dataRule.type == "number") { // 如果是整数
+                            data[saveField] = parseFloat(value); // 转换为整数
+                        }
+                        else if (rule.dataRule.type == "timestamp") { // 如果是时间戳
+                            data[saveField] = parseInt(new Date(value).getTime() / 1000); // 转换为时间戳
+                        }
+                        else if (rule.dataRule.type == "string") { // 如果是字符串
+                            if (data[saveField] === true) {
+                                data[saveField] = "true";
+                            }
+                            else if (data[saveField] === false) {
+                                data[saveField] = "false";
+                            }
+                            else if (data[saveField]) {
+                                data[saveField] = value + "";
+                            }
+                        }
+                        else {
+                            data[saveField] = value;
                         }
                     }
-                    else {
+                }catch(e){
-                        data[saveField] = value;
+                    console.log(e)
-                    }
                 }
             });
         };

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

@@ -452,7 +452,7 @@ export default {
             let detail = data.row2;
 
             console.log(detail)
-            this.formOptions.data.mold_scheme = detail.mold_scheme;
+            this.formOptions.data.mold_detail = detail.mold_scheme;
             this.formOptions.data.mold_id = detail.mold_id;
 
 

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

@@ -373,6 +373,7 @@ export default {
         // 如果是新增模式，提交的数据中加入id 如果是编辑模式，提交的数据中不加入id
         let postdata = Object.assign({}, this.formOptions.data);
 
+        console.log(postdata)
 
         // 格式化提交的数据
         this.$mk.formatFormData({ data: postdata, rules: this.formOptions.items });
@@ -391,6 +392,8 @@ export default {
             { field: 'create_uid', type: 'bigint' }
           ]
         });
+        
+
         postdata.mold_scheme_processes = this.$mk.getPostFieldValue({
           rowFilter: (row) => { return row.id || (row.component_id && row.mes_processes_id) },
           dataId: this.getDataId_BigInt(),
@@ -405,7 +408,6 @@ export default {
           ]
         });
 
-
         // 提交数据
         this.$mk.post({
           url: action,

src/pages/Middle/Mold/Touch/Reporting.vue

@@ -119,23 +119,37 @@ export default {
         items: [
 
 
+        { field: 'code', title: '编号', span: 8, itemRender: { name: 'MkFormInputShow' } },
+        {
+            title: '订单号', span: 8,
+            field: 'mold_order', 
+            itemRender: {
+              name: 'MkFormInputShow', props: {
+                params: {
+                  dataType: "object",
+                  valueField: "id",
+                  textField: "code" 
+                }
+              }
+            }
+          }, 
+
+          { field: 'manufacture_cycle', dataRule: { type: 'timestamp' }, title: '制作周期', span: 8, itemRender: { name: 'MkFormInputShow', props: { params:{dataType : 'date' }  } }},
+          { field: 'draw_start_time', dataRule: { type: 'timestamp' }, title: '预计开始画图时间', span: 8, itemRender: { name: 'MkFormInputShow', props: { params:{dataType : 'date' } } } },
+          { field: 'split_design_time', dataRule: { type: 'timestamp' }, title: '分模设计时间预计', span: 8, itemRender: { name: 'MkFormInputShow', props: { params:{dataType : 'date' } } } },
+          { field: 'draw_time', dataRule: { type: 'timestamp' }, title: '出图时间预计', span: 8, itemRender: { name: 'MkFormInputShow', props: { params:{dataType : 'date' }} } },
+          { field: 'split_design_time', dataRule: { type: 'timestamp' }, title: '分模设计时间预计', span: 8, itemRender: { name: 'MkFormInputShow', props: { params:{dataType : 'date' }} } },
+          { field: 'draw_time', dataRule: { type: 'timestamp' }, title: '出图时间预计', span: 8, itemRender: { name: 'MkFormInputShow', props: { params:{dataType : 'date' } } } },
+          { field: 'draw2D_time', dataRule: { type: 'timestamp' }, title: '出2D时间预计', span: 8, itemRender: { name: 'MkFormInputShow', props: {params:{dataType : 'date' } } } },
+          { field: 'draw3D_time', dataRule: { type: 'timestamp' }, title: '出3D时间预计', span: 8, itemRender: { name: 'MkFormInputShow', props: { params:{dataType : 'date' } } } },
+          { field: 'horizontal_frame_time', dataRule: { type: 'timestamp' }, title: '出2D时间预计', span: 8, itemRender: { name: 'MkFormInputShow', props: { params:{dataType : 'date' } } } },
+          { field: 'inlay_deep_hole_time', dataRule: { type: 'timestamp' }, title: '镶件深孔钻到厂日期预计', span: 8, itemRender: { name: 'MkFormInputShow', props: { params:{dataType : 'date' } } } },
+          { field: 'problem', title: '出现问题及建议反馈', span: 24, itemRender: { name: 'MkFormInputShow', props: {} } },
+ 
+        
+
 
-          { field: 'code', title: '订单编码', span: 24, itemRender: { name: 'MkFormInputShow' } },
-          { field: 'name', title: '客户名称', span: 24, itemRender: { name: 'MkFormInputShow' } },
-          { field: 'contact', title: '联系人', span: 24, itemRender: { name: 'MkFormInputShow' } },
-          { field: 'phone', title: '联系电话', span: 24, itemRender: { name: 'MkFormInputShow' } },
-          { field: 'salesman', title: '业务员姓名', span: 24, itemRender: { name: 'MkFormInputShow' } },
-          { field: 'contract_no', title: '合同号', span: 24, itemRender: { name: 'MkFormInputShow' } },
-          {
-            field: 'contract_start_time', dataRule: { type: "timestamp" }, title: '合同开始日期',
-            span: 24, itemRender: { name: 'MkFormInputShow', props: { type: "date" } }
-          },
-          {
-            field: 'contract_end_time', dataRule: { type: "timestamp" },
-            title: '合同结束日期', span: 24, itemRender: { name: 'MkFormInputShow', props: { type: "date" } }
-          },
 
-          { field: 'remark', title: '备注', span: 24, itemRender: { name: 'MkFormInputShow' } },
 
         ]
       },
@@ -157,8 +171,8 @@ export default {
             {
               span: 18,
               children: [
-                { field: 'code', title: '料品编号', span: 24, itemRender: { name: 'MkFormInputShow' } },
+                { field: 'code', title: '编号', span: 24, itemRender: { name: 'MkFormInputShow' } },
-                { field: 'name', title: '料品名称', span: 24, itemRender: { name: 'MkFormInputShow' } },
+                { field: 'name', title: '名称', span: 24, itemRender: { name: 'MkFormInputShow' } },
 
               ]
             },
@@ -166,7 +180,7 @@ export default {
               span: 6,
               children: [
                 {
-                  field: 'avatar', span: 24, itemRender: {
+                  field: 'image', span: 24, itemRender: {
                     name: 'MkFormCropper', props: {
                       isReadonly: true
                     }