From f959e8483ddb0f2c1ec8a77604b22900823e64bb Mon Sep 17 00:00:00 2001 From: xielue Date: Thu, 31 Aug 2023 23:23:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/application/mk/libs/function/form.js | 68 ++++++++++--------- .../Middle/Mold/MoldProductionOrder/Edit.vue | 2 +- src/pages/Middle/Mold/MoldScheme/Edit.vue | 4 +- src/pages/Middle/Mold/Touch/Reporting.vue | 50 +++++++++----- 4 files changed, 72 insertions(+), 52 deletions(-) diff --git a/src/application/mk/libs/function/form.js b/src/application/mk/libs/function/form.js index 9111bb0..6acf06b 100644 --- a/src/application/mk/libs/function/form.js +++ b/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) { - 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]; + try{ + if (rule.children && rule.children.length) { + feachRules(rule.children); } - let saveField = rule.field; - if (rule.dataRule.saveField) { - saveField = rule.dataRule.saveField; + if (!rule.dataRule) { + return; } - if (rule.dataRule.type == "integer") { // 如果是整数 - 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"; + if (rule.field in data) { // 如果字段在数据中 + let value = data[rule.field]; // 获取值 + if (rule.dataRule.fromField) { + value = value[rule.dataRule.fromField]; } - else if (data[saveField] === false) { - data[saveField] = "false"; + let saveField = rule.field; + if (rule.dataRule.saveField) { + saveField = rule.dataRule.saveField; } - else if (data[saveField]) { - data[saveField] = value + ""; + if (rule.dataRule.type == "integer") { // 如果是整数 + 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 { - data[saveField] = value; - } + }catch(e){ + console.log(e) } }); }; diff --git a/src/pages/Middle/Mold/MoldProductionOrder/Edit.vue b/src/pages/Middle/Mold/MoldProductionOrder/Edit.vue index 2af0b15..2310ae9 100644 --- a/src/pages/Middle/Mold/MoldProductionOrder/Edit.vue +++ b/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; diff --git a/src/pages/Middle/Mold/MoldScheme/Edit.vue b/src/pages/Middle/Mold/MoldScheme/Edit.vue index fc7d8ca..e81ed5e 100644 --- a/src/pages/Middle/Mold/MoldScheme/Edit.vue +++ b/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, diff --git a/src/pages/Middle/Mold/Touch/Reporting.vue b/src/pages/Middle/Mold/Touch/Reporting.vue index cce73a4..65bc52a 100644 --- a/src/pages/Middle/Mold/Touch/Reporting.vue +++ b/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: 'name', title: '料品名称', span: 24, itemRender: { name: 'MkFormInputShow' } }, + { field: 'code', 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 }