From c2417d66aa2db613c2c4db1c4a053225e72e238b Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期一, 11 五月 2026 15:51:22 +0800
Subject: [PATCH] 销售台账发货新增部分发货字段
---
src/views/salesManagement/salesLedger/index.vue | 39 ++++++++++++++++++++++++---------------
1 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 94e992d..ead0712 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -64,12 +64,14 @@
:value="1" />
<el-option label="瀹℃壒涓�"
:value="2" />
- <el-option label="瀹℃壒澶辫触"
+ <el-option label="瀹℃壒涓嶉�氳繃"
:value="3" />
<el-option label="瀹℃壒閫氳繃"
:value="4" />
<el-option label="宸插彂璐�"
:value="5" />
+ <el-option label="閮ㄥ垎鍙戣揣"
+ :value="6" />
</el-select>
</el-form-item>
<el-form-item label="鍏ュ簱鐘舵�侊細">
@@ -373,6 +375,8 @@
type="primary">瀹℃壒閫氳繃</el-tag>
<el-tag v-else-if="Number(scope.row.deliveryStatus) === 5"
type="success">宸插彂璐�</el-tag>
+ <el-tag v-else-if="Number(scope.row.deliveryStatus) === 6"
+ type="warning">閮ㄥ垎鍙戣揣</el-tag>
<el-tag v-else
type="info">-</el-tag>
</template>
@@ -2005,7 +2009,7 @@
entryDate: null, // 褰曞叆鏃ユ湡
entryDateStart: undefined,
entryDateEnd: undefined,
- deliveryStatus: undefined, // 鍙戣揣鐘舵�侊細1鏈彂璐� 2瀹℃壒涓� 3瀹℃壒澶辫触 4宸插彂璐�
+ deliveryStatus: undefined, // 鍙戣揣鐘舵�侊細1鏈彂璐� 2瀹℃壒涓� 3瀹℃壒涓嶉�氳繃 4瀹℃壒閫氳繃 5宸插彂璐� 6閮ㄥ垎鍙戣揣
stockStatus: undefined, // 鍏ュ簱鐘舵�侊細0鏈叆搴� 1閮ㄥ垎鍏ュ簱 2宸插叆搴�
},
form: {
@@ -4513,15 +4517,15 @@
return false;
}
- // 濡傛灉鍚庣杩斿洖浜嗗彴璐︾骇鍙戣揣鐘舵�侊紙deliveryStatus锛�
- // 1=宸插彂璐э紝鍒欑姝㈠啀娆″彂璐�
+ // 鍙拌处绾у彂璐х姸鎬侊紙deliveryStatus锛夛細2瀹℃壒涓��5宸插彂璐� 鏃朵笉鍙啀鍙戣捣鏈鍙戣揣锛�6閮ㄥ垎鍙戣揣浠嶅彲鎸夋槑缁嗙户缁彂
const deliveryStatus = row.deliveryStatus;
if (
deliveryStatus !== null &&
deliveryStatus !== undefined &&
String(deliveryStatus).trim() !== ""
) {
- if (Number(deliveryStatus) === 1) return false;
+ const ds = Number(deliveryStatus);
+ if (ds === 2 || ds === 5) return false;
}
// 鑾峰彇鍙戣揣鐘舵��
@@ -4577,12 +4581,16 @@
return;
}
- // 鍙厑璁搞�愭湭鍙戣揣/瀹℃壒澶辫触銆戣繘鍏ュ彂璐ф祦绋�
+ // 鍏佽锛�1鏈彂璐с��3瀹℃壒涓嶉�氳繃銆�4瀹℃壒閫氳繃銆�6閮ㄥ垎鍙戣揣锛涗笉鍏佽锛�2瀹℃壒涓��5宸插彂璐�
const statusItem = selectedRows.value[0].deliveryStatus;
+ const ledgerAllowsDelivery = s =>
+ [1, 3, 4, 6].includes(Number(s));
let isTrue = true;
selectedRows.value.forEach(row => {
- if (row.deliveryStatus != 1 && row.deliveryStatus != 3) {
- proxy.$modal.msgWarning("浠呮湭鍙戣揣鎴栧鎵瑰け璐ョ殑鍙拌处鍙互鍙戣揣");
+ if (!ledgerAllowsDelivery(row.deliveryStatus)) {
+ proxy.$modal.msgWarning(
+ "浠呮湭鍙戣揣銆佸鎵逛笉閫氳繃銆佸鎵归�氳繃鎴栭儴鍒嗗彂璐х殑鍙拌处鍙互鍙戣揣"
+ );
isTrue = false;
return;
}
@@ -4619,9 +4627,9 @@
return;
}
- // 宸插彂璐у彴璐︼細寮圭獥鎻愰啋锛屼笉鑳藉啀娆″彂璐э紙4 瑙嗕负宸插彂璐э級
+ // 宸插叏閮ㄥ彂璐э紙5锛夌殑鍙拌处锛氬脊绐楁彁閱掞紝涓嶈兘鍐嶆鍙戣揣
const shippedLedgers = selectedRows.value.filter(
- r => Number(r.deliveryStatus) === 4
+ r => Number(r.deliveryStatus) === 5
);
if (shippedLedgers.length === selectedRows.value.length) {
try {
@@ -4678,9 +4686,9 @@
try {
const targets = [];
for (const ledger of selectedRows.value) {
- //濡傛灉宸茬粡鏄�滃鎵逛腑(2)鈥濇垨鈥滃凡鍙戣揣(4)鈥濓紝鍒欒烦杩囷紝涓嶅厑璁搁噸澶嶆搷浣�
+ // 瀹℃壒涓�(2)銆佸凡鍏ㄩ儴鍙戣揣(5) 璺宠繃锛涢儴鍒嗗彂璐�(6) 绛変粛鏀堕泦鍙彂鏄庣粏
const status = Number(ledger.deliveryStatus);
- if (status === 2 || status === 4) {
+ if (status === 2 || status === 5) {
console.warn(
`鍙拌处缂栧彿 ${ledger.salesContractNo} 鐘舵�佷负 ${status}锛岃烦杩囧彂璐
);
@@ -4736,10 +4744,11 @@
// 鎵撳紑鍙戣揣寮规锛堝崟鏉★級
const openDeliveryForm = async row => {
- // 鍙厑璁搞�愭湭鍙戣揣/瀹℃壒澶辫触銆戝彂璐э紱宸插彂璐�/瀹℃壒涓笉鍏佽
const status = Number(row.deliveryStatus);
- if (status !== 1 && status !== 3) {
- proxy.$modal.msgWarning("鍙湁鍙戣揣鐘舵�佷负鏈彂璐ф垨瀹℃壒澶辫触鐨勮褰曟墠鍙互鍙戣揣");
+ if (![1, 3, 4, 6].includes(status)) {
+ proxy.$modal.msgWarning(
+ "鍙湁鍙戣揣鐘舵�佷负鏈彂璐с�佸鎵逛笉閫氳繃銆佸鎵归�氳繃鎴栭儴鍒嗗彂璐х殑璁板綍鎵嶅彲浠ュ彂璐�"
+ );
return;
}
--
Gitblit v1.9.3