ysy 2 년 전
부모
커밋
3db5c904db

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

@@ -209,12 +209,12 @@ export default {
           prop: 'modelType'
         },
         {
-          label: '需量(子)',
+          label: '净重',
           slot: 'count',
           action: 'count'
         },
         {
-          label: '单位',
+          label: '重量单位',
           slot: 'unit',
           action: 'unit'
         },

+ 2 - 2
src/views/material/materialBOM/components/view-dialog.vue

@@ -122,11 +122,11 @@
             prop: 'model'
           },
           {
-            label: '需量(子)',
+            label: '净重',
             prop: 'count'
           },
           {
-            label: '单位',
+            label: '重量单位',
             prop: 'unit'
             // },
             // {

+ 16 - 2
src/views/material/product/components/MaterialAdd.vue

@@ -285,8 +285,21 @@ export default {
                     return false;
                 }
 
-                console.log(this.form)
-                if (this.form.subDetailList.length == 0) {
+                
+                let _arr = []
+                _arr = this.form.subDetailList.map((m) => {
+                    return{
+                        bomId: '',
+                        categoryId: m.id,
+                        count: '',
+                        id: m.id,
+                        sortNum: '',
+                        subCode: m.code,
+                        unit:  m.measuringUnit
+                    }
+                })
+           
+                if (_arr.length == 0) {
                     this.$message.info('请至少添加一条物料');
                     return;
                 }
@@ -297,6 +310,7 @@ export default {
 
                 const data = {
                     ...this.form,
+                    subDetailList: _arr,
                     categoryId: this.categoryId,
                 };
 

+ 8 - 7
src/views/material/product/components/MaterialModal.vue

@@ -58,7 +58,7 @@
                         @click="handleAdd">新增</el-button>
 
 
-                   
+
 
                 </div>
             </header-title>
@@ -69,19 +69,19 @@
 
                     <el-col :span="8">
                         <el-form-item label="BOM编码:">
-                            {{  bomItem.code }}
+                            {{ bomItem.code }}
                         </el-form-item>
                     </el-col>
 
                     <el-col :span="8">
                         <el-form-item label="BOM名称:" prop="name">
-                            {{  bomItem.name }}
+                            {{ bomItem.name }}
                         </el-form-item>
                     </el-col>
 
                     <el-col :span="8">
                         <el-form-item label="版本号:" prop="version">
-                          {{  bomItem.version }}
+                            {{ bomItem.version }}
                         </el-form-item>
                     </el-col>
 
@@ -117,7 +117,7 @@
                         <el-form-item label="基本数量:" prop="baseCount">
                             <el-row>
                                 <el-col :span="12">
-                                {{ bomItem.baseCount }}   
+                                    {{ bomItem.baseCount }}
                                 </el-col>
                                 <el-col :span="2">&nbsp;</el-col>
                                 <el-col :span="10">
@@ -143,8 +143,9 @@
                                 <el-button size="small" icon="el-icon-plus" class="ele-btn-icon" type="primary"
                                     @click.native="openParam(index)">添加物料</el-button>
 
-                                    <el-button size="small" type="danger" icon="el-icon-delete" @click="removeBom(index)">删除</el-button>
-                                    
+                                <el-button size="small" type="danger" icon="el-icon-delete"
+                                    @click="removeBom(index)">删除</el-button>
+
                             </template>
 
                             <!-- 操作列 -->