优化

src/views/inspectionPlan/components/baseInfo.vue

@@ -20,22 +20,14 @@
         </el-form-item>
       </el-col>
       <el-col :span="6">
-<!--        <el-form-item label="检验标准:" prop="inspectionStandards">-->
-<!--          <el-select v-model="form.inspectionStandards" placeholder="请选择" style="width: 100%" clearable></el-select>-->
-<!--        </el-form-item>-->
+        <!--        <el-form-item label="检验标准:" prop="inspectionStandards">-->
+        <!--          <el-select v-model="form.inspectionStandards" placeholder="请选择" style="width: 100%" clearable></el-select>-->
+        <!--        </el-form-item>-->
         <el-form-item label="检验标准" prop="inspectionStandards">
           <!-- 计量 计重 -->
-          <el-select
-            style="width: 100%"
-            v-model="form.inspectionStandards"
-            placeholder="请选择"
-          >
-            <el-option
-              v-for="item in inspectionStandardsList"
-              :label="item.label"
-              :value="item.value"
-              :key="item.value"
-            >
+          <el-select style="width: 100%" v-model="form.inspectionStandards" placeholder="请选择">
+            <el-option v-for="item in inspectionStandardsList" :label="item.label" :value="item.value"
+              :key="item.value">
             </el-option>
           </el-select>
         </el-form-item>
@@ -138,7 +130,7 @@
       </el-col>
       <el-col :span="6">
         <el-form-item label="工序:" prop=" produceTaskName">
-          <el-input  v-model="form.produceTaskName" disabled />
+          <el-input v-model="form.produceTaskName" disabled />
         </el-form-item>
       </el-col>
     </el-row>
@@ -164,6 +156,8 @@
           <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,
@@ -174,6 +168,13 @@
             :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">
@@ -339,7 +340,7 @@ export default {
     //质检计划类型
     planChange(value) {
       if (value == 1) {
-        this.sourceList = [{ label: '采购入收货单', value: '1' }];
+        this.sourceList = [{ label: '采购收货单', value: '1' }];
       } else if (value == 2) {
         this.sourceList = [
           { label: '生产计划', value: '2' },
@@ -403,7 +404,7 @@ export default {
       if (!val) return;
       this.form.planSourceId = val.id;
       this.form.planSourceCode = val.receiveNo;
-      console.log(this.form.planSourceCode,'this.form.planSourceCode')
+      console.log(this.form.planSourceCode, 'this.form.planSourceCode')
 
       this.form.productName = val.productName;
       this.form.productCode = val.productCode;
@@ -428,7 +429,7 @@ export default {
       let productCategoryId = val.productCategoryId;
       let productCategoryName = val.productCategoryName;
       if (receiveNo && categoryCode && categoryid) {
-        this.$emit('getList', receiveNo, categoryCode,productCategoryId,productCategoryName,categoryid,batchNo);
+        this.$emit('getList', receiveNo, categoryCode, productCategoryId, productCategoryName, categoryid, batchNo);
       }
     },
 

src/views/inspectionPlan/components/edit.vue

@@ -135,6 +135,7 @@ export default {
         qualificationRate: '',
         totalWeight: '',
         sampleNumber: null,
+        sampleProportion: '',
 
         remark: '',
         accessory: []
@@ -416,6 +417,7 @@ export default {
           this.$message.error('请确认该物品是否配置质检方案！');
           return;
         }
+        this.baseForm.sampleProportion = res.checkProportion;
         console.log(res, 'resresresresresresresresresresresresresresresresresresresresresres')
         this.baseForm.inspectionStandards = res?.inspectionStandards;
 

src/views/inspectionPlan/components/warehousing.vue

@@ -136,7 +136,7 @@
 
           {
             prop: 'supplierMark',
-            label: '供应商名称',
+            label: '供应商代号',
             align: 'center',
             showOverflowTooltip: true,
             minWidth: 140