提交

src/api/business/beforeCheckoutVerify.js

@@ -14,3 +14,19 @@ export function listCheckoutInspection(query) {
     params: query
   })
 }
+
+export function confirmInspection(data) {
+  return request({
+    url: baseUrl + '/business/beforeCheckoutVerify/confirm',
+    method: 'post',
+    data: data
+  })
+}
+
+export function rejectInspection(data) {
+  return request({
+    url: baseUrl + '/business/beforeCheckoutVerify/reject',
+    method: 'post',
+    data: data
+  })
+}

src/views/business/outsourceInspectionVerify/index.vue

@@ -7,6 +7,20 @@
         <el-input v-model="queryParams.outsourcedInspectionNo" placeholder="请输入单据号" style="width: 144px" clearable
           @keyup.enter="handleQuery" />
       </el-form-item>
+      <el-form-item label="检查日期：" prop="startTime">
+        <!-- <el-input v-model="queryParams.startTime" placeholder="" style="width: 144px" clearable
+          @keyup.enter="handleQuery" /> -->
+        <el-date-picker v-model="queryParams.startTime" type="date" placeholder="选择日期" style="width: 144px" clearable
+          @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="外协商名称：" prop="supplierName">
+        <el-input v-model="queryParams.supplierName" placeholder="请输入外协商名称" style="width: 144px" clearable
+          @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="批次号：" prop="lotCode">
+        <el-input v-model="queryParams.lotCode" placeholder="请输入批次号" style="width: 144px" clearable
+          @keyup.enter="handleQuery" />
+      </el-form-item>
       <el-form-item label="状态：" prop="auditStatus">
         <el-select v-model="queryParams.auditStatus" style="width: 144px" clearable placeholder="请选择">
           <el-option v-for="dict in outsource_before_checkout_verify_status" :key="dict.value" :label="dict.label"
@@ -29,15 +43,24 @@
         <el-table v-loading="loading" :data="orderList" size="small" border height="100%"
           @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="48" align="center" />
+          <el-table-column label="外协单位" align="center" prop="outsourcedOrderDetail.supplierName" width="320" />
+          <el-table-column label="批次号" align="center" prop="lotCode" width="100" />
+          <el-table-column label="产品描述" align="center" prop="productDescription" width="320" />
           <el-table-column label="质检单号" align="center" prop="outsourcedInspectionNo" width="120" />
+          <el-table-column label="检查状态" align="center" prop="status" width="120">
+            <template #default="scope">
+              <dict-tag :options="process_inspection_status" :value="scope.row.status" />
+            </template>
+          </el-table-column>
+          <el-table-column label="外协工序" align="center" prop="processNames" width="120" />
           <el-table-column label="外协日期" align="center" prop="outsourcedOrderDetail.formDate" width="120">
             <template #default="scope">
               {{ parseTime(scope.row.outsourcedOrderDetail.formDate, "{y}-{m}-{d}") }}
             </template>
           </el-table-column>
-          <el-table-column label="外协商" align="center" prop="outsourcedOrderDetail.supplierName" width="320" />
+          <el-table-column label="发出量" align="center" prop="outsourcedOrderDetail.productNum" width="120" />
           <el-table-column label="收回日期" align="center" prop="returnReceiptDetail.formDate" width="120" />
-          <el-table-column label="外协工序" align="center" prop="settlementType" width="120" />
+          <el-table-column label="收回量" align="center" prop="returnReceiptDetail.auditNum" width="120" />
           <el-table-column label="状态" align="center" prop="auditStatus" width="120">
             <template #default="scope">
               <dict-tag :options="outsource_before_checkout_verify_status" :value="scope.row.auditStatus" />
@@ -46,12 +69,12 @@
           <el-table-column label="备注" align="center" prop="remark" />
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
             <template #default="scope">
-              <el-button v-if="scope.row.auditStatus == 0 || scope.row.auditStatus == 2" link type="warning" icon="Edit"
-                @click="handleUpdate(scope.row)" v-hasPermi="['business:beforeCheckoutVerify:edit']">
+              <el-button v-if="scope.row.auditStatus == 0 || scope.row.auditStatus == 2" link type="warning"
+                icon="Check" @click="handleConfirm(scope.row)" v-hasPermi="['business:beforeCheckoutVerify:edit']">
                 通过
               </el-button>
-              <el-button v-if="scope.row.auditStatus == 0 || scope.row.auditStatus == 1" link type="primary" icon="View"
-                @click="handleView(scope.row)" v-hasPermi="['business:beforeCheckoutVerify:edit']">
+              <el-button v-if="scope.row.auditStatus == 0 || scope.row.auditStatus == 1" link type="primary"
+                icon="Close" @click="handleReject(scope.row)" v-hasPermi="['business:beforeCheckoutVerify:edit']">
                 不通过
               </el-button>
             </template>
@@ -68,13 +91,17 @@
 
 <script setup name="Order">
 import {
-  listCheckoutInspection
+  listCheckoutInspection,
+  rejectInspection,
+  confirmInspection
 } from '@/api/business/beforeCheckoutVerify'
 import { nextTick } from "vue";
 const { proxy } = getCurrentInstance();
 /** 字典数组区 */
 const { outsource_before_checkout_verify_status } = proxy.useDict("outsource_before_checkout_verify_status");
 
+const { process_inspection_status } = proxy.useDict("process_inspection_status");
+
 const orderList = ref([]);
 const loading = ref(true);
 const ids = ref([]);
@@ -101,8 +128,7 @@ const queryParams = ref({
 
 /***********************  方法区  ****************************/
 
-/** 查询外协单主
-带箱方式，是整单的。如果换新箱子，明细中，都需要更换箱子列表 */
+/** 查询外协单主 带箱方式，是整单的。如果换新箱子，明细中，都需要更换箱子列表 */
 function getList() {
   loading.value = true;
   listCheckoutInspection(queryParams.value).then((response) => {
@@ -131,21 +157,29 @@ function handleSelectionChange(selection) {
   multiple.value = !selection.length;
 }
 
-/** 新增按钮操作 */
-function handleAdd() {
-  proxy.$refs.orderRef.open();
+function handleConfirm(row) {
+  proxy.$confirm('是否确认通过？', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    confirmInspection(row).then(res => {
+      getList()
+    })
+  });
 }
 
-/** 修改按钮操作 */
-function handleUpdate(row) {
-  const id = row.id || ids.value;
-  row.flag = true
-  proxy.$refs.orderRef.open(row);
-}
-function handleView(row) {
-  const id = row.id || ids.value;
-  row.flag = false
-  proxy.$refs.orderRef.open(row);
+function handleReject(row) {
+
+  proxy.$confirm('是否确认不通过？', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    rejectInspection(row).then(res => {
+      getList();
+    })
+  });
 }