优化

src/views/material/materialBOM/components/edit-dialog.vue

@@ -97,6 +97,13 @@
       <template v-slot:subCode="{ row }">
         <el-input v-model="row.subCode" placeholder="请输入"></el-input>
       </template>
+
+      <template v-slot:isReworkBom="{ row }">
+        <el-select v-model="row.isReworkBom">
+          <el-option v-for="item in isReworkBomList" :key="item.value" :label="item.label" :value="item.value">
+          </el-option>
+        </el-select>
+      </template>
       <template v-slot:unit="{ row }">
         <DictSelection dictName="重量单位" v-model="row.unit"></DictSelection>
       </template>
@@ -173,6 +180,7 @@ export default {
         categoryCode: '',
         categoryId: '',
         categoryName: '',
+        isReworkBom: 0,
         version: '',
         categoryType: '',
         baseCount: '',
@@ -222,6 +230,13 @@ export default {
           slot: 'categoryName',
           action: 'categoryName'
         },
+        {
+          label: '是否反工料',
+          prop: 'isReworkBom',
+          slot: 'isReworkBom',
+          action: 'isReworkBom'
+
+        },
         {
           label: '物料编码',
           prop: 'categoryCode'
@@ -273,6 +288,11 @@ export default {
       loading: false,
       // 是否是修改
       isUpdate: false,
+
+      isReworkBomList: [
+        { label: '否', value: 0 },
+        { label: '是', value: 1 }
+      ],
     };
   },
   methods: {
@@ -310,6 +330,7 @@ export default {
         subCode,
         categoryId: '',
         categoryName: '',
+        isReworkBom: 0,
         brandNum: '',
         count: '',
         modelType: '',
@@ -417,7 +438,7 @@ export default {
     async _getById(id) {
       const data = await getById(id);
       this.form = data;
-      this.productionList = [ { id:  this.form.taskId, name: this.form.taskName }]
+      this.productionList = [{ id: this.form.taskId, name: this.form.taskName }]
       this.form.status = this.form.status + ''
     },
 
@@ -434,12 +455,12 @@ export default {
 
     addParamrter() {
       let arr = this.$refs.ProductionCom.getRowData();
-      this.productionList = [ arr ]
+      this.productionList = [arr]
       this.form['taskId'] = arr.id
       this.form['taskName'] = arr.name
       this.addDialog = false;
 
- 
+
 
     }
 

src/views/material/product/components/MaterialAdd.vue

@@ -6,9 +6,9 @@
             <header-title title="物料BOM"> </header-title>
 
             <el-row>
-              
+
                 <el-col :span="8">
-                  
+
                     <el-form-item label="BOM编码:" prop="code">
                         <el-input v-model="form.code" disabled />
                     </el-form-item>
@@ -73,13 +73,22 @@
                         <template v-slot:subCode="{ row }">
                             <el-input v-model="row.subCode" placeholder="请输入"></el-input>
                         </template>
+
+                        <template v-slot:isReworkBom="{ row }">
+                            <el-select v-model="row.isReworkBom">
+                                <el-option v-for="item in isReworkBomList" :key="item.value" :label="item.label"
+                                    :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </template>
+
                         <template v-slot:unit="{ row }">
                             <DictSelection dictName="计量单位" v-model="row.unit"></DictSelection>
                         </template>
 
 
                         <template v-slot:count="{ row }">
-                            <el-input v-model="row.count" placeholder="请输入" @input="(value) =>
+                            <el-input v-model="row.count"  placeholder="请输入" @input="(value) =>
                             (row.count = value.replace(
                                 /^(-)*(\d+)\.(\d\d\d\d\d\d).*$/,
                                 '$1$2.$3'
@@ -125,7 +134,7 @@ export default {
         // 修改回显的数据
         categoryId: [String, Number],
         data: Object,
-        taskId:  [String, Number],
+        taskId: [String, Number],
     },
     data() {
 
@@ -147,12 +156,12 @@ export default {
             factoryId: '',
             type: 0,
             status: '',
-            
+            isReworkBom: 0,
             baseCount: '',
             baseCountUnit: '',
             taskId: '',
-            
-          
+
+
 
         };
         return {
@@ -183,7 +192,7 @@ export default {
                     { required: true, message: '请选择状态', trigger: 'change' }
                 ],
 
-           
+
 
                 factoryId: [
                     { required: true, message: '请输入所属工厂', trigger: 'change' }
@@ -213,6 +222,13 @@ export default {
                     slot: 'categoryName',
                     action: 'categoryName'
                 },
+                {
+                    label: '是否反工料',
+                    prop: 'isReworkBom',
+                    slot: 'isReworkBom',
+                    action: 'isReworkBom'
+                 
+                },
                 {
                     label: '物料编码',
                     prop: 'categoryCode'
@@ -236,7 +252,7 @@ export default {
                     action: 'unit'
                 },
 
-  
+
 
                 {
                     action: 'action',
@@ -252,6 +268,11 @@ export default {
                 { label: '生效', value: 1 }
             ],
 
+            isReworkBomList: [
+                { label: '否', value: 0 },
+                { label: '是', value: 1 }
+            ],
+
             // 提交状态
             loading: false,
             // 是否是修改
@@ -291,6 +312,7 @@ export default {
                 subCode,
                 categoryId: '',
                 categoryName: '',
+                isReworkBom: 0,
                 brandNum: '',
                 count: '',
                 modelType: '',
@@ -384,7 +406,7 @@ export default {
         async visible(visible) {
             if (visible) {
                 this._getCode()
-              
+
                 this.removeSubBomIdList = []
                 if (this.data) {
                     this.tableData = this.data.subDetailList

src/views/material/product/components/MaterialModal.vue

@@ -116,6 +116,11 @@
                             <div class="ele-body">
                                 <ele-pro-table ref="table" :columns="columns" :need-page="false" row-key="id"
                                     :datasource="bomItem.subDetailList" min-height="200px">
+
+                                    <template v-slot:isReworkBom="{ row }">
+                                        {{ row.isReworkBom ? '是' : '否' }}
+                                    </template>
+
                                     <template v-slot:toolbar>
                                         <el-button type="primary" size="small" @click="openEdit(index)">编辑</el-button>
 
@@ -233,6 +238,15 @@ export default {
                     prop: 'categoryName',
                     action: 'categoryName'
                 },
+
+                {
+                    label: '是否反工料',
+                    prop: 'isReworkBom',
+                    action: 'isReworkBom',
+                    slot: 'isReworkBom',
+                    width: 95,
+                },
+
                 {
                     label: '物料编码',
                     prop: 'categoryCode'