新增取样记录作废功能并优化质检工单派单条件

src/api/inspectionWork/index.js

@@ -158,6 +158,14 @@ export async function verificationQualityInspector(id) {
   return Promise.reject(new Error(res.data.message));
 }
 
+export async function checkByQualityWorkOrderId(qualityWorkOrderId) {
+  const res = await request.get(`/qms/samplingrecord/checkByQualityWorkOrderId/`+qualityWorkOrderId);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
 //转派
 export async function transferQualityWork(data) {
   const res = await request.post('/qms/quality_work_order/transfer', data);

src/api/samplingRecords/index.js

@@ -36,3 +36,11 @@ export async function getById(id) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+//作废
+export async function listCancel(data) {
+  const res = await request.put(`/qms/samplingrecord/cancel`, data);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/views/inspectionWork/index.vue

@@ -83,7 +83,8 @@
             @click="addSampleOpen(row)"
             v-if="
               $hasPermission('qms:samplingrecord:save') &&
-              ![1, 2].includes(row.status)&&row.sampleQuantity<row.total
+              ![1, 2].includes(row.status) &&
+              row.sampleQuantity < row.total
             "
             >取样</el-link
           >
@@ -110,14 +111,22 @@
           <el-link
             type="primary"
             :underline="false"
-            v-if="row.status == 0 && row.recordingMethod == 1&&$hasPermission('qms:quality_work_order:qualityInspectionSend')"
+            v-if="
+              row.status == 0 &&
+              row.recordingMethod == 1 &&
+              $hasPermission('qms:quality_work_order:qualityInspectionSend')
+            "
             @click="qualityInspectionSend(row, 1)"
             >质检项派单</el-link
           >
           <el-link
             type="primary"
             :underline="false"
-            v-if="row.status == 0 && row.recordingMethod == 1&&$hasPermission('qms:quality_work_order:request')"
+            v-if="
+              row.status == 0 &&
+              row.recordingMethod == 1 &&
+              $hasPermission('qms:quality_work_order:request')
+            "
             @click="qualityInspectionSend(row, 2)"
             >质检项请托</el-link
           >
@@ -251,7 +260,7 @@
     ></process-submit-dialog>
 
     <addSample ref="addSampleRef" @reload="search"></addSample>
-        <inspectionProjectTaskSend
+    <inspectionProjectTaskSend
       ref="inspectionProjectTaskSendRef"
       @reload="search"
     ></inspectionProjectTaskSend>
@@ -282,7 +291,8 @@
     updateCertificateNumber,
     closeWorkList,
     verificationQualityInspector,
-    closeWork
+    closeWork,
+    checkByQualityWorkOrderId
   } from '@/api/inspectionWork';
   import { queryTodo } from '@/api/bpm/task';
   import dictMixins from '@/mixins/dictMixins';
@@ -295,7 +305,6 @@
   import inspection_report1 from '../inspectionReport/template/inspection_report1.vue';
   import { inspectionProjectStatus } from '@/enum/dict.js';
 
-
   export default {
     mixins: [dictMixins, tabMixins],
     components: {
@@ -304,7 +313,9 @@
       Certificate,
       Transfer,
       processSubmitDialog,
-      addSample,inspectionProjectTaskSend,inspection_report1
+      addSample,
+      inspectionProjectTaskSend,
+      inspection_report1
     },
     data() {
       return {
@@ -680,6 +691,11 @@
         if (code == '-1') {
           return;
         }
+        const is = await checkByQualityWorkOrderId(row.id);
+        if (is) {
+          this.$message.warning('此工单存在未处理完的取样记录，请检查！');
+          return;
+        }
         this.$refs.addSampleRef.open('add', row);
       },
       // 批量关闭

src/views/sample/sampleRecord/index.vue

@@ -55,6 +55,18 @@
             @click="approvalSubmit(row)"
             >提交</el-link
           >
+          <el-popconfirm
+            class="ele-action"
+            title="确定要删除此信息吗？"
+            v-if="[0, 3].includes(row.approvalStatus)"
+            @confirm="listCancel(row.id)"
+          >
+            <template v-slot:reference>
+              <el-link type="danger" :underline="false" icon="el-icon-delete">
+                作废
+              </el-link>
+            </template>
+          </el-popconfirm>
         </template>
       </ele-pro-table>
     </el-card>
@@ -76,7 +88,7 @@
   import dictMixins from '@/mixins/dictMixins';
   import tableColumnsMixin from '@/mixins/tableColumnsMixin';
   import addSample from './components/addSample.vue';
-  import { samplingRecordsPage } from '@/api/samplingRecords';
+  import { samplingRecordsPage, listCancel } from '@/api/samplingRecords';
   import processSubmitDialog from '@/components/processSubmitDialog/processSubmitDialog.vue';
   import { reviewStatus } from '@/enum/dict';
 
@@ -372,6 +384,11 @@
           this.$refs.processSubmitDialogRef.init(params);
         });
       },
+      listCancel(id) {
+        listCancel({ id }).then((res) => {
+          this.reload();
+        });
+      },
       /* 表格数据源 */
       datasource({ page, limit, where, order }) {
         // 参数