From de2e77c502acc458ca49c2228e105e922dfb2369 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Mon, 6 Oct 2025 14:36:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=8E=A5=E6=94=B6=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=8F=96=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/purchase/cancelReceipt.vue | 169 +++++++++----------
 1 file changed, 79 insertions(+), 90 deletions(-)

diff --git a/src/views/modules/purchase/cancelReceipt.vue b/src/views/modules/purchase/cancelReceipt.vue
index 66c4905..65241c7 100644
--- a/src/views/modules/purchase/cancelReceipt.vue
+++ b/src/views/modules/purchase/cancelReceipt.vue
@@ -1,11 +1,8 @@
 <template>
   <div class="mod-config">
     <el-form :inline="true" label-position="top">
-      <el-form-item label="工厂编码">
-        <el-input style="width: 120px;" v-model="queryHeaderData.site"></el-input>
-      </el-form-item>
-      <el-form-item label="接收单号">
-        <el-input style="width: 120px;" v-model="queryHeaderData.receiptNo"></el-input>
+      <el-form-item label="订单号">
+        <el-input style="width: 120px;" v-model="queryHeaderData.orderNo"></el-input>
       </el-form-item>
       <el-form-item label="物料编码">
         <el-input style="width: 120px;" v-model="queryHeaderData.partNo"></el-input>
@@ -35,7 +32,7 @@
       <el-form-item style="margin-top: 20px;">
         <el-button @click="getDataList('Y')" type="primary">查询</el-button>
         <el-button @click="resetQuery">重置</el-button>
-        <el-button @click="cancelSelectedReceipts" type="danger" :disabled="dataListSelections.length === 0">取消接收</el-button>
+<!--        <el-button @click="cancelSelectedReceipts" type="danger" :disabled="dataListSelections.length === 0">取消接收</el-button>-->
       </el-form-item>
     </el-form>
 
@@ -46,19 +43,12 @@
        v-loading="dataListLoading"
        @selection-change="selectionChangeHandle"
        style="width: 100%;">
-       <el-table-column
+<!--       <el-table-column
          type="selection"
          header-align="center"
          align="center"
          width="50">
-       </el-table-column>
-       <el-table-column
-         prop="site"
-         header-align="center"
-         align="center"
-         label="工厂编码"
-         width="100">
-       </el-table-column>
+       </el-table-column>-->
        <el-table-column
          prop="receiptNo"
          header-align="center"
@@ -66,34 +56,34 @@
          label="接收单号"
          width="140">
        </el-table-column>
-       <el-table-column
-         prop="itemNo"
-         header-align="center"
-         align="center"
-         label="行号"
-         width="80">
-       </el-table-column>
-       <el-table-column
-         prop="partNo"
-         header-align="center"
-         align="center"
-         label="物料编码"
-         width="120">
-       </el-table-column>
-       <el-table-column
-         prop="batchNo"
-         header-align="center"
-         align="center"
-         label="批次号"
-         width="120">
-       </el-table-column>
-       <el-table-column
-         prop="locationId"
-         header-align="center"
-         align="center"
-         label="库位"
-         width="100">
-       </el-table-column>
+      <el-table-column
+        prop="receiptSequence"
+        header-align="center"
+        align="center"
+        label="接收序号"
+        width="100">
+      </el-table-column>
+      <el-table-column
+        prop="sourcePartNo"
+        header-align="center"
+        align="center"
+        label="物料编码"
+        width="150">
+      </el-table-column>
+      <el-table-column
+        prop="receiptReference"
+        header-align="center"
+        align="center"
+        label="接收参考"
+        width="120">
+      </el-table-column>
+      <el-table-column
+        prop="description"
+        header-align="center"
+        align="center"
+        label="物料描述"
+        width="200">
+      </el-table-column>
 <!--       <el-table-column
          prop="arriveQty"
          header-align="center"
@@ -101,34 +91,34 @@
          label="到货数量"
          width="100">
        </el-table-column>-->
