From 10a8da68d9db10313c67e0f193c160e9740d95cd Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 21 四月 2026 17:09:42 +0800
Subject: [PATCH] 湟水峡 1.发货改为在产品上发货
---
src/views/salesManagement/deliveryLedger/index.vue | 36 +++++++++++++++---------------------
1 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/src/views/salesManagement/deliveryLedger/index.vue b/src/views/salesManagement/deliveryLedger/index.vue
index 2b1b0b0..314c61c 100644
--- a/src/views/salesManagement/deliveryLedger/index.vue
+++ b/src/views/salesManagement/deliveryLedger/index.vue
@@ -40,31 +40,22 @@
<el-table-column label="鍙戣揣杞︾墝鍙�" prop="shippingCarNumber" show-overflow-tooltip />
<el-table-column label="蹇�掑叕鍙�" prop="expressCompany" show-overflow-tooltip />
<el-table-column label="蹇�掑崟鍙�" prop="expressNumber" show-overflow-tooltip />
- <el-table-column label="瀹℃牳鐘舵��" prop="status" align="center" width="120">
- <template #default="scope">
- <el-tag :type="getApprovalStatusType(scope.row.status)">
- {{ getApprovalStatusText(scope.row.status) }}
- </el-tag>
- </template>
- </el-table-column>
- <el-table-column fixed="right" label="鎿嶄綔" width="200" align="center">
+ <el-table-column fixed="right" label="鎿嶄綔" width="220" align="center">
<template #default="scope">
<el-button
link
- type="primary"
- size="small"
- :disabled="!isApproved(scope.row.status)"
+ type="primary"
+ :disabled="!canSupplement(scope.row)"
@click="openForm('edit', scope.row)">琛ュ厖鍙戣揣淇℃伅</el-button>
<el-button
link
type="primary"
- size="small"
+ style="color: #67C23A"
@click="openDetail(scope.row)"
>璇︽儏</el-button>
<el-button
link
- type="danger"
- size="small"
+ type="danger"
:disabled="isApproving(scope.row.status)"
@click="handleDeleteSingle(scope.row)">鍒犻櫎</el-button>
</template>
@@ -83,6 +74,7 @@
v-model="form.type"
placeholder="璇烽�夋嫨鍙戣揣绫诲瀷"
style="width: 100%"
+ disabled
@change="handleShippingTypeChange"
>
<el-option label="璐ц溅" value="璐ц溅" />
@@ -356,12 +348,6 @@
// 鎵撳紑寮规
const openForm = async (type, row) => {
- // 琛ュ厖鍙戣揣淇℃伅锛氫粎鈥滃鏍搁�氳繃鈥濆厑璁哥紪杈�
- if (type === 'edit' && row && !isApproved(row.status)) {
- proxy.$modal.msgWarning("鍙湁瀹℃牳閫氳繃鐨勬暟鎹墠鍙互琛ュ厖鍙戣揣淇℃伅");
- return;
- }
-
operationType.value = type;
const baseUrl = import.meta.env.VITE_APP_BASE_API;
@@ -412,7 +398,6 @@
};
deliveryFileList.value = [];
}
-
dialogFormVisible.value = true;
};
@@ -693,6 +678,15 @@
return statusStr === '瀹℃牳閫氳繃' || statusStr === '3';
};
+// 妫�鏌ユ槸鍚﹀彲浠ヨˉ鍏呭彂璐т俊鎭紙瀹℃牳閫氳繃涓旀病鏈夊彂璐ц溅鐗屽彿鎴栧揩閫掑崟鍙凤級
+const canSupplement = (row) => {
+ // 濡傛灉鏈夊彂璐ц溅鐗屽彿鎴栧揩閫掑崟鍙凤紝鍒欎笉鑳借ˉ鍏�
+ if (row?.shippingCarNumber || row?.expressNumber) {
+ return false;
+ }
+ return true;
+};
+
// 妫�鏌ュ鏍哥姸鎬佹槸鍚︿负"瀹℃牳涓�"
const isApproving = (status) => {
if (status === null || status === undefined || status === '') {
--
Gitblit v1.9.3