工艺文件

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

@@ -498,6 +498,7 @@ import term from '../qualityTesting/term';
 import fileIndex from '../file/index.vue';
 import fileBrowse from '../file/fileBrowse.vue';
 import replaceMaterialPop from './replaceMaterialPop.vue';
+import { filePageAPI } from '@/api/material/file';
 export default {
   components: {
     userSearch,
@@ -1193,9 +1194,13 @@ export default {
           this.tableData.taskParam[this.currentIndex].fileParam = [];
           this.$refs.fileTable.setData([]);
         } else {
-          this.$refs.fileTable.setData(
-            this.tableData.taskParam[this.currentIndex].fileParam
-          );
+          let fileId=this.tableData.taskParam[this.currentIndex].fileParam
+          if(fileId.length > 0){
+             this.fileParamDatasource(fileId)
+          }
+          // this.$refs.fileTable.setData(
+          //   this.tableData.taskParam[this.currentIndex].fileParam
+          // );
         }
       } else if (this.activeName === '标准产出') {
         this.$refs.standard.setData(
@@ -1367,7 +1372,25 @@ export default {
               this.tableData.taskParam[this.currentIndex].qualityParam =
                 this.$refs.qualityParamRef.getDate() || [];
             }
-
+            //工艺文件只传id
+            let fileParamArr=JSON.parse(JSON.stringify(this.tableData.taskParam))
+            fileParamArr.map((item,index)=>{
+              if(item.fileParam.length>0){
+                let val=[]
+                item.fileParam.map((fileItem)=>{
+                  let obj={
+                    id:fileItem.id
+                  }
+                  val.push(obj)
+                })
+                this.$set(
+                    this.tableData.taskParam[index],
+                    'fileParam',
+                    val
+                );
+              }
+            })
+            console.log('111112223344',this.tableData.taskParam)
             workingProcedureUpdate({
               id: this.tableData.id,
               categoryId: this.treeData.categoryId,
@@ -1386,6 +1409,24 @@ export default {
       })
     },
 
+    //工艺文件表格回显
+    fileParamDatasource(fileParam) {
+      let fileId=fileParam.map(item => item.id).join(',')
+      filePageAPI({
+          pageNum: 1,
+          size: 999,
+          directoryId: '1',
+          lcyStatus: 1,
+          fileType: 0,
+          ids:fileId
+      }).then((res) => {
+        this.$refs.fileTable.setData(
+            res.list
+          );
+      })
+      
+    },
+
     async getDictList(code) {
       let { data: res } = await getByCode(code);
 

src/views/material/BOMmanage/file/index.vue

@@ -277,7 +277,9 @@
         this.$emit('close', false);
       },
       handleSave() {
+        // 检查选中的条目数量
         if(this.selection.length == 0) return this.$message.warning('请选择一条数据')
+        console.log('this.selection1111',this.selection)
         this.$emit('close', JSON.parse(JSON.stringify(this.selection)));
       },
 

src/views/material/product/detail.vue

@@ -29,37 +29,36 @@
               <el-input v-model="form.name" />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="存货类型:" prop="attributeType">
-              <el-select v-model="form.attributeType" filterable class="ele-block">
-                <el-option v-for="item in attributeList" :key="item.value" :value="item.value"
-                  :label="item.label"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
           <el-col :span="8">
             <div>
-              <el-form-item label="属性类型" prop="componentAttribute">
-                <el-select style="width: 100%" v-model="form.componentAttribute" filterable multiple>
-                  <el-option v-for="item in lbjtList" :key="item.value" :value="item.value"
+              <el-form-item label="生产类型" prop="produceType">
+                <el-select style="width: 100%" v-model="form.produceType" filterable @change="produceTypeChange">
+                  <el-option v-for="item in dictList" :key="item.value" :value="item.value"
                     :label="item.label"></el-option>
                 </el-select>
               </el-form-item>
             </div>
-
           </el-col>
           <el-col :span="8">
             <div>
-              <el-form-item label="生产类型" prop="produceType">
-                <el-select style="width: 100%" v-model="form.produceType" filterable>
-                  <el-option v-for="item in dictList" :key="item.value" :value="item.value"
+              <el-form-item label="属性类型" prop="componentAttribute">
+                <el-select style="width: 100%" v-model="form.componentAttribute" filterable multiple>
+                  <el-option v-for="item in lbjtList" :key="item.value" :value="item.value"
                     :label="item.label"></el-option>
                 </el-select>
               </el-form-item>
             </div>
 
           </el-col>
-
+          <el-col :span="8">
+            <el-form-item label="存货类型:" prop="attributeType">
+              <el-select v-model="form.attributeType" filterable class="ele-block">
+                <el-option v-for="item in attributeList" :key="item.value" :value="item.value"
+                  :label="item.label"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          
 
           <el-col :span="8">
             <!-- v-if="
@@ -1081,6 +1080,44 @@ export default {
             this.loading = false;
           });
       });
+    },
+    //生产类型切换
+    produceTypeChange(value){
+      if(value==1){
+        this.attributeList=[
+          {
+            label: '成品',
+            value: 1
+          },
+          {
+            label: '半成品',
+            value: 2
+          }, {
+            label: '原材料',
+            value: 4
+          }
+        ]
+        this.form.attributeType=1
+      }else{
+        this.attributeList=[
+          {
+            label: '总装',
+            value: 1
+          },
+          {
+            label: '部件',
+            value: 2
+          },
+          {
+            label: '零件',
+            value: 3
+          }, {
+            label: '原材料',
+            value: 4
+          }
+        ]
+        this.form.attributeType=1
+      }
     }
   }
 };