ysy 2 лет назад
Родитель
Сommit
10eabf089d

+ 4 - 23
src/views/material/product/components/MaterialAdd.vue

@@ -35,15 +35,7 @@
                     </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.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="factoryId">
@@ -167,7 +159,7 @@ export default {
             factoryId: '',
             type: 0,
             status: '',
-            produceVersionId: '',
+            
             baseCount: '',
             baseCountUnit: '',
             taskId: '',
@@ -203,9 +195,7 @@ export default {
                     { required: true, message: '请选择状态', trigger: 'change' }
                 ],
 
-                produceVersionId: [
-                    { required: true, message: '请选择生产版本', trigger: 'change' }
-                ],
+           
 
                 factoryId: [
                     { required: true, message: '请输入所属工厂', trigger: 'change' }
@@ -338,15 +328,6 @@ export default {
             this.form.code = code;
         },
 
-        async getVersionList() {
-            const res = await pageList({
-                pageNum: 1,
-                size: 100
-            });
-
-            this.versionList = res.list;
-        },
-
         /* 保存编辑 */
         save() {
             this.$refs.form.validate((valid) => {
@@ -423,7 +404,7 @@ export default {
         async visible(visible) {
             if (visible) {
                 this._getCode()
-                this.getVersionList();
+              
                 this.removeSubBomIdList = []
                 if (this.data) {
                     this.tableData = this.data.subDetailList

+ 3 - 10
src/views/material/product/components/MaterialModal.vue

@@ -89,16 +89,7 @@
                                 </el-form-item>
                             </el-col>
 
-                            <el-col :span="8">
-                                <el-form-item label="生产版本:" prop="produceVersionId">
-                                    <el-select v-model="bomItem.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="factoryId">
@@ -385,6 +376,8 @@ export default {
         },
 
         addParamrter() {
+         
+            console.log(this.$refs.ProductionCom.selection)
             let arr = [];
             arr = this.$refs.ProductionCom.selection.map(m => {
                 return {

+ 7 - 4
src/views/technology/route/components/production/index.vue

@@ -4,7 +4,7 @@
       <!-- 搜索表单 -->
       <user-search @search="reload" />
       <!-- 数据表格 -->
-
+    
       <ele-pro-table ref="table" :columns="columns" :datasource="datasource" @selection-change="selectListChange"
         row-key="id">
         <!-- 状态列 -->
@@ -110,6 +110,9 @@ export default {
     };
   },
 
+  mounted() {
+   
+  },
 
   methods: {
     /*配置工艺参数 */
@@ -216,9 +219,9 @@ export default {
       return this.rowData
     },
 
-    getSelection() {
-      return this.selection
-    }
+
+
+
 
   }
 };