bug

src/views/inspectionProjectRequest/index.vue

@@ -30,6 +30,17 @@
             >{{ row.code }}</el-link
           >
         </template>
+        <template v-slot:approvalStatus="{ row }">
+          <el-link
+            v-if="row.processInstanceId"
+            type="primary"
+            :underline="false"
+            @click="bpmDetailOpen(row, 'detail')"
+            >{{ reviewStatus[row.approvalStatus] }}
+          </el-link>
+          <span v-else> {{ reviewStatus[row.approvalStatus] }}</span>
+        </template>
+
         <!-- 操作列 -->
         <template v-slot:action="{ row }">
           <el-link
@@ -124,6 +135,22 @@
       @success="transferConfirm"
       :id="transferId"
     ></Transfer>
+    <ele-modal
+      :visible.sync="bpmDetailShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      append-to-body
+      width="70%"
+      :maxable="true"
+    >
+      <bpmDetail
+        v-if="bpmDetailShow && processInstanceId"
+        :id="processInstanceId"
+      ></bpmDetail>
+      <template v-slot:footer>
+        <el-button @click="bpmDetailShow = false">关闭</el-button>
+      </template>
+    </ele-modal>
   </div>
 </template>
 
@@ -145,14 +172,15 @@
   import dictMixins from '@/mixins/dictMixins';
   import { reviewStatus } from '@/enum/dict';
   import processSubmitDialog from '@/components/processSubmitDialog/processSubmitDialog.vue';
