提交qmsbug

src/views/inspectionPlan/components/baseInfo.vue

@@ -146,12 +146,16 @@
       <el-row>
         <el-col :span="6">
           <el-form-item label="合格品数量:" prop="qualifiedNumber">
-            <el-input type="number" v-model="form.qualifiedNumber" disabled />
+            <el-input type="number" v-model="form.qualifiedNumber" disabled >
+              <template #append>{{form.measureUnit}}</template>
+            </el-input>
           </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-input type="number" v-model="form.unqualifiedNumber" disabled >
+              <template #append>{{form.measureUnit}}</template>
+            </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
@@ -161,7 +165,9 @@
         </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-input type="number" v-model="form.totalWeight" :disabled="btnType == 'detail' || btnType == 'issued'" >
+              <template #append>{{form.weightUnitZ}}</template>
+            </el-input>
           </el-form-item>
         </el-col>
       </el-row>
@@ -420,7 +426,7 @@ export default {
 
       this.form.planSourceCode = val.receiveNo;
       console.log(this.form.planSourceCode, 'this.form.planSourceCode')
-
+      this.form.supplierName = val.supplierName;
       this.form.supplierMark = val.supplierMark;
       this.form.productName = val.productName;
       this.form.productCode = val.productCode;
@@ -445,7 +451,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,val.supplierName,val.supplierMark);
       }
     },
 

src/views/inspectionPlan/components/edit.vue

