优化

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

@@ -69,19 +69,19 @@
 
                     <el-col :span="8">
                         <el-form-item label="BOM编码:">
-                            <el-input v-model="bomItem.bomCode" @click.native="chooseBom(index)" />
+                            <el-input v-model="bomItem.bomCode" />
                         </el-form-item>
                     </el-col>
 
                     <el-col :span="8">
                         <el-form-item label="BOM名称:" prop="bomName">
-                            <el-input placeholder="自动带入" disabled v-model="bomItem.bomName" />
+                            <el-input placeholder="请输入BOM名称" v-model="bomItem.bomName" />
                         </el-form-item>
                     </el-col>
 
                     <el-col :span="8">
-                        <el-form-item label="BOM版本:" prop="bomVersion">
-                            <el-input placeholder="自动带入" disabled v-model="bomItem.bomVersion" />
+                        <el-form-item label="版本号:" prop="bomVersion">
+                            <el-input placeholder="请输入BOM版本号" v-model="bomItem.bomVersion" />
                         </el-form-item>
                     </el-col>
 
@@ -97,13 +97,13 @@
 
 
 
-
+        
 
                     <el-col :span="8">
                         <el-form-item label="生产版本:" prop="produceVersionId">
                             <el-select v-model="bomItem.produceVersionId" filterable placeholder="清选择"
                                 :style="{ width: '100%' }">
-                                <el-option v-for="item in versionList" :key="item.id" :label="item.code + '-' + item.name"
+                                <el-option v-for="item in versionList" :key="item.code" :label="item.code + '-' + item.name"
                                     :value="item.id">
                                 </el-option>
                             </el-select>
@@ -111,11 +111,7 @@
                     </el-col>
 
 
-                    <el-col :span="8">
-                        <el-button size="small" type="danger" icon="el-icon-delete" @click="removeBom(index)"
-                            style="margin-left: 120px">删除</el-button>
-                    </el-col>
-
+             
 
                 </el-row>
 
@@ -132,7 +128,7 @@
 
                             <!-- 操作列 -->
                             <template v-slot:action="{ row }">
-                                <el-popconfirm class="ele-action" title="确定要删除当前物料吗？" @confirm="remove(index,row)">
+                                <el-popconfirm class="ele-action" title="确定要删除当前物料吗？" @confirm="remove(index, row)">
                                     <template v-slot:reference>
                                         <el-link type="danger" :underline="false" icon="el-icon-delete">
                                             删除
@@ -144,6 +140,15 @@
                     </div>
 
                 </el-row>
+
+                <el-row class="rx-cc">
+                    <el-button size="small" type="danger" icon="el-icon-delete" @click="removeBom(index)"
+                            >删除</el-button>
+
+                        <el-button type="primary" size="small" @click="save">
+                            保存
+                        </el-button>
+                </el-row>
             </el-card>
 
 
@@ -158,31 +163,24 @@
 
 
 
-        <template v-slot:footer>
-            <el-button @click="updateVisible(false)">取消</el-button>
-            <el-button type="primary" :loading="loading" @click="save">
-                保存
-            </el-button>
-        </template>
 
 
         <!-- 选择物料弹窗 -->
         <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,
-        bomModal
+
     },
     props: {
         // 弹窗是否打开
@@ -204,7 +202,7 @@ export default {
                 {
                     bomCode: '',
                     bomName: '',
-                    bomVersion: '',
+                    bomVersion: '1.0',
                     status: '',
                     produceVersionId: '',
                     materialList: []
@@ -311,24 +309,16 @@ export default {
 
         chooseModal(data, id, idx) {
             this.$set(this.form.list[idx], 'materialList', data)
-          
-        },
 
-        chooseBom(index) {
-            this.$refs.bomRefs.open(this.form, index)
         },
 
-        changeBom(row, idx) {
-            this.$set(this.form.list[idx], 'bomName', row.name)
-            this.$set(this.form.list[idx], 'bomId', row.id)
-            this.$set(this.form.list[idx], 'bomCode', row.code)
-            this.$set(this.form.list[idx], 'bomVersion', row.version)
-        },
+
+
 
         /* 删除 */
-        remove(index,row) {
-           console.log(row)
-           this.form.list[index].materialList = this.form.list[index].materialList.filter((d) => d.id !== row.id)
+        remove(index, row) {
+            console.log(row)
+            this.form.list[index].materialList = this.form.list[index].materialList.filter((d) => d.id !== row.id)
 
         },
 
@@ -344,6 +334,7 @@ export default {
                 pageNum: 1,
                 size: 100
             });
+ 
             this.versionList = res.list
         },