优化

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

@@ -61,6 +61,49 @@
 
             <header-title title="物料BOM"></header-title>
 
+            <el-row>
+
+                <el-col :span="8">
+                    <el-form-item label="BOM编码:" prop="bomCode">
+                        <el-input v-model="form.bomCode" @click.native="chooseBom" />
+                    </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                    <el-form-item label="BOM名称:" prop="bomName">
+                        <el-input placeholder="自动带入" disabled v-model="form.bomName" />
+                    </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                    <el-form-item label="BOM版本:" prop="bomVersion">
+                        <el-input placeholder="自动带入" disabled v-model="form.bomVersion" />
+                    </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                    <el-form-item label="状态:" prop="status">
+                        <el-select v-model="form.status" placeholder="" filterable>
+                            <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+
+                
+        <el-col :span="8">
+          <el-form-item label="生产版本:" prop="produceVersionId">
+            <el-select v-model="form.produceVersionId" filterable placeholder="清选择" :style="{ width: '100%' }">
+              <el-option v-for="item in versionList" :key="item.id" :label="item.code + '-' + item.name" :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+
+            </el-row>
+
+
             <el-row>
 
                 <div class="ele-body">
@@ -110,23 +153,22 @@
 
 
         <!-- 选择物料弹窗 -->
-
         <materialDialog ref="materiaRef" @chooseModal="chooseModal"></materialDialog>
 
-
+        <!-- 选择物料BOM -->
+        <bomModal ref="bomRefs" @changeBom="changeBom"></bomModal>
 
     </ele-modal>
 </template>
   
 <script>
-
-
-
 import materialDialog from '@/components/material'
+import bomModal from '@/views/technology/version/components/bomModal.vue'
+import { pageList } from '@/api/technology/version/version.js';
 export default {
     components: {
-        materialDialog
-
+        materialDialog,
+        bomModal
     },
     props: {
         // 弹窗是否打开
@@ -207,6 +249,13 @@ export default {
             ],
 
 
+            statusList: [
+                { label: '草稿', value: -1 },
+                { label: '失效', value: 0 },
+                { label: '生效', value: 1 }
+            ],
+
+
             // 提交状态
             loading: false,
 
@@ -238,17 +287,27 @@ export default {
 
         },
 
-        
-    /* 删除 */
-    remove(row) {
-      const data = this.$refs.table.getData() ?? [];
-      if (row.id) {
-        this.removeList.push(row.id);
-        this.$refs.table.setData(data.filter((d) => d.id !== row.id));
-      }
+        chooseBom() {
+            this.$refs.bomRefs.open(this.form)
+        },
+
+        changeBom(row) {
+            this.$set(this.form, 'bomName', row.name)
+            this.$set(this.form, 'bomId', row.id)
+            this.$set(this.form, 'bomCode', row.code)
+            this.$set(this.form, 'bomVersion', row.version)
+        },
+
+        /* 删除 */
+        remove(row) {
+            const data = this.$refs.table.getData() ?? [];
+            if (row.id) {
+                this.removeList.push(row.id);
+                this.$refs.table.setData(data.filter((d) => d.id !== row.id));
+            }
 
-     
-    },
+
+        },
 
 
         /* 表格数据源 */
@@ -257,6 +316,14 @@ export default {
         },
 
 
+        async getVersionList() {
+      const res = await pageList({
+        pageNum: 1,
+        size: 100
+      });
+      this.versionList = res.list
+    },
+
 
         /* 保存编辑 */
         save() {
@@ -282,7 +349,7 @@ export default {
     watch: {
         async visible(visible) {
             if (visible) {
-
+                this.getVersionList()
                 if (this.data) {
 
                     this.$util.assignObject(this.form, {

src/views/material/product/components/index-data.vue

@@ -29,9 +29,9 @@
         <el-link type="primary" :underline="false" @click="openParam(row)">
           工艺参数
         </el-link>
+        <!-- v-if="row.isProduct == 1" -->
 
-
-        <el-link v-if="row.isProduct == 1" type="primary" :underline="false" @click="openMaterial(row)">
+        <el-link  type="primary" :underline="false" @click="openMaterial(row)">
           物料BOM
         </el-link>
 

vue.config.js

@@ -31,8 +31,8 @@ module.exports = {
     proxy: {
       // 当我们的本地的请求 有/api的时候，就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
-        // target: 'http://124.71.68.31:50001',
-        target: 'http://192.168.1.139:18086',
+        target: 'http://124.71.68.31:50001',
+        // target: 'http://192.168.1.139:18086',
         // target: 'http://192.168.1.132:18086',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {