基本信息展开收起，已质检不再次质检

src/views/inspectionPlan/components/baseInfo.vue

@@ -1,4 +1,5 @@
 <template>
+
   <el-form ref="form1" :model="form" :rules="rules" label-width="120px">
     <el-row>
       <el-col :span="6">
@@ -63,134 +64,142 @@
         </el-form-item>
       </el-col>
     </el-row>
-    <el-row>
-      <el-col :span="6">
-        <el-form-item label="结束时间:" prop="planEndTime">
-          <el-date-picker :disabled="btnType == 'detail'" class="w100" v-model="form.planEndTime" type="date"
-            value-format="yyyy-MM-dd" placeholder="请输入"></el-date-picker>
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="类型:" prop="type">
-          <DictSelection dictName="质检计划类型" v-model="form.type" clearable @change="typeChange"
-            :disabled="btnType == 'detail' || btnType == 'issued'"></DictSelection>
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="计划来源:" prop="planSource">
-          <el-select v-model="form.planSource" placeholder="请选择" style="width: 100%" clearable
-            @change="planSourceChange" :disabled="btnType == 'detail' || btnType == 'issued'">
-            <el-option :label="item.label" v-for="item in sourceList" :key="item.value" :value="item.value" />
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="来源编码:" prop="planSourceCode">
-          <el-input v-model="form.planSourceCode" disabled />
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="6">
-        <el-form-item label="名称:" prop=" productName">
-          <el-input v-model="form.productName" disabled />
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="编码:" prop=" productCode">
-          <el-input v-model="form.productCode" disabled />
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="批次号:" prop=" batchNo">
-          <el-input v-model="form.batchNo" disabled />
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="规格:" prop=" specification">
-          <el-input v-model="form.specification" disabled />
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="6">
-        <el-form-item label="型号:" prop=" modelType">
-          <el-input v-model="form.modelType" disabled />
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="牌号:" prop=" brandNo">
-          <el-input v-model="form.brandNo" disabled />
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="数量:" prop=" productNumber">
-          <el-input type="number" v-model="form.productNumber" disabled />
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="工序:" prop=" produceTaskName">
-          <el-input v-model="form.produceTaskName" disabled />
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="6">
-        <el-form-item label="合格品数量:" prop=" qualifiedNumber">
-          <el-input type="number" v-model="form.qualifiedNumber" disabled />
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="不合格品数量:" prop=" unqualifiedNumber">
-          <el-input type="number" v-model="form.unqualifiedNumber" disabled />
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="合格率:" prop="qualificationRate">
-          <el-input type="number" v-model="form.qualificationRate"
-            :disabled="btnType == 'detail' || btnType == 'issued'" />
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="总重量:" prop="totalWeight">
-          <el-input type="number" v-model="form.totalWeight" :disabled="btnType == 'detail' || btnType == 'issued'" />
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="6" v-if="form.qualityMode == 2">
-        <el-form-item label="取样数量:" prop="sampleNumber" :rules="{
-          required: form.qualityMode == 2 ? true : false,
-          message: '请输入取样数量',
-          trigger: 'blur'
-        }">
-          <el-input type="number" v-model="form.sampleNumber" @change="handleChangeNumber"
-            :disabled="btnType == 'detail' || btnType == 'issued'" />
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="抽样比例:" prop="sampleProportion">
-          <el-input v-model="form.sampleProportion" :disabled="btnType == 'detail' || btnType == 'issued'">
-            <template #append>%</template>
-          </el-input>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="24">
-        <el-form-item label="备注:" prop="remark">
-          <el-input type="textarea" v-model="form.remark" placeholder="请输入"
-            :disabled="btnType == 'detail' || btnType == 'issued'" />
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="8">
-        <el-form-item label="附件:" prop="accessory">
-          <fileUpload v-model="form.accessory" />
-        </el-form-item>
-      </el-col>
-    </el-row>
+    <div style="text-align: right;margin-bottom: 22px;">
+      <div @click="toggleExpand">
+        <div v-if="isExpanded"><i class="el-icon-arrow-up"></i>收起</div>
+        <div v-if="!isExpanded"><i class="el-icon-arrow-down"></i>展开更多</div>
+      </div>
+    </div>
+    <div v-if="isExpanded">
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="结束时间:" prop="planEndTime">
+            <el-date-picker :disabled="btnType == 'detail'" class="w100" v-model="form.planEndTime" type="date"
+              value-format="yyyy-MM-dd" placeholder="请输入"></el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类型:" prop="type">
+            <DictSelection dictName="质检计划类型" v-model="form.type" clearable @change="typeChange"
+              :disabled="btnType == 'detail' || btnType == 'issued'"></DictSelection>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="计划来源:" prop="planSource">
+            <el-select v-model="form.planSource" placeholder="请选择" style="width: 100%" clearable
+              @change="planSourceChange" :disabled="btnType == 'detail' || btnType == 'issued'">
+              <el-option :label="item.label" v-for="item in sourceList" :key="item.value" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="来源编码:" prop="planSourceCode">
+            <el-input v-model="form.planSourceCode" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="名称:" prop=" productName">
+            <el-input v-model="form.productName" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="编码:" prop=" productCode">
+            <el-input v-model="form.productCode" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="批次号:" prop=" batchNo">
+            <el-input v-model="form.batchNo" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="规格:" prop=" specification">
+            <el-input v-model="form.specification" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="型号:" prop=" modelType">
+            <el-input v-model="form.modelType" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="牌号:" prop=" brandNo">
+            <el-input v-model="form.brandNo" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="数量:" prop=" productNumber">
+            <el-input type="number" v-model="form.productNumber" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="工序:" prop=" produceTaskName">
+            <el-input v-model="form.produceTaskName" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="合格品数量:" prop=" qualifiedNumber">
+            <el-input type="number" v-model="form.qualifiedNumber" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="不合格品数量:" prop=" unqualifiedNumber">
+            <el-input type="number" v-model="form.unqualifiedNumber" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="合格率:" prop="qualificationRate">
+            <el-input type="number" v-model="form.qualificationRate"
+              :disabled="btnType == 'detail' || btnType == 'issued'" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="总重量:" prop="totalWeight">
+            <el-input type="number" v-model="form.totalWeight" :disabled="btnType == 'detail' || btnType == 'issued'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="6" v-if="form.qualityMode == 2">
+          <el-form-item label="取样数量:" prop="sampleNumber" :rules="{
+            required: form.qualityMode == 2 ? true : false,
+            message: '请输入取样数量',
+            trigger: 'blur'
+          }">
+            <el-input type="number" v-model="form.sampleNumber" @change="handleChangeNumber"
+              :disabled="btnType == 'detail' || btnType == 'issued'" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="抽样比例:" prop="sampleProportion">
+            <el-input v-model="form.sampleProportion" :disabled="btnType == 'detail' || btnType == 'issued'">
+              <template #append>%</template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="备注:" prop="remark">
+            <el-input type="textarea" v-model="form.remark" placeholder="请输入"
+              :disabled="btnType == 'detail' || btnType == 'issued'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="附件:" prop="accessory">
+            <fileUpload v-model="form.accessory" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </div>
 
     <warehousing ref="warehousingRef" @choose="handleChoose" />
     <productionPlan ref="productionPlanRef" @choose="handleChoose" />
