优化

src/api/material/list.js

@@ -44,8 +44,8 @@ export async function editMaterial(data) {
 
 // 获取列表
 export async function getMaterialList(data) {
-  const res = await request.post(`/main/category/getList`, {
-    data
+  const res = await request.get(`/main/category/getList`, {
+    params: data
   });
   if (res.data.code == 0) {
     return res.data.data;

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

@@ -92,7 +92,7 @@
         <el-input v-model="row.subCode" placeholder="请输入"></el-input>
       </template>
       <template v-slot:unit="{ row }">
-        <DictSelection dictName="计量单位" v-model="row.unit"></DictSelection>
+        <DictSelection dictName="重量单位" v-model="row.unit"></DictSelection>
       </template>
       <template v-slot:count="{ row }">
         <el-input v-model="row.count" placeholder="请输入" @input="(value) =>

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

@@ -80,7 +80,7 @@
                             <el-input v-model="row.subCode" placeholder="请输入"></el-input>
                         </template>
                         <template v-slot:unit="{ row }">
-                            <DictSelection dictName="计量单位" v-model="row.unit"></DictSelection>
+                            <DictSelection dictName="重量单位" v-model="row.unit"></DictSelection>
                         </template>
                         <template v-slot:count="{ row }">
                             <el-input v-model="row.count" placeholder="请输入" @input="(value) =>

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

@@ -24,17 +24,18 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="产品名称:" prop="categoryName">
-            <el-input @click.native="chooseProduct" v-model="form.categoryName" readonly />
-          </el-form-item>
-        </el-col>
 
         <el-col :span="8">
-          <el-form-item label="产品编码:" prop="categoryCode">
-            <el-input placeholder="自动带入" disabled v-model="form.categoryCode" />
-          </el-form-item>
-        </el-col>
+                        <el-form-item label="生产版本:" prop="produceVersionId">
+                            <el-select v-model="form.produceVersionId" filterable placeholder="清选择" disabled
+                                :style="{ width: '100%' }">
+                                <el-option v-for="item in versionList" :key="item.code" :label="item.code + '-' + item.name"
+                                    :value="item.id">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+
 
         <el-col :span="8">
           <el-form-item label="工艺路线版本:" prop="version">
@@ -49,6 +50,8 @@
             </el-select>
           </el-form-item>
         </el-col>
+
+        
       </el-row>
     </el-form>
 
@@ -59,19 +62,18 @@
       </el-button>
     </template>
 
-    <!-- 选择产品弹窗 -->
-    <ProductModal ref="productRefs" @changeProduct='determineChoose' />
+
   </ele-modal>
 </template>
 
 <script>
-import ProductModal from './ProductModal.vue';
-import route from '@/api/technology/route';
 
+import route from '@/api/technology/route';
+import { pageList } from '@/api/technology/version/version.js';
 
 export default {
   components: {
-    ProductModal
+  
   },
   props: {
     // 弹窗是否打开
@@ -88,8 +90,7 @@ export default {
       categoryId: '',
       version: '1.0',
       id: '',
-      categoryCode: '',
-      categoryName: ''
+
     };
     return {
       defaultForm,
@@ -116,12 +117,7 @@ export default {
         factoryId: [
           { required: true, message: '请输入工艺路线', trigger: 'blur' }
         ],
-        categoryCode: [
-          { required: true, message: '请选择产品编码', trigger: 'change' }
-        ],
-        categoryName: [
-          { required: true, message: '请选择产品名称', trigger: 'change' }
-        ],
+
         status: [
           { required: true, message: '请输入工艺路线版本', trigger: 'blur' }
         ],
@@ -129,6 +125,7 @@ export default {
           { required: true, message: '请输入工艺路线版本', trigger: 'blur' }
         ]
       },
+      versionList: [],
       // 提交状态
       loading: false,
       // 是否是修改
@@ -145,15 +142,8 @@ export default {
     }
   },
   methods: {
-    chooseProduct() {
-      this.$refs.productRefs.open(this.form)
-    },
-    determineChoose(row) {
-      this.$set(this.form, 'categoryName', row.name)
-      this.$set(this.form, 'categoryId', row.id)
-      this.$set(this.form, 'categoryCode', row.code)
-  
-    },
+
+
     /* 保存编辑 */
     save() {
       this.$refs.form.validate((valid) => {
@@ -186,6 +176,16 @@ export default {
           });
       });
     },
+
+    async getVersionList() {
+            const res = await pageList({
+                pageNum: 1,
+                size: 100
+            });
+
+            this.versionList = res.list;
+        },
+
     /* 更新visible */
     updateVisible(value) {
       this.$emit('update:visible', value);
@@ -194,7 +194,9 @@ export default {
 
   watch: {
     async visible(visible) {
+      
       if (visible) {
+        this.getVersionList()
         const res = await route.Flist({
           pageNum: 1,
           size: -1,