优化

src/views/material/BOMmanage/components/routing.vue

@@ -42,9 +42,7 @@
   import { getMbomPage } from '@/api/material/BOM';
   import routingDialog from './routingDialog.vue';
 
-  import {
-    workingProcedureUpdate,
-  } from '@/api/material/BOM';
+  import { workingProcedureUpdate } from '@/api/material/BOM';
   export default {
     name: 'technologyRoute',
     components: {
@@ -156,7 +154,7 @@
       },
 
       handleDel(row) {
-        console.log(row,  this.tableData);
+        console.log(row, this.tableData);
         workingProcedureUpdate({
           id: this.tableData.id,
           categoryId: this.taskParam.categoryId,
@@ -164,8 +162,8 @@
           categoryCode: this.taskParam.categoryCode,
           processRoute: {
             list: this.tableData.processRoute.list.filter(
-            (item) => item.id !== row.id
-          )
+              (item) => item.id !== row.id
+            )
           }
         }).then((data) => {
           this.$message.success('删除成功');

src/views/material/BOMmanage/components/workingProcedure.vue

@@ -158,7 +158,7 @@
           </ele-pro-table>
         </el-tab-pane>
         <el-tab-pane label="质检项参数" name="质检项参数">
-             <term></term>
+          <term></term>
         </el-tab-pane>
         <el-tab-pane label="生产节拍" name="生产节拍">
           <el-form label-width="100px" ref="form" :model="beatParam">
@@ -639,6 +639,9 @@
           </ele-pro-table>
         </el-tab-pane>
         <el-tab-pane label="替代料" name="替代料">
+
+
+
           <ele-pro-table
             ref="replaceMaterialTable"
             :columns="columns1"
@@ -649,7 +652,16 @@
             <!-- 表头工具栏 -->
             <template v-if="!isView" v-slot:toolbar>
               <el-button type="primary" @click="add">添加</el-button>
+              <div class="toolbar_box">
+                <div
+                  ><span>基本数量</span>
+                  <el-input placeholder="请输入" v-model.number="baseCount2">
+                  </el-input>
+                  <DictSelection dictName="计量单位" v-model="baseCountUnit2"
+                /></div>
+              </div>
             </template>
+
             <template v-slot:action="{ row, $index }">
               <el-link type="primary" @click="handleDel(row, $index)"
                 >删除</el-link
@@ -931,7 +943,7 @@
   import userSearch from './user-search.vue';
   import jobDialog from './jobDialog.vue';
   import standardOutput from './standardOutput.vue';
-  import term from '../qualityTesting/term'
+  import term from '../qualityTesting/term';
   export default {
     components: {
       userSearch,
@@ -948,6 +960,8 @@
       return {
         baseCount: '',
         baseCountUnit: '',
+        baseCount2: '',
+        baseCountUnit2: '',
         isView: false,
         filedList: [],
         jobFiledList: [],
@@ -1391,7 +1405,6 @@
         this.$refs.productRefs.open(row, '选择物料', '1', idx);
       },
       handleDel(row, index) {
-      
         let type = '';
         if (this.activeName === '材料定额') {
           type = 'materialQuota';
@@ -1605,7 +1618,7 @@
         let dom = null;
         if (this.activeName === '工艺参数') {
           dom = this.$refs.table;
-        } 
+        }
         dom.setData([...data, ...dom.getData()]);
         this.$set(
           this.tableData.taskParam[this.currentIndex],
@@ -1686,6 +1699,13 @@
           (item) => item.id === rowData.id
         );
         this.activeName = '工艺参数';
+
+        this.baseCount = rowData.baseCount;
+        this.baseCountUnit = rowData.baseCountUnit;
+
+        this.baseCount2 = rowData.baseCount2;
+        this.baseCountUnit2 = rowData.baseCountUnit2;
+
         this.visible = true;
         setTimeout(() => {
           console.log(this.$refs);
@@ -1724,6 +1744,12 @@
             this.baseCount;
           this.tableData.taskParam[this.currentIndex].baseCountUnit =
             this.baseCountUnit;
+
+            this.tableData.taskParam[this.currentIndex].baseCount2 =
+            this.baseCount2;
+          this.tableData.taskParam[this.currentIndex].baseCountUnit2 =
+            this.baseCountUnit2;
+
           workingProcedureUpdate({
             id: this.tableData.id,
             categoryId: this.treeData.categoryId,

src/views/material/product/detail.vue

@@ -372,12 +372,11 @@
       async _getDetails() {
         const data = await getDetails(this.$route.query.id);
         const info = deepClone(data);
-        console.log(123, info);
+
         this.form = {
           ...info.category
         };
-        let productType_ = this.form.produceType;
-        this.form.produceType = productType_.split(",");
+
 
         this.categoryLevelPathId = info.category.categoryLevelPathIdParent;
         this.judgeSet(info);
@@ -472,7 +471,7 @@
         this.dictList = res.map((item) => {
           let values = Object.keys(item);
           return {
-            value: values[0],
+            value: Number(values[0]),
             label: item[values[0]]
           };
         });

src/views/technology/route/components/user-taskinstance.vue

@@ -175,6 +175,7 @@
         let len = this.$refs.table.getData().length + 1;
         let arrM = arr.map((item, index) => {
           return { ...item.detail, orderNum: len + index };
+
         });
         arrM.forEach((element) => {
           if (element.id) {