1

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

@@ -321,9 +321,9 @@ export default {
         dataUrl: `${BASE_URL.BASE_URL}/MesStaff/v1/mes/staff/list`
       },
 
-      currentRow: null
+      currentRow: null,
-
+      allProcessingCost: 0,
-    };
+    }
 
 
     return pageData;
@@ -364,6 +364,7 @@ export default {
 
       this.postDataUpdate();
 
+
     },
 
     isComponentDone() {
@@ -686,22 +687,18 @@ export default {
 
 
     },
-    afterEditEvent2({column, row}) {
+    afterEditEvent2({column, row}) { // 编辑后事件
       console.log(column, row);
 
-      if(column.field == "processing_cost"){
+      if (column.field == "processing_cost") { // 如果编辑的字段是加工成本
 
-        let processing_cost = 0;
+        let processing_cost = 0; // 加工成本设置为0
-         this.detailsData2.forEach(item=>{
+        this.detailsData2.forEach(item => { // 遍历所有的行
-          processing_cost += parseFloat(item.processing_cost || 0);
+          processing_cost += parseFloat(item.processing_cost || 0); // 加上每一行的加工成本
         });
-
+        this.detailsData.forEach(item => { // 遍历所有的行
-         this.detailsData.forEach(item=>{
+          item.processing_cost = processing_cost; // 设置每一行的加工成本
-
-          item.processing_cost = processing_cost;
         })
-
-         console.log(processing_cost)
         this.$forceUpdate();
       }
       this.postDataUpdate();

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

@@ -38,13 +38,12 @@
           <a-collapse-panel v-for="info  in infos" :key="info.key" :header="info.header">
 
             <component-detail :readonly="true" :dataId="getDataId()" :itemData="info.data"
-              @reloadData="pageInit"></component-detail>
+                              @reloadData="pageInit" @allProcessingCost="allProcessingCost"></component-detail>
 
           </a-collapse-panel>
         </a-collapse>
 
 
-
       </a-tab-pane>
 
 
@@ -60,9 +59,13 @@
 
     </a-tabs>
 
+    <div>
+      总成本：{{ ProcessingCost }}
+    </div>
     <h4 style="margin-top: 5px;">出现问题及建议反馈</h4>
     <vxe-form :data="formOptions2.data" ref="xForm" :title-width="formOptions2.titleWidth"
-      :title-align="formOptions2.titleAlign" :rules="formOptions2.rules" :items="formOptions2.items" :titleColon="false"
+              :title-align="formOptions2.titleAlign" :rules="formOptions2.rules" :items="formOptions2.items"
+              :titleColon="false"
               vertical>
     </vxe-form>
 
@@ -92,8 +95,7 @@ export default {
       type: String,
       default: "edit"
     },
-    dataId: {
+    dataId: {}
-    }
 
   },
 
@@ -189,23 +191,83 @@ export default {
           },
           {field: 'code', title: '编号', span: 6, itemRender: {name: '$input'}},
 
-          { field: 'production_type', dataRule: { type: 'integer' }, title: '布产类型', span: 6, itemRender: { name: '$select', props: { options: options_production_type } } },
+          {
+            field: 'production_type',
+            dataRule: {type: 'integer'},
+            title: '布产类型',
+            span: 6,
+            itemRender: {name: '$select', props: {options: options_production_type}}
+          },
 
           {field: 'rubber', title: '胶件材质/缩水', span: 6, itemRender: {name: '$input'}},
           {field: 'hole', title: '模具穴数', span: 6, itemRender: {name: '$input'}},
           {field: 'water', title: '入水口类型/位置', span: 6, itemRender: {name: '$input'}},
 
 
-          { field: 'manufacture_cycle', dataRule: { type: 'timestamp' }, title: '制作周期', span: 6, itemRender: { name: '$input', props: { type: 'date' } } },
+          {
-          { field: 'draw_start_time', dataRule: { type: 'timestamp' }, title: '预计开始画图时间', span: 6, itemRender: { name: '$input', props: { type: 'date' } } },
+            field: 'manufacture_cycle',
-          { field: 'split_design_time', dataRule: { type: 'timestamp' }, title: '分模设计时间预计', span: 6, itemRender: { name: '$input', props: { type: 'date' } } },
+            dataRule: {type: 'timestamp'},
-          { field: 'draw_time', dataRule: { type: 'timestamp' }, title: '出图时间预计', span: 6, itemRender: { name: '$input', props: { type: 'date' } } },
+            title: '制作周期',
+            span: 6,
+            itemRender: {name: '$input', props: {type: 'date'}}
+          },
+          {
+            field: 'draw_start_time',
+            dataRule: {type: 'timestamp'},
+            title: '预计开始画图时间',
+            span: 6,
+            itemRender: {name: '$input', props: {type: 'date'}}
+          },
+          {
+            field: 'split_design_time',
+            dataRule: {type: 'timestamp'},
+            title: '分模设计时间预计',
+            span: 6,
+            itemRender: {name: '$input', props: {type: 'date'}}
+          },
+          {
+            field: 'draw_time',
+            dataRule: {type: 'timestamp'},
+            title: '出图时间预计',
+            span: 6,
+            itemRender: {name: '$input', props: {type: 'date'}}
+          },
 
-          { field: 'draw2D_time', dataRule: { type: 'timestamp' }, title: '出2D时间预计', span: 6, itemRender: { name: '$input', props: { type: 'date' } } },
+          {
-          { field: 'draw3D_time', dataRule: { type: 'timestamp' }, title: '出3D时间预计', span: 6, itemRender: { name: '$input', props: { type: 'date' } } },
+            field: 'draw2D_time',
-          { field: 'inlay_deep_hole_time', dataRule: { type: 'timestamp' }, title: '镶件深孔钻到厂日期预计', span: 6, itemRender: { name: '$input', props: { type: 'date' } } },
+            dataRule: {type: 'timestamp'},
-          { field: 'horizontal_frame_time', dataRule: { type: 'timestamp' }, title: '横架到厂日期预计', span: 6, itemRender: { name: '$input', props: { type: 'date' } } },
+            title: '出2D时间预计',
-          { field: 'complete_time', dataRule: { type: 'timestamp' }, title: '要求完成时间', span: 6, itemRender: { name: '$input', props: { type: 'date' } } },
+            span: 6,
+            itemRender: {name: '$input', props: {type: 'date'}}
+          },
+          {
+            field: 'draw3D_time',
+            dataRule: {type: 'timestamp'},
+            title: '出3D时间预计',
+            span: 6,
+            itemRender: {name: '$input', props: {type: 'date'}}
+          },
+          {
+            field: 'inlay_deep_hole_time',
+            dataRule: {type: 'timestamp'},
+            title: '镶件深孔钻到厂日期预计',
+            span: 6,
+            itemRender: {name: '$input', props: {type: 'date'}}
+          },
+          {
+            field: 'horizontal_frame_time',
+            dataRule: {type: 'timestamp'},
+            title: '横架到厂日期预计',
+            span: 6,
+            itemRender: {name: '$input', props: {type: 'date'}}
+          },
+          {
+            field: 'complete_time',
+            dataRule: {type: 'timestamp'},
+            title: '要求完成时间',
+            span: 6,
+            itemRender: {name: '$input', props: {type: 'date'}}
+          },
           {
             title: '模具师傅', span: 6,
             field: 'mold_master_user_detail',
@@ -232,8 +294,7 @@ export default {
             },
             itemRender: {
               name: 'MkFormInputShow', props: {
-                params: {
+                params: {}
-                }
               }
             }
           },
@@ -251,16 +312,14 @@ export default {
         ]
       },
       formOptions2: {
-        data: {
+        data: {},
-        },
         // 标题宽度
         titleWidth: 180,
         // 标题对齐方式
         titleAlign: 'top',
 
         // 表单校验规则
-        rules: {
+        rules: {},
-        },
         // 表单项
         items: [
 
@@ -275,25 +334,16 @@ export default {
       departmentId: null,
 
       // 新增模式表单项
-      addModeItems: [
+      addModeItems: [],
-
-      ],
 
 
       table1Height: 400,
-      detailsSourceData: [
+      detailsSourceData: [],
-      ],
+      detailsData: [],
-      detailsData: [
+      deletedDetailsData: [],
-      ],
-      deletedDetailsData: [
 
-      ],
+      detailsData2: [],
-
+      deletedDetailsData2: [],
-      detailsData2: [
-      ],
-      deletedDetailsData2: [
-
-      ],
       editor_component: {
         dataType: "object",
         valueField: "id",
@@ -359,6 +409,7 @@ export default {
 
 
       loadCount: 0,
+      ProcessingCost: 0,
 
     };
 
@@ -379,7 +430,6 @@ export default {
   created() {
 
 
-
     this.pageInit();
 
 
@@ -392,7 +442,6 @@ export default {
   methods: {
 
 
-
     loadDepartments() {
       this.$mk.post({
         url: `${BASE_URL.BASE_URL}/BaseDepartment/v1/base/department/list`,
@@ -401,10 +450,8 @@ export default {
           "page": 1,
           "limit": 1000,
           "end_time": 0,
-          "order_bys": [
+          "order_bys": [],
-          ],
+          "search_rules": [],
-          "search_rules": [
-          ],
           "start_time": 0
         },
         useBigInt: true
@@ -441,7 +488,10 @@ export default {
         }).then(a => {
 
 
-          this.formOptions.data = this.$mk.formatDetailData({ data: a.data[this.detailDataFieldName], rules: this.formOptions.items });
+          this.formOptions.data = this.$mk.formatDetailData({
+            data: a.data[this.detailDataFieldName],
+            rules: this.formOptions.items
+          });
 
 
           this.formOptions2.data = {
@@ -486,7 +536,6 @@ export default {
         this.isEdit = true;
 
 
-
       } else {
         // 如果没有id参数，说明是新增模式
         this.addModeItems.forEach(item => {
@@ -737,12 +786,14 @@ export default {
     },
 
 
+    allProcessingCost(data) {
+      this.ProcessingCost = data;
+    },
 
     // 保存
     ok() {
 
 
-
       let save = () => {
 
 
@@ -768,7 +819,11 @@ export default {
         }
 
         postdata.mold_production_order_component = !this.isEdit ? [] : {insertList: [], deleteList: [], updateList: []};
-        postdata.mold_production_order_component_processes = !this.isEdit ? [] : { insertList: [], deleteList: [], updateList: [] };
+        postdata.mold_production_order_component_processes = !this.isEdit ? [] : {
+          insertList: [],
+          deleteList: [],
+          updateList: []
+        };
 
         this.infos.forEach(info => {
           if (!info.data.postdata) {
@@ -833,9 +888,6 @@ export default {
       };
 
 
-
-
-
       // 验证表单
       this.$mk.validateForm({form: this.$refs.xForm}).then(() => { // 验证表单
 
@@ -873,8 +925,7 @@ export default {
           if (a.code == "200") {
             this.$mk.success("操作成功");
             this.$openPage(this.editPageUrl + a.data.id);
-          }
+          } else {
-          else {
             this.$mk.error(a.msg);
           }
         });
@@ -906,8 +957,7 @@ export default {
           if (a.code == "200") {
             this.$mk.success("操作成功");
             this.pageInit();
-          }
+          } else {
-          else {
             this.$mk.error(a.msg);
           }
         });
@@ -939,8 +989,7 @@ export default {
           if (a.code == "200") {
             this.$mk.success("操作成功");
             this.pageInit();
-          }
+          } else {
-          else {
             this.$mk.error(a.msg);
           }
         });
@@ -971,8 +1020,7 @@ export default {
           if (a.code == "200") {
             this.$mk.success("审批成功");
             this.pageInit();
-          }
+          } else {
-          else {
             this.$mk.error(a.msg);
           }
         });
@@ -984,7 +1032,6 @@ export default {
     print() { // 打印
 
 
-
       let hiprint = this.$hiPrint; // 获取打印组件
       let tdata = JSON.parse(JSON.stringify(this.formOptions.data)); // 复制表单数据
 
@@ -1058,7 +1105,6 @@ export default {
       });
 
 
-
       hiprint.init(); // 初始化打印组件
 
 
@@ -1070,9 +1116,7 @@ export default {
 
   },
   // 监听属性
-  watch: {
+  watch: {}
-
-  }
 };
 
 </script>

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

@@ -33,13 +33,13 @@
           <a-collapse-panel v-for="(info, index)  in infos" :key="info.key" :header="info.header">
 
             <a-icon slot="extra" type="delete" @click.stop="removeInfo(index)"/>
-            <component-detail ref="componentDetail" :dataId="getDataId()" :itemData="info.data" @reloadData="pageInit"></component-detail>
+            <component-detail ref="componentDetail" :dataId="getDataId()" :itemData="info.data"
+                              @reloadData="pageInit"></component-detail>
 
           </a-collapse-panel>
         </a-collapse>
 
 
-
       </a-tab-pane>
 
 
@@ -55,6 +55,9 @@
 
     </a-tabs>
 
+    <h3 style="padding: 20px;text-align: right;">
+      总成本：{{ ProcessingCost }} 元
+    </h3>
     <vxe-form :data="formOptions2.data" ref="xForm2" :title-width="formOptions2.titleWidth"
               :title-align="formOptions2.titleAlign" :rules="formOptions2.rules" :items="formOptions2.items"
     >
@@ -86,8 +89,7 @@ export default {
       type: String,
       default: "edit"
     },
-    dataId: {
+    dataId: {}
-    }
 
   },
 
@@ -182,7 +184,13 @@ export default {
           },
           {field: 'code', title: '编号', span: 6, itemRender: {name: '$input'}},
 
-          { field: 'production_type', dataRule: { type: 'integer' }, title: '布产类型', span: 6, itemRender: { name: '$select', props: { options: options_production_type } } },
+          {
+            field: 'production_type',
+            dataRule: {type: 'integer'},
+            title: '布产类型',
+            span: 6,
+            itemRender: {name: '$select', props: {options: options_production_type}}
+          },
 
 
           {field: 'rubber', title: '胶件材质/缩水', span: 6, itemRender: {name: '$input'}},
@@ -190,17 +198,71 @@ export default {
           {field: 'water', title: '入水口类型/位置', span: 6, itemRender: {name: '$input'}},
 
 
-          { field: 'manufacture_cycle', dataRule: { type: 'timestamp' }, title: '制作周期', span: 6, itemRender: { name: '$input', props: { type: 'date' } } },
+          {
-          { field: 'draw_start_time', dataRule: { type: 'timestamp' }, title: '预计开始画图时间', span: 6, itemRender: { name: '$input', props: { type: 'date' } } },
+            field: 'manufacture_cycle',
-          { field: 'split_design_time', dataRule: { type: 'timestamp' }, title: '分模设计时间预计', span: 6, itemRender: { name: '$input', props: { type: 'date' } } },
+            dataRule: {type: 'timestamp'},
-          { field: 'draw_time', dataRule: { type: 'timestamp' }, title: '出图时间预计', span: 6, itemRender: { name: '$input', props: { type: 'date' } } },
+            title: '制作周期',
+            span: 6,
+            itemRender: {name: '$input', props: {type: 'date'}}
+          },
+          {
+            field: 'draw_start_time',
+            dataRule: {type: 'timestamp'},
+            title: '预计开始画图时间',
+            span: 6,
+            itemRender: {name: '$input', props: {type: 'date'}}
+          },
+          {
+            field: 'split_design_time',
+            dataRule: {type: 'timestamp'},
+            title: '分模设计时间预计',
+            span: 6,
+            itemRender: {name: '$input', props: {type: 'date'}}
+          },
+          {
+            field: 'draw_time',
+            dataRule: {type: 'timestamp'},
+            title: '出图时间预计',
+            span: 6,
+            itemRender: {name: '$input', props: {type: 'date'}}
+          },
 
-          { field: 'draw2D_time', dataRule: { type: 'timestamp' }, title: '出2D时间预计', span: 6, itemRender: { name: '$input', props: { type: 'date' } } },
+          {
-          { field: 'draw3D_time', dataRule: { type: 'timestamp' }, title: '出3D时间预计', span: 6, itemRender: { name: '$input', props: { type: 'date' } } },
+            field: 'draw2D_time',
-          { field: 'inlay_deep_hole_time', dataRule: { type: 'timestamp' }, title: '镶件深孔钻到厂日期预计', span: 6, itemRender: { name: '$input', props: { type: 'date' } } },
+            dataRule: {type: 'timestamp'},
-          { field: 'horizontal_frame_time', dataRule: { type: 'timestamp' }, title: '横架到厂日期预计', span: 6, itemRender: { name: '$input', props: { type: 'date' } } },
+            title: '出2D时间预计',
+            span: 6,
+            itemRender: {name: '$input', props: {type: 'date'}}
+          },
+          {
+            field: 'draw3D_time',
+            dataRule: {type: 'timestamp'},
+            title: '出3D时间预计',
+            span: 6,
+            itemRender: {name: '$input', props: {type: 'date'}}
+          },
+          {
+            field: 'inlay_deep_hole_time',
+            dataRule: {type: 'timestamp'},
+            title: '镶件深孔钻到厂日期预计',
+            span: 6,
+            itemRender: {name: '$input', props: {type: 'date'}}
+          },
+          {
+            field: 'horizontal_frame_time',
+            dataRule: {type: 'timestamp'},
+            title: '横架到厂日期预计',
+            span: 6,
+            itemRender: {name: '$input', props: {type: 'date'}}
+          },
 
-          { field: 'complete_time', dataRule: { type: 'timestamp' }, title: '要求完成时间', span: 6, itemRender: { name: '$input', props: { type: 'date' } } },
+          {
+            field: 'complete_time',
+            dataRule: {type: 'timestamp'},
+            title: '要求完成时间',
+            span: 6,
+            itemRender: {name: '$input', props: {type: 'date'}}
+          },
           {
             title: '模具师傅', span: 6,
             field: 'mold_master_user_detail',
@@ -266,15 +328,13 @@ export default {
 
 
       formOptions2: {
-        data: {
+        data: {},
-        },
         // 标题宽度
         titleWidth: 180,
         // 标题对齐方式 
 
         // 表单校验规则
-        rules: {
+        rules: {},
-        },
         // 表单项
         items: [
 
@@ -287,25 +347,16 @@ export default {
       },
 
       // 新增模式表单项
-      addModeItems: [
+      addModeItems: [],
-
-      ],
 
 
       table1Height: 400,
-      detailsSourceData: [
+      detailsSourceData: [],
-      ],
+      detailsData: [],
-      detailsData: [
+      deletedDetailsData: [],
-      ],
-      deletedDetailsData: [
 
-      ],
+      detailsData2: [],
-
+      deletedDetailsData2: [],
-      detailsData2: [
-      ],
-      deletedDetailsData2: [
-
-      ],
       editor_component: {
         dataType: "object",
         valueField: "id",
@@ -371,6 +422,7 @@ export default {
 
 
       loadCount: 0,
+      ProcessingCost: 0,
 
     };
 
@@ -393,7 +445,6 @@ export default {
   created() {
 
 
-
     this.pageInit();
 
 
@@ -424,7 +475,10 @@ export default {
         }).then(a => {
 
 
-          this.formOptions.data = this.$mk.formatDetailData({ data: a.data[this.detailDataFieldName], rules: this.formOptions.items });
+          this.formOptions.data = this.$mk.formatDetailData({
+            data: a.data[this.detailDataFieldName],
+            rules: this.formOptions.items
+          });
 
 
           this.formOptions2.data = {
@@ -449,7 +503,6 @@ export default {
           this.setPageReadonly(this.pageStatus == 'approved');
 
 
-
           this.$forceUpdate();
 
         });
@@ -457,7 +510,6 @@ export default {
         this.isEdit = true;
 
 
-
       } else {
         // 如果没有id参数，说明是新增模式
         this.addModeItems.forEach(item => {
@@ -589,8 +641,6 @@ export default {
               })
 
 
-
-
             }
           });
 
@@ -664,7 +714,10 @@ export default {
 
           if (detail.mold_master_uid) {
             this.formOptions.data.mold_master_uid = detail.mold_master_uid;
-            this.formOptions.data.mold_master_user_detail = { id: detail.mold_master_user_detail.id, name: detail.mold_master_user_detail.name };
+            this.formOptions.data.mold_master_user_detail = {
+              id: detail.mold_master_user_detail.id,
+              name: detail.mold_master_user_detail.name
+            };
           }
 
           this.formOptions.data = JSON.parse(JSON.stringify(this.formOptions.data))
@@ -775,12 +828,10 @@ export default {
     },
 
 
-
     // 保存
     ok() {
 
 
-
       let save = () => {
 
 
@@ -818,7 +869,11 @@ export default {
         }
 
         postdata.mold_production_order_component = !this.isEdit ? [] : {insertList: [], deleteList: [], updateList: []};
-        postdata.mold_production_order_component_processes = !this.isEdit ? [] : { insertList: [], deleteList: [], updateList: [] };
+        postdata.mold_production_order_component_processes = !this.isEdit ? [] : {
+          insertList: [],
+          deleteList: [],
+          updateList: []
+        };
 
         let componentDetails = this.$refs['componentDetail'];
 
@@ -881,8 +936,7 @@ export default {
             this.$mk.success("保存成功");
             if (!this.isEdit) { // 如果是新增模式，关闭当前页面
               this.back();
-            }
+            } else {
-            else{
 
               this.pageInit();
             }
@@ -898,9 +952,6 @@ export default {
       };
 
 
-
-
-
       // 验证表单
       this.$mk.validateForm({form: this.$refs.xForm}).then(() => { // 验证表单
 
@@ -920,8 +971,6 @@ export default {
     },
 
 
-
-
     pageApproved() {
       let dataId = this.getDataId();
       if (!dataId) {
@@ -941,8 +990,7 @@ export default {
           if (a.code == "200") {
             this.$mk.success("审批成功");
             this.pageInit();
-          }
+          } else {
-          else {
             this.$mk.error(a.msg);
           }
         });
@@ -953,12 +1001,9 @@ export default {
     },
 
 
-
   },
   // 监听属性
-  watch: {
+  watch: {}
-
-  }
 };
 
 </script>