Просмотр исходного кода

方案类型不出来,工单保存报错

wsx 11 месяцев назад
Родитель
Сommit
d0f94298b3
2 измененных файлов с 42 добавлено и 24 удалено
  1. 31 21
      src/views/inspectionTemplate/index.vue
  2. 11 3
      src/views/inspectionWork/edit.vue

+ 31 - 21
src/views/inspectionTemplate/index.vue

@@ -2,8 +2,8 @@
   <div class="ele-body">
     <el-card shadow="never">
       <seek-page
+        v-if="renderFlag"
         :seekList="seekList"
-        v-if="typeList.length"
         @search="search"
         ref="search"
       ></seek-page>
@@ -118,11 +118,10 @@
       AddOrUpdate
       // search
     },
-    computed: {
-      seekList() {
-        console.log(this.typeList);
-        
-        return [
+    computed: {},
+    data() {
+      return {
+        seekList: [
           {
             label: '名称:',
             value: 'qualitySchemeTemplateName',
@@ -140,7 +139,7 @@
             value: 'type',
             type: 'select',
             placeholder: '',
-            planList: this.typeList
+            planList: []
           },
           {
             label: '状态:',
@@ -152,11 +151,7 @@
             ],
             placeholder: ''
           }
-        ];
-      }
-    },
-    data() {
-      return {
+        ],
         dataForm: {
           key: ''
         },
@@ -224,18 +219,33 @@
             fixed: 'right'
           }
         ],
-        typeList: []
+        typeList: [],
+        renderFlag: false
       };
     },
-    created() {
-      this.requestDict('质检类型').then((res) => {
-        this.typeList = res.map((item) => {
-          return {
-            value: item.dictCode,
-            label: item.dictValue
-          };
-        });
+    async created() {
+      const res = await this.requestDict('质检类型');
+    
+      this.typeList = res.map((item) => {
+        let values = Object.keys(item);
+        return {
+          value: Number(values[0]),
+          label: item[values[0]]
+        };
+      });
+
+      const index = this.seekList.findIndex((item) => item.value === 'type');
+
+      this.$set(this.seekList, index, {
+        label: '类型:',
+        value: 'type',
+        type: 'select',
+        placeholder: '',
+        planList: this.typeList
       });
+      this.renderFlag = true;
+
+   
     },
     methods: {
       // 获取数据列表

+ 11 - 3
src/views/inspectionWork/edit.vue

@@ -192,6 +192,8 @@
     methods: {
       //切换检验方式
       changeModel(val, flag) {
+        console.log('切换检验方式');
+        
         this.$refs.tabsRef.tableSelClear();
         this.sampleList = [];
         this.$refs.tabsRef.tabsChange('1');
@@ -466,8 +468,10 @@
         });
 
         // await this.queryQualityInventory()
+        // 质检方案
         await this.queryQualityTempleContent();
         await this.queryQualitySamplContent();
+        // 来源清单
         await this.getQueryQualityInventory();
       },
       // getNewData(val) {
@@ -743,9 +747,9 @@
         });
         let addStatus = res.list.map((item) => {
           item.isValid = true;
-          item.disposeTime = item.disposeTime
-            ? item.disposeTime.split(' ')[0]
-            : null;
+          // item.disposeTime = item.disposeTime
+          //   ? item.disposeTime.split(' ')[0]
+          //   : null;
           item.sampleDate = item.sampleDate
             ? item.sampleDate.split(' ')[0]
             : null;
@@ -793,6 +797,10 @@
 
           delete this.form['qualityTimeEnd'];
 
+          console.log(this.sampleList);
+          // return
+          
+
           let params = {
             ...this.form,
             sampleList: this.sampleList,