@@ -169,6 +169,8 @@ export default {
         { label: '计量单位', prop: 'measureUnit', align: 'center' },
         { label: '物料代号', prop: 'materielDesignation', align: 'center' },
         { label: '客户代号', prop: 'clientCode', align: 'center' },
+        { label: '供应商名称', prop: 'supplierName', align: 'center' ,width: '120' },
+        { label: '供应商代号', prop: 'supplierCode', align: 'center' ,width: '120'},
         { label: '刻码', prop: 'engrave', align: 'center' },
         { label: '重量', prop: 'weight', align: 'center' },
         { label: '重量单位', prop: 'weightUnit', align: 'center' },
@@ -341,14 +343,14 @@ export default {
       this.schemePagination.currentPage = 1;
       this.schemePagination.total = this.schemeList.length;
     },
-    async getList(receiveNo, productCode, productCategoryId, productCategoryName, categoryid, batchNo) {
+    async getList(receiveNo, productCode, productCategoryId, productCategoryName, categoryid, batchNo,supplierName, supplierMark) {
       //通过来源和产品 获取来料清单
-      await this.getGoodsList(receiveNo, productCode, null, productCategoryId, productCategoryName, categoryid, batchNo);
+      await this.getGoodsList(receiveNo, productCode, null, productCategoryId, productCategoryName, categoryid, batchNo,supplierName, supplierMark);
 
       //通过来源和产品 获取质检方案
       this.getQualityTemplate(productCode);
     },
-    async getGoodsList(receiveNo, productCode, ids, productCategoryId, productCategoryName, categoryid, batchNo) {
+    async getGoodsList(receiveNo, productCode, ids, productCategoryId, productCategoryName, categoryid, batchNo,supplierName, supplierMark) {
       let res;
       const res1 = await outInRecordsPage({
         sourceBizNo: receiveNo,
@@ -361,6 +363,11 @@ export default {
       if (res1.list.length > 0) {
         console.log(res1.list[0].status, 'status=2 不赋值')
         if (res1.list[0].status != 2) {
+          // res1.list.forEach(item => ({
+          //   ...item,
+          //   supplierName :supplierName,
+          //   supplierMark :supplierMark,
+          // }))
           res = res1.list
           this.isCheck = true;
         } else {
@@ -378,6 +385,8 @@ export default {
         if (resData) {
           if (resData.qualityControl != 2) {
             this.isCheck = false;
+            // resData.supplierName = supplierName;
+            // resData.supplierMark = supplierMark;
             res = [resData];
           } else {
             res = []

src/views/inspectionWork/components/QualityContentTabs.vue

@@ -18,6 +18,26 @@
             <el-table-column :label="column.label" :prop="column.prop" :show-overflow-tooltip="true"
               :width="column.width" :align="column.align"></el-table-column>
           </template>
+          <el-table-column label="物料代号" prop="materielDesignation" align="center" width="100" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <span>{{scope.row.materielDesignation}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="客户代号" prop="clientCode" align="center" width="100" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <span>{{scope.row.clientCode}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="刻码" prop="engrave" align="center" width="100"  :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <span>{{scope.row.engrave}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="重量" prop="weight" align="center" width="100"  :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <span>{{scope.row.weight}}</span>
+            </template>
+          </el-table-column>
         </el-table>
         <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
           :current-page="pagination.currentPage" :page-sizes="[10, 20, 50, 100]" :page-size="pagination.pageSize"
@@ -37,16 +57,36 @@
                     {{ scope.row.categoryCode }}
                   </el-link>
                 </template>
-                <template v-else-if="column.prop === 'weight'">
-                  <el-input type="number" v-model="scope.row.weight" :min="0"
-                    @input="inputWeight(scope.row, scope.$index)"></el-input>
-                </template>
+<!--                <template v-else-if="column.prop === 'weight'">-->
+<!--                  <el-input type="number" v-model="scope.row.weight" :min="0"-->
+<!--                    @input="inputWeight(scope.row, scope.$index)"></el-input>-->
+<!--                </template>-->
                 <template v-else>
                   {{ scope.row[column.prop] }}
                 </template>
               </template>
             </el-table-column>
           </template>
+          <el-table-column label="物料代号" prop="materielDesignation" align="center" width="100" fixed="right"  :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <el-input :disabled="scope.row.isMaterielDesignationEmpty" v-model="scope.row.materielDesignation" ></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column label="客户代号" prop="clientCode" align="center" width="100" fixed="right"  :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <el-input :disabled="scope.row.isClientCodeEmpty" v-model="scope.row.clientCode" ></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column label="刻码" prop="engrave" align="center" width="100" fixed="right"  :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <el-input :disabled="scope.row.isEngraveEmpty" v-model="scope.row.engrave" ></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column label="重量" prop="weight" align="center" width="100" fixed="right"  :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <el-input type="number" v-model="scope.row.weight" :min="0" @input="inputWeight(scope.row, scope.$index)"></el-input>
+            </template>
+          </el-table-column>
           <el-table-column label="处置状态" prop="disposalStatus" align="center" width="80" fixed="right"
             :show-overflow-tooltip="true">
             <template slot-scope="scope">
@@ -165,10 +205,12 @@ export default {
         { label: '包装单位', prop: 'packingUnit', align: 'center' },
         { label: '计量数量', prop: 'measureQuantity', align: 'center' },
         { label: '计量单位', prop: 'measureUnit', align: 'center' },
-        { label: '物料代号', prop: 'materielDesignation', align: 'center' },
-        { label: '客户代号', prop: 'clientCode', align: 'center' },
-        { label: '刻码', prop: 'engrave', align: 'center' },
-        { label: '重量', prop: 'weight', align: 'center', width: "100" },
+        { label: '供应商名称', prop: 'supplierName', align: 'center' ,width: '120' },
+        { label: '供应商代号', prop: 'supplierCode', align: 'center' ,width: '120'},
+        // { label: '物料代号', prop: 'materielDesignation', align: 'center' },
+        // { label: '客户代号', prop: 'clientCode', align: 'center' },
+        // { label: '刻码', prop: 'engrave', align: 'center' },
+        // { label: '重量', prop: 'weight', align: 'center', width: "100" },
         { label: '重量单位', prop: 'weightUnit', align: 'center', width: "100" },
         { label: '仓库', prop: 'warehouseName', align: 'center' },
         { label: '货区', prop: 'areaName', align: 'center' },

src/views/inspectionWork/components/baseInfo.vue

@@ -70,113 +70,119 @@
       </div>
     </div>
     <div v-if="isExpanded">
-
-      <el-col :span="6" v-if="parseInt(qualityType1) == 2">
-        <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" v-if="parseInt(qualityType1) == 2">
-        <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 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-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-col :span="6">
-        <el-form-item label="合格率:" prop="qualificationRate">
-          <el-input v-model="form.qualificationRate" disabled />
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="不合格率:" prop="noQualificationRate">
-          <el-input 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="{
+      <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="qualifiedNumber">
+            <el-input v-model="form.qualifiedNumber" disabled 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-col :span="6">
+          <el-form-item label="合格率:" prop="qualificationRate">
+            <el-input v-model="form.qualificationRate" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="不合格率:" prop="noQualificationRate">
+            <el-input v-model="form.noQualificationRate" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <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="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="sampleNumber" :rules="{
           required: form.qualityMode == 2 ? true : false,
           message: '请输入取样数量',
           trigger: 'blur'
         }" v-if="form.qualityMode == 2">
-          <el-input type="number"
-            :disabled="form.qualityMode ==null || form.qualityMode == 1 || (form.qualityMode == 2 && form.sampleNumber) ? true : false"
-            v-model="form.sampleNumber" @change="handleChangeNumber" />
-        </el-form-item>
-      </el-col>
-
-      <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-input type="number"
+                      :disabled="form.qualityMode ==null || form.qualityMode == 1 || (form.qualityMode == 2 && form.sampleNumber) ? true : false"
+                      v-model="form.sampleNumber" @change="handleChangeNumber" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="6" v-if="parseInt(qualityType1) == 2">
+          <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" v-if="parseInt(qualityType1) == 2">
+          <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="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">

src/views/inspectionWork/edit.vue

@@ -506,16 +506,16 @@ export default {
       console.log(list)
 
       // 检查有效性
-      for (const item of list) {
-        for (const child of item.qualitySampleTemplateList) {
-
-          console.log(child, 'child')
-          if (!child.qualityResultContent || !child.qualityResults) {
-            this.$message.error('请完善报工内容！');
-            return;
-          }
-        }
-      }
+      // for (const item of list) {
+      //   for (const child of item.qualitySampleTemplateList) {
+      //
+      //     console.log(child, 'child')
+      //     if (!child.qualityResultContent || !child.qualityResults) {
+      //       this.$message.error('请完善报工内容！');
+      //       return;
+      //     }
+      //   }
+      // }
       console.log(list, 'listlistlistlist')
       list.forEach((item) => {
         if (item.qualitySampleTemplateList.some(child => child.qualityResults === 2)) {