Merge remote-tracking branch 'origin/dev' into dev

src/api/material/BOM.js

@@ -167,7 +167,14 @@ export async function getBomPageCategoryId(params) {
   return Promise.reject(new Error(res.data.message));
 }
 
-
+// 修改BOM属性
+export async function bomCategoryUpdate(data) {
+  const res = await request.post(`/main/bomCategory/update`, data);
+  if (res.data.code == 0) {
+    return res.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
 
 
 // 转换
@@ -290,3 +297,6 @@ export async function workingStepSave(data) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+
+
+

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

@@ -3,7 +3,7 @@
     <el-form label-width="100px" ref="form" :model="attributeData">
       <el-row>
         <el-col :span="8" label-width="100px">
-          <el-form-item label="名称:" prop="category.name">
+          <el-form-item label="名称:" prop="name">
             <el-input
               placeholder=""
               v-model="category.name"
@@ -118,21 +118,26 @@
 
         <el-col :span="8" label-width="100px">
           <el-form-item label="生产类型:" prop="produceType">
-            <el-select v-model="category.produceType" filterable multiple>
-                <el-option
-                  v-for="item in dictList"
-                  :key="item.value"
-                  :value="item.value"
-                  :label="item.label"
-                ></el-option>
-              </el-select>
+            <el-select
+              v-model="category.produceType"
+              filterable
+              multiple
+              class="ele-block"
+            >
+              <el-option
+                v-for="item in dictList"
+                :key="item.value"
+                :value="item.value"
+                :label="item.label"
+              ></el-option>
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
 
       <el-row>
         <el-col :span="8" label-width="100px">
-          <el-form-item label="材料" prop="name">
+          <el-form-item label="材料" prop="materialsName">
             <el-input
               placeholder=""
               v-model="attributeData.materialsName"
@@ -141,7 +146,7 @@
         </el-col>
 
         <el-col :span="8" label-width="100px">
-          <el-form-item label="bom路线" prop="name">
+          <el-form-item label="bom路线" prop="bomTypeRouting">
             <el-input
               placeholder=""
               v-model="attributeData.bomTypeRouting"
@@ -152,7 +157,7 @@
 
       <el-row>
         <el-col :span="8" label-width="100px">
-          <el-form-item label="来源" prop="name">
+          <el-form-item label="来源" prop="sourceData">
             <el-input
               placeholder=""
               v-model="attributeData.sourceData"
@@ -161,19 +166,33 @@
         </el-col>
 
         <el-col :span="8" label-width="100px">
-          <el-form-item label="用量" prop="name">
+          <el-form-item label="用量" prop="dosage">
             <el-input placeholder="" v-model="attributeData.dosage"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
 
       <el-row>
+        <el-col :span="8" label-width="100px">
+          <el-form-item label="基本数量" prop="name">
+            <el-input
+              placeholder=""
+              v-model="attributeData.baseCount"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+
         <el-col :span="8" label-width="100px">
           <el-form-item label="单位" prop="name">
-            <el-input placeholder="" v-model="attributeData.unit"></el-input>
+            <DictSelection
+              dictName="计量单位"
+              v-model="attributeData.unit"
+            ></DictSelection>
           </el-form-item>
         </el-col>
+      </el-row>
 
+      <el-row>
         <el-col :span="8" label-width="100px">
           <el-form-item label="物料库路径" prop="name">
             <el-input
@@ -182,11 +201,8 @@
             ></el-input>
           </el-form-item>
         </el-col>
-
       </el-row>
 
-
-
       <el-row>
         <el-col :span="20" label-width="100px">
           <el-form-item label="备注" prop="name">
@@ -223,7 +239,7 @@
       </el-row>
 
       <div class="btn_box">
-        <el-button type="primary">修改</el-button>
+        <el-button type="primary" @click="handleUpdate">修改</el-button>
       </div>
     </el-form>
   </div>
@@ -231,6 +247,7 @@
 
 <script>
   import { getByCode } from '@/api/system/dictionary-data';
+  import { bomCategoryUpdate } from '@/api/material/BOM';
   export default {
     components: {},
     data() {
@@ -263,7 +280,7 @@
             value: '3'
           }
         ],
-        dictList: [],
+        dictList: []
       };
     },
 
@@ -274,7 +291,6 @@
     beforeDestroy() {},
     methods: {
       async getDictList(code) {
-      
         let { data: res } = await getByCode(code);
         this.dictList = res.map((item) => {
           let values = Object.keys(item);
@@ -283,8 +299,13 @@
             label: item[values[0]]
           };
         });
-     
       },
+
+      handleUpdate() {
+        bomCategoryUpdate(this.attributeData).then((res) => {
+          this.$message.success('修改成功');
+        });
+      }
     },
     props: {
       attributeData: {
@@ -295,12 +316,10 @@
 
     watch: {
       attributeData(val) {
-        console.log(val);
         console.log(Object.prototype.hasOwnProperty.call(val, 'category'));
         if (Object.prototype.hasOwnProperty.call(val, 'category')) {
           this.category = val.category;
-          this.category.produceType  = val.produceType
-          
+          this.category.produceType = val.produceType;
 
           this.$forceUpdate();
         }

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

@@ -22,7 +22,7 @@
                   ><span>基本数量</span>
                   <el-input placeholder="请输入" v-model.number="attributeData.baseCount">
                   </el-input>
-                  <DictSelection dictName="计量单位" v-model="attributeData.baseCountUnit"
+                  <DictSelection dictName="计量单位" v-model="attributeData.unit"
                 /></div>
               </div>
         </template>

src/views/material/BOMmanage/details.vue

@@ -165,7 +165,7 @@
     convert,
     convertABom,
     convertCBom,
-    deleteBomTreeList
+    deleteBomTreeList,
   } from '@/api/material/BOM.js';
   import { getTreeByGroup } from '@/api/classifyManage';
   import attribute from './components/attribute.vue';