bug修改

src/views/inspectionPlan/components/edit.vue

@@ -623,7 +623,7 @@ export default {
     async handleSampleList() {
       let packingList = this.$refs.table12.getData();
       //全检时 计量时
-      if (this.baseForm.qualityMode == 1 && this.baseForm.inspectionStandards == 1) {
+      if (this.baseForm.qualityMode == 1 && this.baseForm.inspectionStandards == 1 && this.btnType != "detail") {
         this.sampleList = [];
         console.log(this.baseForm, '---isUnpack---')
         await this.handleUnpackCase(packingList);
@@ -643,7 +643,7 @@ export default {
         //   }
         // }
         //全检 计重时
-      } else if (this.baseForm.qualityMode == 1 && this.baseForm.inspectionStandards == 2)  {
+      } else if (this.baseForm.qualityMode == 1 && this.baseForm.inspectionStandards == 2 && this.btnType != "detail")  {
         this.sampleList = [];
         this.getFullInspectionWeight(packingList);
       } else {

src/views/inspectionWork/components/baseInfo.vue

@@ -161,9 +161,9 @@
             </div>
           </el-form-item>
         </el-col> -->
-        <el-col :span="6" v-if="btnType != 'detail'">
+        <!-- <el-col :span="6" v-if="btnType != 'detail'">
           <el-form-item label="取样数量:" prop="sampleNumber" :rules="{
-            // required: form.qualityMode == 2 ? true : false,
+            required: form.qualityMode == 2 ? true : false,
             message: '请输入取样数量',
             trigger: 'blur'
           }" v-if="form.qualityMode == 2">
@@ -176,6 +176,11 @@
               </DictSelection>
             </div>
           </el-form-item>
+        </el-col> -->
+        <el-col :span="6">
+          <el-form-item label="合格证号:" prop="certificateNumber">
+            <el-input v-model="form.certificateNumber" :disabled="btnType == 'detail'" placeholder="请输入"></el-input>
+          </el-form-item>
         </el-col>
       </el-row>
       <el-row>
@@ -194,11 +199,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label="合格证号:" prop="certificateNumber">
-            <el-input v-model="form.certificateNumber" :disabled="btnType == 'detail'" placeholder="请输入"></el-input>
-          </el-form-item>
-        </el-col>
         <el-col :span="6">
           <el-form-item label="质检结果:" prop="qualityResults" v-if="form.qualityMode == 2">
             <el-select v-model="form.qualityResults" placeholder="请选择" style="width: 100%"
@@ -275,7 +275,7 @@ export default {
     },
     'form.inspectionStandards': {
       handler(newVal) {
-        if (newVal) {
+        if (newVal && this.qualityType1 == 2) {
           this.$emit('changeInspectionStandardsModel', newVal);
         } else {
           console.log('清空样品清单');