From 3d97747496ad71c6f74600fae0547cd87e2f2340 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 31 Oct 2025 10:19:34 +0800
Subject: [PATCH] =?UTF-8?q?2025-10-31=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/boxManage/saleBoxManage.vue | 31 +++++++++++++++++--
 src/views/modules/qc/outboundNotification.vue | 18 +++++------
 2 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/src/views/modules/boxManage/saleBoxManage.vue b/src/views/modules/boxManage/saleBoxManage.vue
index c6cfa5e..49b85bd 100644
--- a/src/views/modules/boxManage/saleBoxManage.vue
+++ b/src/views/modules/boxManage/saleBoxManage.vue
@@ -22,6 +22,12 @@
               <el-option label="已出库" value="已出库"></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item :label="'是否送检'">
+            <el-select v-model="searchData.inspectionFlag" clearable style="width: 100px">
+              <el-option label="是" value="Y"></el-option>
+              <el-option label="否" value="N"></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item :label="' '" >
             <el-button class="customer-bun-min" type="primary" @click="getMainData" style="">查询</el-button>
             <el-button @click="exportExcel()" type="primary" style="margin-left: 2px">{{'导出'}}</el-button>
@@ -51,7 +57,8 @@
         :min-width="item.columnWidth"
         :label="item.columnLabel">
         <template slot-scope="scope">
-          <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
+          <span v-if="!item.columnHidden && item.columnProp !== 'inspectionFlag'"> {{scope.row[item.columnProp]}}</span>
+          <span v-if="!item.columnHidden && item.columnProp === 'inspectionFlag'"> {{scope.row[item.columnProp] === 'Y' ? '是' : scope.row[item.columnProp] === 'N' ? '否' : ''}}</span>
           <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
         </template>
       </el-table-column>
@@ -62,7 +69,7 @@
         width="80"
         label="操作">
         <template slot-scope="scope">
-          <el-link v-if="scope.row.orderStatus === '待包装'" style="cursor: pointer" @click="handleComplete(scope.row)">完成</el-link>
+          <el-link v-if="scope.row.orderStatus === '待包装'" style="cursor: pointer" @click="handleComplete(scope.row)">送检</el-link>
         </template>
       </el-table-column>
     </el-table>
@@ -358,6 +365,7 @@ export default {
         orderType:'销售出库',
         orderStatus: '',
         orderStatusList: ['待包装'],
+        inspectionFlag: '',
         buNo:'',
         customerName:'',
         site:this.$store.state.user.site,
@@ -446,6 +454,24 @@ export default {
           status: true,
           fixed: false
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: this.functionId,
+          serialNumber: '750001Table1InspectionFlag',
+          tableId: "750001Table1",
+          tableName: "销售发货清单",
+          columnProp: "inspectionFlag",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "是否送检",
+          columnWidth: '80',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
         {
           userId: this.$store.state.user.name,
           functionId: this.functionId,
@@ -1128,6 +1154,7 @@ export default {
               site: row.site,
               buNo: row.buNo,
               orderNo: row.orderNo,
+              partNo: row.partNo,
               customerId: row.customerId,
               relatedOrderNo: row.relatedOrderNo,
               relatedOrderLineNo: row.relatedOrderLineNo,
diff --git a/src/views/modules/qc/outboundNotification.vue b/src/views/modules/qc/outboundNotification.vue
index 9f4dab9..3b9c779 100644
--- a/src/views/modules/qc/outboundNotification.vue
+++ b/src/views/modules/qc/outboundNotification.vue
@@ -18,7 +18,7 @@
           <el-option label="待检验" value="待检验"></el-option>
           <el-option label="编辑中" value="编辑中"></el-option>
           <el-option label="待包装" value="待包装"></el-option>
-          <el-option label="待入库" value="待入库"></el-option>
+          <el-option label="待出库" value="待出库"></el-option>
           <el-option label="已完成" value="已完成"></el-option>
           <el-option label="已关闭" value="已关闭"></el-option>
           <el-option label="已归档" value="已归档"></el-option>
@@ -1259,19 +1259,19 @@
           this.$message.warning('请勾选要包装的单据！')
           return
         }
-        
+
         // 校验选中的单据是否都是"销售出库"类型且状态为"待出库"
         const invalidOrders = this.outboundSelection.filter(item => {
           return item.orderType !== '销售出库' || item.orderStatus !== '待出库'
         })
-        
+
         if (invalidOrders.length > 0) {
           this.$message.warning('只能对"销售出库"类型且状态为"待出库"的单据进行包装操作！')
           return
         }
-        
+
         // 确认操作
-        this.$confirm(`确定将选中的 ${this.outboundSelection.length} 条单据状态更新为"待包装"?`, '提示', {
+        this.$confirm(`是否重新包装"?`, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
@@ -1283,20 +1283,20 @@
             orderNo: item.orderNo,
             orderStatus: '待包装'
           }))
-          
+
           this.batchUpdateOrderStatus(updateList)
         }).catch(() => {
           // 用户取消操作
         })
       },
-      
+
       // 批量更新单据状态
       batchUpdateOrderStatus (updateList) {
         // 这里需要调用后端API，暂时使用循环调用单个更新接口
         let successCount = 0
         let errorCount = 0
         const totalCount = updateList.length
-        
+
         const updatePromises = updateList.map(item => {
           return this.$http({
             url: this.$http.adornUrl('/outboundNotification/updateOrderStatus'),
@@ -1312,7 +1312,7 @@
             errorCount++
           })
         })
-        
+
         Promise.all(updatePromises).then(() => {
           if (errorCount === 0) {
             this.$message.success(`成功更新 ${successCount} 条单据状态为"待包装"`)