Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dev

src/api/material/manage.js

@@ -55,7 +55,8 @@ export async function removeMaterial (id) {
   }
   return Promise.reject(new Error(res.data.message));
 }
-//根据类别ID获取bom与工艺路线列表  产品管理
+
+//根据产品ID获取bom列表、工艺路线列表【产品管理】
 export async function getBomRoutingList (categoryId) {
   const res = await request.get(`/main/category/getSourceList/${categoryId}`);
   if (res.data.code == 0) {

src/views/material/manage/manageMaterial.vue

@@ -79,7 +79,7 @@
              <el-form-item label="毛重">
                 <div class="form-line">
                   <el-input  v-model="form.roughWeight"/>
-                  <DictSelection class="line-select" dictName="重量单位" clearable v-model="form.roughWeightUnit">
+                  <DictSelection class="line-select" dictName="重量单位" clearable v-model="form.weightUnit">
                   </DictSelection>
                 </div>
              </el-form-item>
@@ -88,8 +88,8 @@
              <el-form-item label="净重" prop="netWeight">
                   <el-input  v-model="form.netWeight"/>
              </el-form-item>
-             <el-form-item label-width="15px" prop="netWeightUnit" style="width: 45%;">
-                <DictSelection class="line-select" dictName="重量单位" clearable v-model="form.netWeightUnit">
+             <el-form-item label-width="15px" prop="weightUnit" style="width: 45%;">
+                <DictSelection class="line-select" dictName="重量单位" clearable v-model="form.weightUnit">
                 </DictSelection>
              </el-form-item>
            </el-col>
@@ -214,7 +214,7 @@
            packingUnit:[{ required: true, message: '请选择包装单位', trigger: 'change' }],
            isProduct:[{ required: true, message: '请选择是否产品', trigger: 'change' }],
            netWeight:[{ required: true, message: '请输入净重', trigger: 'blur' }],
-           netWeightUnit:[{ required: true, message: '请选择净重单位', trigger: 'change' }]
+           weightUnit:[{ required: true, message: '请选择重量单位', trigger: 'change' }]
          }
          return rules
       }

src/views/material/product/detail.vue

@@ -96,7 +96,7 @@
                   class="line-select"
                   dictName="重量单位"
                   clearable
-                  v-model="form.roughWeightUnit"
+                  v-model="form.weightUnit"
                 >
                 </DictSelection>
               </div>
@@ -110,7 +110,7 @@
                   class="line-select"
                   dictName="重量单位"
                   clearable
-                  v-model="form.netWeightUnit"
+                  v-model="form.weightUnit"
                 >
                 </DictSelection>
               </div>