@@ -320,13 +329,17 @@ export default {
         executeId: [
           { required: true, message: '请选择执行人员:', trigger: 'blur' }
         ]
-      }
+      },
+      isExpanded: false // 控制展开/收起状态
     };
   },
   created() {
     this.getDictListIqoCode('iqo_code');
   },
   methods: {
+    toggleExpand() {
+      this.isExpanded = !this.isExpanded;
+    },
     async getDictListIqoCode(code) {
       let { data: res } = await getByCode(code);
       this.inspectionStandardsList = res.map((item) => {
@@ -403,6 +416,8 @@ export default {
     handleChoose(val) {
       if (!val) return;
       this.form.planSourceId = val.id;
+      // this.form.planReceiveId = val.receiveId;
+
       this.form.planSourceCode = val.receiveNo;
       console.log(this.form.planSourceCode, 'this.form.planSourceCode')
 
@@ -439,7 +454,7 @@ export default {
     },
     typeChange(val) {
       if (val == 1) {
-        this.sourceList = [{ label: '采购入收货单', value: '1' }];
+        this.sourceList = [{ label: '采购收货单', value: '1' }];
       } else if (val == 2) {
         this.sourceList = [
           { label: '生产计划', value: '2' },
@@ -451,4 +466,8 @@ export default {
   }
 };
 </script>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+::v-deep .el-form-item .el-form-item--medium .more {
+  margin: 0 !important;
+}
+</style>

src/views/inspectionPlan/components/edit.vue

@@ -6,7 +6,7 @@
     <base-info ref="baseInfoRefs" v-if="baseForm" :form="baseForm" :btnType="btnType" @resetTable="resetTable"
       @getList="getList" @changeModel="changeModel" @changeNumber="changeNumber" @table2="table2"></base-info>
 
-    <el-row style="margin-top: 24px">
+    <el-row>
       <header-title title="质检内容"></header-title>
       <el-tabs v-model="activeName" @tab-click="handleClick">
         <el-tab-pane label="来源清单" name="1"></el-tab-pane>
@@ -136,6 +136,7 @@ export default {
         totalWeight: '',
         sampleNumber: null,
         sampleProportion: '',
+        // planReceiveId: '',
 
         remark: '',
         accessory: []
@@ -349,8 +350,15 @@ export default {
       });
       console.log(res1, 'res1')
       if (res1.list.length > 0) {
-        res = res1.list
-        this.isCheck = true;
+        console.log(res1.list[0].status, 'statusssssssssssssssssssss')
+        if (res1.list[0].status != 2) {
+          res = res1.list
+          this.isCheck = true;
+        } else {
+          res = []
+          this.$message.error('此数据已质检，无需再次质检！');
+          return
+        }
       } else {
         let resData = await getBatchInfoData({
           sourceBizNo: receiveNo,
@@ -359,8 +367,14 @@ export default {
         });
         console.log(resData, 'resData')
         if (resData) {
-          this.isCheck = false;
-          res = [resData];
+          if (resData.qualityControl != 2) {
+            this.isCheck = false;
+            res = [resData];
+          } else {
+            res = []
+            this.$message.error('此数据已质检，无需再次质检！');
+            return
+          }
         }
       }
 

src/views/inspectionPlan/components/searchWarehousing.vue

@@ -31,7 +31,7 @@
     </el-row>
     <el-row :gutter="15">
 
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+      <!-- <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="质检结果:">
           <el-select
             v-model="where.qualityResults"
@@ -54,9 +54,9 @@
             <el-option label="已检" :value="1" />
           </el-select>
         </el-form-item>
-      </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 12, md: 12 } : { span: 12 }">
-        <div style="text-align: right">
+      </el-col> -->
+      <el-col v-bind="styleResponsive ? { lg: 24, md: 24 } : { span: 24 }">
+        <div style="text-align: right;margin-bottom: 8px;">
           <el-button
             type="primary"
             icon="el-icon-search"

src/views/inspectionWork/components/baseInfo.vue

@@ -63,131 +63,139 @@
         </el-form-item>
       </el-col>
     </el-row>
-    <el-row>
-      <el-col :span="6">
-        <el-form-item label="工艺路线:">
-          <el-input @click.native="openVersion" clearable v-model="form.produceRoutingName"
-            :disabled="btnType == 'detail'" placeholder="请选择" />
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="工序:">
-          <el-select style="width: 100%" v-model="form.produceTaskId" placeholder="请选择" clearable
-            @change="produceTaskChange" :disabled="btnType == 'detail'">
-            <el-option v-for="item in produceTaskList" :key="item.id" :label="item.name" :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="合格数:" prop="qualifiedNumber">
-          <el-input v-model="form.qualifiedNumber" :disabled="btnType == 'detail'" placeholder="请输入"></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="不合格数:" prop="noQualifiedNumber">
-          <el-input v-model="form.noQualifiedNumber" disabled placeholder="请输入"></el-input>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="6">
-        <el-form-item label="质检部门" prop="groupId">
-          <deptSelect :disabled="btnType == 'detail'" v-model="form.groupId" @changeGroup="searchDeptNodeClick" />
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="质检人" prop="qualityId">
-          <el-select :disabled="btnType == 'detail'" v-model="form.qualityId" @change="changeExecutor" size="small"
-            style="width: 100%" filterable>
-            <el-option v-for="item in executorList" :key="item.id" :value="item.id" :label="item.name"></el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="质检时间:" prop="qualityTime">
-          <el-date-picker class="w100" v-model="form.qualityTime" type="date" value-format="yyyy-MM-dd"
-            :disabled="btnType == 'detail'" placeholder="请选择"></el-date-picker>
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="工时(h):" prop="hours">
-          <el-input v-model="form.hours" :disabled="btnType == 'detail'"></el-input>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="6">
-        <el-form-item label="合格率:" prop="qualificationRate">
-          <el-input type="number" v-model="form.qualificationRate" disabled />
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="不合格率:" prop="noQualificationRate">
-          <el-input type="number" v-model="form.noQualificationRate" disabled />
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="总重量:" prop="totalWeight">
-          <el-input type="number" v-model="form.totalWeight" />
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="取样数量:" prop="sampleNumber" :rules="{
-          required: form.qualityMode == 2 ? true : false,
-          message: '请输入取样数量',
-          trigger: 'blur'
-        }">
-          <el-input type="number" disabled v-model="form.sampleNumber" @change="handleChangeNumber" />
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="6">
-        <el-form-item label="检验标准" prop="inspectionStandards">
-          <!-- 计量 计重 -->
-          <el-select style="width: 100%" v-model="form.inspectionStandards" placeholder="请选择"
-            :disabled="parseInt(qualityType1) == 1">
-            <el-option v-for="item in inspectionStandardsList" :label="item.label" :value="item.value"
-              :key="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="检验方式:" prop="qualityMode">
-          <!-- <DictSelection dictName="取样类型" v-model="form.qualityMode" :disabled="qualityType == 1"></DictSelection> -->
-          <el-select style="width: 100%" v-model="form.qualityMode" placeholder="请选择"
-            :disabled="parseInt(qualityType1) == 1">
-            <el-option v-for="item in qualityModeList" :label="item.label" :value="item.value" :key="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="质检结果:" prop="qualityResults">
-          <el-select v-model="form.qualityResults" placeholder="请选择" style="width: 100%" :disabled="btnType == 'issued'"
-            clearable>
-            <el-option label="合格" :value=1 />
-            <el-option label="不合格" :value=2 />
-          </el-select>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="24">
-        <el-form-item label="备注:" prop="remark">
-          <el-input type="textarea" v-model="form.remark" placeholder="请输入" :disabled="btnType == 'issued'" />
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="8">
-        <el-form-item label="附件:" prop="imgUrl">
-          <fileUpload v-model="form.imgUrl" />
-        </el-form-item>
-      </el-col>
-    </el-row>
+    <div style="text-align: right;margin-bottom: 22px;">
+      <div @click="toggleExpand">
+        <div v-if="isExpanded"><i class="el-icon-arrow-up"></i>收起</div>
+        <div v-if="!isExpanded"><i class="el-icon-arrow-down"></i>展开更多</div>
+      </div>
+    </div>
+    <div v-if="isExpanded">
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="工艺路线:">
+            <el-input @click.native="openVersion" clearable v-model="form.produceRoutingName"
+              :disabled="btnType == 'detail'" placeholder="请选择" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="工序:">
+            <el-select style="width: 100%" v-model="form.produceTaskId" placeholder="请选择" clearable
+              @change="produceTaskChange" :disabled="btnType == 'detail'">
+              <el-option v-for="item in produceTaskList" :key="item.id" :label="item.name" :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="合格数:" prop="qualifiedNumber">
+            <el-input v-model="form.qualifiedNumber" :disabled="btnType == 'detail'" placeholder="请输入"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="不合格数:" prop="noQualifiedNumber">
+            <el-input v-model="form.noQualifiedNumber" disabled placeholder="请输入"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="质检部门" prop="groupId">
+            <deptSelect :disabled="btnType == 'detail'" v-model="form.groupId" @changeGroup="searchDeptNodeClick" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="质检人" prop="qualityId">
+            <el-select :disabled="btnType == 'detail'" v-model="form.qualityId" @change="changeExecutor" size="small"
+              style="width: 100%" filterable>
+              <el-option v-for="item in executorList" :key="item.id" :value="item.id" :label="item.name"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="质检时间:" prop="qualityTime">
+            <el-date-picker class="w100" v-model="form.qualityTime" type="date" value-format="yyyy-MM-dd"
+              :disabled="btnType == 'detail'" placeholder="请选择"></el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="工时(h):" prop="hours">
+            <el-input v-model="form.hours" :disabled="btnType == 'detail'"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="合格率:" prop="qualificationRate">
+            <el-input type="number" v-model="form.qualificationRate" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="不合格率:" prop="noQualificationRate">
+            <el-input type="number" v-model="form.noQualificationRate" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="总重量:" prop="totalWeight">
+            <el-input type="number" v-model="form.totalWeight" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="取样数量:" prop="sampleNumber" :rules="{
+            required: form.qualityMode == 2 ? true : false,
+            message: '请输入取样数量',
+            trigger: 'blur'
+          }">
+            <el-input type="number" disabled v-model="form.sampleNumber" @change="handleChangeNumber" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="检验标准" prop="inspectionStandards">
+            <!-- 计量 计重 -->
+            <el-select style="width: 100%" v-model="form.inspectionStandards" placeholder="请选择"
+              :disabled="parseInt(qualityType1) == 1">
+              <el-option v-for="item in inspectionStandardsList" :label="item.label" :value="item.value"
+                :key="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="检验方式:" prop="qualityMode">
+            <!-- <DictSelection dictName="取样类型" v-model="form.qualityMode" :disabled="qualityType == 1"></DictSelection> -->
+            <el-select style="width: 100%" v-model="form.qualityMode" placeholder="请选择"
+              :disabled="parseInt(qualityType1) == 1">
+              <el-option v-for="item in qualityModeList" :label="item.label" :value="item.value" :key="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="质检结果:" prop="qualityResults">
+            <el-select v-model="form.qualityResults" placeholder="请选择" style="width: 100%"
+              :disabled="btnType == 'issued'" clearable>
+              <el-option label="合格" :value=1 />
+              <el-option label="不合格" :value=2 />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="备注:" prop="remark">
+            <el-input type="textarea" v-model="form.remark" placeholder="请输入" :disabled="btnType == 'issued'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="附件:" prop="imgUrl">
+            <fileUpload v-model="form.imgUrl" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </div>
     <ProductionVersion ref="versionRefs" @changeProduct="changeProduct" />
     <EquipmentDialog ref="equipmentRefs" @choose="choose" />
   </el-form>
@@ -268,6 +276,7 @@ export default {
       produceTaskList: [],
       inspectionStandardsList: [],
       qualityModeList: [],
+      isExpanded: false
 
     };
   },
@@ -276,6 +285,9 @@ export default {
     this.getQualityModeList('quality_method_code');
   },
   methods: {
+    toggleExpand() {
+      this.isExpanded = !this.isExpanded;
+    },
     async getDictListIqoCode(code) {
       let { data: res } = await getByCode(code);
       this.inspectionStandardsList = res.map((item) => {
@@ -319,6 +331,7 @@ export default {
         routingId: this.form.produceRoutingId,
         size: -1
       });
+      console.log(res.list, '工序！！！！！！！！！！！！！！！！！！')
       this.produceTaskList = res.list;
     },
     // 选择工序

src/views/inspectionWork/edit.vue

@@ -103,7 +103,7 @@
                 @click="handleDetail(scope.$index, scope.row, 'report')">
                 质检
               </el-link>
-              <el-link type='primary' :underline="false" @click="handleDispose(scope.$index, scope.row, 'dispose')"> 处置
+              <el-link type='primary' :underline="false" @click="handleDispose(scope.$index, scope.row, 'dispose')">处置
               </el-link>
             </template>
           </el-table-column>
@@ -429,14 +429,16 @@ export default {
 
         if (this.form.groupId) {
           this.$nextTick(() => {
-            if (this.$refs.baseInfoRefs) {
-              this.$refs.baseInfoRefs.getUserList({
-                groupId: this.form.groupId
-              });
-              this.$refs.baseInfoRefs.getTaskList();
-            }
+            this.$refs.baseInfoRefs?.getUserList({
+              groupId: this.form.groupId
+            });
           });
         }
+        if (this.form.produceRoutingId) {
+          this.$nextTick(() => {
+            this.$refs.baseInfoRefs?.getTaskList();
+          })
+        }
       });
       await this.queryQualityInventory()
       await this.queryQualitySamplContent()