Explorar o código

处置方式;取小样生成数据优化;

yijing hai 1 ano
pai
achega
2b0b7b693c

+ 9 - 15
src/views/inspectionPlan/components/edit.vue

@@ -23,8 +23,8 @@
                 </el-dropdown-menu>
               </el-dropdown>
             </template>
-            <template v-slot:toolkit>
-              <div v-if="conditionType == 2">
+            <template v-slot:toolkit v-if="conditionType == 2">
+              <div>
                 <div style="display: flex;align-items: center;">
                   <el-input v-model="formData.number" style="width: 120px;" placeholder="请输入" size="mini"
                     @change="handleInputNumber"></el-input>
@@ -889,27 +889,21 @@ export default {
     },
     getNewSampleList(measureQ, unit, nums) {
       this.sampleList = [];
-      let data = [];
+      // let data = [];
       if (!this.selectedList || this.selectedList.length == 0) {
         this.$message.warning('请先选择样品!');
         return;
       }
-      this.selectedList.forEach(oldItem => {
+      this.selectedList.forEach((oldItem, index) => {
 
-        delete oldItem.id;
-
-        for (let i = 0; i < nums; i++) {
-          data.push({
-            ...oldItem,
-            measureQuantity: measureQ,
-            measureUnit: unit
-          });
-        }
+        this.$set(oldItem, 'id', null);
+        this.$set(oldItem, 'measureQuantity', measureQ);
+        this.$set(oldItem, 'measureUnit', unit);
       });
 
-      console.log(data, 'datadatadatadatadatadata', nums)
+      console.log(this.selectedList, 'datadatadatadatadatadata', nums)
 
-      this.sampleList = data;
+      this.sampleList = this.selectedList;
     },
     handleCancel() {
       this.takeAsampleVisible = false;

+ 12 - 3
src/views/inspectionWork/components/sampleDisposeDialog.vue

@@ -5,12 +5,13 @@
       <el-row>
         <el-col :span="6">
           <el-form-item label="处置方式" prop="disposalStatus" align="center">
-            <el-select v-model="formData.disposalStatus" placeholder="请选择" style="width: 100%;" v-if="qualityType == 1">
+            <el-select v-model="formData.disposalStatus" placeholder="请选择" style="width: 100%;" v-if="qualityType == 1"
+              clearable>
               <el-option v-for="item in disposalStatusListType" :key="item.value" :label="item.label"
                 :value="item.value">
               </el-option>
             </el-select>
-            <el-select v-model="formData.disposalStatus" placeholder="请选择" style="width: 100%;" v-else>
+            <el-select v-model="formData.disposalStatus" placeholder="请选择" style="width: 100%;" v-else clearable>
               <el-option v-for="item in disposalStatusList" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
@@ -100,7 +101,7 @@ export default {
         disposeTime: [
           {
             required: true,
-            message: '请输入绑定手机号',
+            message: '请选择处置时间',
             trigger: 'blur'
           }
         ],
@@ -163,6 +164,14 @@ export default {
           value: 8,
           label: '回用'
         },
+        {
+          value: 5,
+          label: '让步接收'
+        },
+        {
+          value: 9,
+          label: '退货'
+        },
       ]
     };
   },

+ 8 - 13
src/views/inspectionWork/edit.vue

@@ -395,29 +395,24 @@ export default {
     },
     getNewSampleList(measureQ, unit, nums) {
       this.sampleList = [];
-      let data = [];
+
       console.log(this.selectedList, 'this.selectedList')
       if (!this.selectedList || this.selectedList.length == 0) {
         this.$message.warning('请先选择来源清单!');
         return;
       }
-      this.selectedList.forEach(oldItem => {
-
-        delete oldItem.id;
+      this.selectedList.forEach((oldItem, index) => {
 
-        for (let i = 0; i < nums; i++) {
-          data.push({
-            ...oldItem,
-            measureQuantity: measureQ,
-            measureUnit: unit
-          });
-        }
+        this.$set(oldItem, 'id', null);
+        this.$set(oldItem, 'measureQuantity', measureQ);
+        this.$set(oldItem, 'measureUnit', unit);
       });
 
-      console.log(data, 'datadatadatadatadatadata', nums)
+      console.log(this.selectedList, 'datadatadatadatadatadata', nums)
+
+      this.sampleList = this.selectedList;
 
       this.$refs.tabsRef.tabsChange('2')
-      this.sampleList = data;
     },
 
     async queryQualitySamplContent() {