1

src/views/inspectionPlan/components/new-baseInfo.vue

@@ -591,7 +591,9 @@
             { required: true, message: '请选择计划来源', trigger: 'blur' }
           ],
           teamId: [{ required: true, message: '请选择班组', trigger: 'blur' }],
-          productLineId: [{ required: true, message: '请选择场站', trigger: 'blur' }],
+          productLineId: [
+            { required: true, message: '请选择场站', trigger: 'blur' }
+          ]
         },
         isExpanded: false, // 控制展开/收起状态
         categoryInfo: {},
@@ -873,7 +875,7 @@
       },
 
       //主数据根据来源得到产品
-      handleMainChoose(val) {
+      async handleMainChoose(val) {
         console.log(val, '主数据根据来源得到产品 1');
         if (!val) return;
 
@@ -891,7 +893,7 @@
         console.log(this.form, '00000000000000000');
         // console.log(this.form.type)
         console.log('----------------->>>>');
-        this.getProductDetails(this.form.productId);
+        await this.getProductDetails(this.form.productId);
         this.$emit('changesMainNumberModal', this.form.productNumber);
         this.changeProductNumber(1);
 

src/views/inspectionWork/components/baseInfo.vue

@@ -129,6 +129,7 @@
               v-model="form.executeJobId"
               size="small"
               style="width: 100%"
+              v-if="form.assignType != 1"
             >
               <el-option
                 v-for="item in form.jobList"
@@ -138,15 +139,17 @@
                 @click.native="changeExecuteJob(item)"
               ></el-option>
             </el-select>
+            <el-input v-else v-model="form.executeJobName" disabled></el-input>
           </el-form-item>
         </el-col>
 
-        <el-col :span="6">
+        <el-col :span="6" style="height: 38px">
           <el-form-item label="执行人" prop="executeUserId">
             <el-select
               :disabled="btnType == 'detail'"
               v-model="form.executeUserIdList"
               size="small"
+              v-if="form.assignType != 1"
               style="width: 100%"
               filterable
               multiple
@@ -162,11 +165,12 @@
                 :label="item.name"
               ></el-option>
             </el-select>
+            <el-input v-else v-model="form.executeUserName" disabled></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6" v-if="form.assignType == 1">
           <el-form-item label="场站" prop="productLineId">
-          <input v-model="form.productLineName" disabled></input>
+            <el-input v-model="form.productLineName" disabled></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
@@ -190,8 +194,7 @@
             ></el-input>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row>
+
         <el-col :span="6">
           <el-form-item label="接收人部门" prop="groupId">
             <!-- <deptSelect
@@ -223,8 +226,7 @@
             </el-select> -->
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row>
+
         <el-col :span="6">
           <el-form-item
             label="合格数:"

src/views/inspectionWork/components/sampleListDialog.vue

@@ -402,9 +402,10 @@
         let num1 = arr.find(
           (item) => item.inspectionName == '炉水电导率'
         )?.qualityResultContent;
+        console.log(num,num1)
 
         arr.forEach((item, i) => {
-          if (num && num1 && item.inspectionName == '干度') {
+          if (num && num1 && item.inspectionName == '干度值') {
             let val = parseFloat(
               (((num - num1 / 1000) / num) * 100).toFixed(5)
             );

src/views/inspectionWork/edit.vue

@@ -1242,6 +1242,10 @@
 
           this.tabTaskId =
             this.categoryParamList[0] && this.categoryParamList[0].id;
+          if (this.form.assignType == 1) {
+            this.form.executeUserIdList = [this.$store.state.user.info.userId];
+            this.form.executeUserName = this.$store.state.user.info.name;
+          }
 
           if (this.form.groupId) {
             this.$nextTick(() => {

src/views/sample/sampleRecord/components/addSample.vue

@@ -440,6 +440,7 @@
             label: '照片',
             prop: 'imgUrl',
             slot: 'imgUrl',
+            width:150,
             align: 'center'
           },
           { label: '批次号', prop: 'batchNo', align: 'center' },