From 61093837ef5ad13e465956d82187a0f8902ec82a Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <jin982011>
Date: Mon, 7 Apr 2025 10:34:55 +0800
Subject: [PATCH] no message

---
 .../src/views/business/receive/asn/asn-form.vue   | 14 ++++++++++----
 .../src/views/business/receive/asn/asn-list.vue   | 15 +++++++++++----
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/smart-admin-web-typescript/src/views/business/receive/asn/asn-form.vue b/smart-admin-web-typescript/src/views/business/receive/asn/asn-form.vue
index 55a17e5..df4142c 100644
--- a/smart-admin-web-typescript/src/views/business/receive/asn/asn-form.vue
+++ b/smart-admin-web-typescript/src/views/business/receive/asn/asn-form.vue
@@ -6,7 +6,7 @@
   <div class="detail-header">
     <a-page-header :title="form.asnId ? '编辑入库单' : '添加入库单'" :avatar="{ src: '' }">
       <template #extra>
-        <a-button @click="onSubmit" type="primary">
+        <a-button @click="onSubmit" type="primary" v-privilege="'asn:add'" :disabled="form.status=='COMPLETED'">
           <template #icon>
             <EditOutlined/>
           </template>
@@ -30,7 +30,8 @@
             </a-col>
             <a-col :span="8">
               <a-form-item label="客户订单号" name="customerNumber">
-                <a-input style="width: 100%" v-model:value="form.customerNumber" placeholder="客户订单号"/>
+                <a-input style="width: 100%" v-model:value="form.customerNumber" :readonly="form.asnId>0"
+                         placeholder="客户订单号"/>
               </a-form-item>
             </a-col>
             <a-col :span="8">
@@ -117,7 +118,8 @@ const formDefault = {
   customerId: undefined, //客户
   customerNumber: undefined, //客户订单号
   orderType: undefined,//单据类型
-  orderDate: dayjs().format('YYYY-MM-DD'),//订单日期
+  status: undefined,//状态
+  orderDate: undefined,//订单日期
   addressId: undefined,//收货单位
   person: undefined,//联系人
   telephone: undefined,//电话
@@ -162,16 +164,20 @@ onMounted(() => {
     // 从sessionStorage中获取数据
     const res = getDataFromSessionStorage(id);
     //编辑时自动填充数据
-    if (res) {
+    if (res != null && res.asnId > 0) {
       form.asnId = res.asnId;
       form.customerId = res.customerId;
       form.customerNumber = res.customerNumber;
+      form.status = res.status;
       form.orderType = res.orderType;
       form.orderDate = res.orderDate;
       form.addressId = res.addressId;
       form.person = res.person;
       form.telephone = res.telephone;
       form.address = res.address;
+    } else {
+      //新建时默认当前日期
+      form.orderDate = dayjs().format('YYYY-MM-DD');
     }
     // 获取数据后移除存储项
     sessionStorage.removeItem(id);
diff --git a/smart-admin-web-typescript/src/views/business/receive/asn/asn-list.vue b/smart-admin-web-typescript/src/views/business/receive/asn/asn-list.vue
index 20c1de3..17e22b8 100644
--- a/smart-admin-web-typescript/src/views/business/receive/asn/asn-list.vue
+++ b/smart-admin-web-typescript/src/views/business/receive/asn/asn-list.vue
@@ -116,7 +116,8 @@
               编辑
             </a-button>
             <a-button @click="onDelete(record)" danger type="link"
-                      :disabled="record.orderQuantity-record.receivedQuantity==0" v-privilege="'asn:delete'">
+                      :disabled="record.orderQuantity>0 && record.orderQuantity-record.receivedQuantity==0"
+                      v-privilege="'asn:delete'">
               <template #icon>
                 <DeleteOutlined/>
               </template>
@@ -361,7 +362,6 @@ function onDelete(data: object) {
 async function requestDelete(data: any) {
   SmartLoading.show();
   try {
-
     await asnApi.delete(data.asnId);
     message.success('删除成功');
     await queryData();
@@ -401,8 +401,15 @@ function confirmBatchDelete() {
 async function requestBatchDelete() {
   try {
     SmartLoading.show();
-    await asnApi.batchDelete(selectedRowKeyList.value);
-    message.success('删除成功');
+    const response = await asnApi.batchDelete(selectedRowKeyList.value);
+    console.log(response)
+    const {error, success} = JSON.parse(response.msg);
+    if (success) {
+      message.success(success);
+    }
+    if (error) {
+      message.error(error);
+    }
     await queryData();
   } catch (e) {
     smartSentry.captureError(e);