-
+  import bpmDetail from '@/views/bpm/processInstance/detail.vue';
   export default {
     components: {
       search,
       inspectionProjectTaskSend,
       processSubmitDialog,
       inspectionProjectReport,
-      Transfer
+      Transfer,
+      bpmDetail
     },
     props: {
       cacheKeyUrl: {
@@ -169,8 +197,10 @@
       return {
         processSubmitDialogFlag: false,
         transferVisible: false,
-
+        reviewStatus,
         transferId: '',
+        processInstanceId: '',
+        bpmDetailShow: false,
         // 表格列配置
         columns: []
       };
@@ -181,6 +211,10 @@
       this.getColumns();
     },
     methods: {
+      bpmDetailOpen(row) {
+        this.bpmDetailShow = true;
+        this.processInstanceId = row.processInstanceId;
+      },
       getColumns() {
         this.columns = [
           {
@@ -340,13 +374,11 @@
           },
           {
             prop: 'approvalStatus',
+            slot: 'approvalStatus',
             label: '审核状态',
             align: 'center',
             minWidth: 110,
-            showOverflowTooltip: true,
-            formatter: (_row, _column, cellValue) => {
-              return reviewStatus[_row.approvalStatus];
-            }
+            showOverflowTooltip: true
           },
           {
             prop: 'createUserName',

src/views/inspectionWork/components/inspectionProjectReport.vue

@@ -19,6 +19,9 @@
         剩余样品总数：{{ form.remainingSampleCount }}
       </template>
 
+      <template v-slot:isRequired="{ column }">
+        <span class="is-required">{{ column.label }}</span>
+      </template>
       <template v-slot:qualityType="{ row }">
         {{ getDictValue('质检计划类型', row.qualityType) }}
       </template>
@@ -275,7 +278,7 @@
           },
           {
             minWidth: 150,
-            prop: 'sourceCode',
+            prop: 'qualityWorkOrderCode',
             align: 'center',
             label: '来源单号',
             showOverflowTooltip: true
@@ -349,6 +352,7 @@
           {
             minWidth: 140,
             prop: 'sampleQuantity',
+            headerSlot: 'isRequired',
             slot: 'sampleQuantity',
             align: 'center',
             label: '样品数',
@@ -365,6 +369,7 @@
           {
             minWidth: 140,
             prop: 'sampleQualifiedNumber',
+            headerSlot: 'isRequired',
             slot: 'sampleQualifiedNumber',
             align: 'center',
             label: '样品合格数',
@@ -690,16 +695,18 @@
         if (type == 'report') {
           let data = { ...workData, ...row };
           data.sampleQuantity = row.sampleQuantity || data.remainingSampleCount;
+          data.sampleQualifiedNumber=row.sampleQualifiedNumber||data.sampleQuantity
           this.$set(this, 'form', JSON.parse(JSON.stringify(data)));
           this.tableData = JSON.parse(JSON.stringify(list));
           this.tableData.forEach((item, index) => {
             if (item.experimentCode) {
-              this.$set(this.tableData[index],'executionMethod',2)
-              // item.executionMethod = 2;
+              this.$set(this.tableData[index], 'executionMethod', 2);
             }
-              this.$set(this.tableData[index],'executionMethod',item.executionMethod || 1)
-
-            // item.executionMethod = item.executionMethod || 1;
+            this.$set(
+              this.tableData[index],
+              'executionMethod',
+              item.executionMethod || 1
+            );
           });
           if (row.sampleQuantity) {
             this.form.remainingSampleCount =
@@ -753,13 +760,16 @@
             item.status = 1;
           }
         });
-        // if (isHandleConfirm) {
-        //   return this.$message.error('质检内容不能为空！');
-        // }
+        if (!this.form.sampleQuantity) {
+          return this.$message.error('样品数不能为空！');
+        }
         if (!this.pageName) {
           this.$emit('success', { data: this.form, tableData: this.tableData });
           this.visible = false;
         } else {
+          if (isHandleConfirm) {
+            return this.$message.error('质检内容不能为空！');
+          }
           let api =
             this.pageName == 'inspectionProjectTask'
               ? exeTaskReportWork

src/views/inspectionWork/components/inspectionWorkDialog.vue

@@ -29,7 +29,7 @@
       >
         <!-- 表头工具栏 -->
         <template v-slot:action="{ row }">
-          <el-radio  class="radio" v-model="radio" :label="row.id"
+          <el-radio class="radio" v-model="radio" :label="row.id"
             ><i></i
           ></el-radio>
         </template>
@@ -312,7 +312,16 @@
             value: 'status',
             type: 'select',
             placeholder: '',
-            planList: this.statusList
+            planList: [
+              {
+                label: '未报工',
+                value: 0
+              },
+              {
+                label: '待取样',
+                value: 3
+              }
+            ]
           }
         ];
       }
@@ -327,6 +336,7 @@
           ...where,
           pageNum: page,
           size: limit,
+
           statusList: '0,3'
         });
       },

src/views/inspectionWork/details.vue

@@ -142,11 +142,11 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="附件信息">
-                  <el-link @click="openFileModal" type="primary"
+                  <!-- <el-link @click="openFileModal" type="primary"
                     >查看附件信息<i class="el-icon-view el-icon--right"></i>
-                  </el-link>
+                  </el-link> -->
 
-                  <fileMain ref="fileMainRef" />
+                  <fileMain ref="fileMainRef" type="view" v-model="accessory" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -201,6 +201,45 @@
                   <el-input disabled v-model="form.sampleWeight" />
                 </el-form-item>
               </el-col>
+              <el-col :span="6">
+                <el-form-item label="记录方法:" prop="recordingMethod">
+                  <el-input
+                    disabled
+                    :value="form.recordingMethod == 1 ? '批样' : '单样全部'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row v-if="form.recordingMethod == 1">
+              <el-col :span="6">
+                <el-form-item
+                  label="留样数(合格品):"
+                  prop="retainedSampleQuantity"
+                >
+                  <el-input disabled :value="form.retainedSampleQuantity" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item
+                  label="留样数(不合格品):"
+                  prop="retainedSampleUnqualified"
+                >
+                  <el-input disabled :value="form.retainedSampleUnqualified" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="损耗数(合格品):" prop="lossNumber">
+                  <el-input disabled :value="form.lossNumber" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item
+                  label="损耗数(不合格品):"
+                  prop="lossNumberUnqualified"
+                >
+                  <el-input disabled :value="form.lossNumberUnqualified" />
+                </el-form-item>
+              </el-col>
             </el-row>
           </el-form>
         </el-tab-pane>
@@ -303,7 +342,7 @@
 
   export default {
     mixins: [detailMixins],
-    components: {sampleListDialog },
+    components: { sampleListDialog },
     data() {
       return {
         activeName: '1',

src/views/inspectionWork/index.vue

@@ -83,7 +83,7 @@
             @click="addSampleOpen(row)"
             v-if="
               $hasPermission('qms:samplingrecord:save') &&
-              ![1, 2].includes(row.status)
+              ![1, 2].includes(row.status)&&row.sampleQuantity<row.total
             "
             >取样</el-link
           >

src/views/inspectionWork/mixins/detailMixins.js

@@ -1,5 +1,7 @@
 const qualityResultList = { 1: '合格', 2: '不合格', 3: '让步接收' };
 const disposalStatustList = { 0: '待处置', 1: '处置中', 2: '处置完成' };
+import { inspectionProjectStatus } from '@/enum/dict.js';
+
 export default {
   data() {
     return {
@@ -229,233 +231,7 @@ export default {
           showOverflowTooltip: true
         }
       ],
-      tableColumns2: [
-        {
-          columnKey: 'index',
-          label: '序号',
-          type: 'index',
-          width: 55,
-          align: 'center',
-          fixed: 'left'
-        },
-        {
-          label: '样品编码',
-          prop: 'sampleCode',
-          width: '200',
-          align: 'center',
-          fixed: 'left',
-          showOverflowTooltip: true
-        },
-        {
-          label: '编码',
-          prop: 'categoryCode',
-          align: 'center',
-          slot: 'categoryCode',
-          fixed: 'left',
-          width: '150',
-          showOverflowTooltip: true
-        },
-        {
-          label: '名称',
-          prop: 'categoryName',
-          align: 'center',
-          width: '150',
-          showOverflowTooltip: true
-        },
-        {
-          label: '批次号',
-          prop: 'batchNo',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-        {
-          label: '发货条码',
-          prop: 'barcodes',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-        {
-          label: '包装编码',
-          prop: 'packageNo',
-          align: 'center',
-          width: '170',
-          showOverflowTooltip: true
-        },
-        { label: '包装数量', prop: 'packingQuantity', align: 'center' },
-        { label: '包装单位', prop: 'packingUnit', align: 'center' },
-        { label: '计量数量', prop: 'measureQuantity', align: 'center' },
-        { label: '计量单位', prop: 'measureUnit', align: 'center' },
-        {
-          label: '供应商名称',
-          prop: 'supplierName',
-          align: 'center',
-          width: '120',
-          showOverflowTooltip: true
-        },
-        {
-          label: '供应商代号',
-          prop: 'supplierCode',
-          align: 'center',
-          width: '120',
-          showOverflowTooltip: true
-        },
-        {
-          label: '物料代号',
-          prop: 'materielDesignation',
-          align: 'center',
-          slot: 'materielDesignation',
-          width: '120',
-          showOverflowTooltip: true
-        },
-        {
-          label: '客户代号',
-          prop: 'clientCode',
-          align: 'center',
-          slot: 'clientCode',
-          width: '120',
-          showOverflowTooltip: true
-        },
-        {
-          label: '刻码',
-          prop: 'engrave',
-          align: 'center',
-          slot: 'engrave',
-          width: '120',
-          showOverflowTooltip: true
-        },
-        {
-          label: '机型',
-          prop: 'modelKey',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-        {
-          label: '颜色',
-          prop: 'colorKey',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-        {
-          label: '重量',
-          prop: 'weight',
-          align: 'center',
-          slot: 'weight',
-          width: '120'
-        },
-        {
-          label: '重量单位',
-          prop: 'weightUnit',
-          align: 'center',
-          width: 100
-        },
-        {
-          label: '仓库',
-          prop: 'warehouseName',
-          align: 'center',
-          width: 150,
-          showOverflowTooltip: true
-        },
-        {
-          label: '货区',
-          prop: 'areaName',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-        { label: '货架', prop: 'goodsShelfName', align: 'center' },
-        { label: '货位', prop: 'goodsAllocationName', align: 'center' },
-        {
-          label: '生产日期',
-          prop: 'productionDate',
-          align: 'center',
-          width: 150,
-          showOverflowTooltip: true
-        },
-        {
-          label: '采购日期',
-          prop: 'purchaseDate',
-          align: 'center',
-          width: 150,
-          showOverflowTooltip: true
-        },
-        {
-          label: '处置状态',
-          prop: 'disposeType',
-          align: 'center',
-          formatter: (_row) => {
-            return this.disposeTypeMap[_row.disposeType] || '';
-          }
-        },
-        {
-          label: '处置时间',
-          prop: 'disposeTime',
-          align: 'center',
-          showOverflowTooltip: true,
-          width: 150
-        },
-        {
-          label: '质检状态',
-          prop: 'qualityStatus',
-          align: 'center',
-          formatter: (row) => {
-            if (row.qualityStatus == 0) {
-              return '未检';
-            }
-            if (row.qualityStatus == 1) {
-              return '已检';
-            }
-            if (row.qualityStatus == 2) {
-              return '待检';
-            }
-          }
-        }
-      ],
-      tableColumns3: [
-        {
-          columnKey: 'index',
-          label: '序号',
-          type: 'index',
-          width: 55,
-          align: 'center',
-          fixed: 'left'
-        },
-        {
-          label: '质检方案编码',
-          prop: 'qualitySchemeTemplateCode',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-        {
-          label: '质检方案名称',
-          prop: 'qualitySchemeTemplateName',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-        {
-          label: '质检类型',
-          prop: 'categoryLevelClassName',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-        {
-          label: '质检项编码',
-          prop: 'inspectionCode',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-        {
-          label: '质检项名称',
-          prop: 'inspectionName',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-        {
-          label: '工艺参数',
-          prop: 'defaultValue',
-          align: 'center',
-          showOverflowTooltip: true,
-          slot: 'defaultValue'
-        }
-      ],
+
       tableColumns4: [
         {
           type: 'index',
@@ -721,6 +497,262 @@ export default {
       ]
     };
   },
+  computed: {
+    tableColumns2() {
+      return [
+        {
+          columnKey: 'index',
+          label: '序号',
+          type: 'index',
+          width: 55,
+          align: 'center',
+          fixed: 'left'
+        },
+        {
+          label: '样品编码',
+          prop: 'sampleCode',
+          width: '200',
+          align: 'center',
+          fixed: 'left',
+          showOverflowTooltip: true
+        },
+        {
+          label: '编码',
+          prop: 'categoryCode',
+          align: 'center',
+          slot: 'categoryCode',
+          fixed: 'left',
+          width: '150',
+          showOverflowTooltip: true
+        },
+        {
+          label: '名称',
+          prop: 'categoryName',
+          align: 'center',
+          width: '150',
+          showOverflowTooltip: true
+        },
+        {
+          label: '批次号',
+          prop: 'batchNo',
+          align: 'center',
+          showOverflowTooltip: true
+        },
+        {
+          label: '发货条码',
+          prop: 'barcodes',
+          align: 'center',
+          showOverflowTooltip: true
+        },
+        {
+          label: '包装编码',
+          prop: 'packageNo',
+          align: 'center',
+          width: '170',
+          showOverflowTooltip: true
+        },
+        { label: '包装数量', prop: 'packingQuantity', align: 'center' },
+        { label: '包装单位', prop: 'packingUnit', align: 'center' },
+        { label: '计量数量', prop: 'measureQuantity', align: 'center' },
+        { label: '计量单位', prop: 'measureUnit', align: 'center' },
+        {
+          label: '供应商名称',
+          prop: 'supplierName',
+          align: 'center',
+          width: '120',
+          showOverflowTooltip: true
+        },
+        {
+          label: '供应商代号',
+          prop: 'supplierCode',
+          align: 'center',
+          width: '120',
+          showOverflowTooltip: true
+        },
+        {
+          label: '物料代号',
+          prop: 'materielDesignation',
+          align: 'center',
+          slot: 'materielDesignation',
+          width: '120',
+          showOverflowTooltip: true
+        },
+        {
+          label: '客户代号',
+          prop: 'clientCode',
+          align: 'center',
+          slot: 'clientCode',
+          width: '120',
+          showOverflowTooltip: true
+        },
+        {
+          label: '刻码',
+          prop: 'engrave',
+          align: 'center',
+          slot: 'engrave',
+          width: '120',
+          showOverflowTooltip: true
+        },
+        {
+          label: '机型',
+          prop: 'modelKey',
+          align: 'center',
+          showOverflowTooltip: true
+        },
+        {
+          label: '颜色',
+          prop: 'colorKey',
+          align: 'center',
+          showOverflowTooltip: true
+        },
+        {
+          label: '重量',
+          prop: 'weight',
+          align: 'center',
+          slot: 'weight',
+          width: '120'
+        },
+        {
+          label: '重量单位',
+          prop: 'weightUnit',
+          align: 'center',
+          width: 100
+        },
+        {
+          label: '仓库',
+          prop: 'warehouseName',
+          align: 'center',
+          width: 150,
+          showOverflowTooltip: true
+        },
+        {
+          label: '货区',
+          prop: 'areaName',
+          align: 'center',
+          showOverflowTooltip: true
+        },
+        { label: '货架', prop: 'goodsShelfName', align: 'center' },
+        { label: '货位', prop: 'goodsAllocationName', align: 'center' },
+        {
+          label: '生产日期',
+          prop: 'productionDate',
+          align: 'center',
+          width: 150,
+          showOverflowTooltip: true
+        },
+        {
+          label: '采购日期',
+          prop: 'purchaseDate',
+          align: 'center',
+          width: 150,
+          showOverflowTooltip: true
+        },
+        {
+          label: '处置状态',
+          prop: 'disposeType',
+          align: 'center',
+          formatter: (_row) => {
+            return this.disposeTypeMap[_row.disposeType] || '';
+          }
+        },
+        {
+          label: '处置时间',
+          prop: 'disposeTime',
+          align: 'center',
+          showOverflowTooltip: true,
+          width: 150
+        },
+        {
+          label: '质检状态',
+          prop: 'qualityStatus',
+          align: 'center',
+          show: this.form.recordingMethod != 1,
+          formatter: (row) => {
+            if (row.qualityStatus == 0) {
+              return '未检';
+            }
+            if (row.qualityStatus == 1) {
+              return '已检';
+            }
+            if (row.qualityStatus == 2) {
+              return '待检';
+            }
+          }
+        }
+      ];
+    },
+    tableColumns3() {
+      return [
+        {
+          columnKey: 'index',
+          label: '序号',
+          type: 'index',
+          width: 55,
+          align: 'center',
+          fixed: 'left'
+        },
+        {
+          label: '质检方案编码',
+          prop: 'qualitySchemeTemplateCode',
+          align: 'center',
+          showOverflowTooltip: true
+        },
+        {
+          label: '质检方案名称',
+          prop: 'qualitySchemeTemplateName',
+          align: 'center',
+          showOverflowTooltip: true
+        },
+        {
+          label: '质检类型',
+          prop: 'categoryLevelClassName',
+          align: 'center',
+          showOverflowTooltip: true
+        },
+        {
+          label: '质检项编码',
+          prop: 'inspectionCode',
+          align: 'center',
+          showOverflowTooltip: true
+        },
+        {
+          label: '质检项名称',
+          prop: 'inspectionName',
+          align: 'center',
+          showOverflowTooltip: true
+        },
+        {
+          label: '工艺参数',
+          prop: 'defaultValue',
+          align: 'center',
+          showOverflowTooltip: true,
+          slot: 'defaultValue'
+        },
+        {
+          label: '质检状态',
+          prop: 'defaultValue',
+          align: 'center',
+          showOverflowTooltip: true,
+          show: this.form.recordingMethod == 1,
+          formatter: (row) => {
+            return inspectionProjectStatus.find(
+              (item) => item.value == row.status
+            )?.label;
+          }
+        },
+        {
+          label: '质检结果',
+          prop: 'defaultValue',
+          align: 'center',
+          show: this.form.recordingMethod == 1,
+          showOverflowTooltip: true,
+          formatter: (row, column, cellValue) => {
+            return qualityResultList[cellValue];
+          }
+        }
+      ];
+    }
+  },
   methods: {
     //样品数操作
     isSampleQuantity(item, index) {

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

@@ -57,7 +57,7 @@
           <el-form-item label="来源单号：" prop="sourceCode">
             <el-input
               disabled
-              :value="form.qualityPlanCode || form.workOrderCode"
+              :value="form.qualityWorkOrderCode"
               placeholder=" "
             />
           </el-form-item>

src/views/sample/sampleRecord/index.vue

@@ -365,8 +365,8 @@
             formCreateUserId: res.createUserId,
             variables: {
               businessCode: res.code,
-              businessName: res.name,
-              businessType: '取样'
+              businessName: '取样',
+              businessType: res.conditionType == 1 ? '整样' : '小样'
             }
           };
           this.$refs.processSubmitDialogRef.init(params);