-       <el-table-column
-         prop="qtyReceived"
-         header-align="center"
-         align="center"
-         label="已接收数量"
-         width="110">
-       </el-table-column>
-       <el-table-column
-         prop="orderNo"
-         header-align="center"
-         align="center"
-         label="订单号"
-         width="120">
-       </el-table-column>
-       <el-table-column
-         prop="receiveDate"
-         header-align="center"
-         align="center"
-         label="接收日期"
-         width="110">
-       </el-table-column>
-       <el-table-column
-         prop="supplierId"
-         header-align="center"
-         align="center"
-         label="供应商编码"
-         width="120">
-       </el-table-column>
+      <el-table-column
+        prop="qtyArrived"
+        header-align="center"
+        align="center"
+        label="到货数量"
+        width="110">
+      </el-table-column>
+      <el-table-column
+        prop="contract"
+        header-align="center"
+        align="center"
+        label="合同号"
+        width="120">
+      </el-table-column>
+      <el-table-column
+        prop="arrivalDate"
+        header-align="center"
+        align="center"
+        label="到货日期"
+        width="110">
+      </el-table-column>
+      <el-table-column
+        prop="sender"
+        header-align="center"
+        align="center"
+        label="供应商编码"
+        width="120">
+      </el-table-column>
        <el-table-column
          prop="receiver"
          header-align="center"
@@ -136,19 +126,19 @@
          label="接收人"
          width="100">
        </el-table-column>
-       <el-table-column
-         prop="status"
-         header-align="center"
-         align="center"
-         label="状态"
-         width="100">
-         <template slot-scope="scope">
-           <span v-if="scope.row.status === 'RECEIVED'" type="success">已接收</span>
-           <span v-else-if="scope.row.status === 'CANCEL'" type="danger">已取消</span>
-           <span v-else-if="scope.row.status === 'ARRIVED'" type="warning">已到货</span>
-           <span v-else type="info">{{ scope.row.status }}</span>
-         </template>
-       </el-table-column>
+      <el-table-column
+        prop="state"
+        header-align="center"
+        align="center"
+        label="状态"
+        width="100">
+        <template slot-scope="scope">
+          <span v-if="scope.row.state === 'Received'" type="success">已接收</span>
+          <span v-else-if="scope.row.state === 'Cancelled'" type="danger">已取消</span>
+          <span v-else-if="scope.row.state === 'Arrived'" type="warning">已到货</span>
+          <span v-else type="info">{{ scope.row.state }}</span>
+        </template>
+      </el-table-column>
        <el-table-column
          fixed="left"
          header-align="center"
@@ -156,7 +146,7 @@
          width="80"
          label="操作">
          <template slot-scope="scope">
-           <a @click="cancelSingleReceipt(scope.row)" type="text" size="small" :disabled="scope.row.status !== 'RECEIVED'">取消</a>
+           <a @click="cancelSingleReceipt(scope.row)" type="text" size="small" :disabled="scope.row.state !== 'Received'">取消</a>
          </template>
        </el-table-column>
      </el-table>
@@ -209,7 +199,7 @@ export default {
       dataListSelections: [],
       queryHeaderData: {
         site: localStorage.getItem('site'),
-        receiptNo: '',
+        orderNo: '',
         partNo: '',
         batchNo: '',
         supplierId: '',
@@ -315,9 +305,8 @@ export default {
        this.cancelLoading = true
        const promises = this.currentCancelRecords.map(record => {
          return cancelReceipt({
-           receiptNo: record.receiptNo,
-           site: record.site,
-           itemNo: record.itemNo,
+           receiptSequence: record.receiptSequence,
+           site: localStorage.getItem('site'),
            cancelReason: this.cancelForm.cancelReason
          })
        })
@@ -355,7 +344,7 @@ export default {
     resetQuery () {
       this.queryHeaderData = {
         site: '',
-        receiptNo: '',
+        orderNo: '',
         partNo: '',
         batchNo: '',
         supplierId: '',