From 78709b775eece2cbd8e4385829c658bc1691ff02 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 22 六月 2026 18:58:53 +0800
Subject: [PATCH] fix: 移除订单状态
---
src/api/salesManagement/salesLedger.js | 8 --
src/views/salesManagement/salesLedger/index.vue | 120 ++++-----------------------------------
2 files changed, 14 insertions(+), 114 deletions(-)
diff --git a/src/api/salesManagement/salesLedger.js b/src/api/salesManagement/salesLedger.js
index c57e319..b0ec216 100644
--- a/src/api/salesManagement/salesLedger.js
+++ b/src/api/salesManagement/salesLedger.js
@@ -230,14 +230,6 @@
})
}
-// 鏍囪璁㈠崟瀹屾垚
-export function markOrderCompleted(data) {
- return request({
- url: "/sales/ledger/markOrderCompleted",
- method: "post",
- data,
- })
-}
// 閫掑鎵撳嵃娆℃暟
export function incrementPrintCount(data) {
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 2b907dd..efa27fb 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -817,17 +817,6 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :xs="24" :sm="12" :md="8" :lg="8">
- <el-form-item label="璁㈠崟鐘舵�侊細">
- <el-select v-model="searchForm.orderStatus"
- placeholder="璇烽�夋嫨"
- clearable
- style="width: 100%">
- <el-option label="杩涜涓�" :value="0" />
- <el-option label="宸插畬鎴�" :value="1" />
- </el-select>
- </el-form-item>
- </el-col>
<el-col :span="24">
<el-form-item label=" ">
<div style="width: 100%; text-align: right;">
@@ -873,9 +862,6 @@
<el-button type="primary"
@click="handleReverseAudit"
:disabled="isBatchButtonDisabled('reverseAudit')">鍙嶅</el-button>
- <el-button type="warning"
- @click="handleMarkCompleted"
- :disabled="isBatchButtonDisabled('markCompleted')">鏍囪瀹屾垚</el-button>
<el-button type="primary"
@click="handleSalesStock"
:disabled="isBatchButtonDisabled('stock')">鍏ュ簱</el-button>
@@ -893,9 +879,6 @@
<el-button type="primary"
@click="handleReverseAudit"
:disabled="isBatchButtonDisabled('reverseAudit')">鍙嶅</el-button>
- <el-button type="warning"
- @click="handleMarkCompleted"
- :disabled="isBatchButtonDisabled('markCompleted')">鏍囪瀹屾垚</el-button>
<el-button type="primary"
@click="handleBulkDelivery"
:disabled="isBatchButtonDisabled('delivery')">鍙戣揣</el-button>
@@ -904,27 +887,12 @@
<el-space v-else-if="activeStatusTab === 'delivered'"
wrap
class="sales-ledger-toolbar-group">
- <el-button type="warning"
- @click="handleMarkCompleted"
- :disabled="isBatchButtonDisabled('markCompleted')">鏍囪瀹屾垚</el-button>
<el-button type="primary"
@click="handleReverseAudit"
:disabled="isBatchButtonDisabled('reverseAudit')">鍙嶅</el-button>
<el-button @click="handleOut">瀵煎嚭</el-button>
</el-space>
- <el-space v-else-if="activeStatusTab === 'completed'"
- wrap
- class="sales-ledger-toolbar-group">
- <el-button @click="handleOut">瀵煎嚭</el-button>
- <el-button type="primary"
- plain
- @click="handlePrintCommand('salesOrder')"
- :disabled="isBatchButtonDisabled('print')">鎵撳嵃鍗曟嵁</el-button>
- <el-button type="primary"
- plain
- @click="handlePrintLabel"
- :disabled="isBatchButtonDisabled('print')">鎵撳嵃鏍囩</el-button>
- </el-space>
+
<el-space v-else-if="activeStatusTab === 'all'"
wrap
class="sales-ledger-toolbar-group">
@@ -1071,16 +1039,6 @@
type="info">-</el-tag>
</template>
</el-table-column>
- <el-table-column label="璁㈠崟鐘舵��"
- min-width="90"
- align="center">
- <template #default="scope">
- <el-tag v-if="Number(scope.row.orderStatus) === 1"
- type="success">宸插畬鎴�</el-tag>
- <el-tag v-else
- type="info">杩涜涓�</el-tag>
- </template>
- </el-table-column>
<el-table-column label="鏍囩鎵撳嵃"
min-width="90"
align="center">
@@ -1122,19 +1080,17 @@
<template #default="scope">
<el-button link
type="primary"
- @click="openForm('edit', scope.row)"
- :disabled="Number(scope.row.orderStatus) === 1">缂栬緫</el-button>
+ @click="openForm('edit', scope.row)">缂栬緫</el-button>
<el-button link
type="primary"
@click="openProcessFlowSelect(scope.row)"
- :disabled="Number(scope.row.reviewStatus) !== 1 || Number(scope.row.orderStatus) === 1">宸ヨ壓璺嚎</el-button>
+ :disabled="Number(scope.row.reviewStatus) !== 1">宸ヨ壓璺嚎</el-button>
<el-button link
type="primary"
@click="downLoadFile(scope.row)">闄勪欢</el-button>
<el-button link
type="primary"
- @click="openLedgerQrDialog(scope.row)"
- :disabled="Number(scope.row.orderStatus) === 1">浜岀淮鐮�</el-button>
+ @click="openLedgerQrDialog(scope.row)">浜岀淮鐮�</el-button>
</template>
</el-table-column>
</el-table>
@@ -1174,9 +1130,9 @@
</template>
<FormDialog v-if="!isFormPageMode"
v-model="dialogFormVisible"
- :title="isCompletedOrder ? '鏌ョ湅閿�鍞彴璐﹂〉闈紙宸插畬鎴愶級' : operationType === 'add' ? '鏂板閿�鍞彴璐﹂〉闈�' : operationType === 'view' ? '鏌ョ湅閿�鍞彴璐﹂〉闈�' : '缂栬緫閿�鍞彴璐﹂〉闈�'"
+ :title="operationType === 'add' ? '鏂板閿�鍞彴璐﹂〉闈�' : operationType === 'view' ? '鏌ョ湅閿�鍞彴璐﹂〉闈�' : '缂栬緫閿�鍞彴璐﹂〉闈�'"
:width="'70%'"
- :operation-type="isCompletedOrder || operationType === 'view' ? 'detail' : operationType"
+ :operation-type="operationType === 'view' ? 'detail' : operationType"
@close="closeDia"
@confirm="submitForm"
@cancel="closeDia">
@@ -1859,9 +1815,9 @@
:on-success="handleUploadSuccess"
:on-remove="handleRemove">
<el-button type="primary"
- v-if="operationType !== 'view' || isCompletedOrder">涓婁紶</el-button>
+ v-if="operationType !== 'view'">涓婁紶</el-button>
<template #tip
- v-if="operationType !== 'view' || isCompletedOrder">
+ v-if="operationType !== 'view'">
<div class="el-upload__tip">
鏂囦欢鏍煎紡鏀寔
doc锛宒ocx锛寈ls锛寈lsx锛宲pt锛宲ptx锛宲df锛宼xt锛寈ml锛宩pg锛宩peg锛宲ng锛実if锛宐mp锛宺ar锛寊ip锛�7z
@@ -2623,7 +2579,6 @@
getSalesLabel,
salesStock,
counterReview,
- markOrderCompleted,
incrementPrintCount,
} from "@/api/salesManagement/salesLedger.js";
import { modelList, productTreeList } from "@/api/basicData/product.js";
@@ -2835,8 +2790,7 @@
// 鐢ㄦ埛淇℃伅琛ㄥ崟寮规鏁版嵁
const operationType = ref("");
const dialogFormVisible = ref(false);
- // 宸插畬鎴愯鍗曟爣璁帮細view 妯″紡浣嗛檮浠朵笂浼犱粛鍙敤
- const isCompletedOrder = ref(false);
+
// 宸插鏍歌鍗曠紪杈戞ā寮忥細鍙兘淇敼鍗曚环锛屽叾浠栧瓧娈电鐢�
const isReviewedEdit = ref(false);
const data = reactive({
@@ -2852,7 +2806,6 @@
deliveryStatus: undefined, // 鍙戣揣鐘舵�侊細1鏈彂璐� 2瀹℃壒涓� 3瀹℃壒涓嶉�氳繃 4瀹℃壒閫氳繃 5宸插彂璐� 6閮ㄥ垎鍙戣揣
stockStatus: undefined, // 鍏ュ簱鐘舵�侊細0鏈叆搴� 1閮ㄥ垎鍏ュ簱 2宸插叆搴�
reviewStatus: undefined, // 瀹℃牳鐘舵�侊細0寰呭鏍� 1宸插鏍� 2宸插弽瀹�
- orderStatus: undefined, // 璁㈠崟鐘舵�侊細0杩涜涓� 1宸插畬鎴�
},
form: {
salesContractNo: "",
@@ -3923,14 +3876,12 @@
{ key: "reverseReviewed", label: "鍙嶅鏍�" },
{ key: "stocked", label: "宸插叆搴�" },
{ key: "delivered", label: "宸插彂璐�" },
- { key: "completed", label: "宸插畬鎴�" },
];
const resetStatusFilters = () => {
searchForm.reviewStatus = undefined;
searchForm.stockStatus = undefined;
searchForm.deliveryStatus = undefined;
- searchForm.orderStatus = undefined;
};
const handleStatusTabChange = tabKey => {
@@ -3954,9 +3905,6 @@
case "delivered":
searchForm.deliveryStatus = 5;
break;
- case "completed":
- searchForm.orderStatus = 1;
- break;
default:
break;
}
@@ -3973,17 +3921,13 @@
handleQuery();
};
- /** 鎵归噺鎸夐挳绂佺敤鍒ゆ柇锛氭牴鎹�変腑琛岀殑瀹℃牳鐘舵�佸拰璁㈠崟鐘舵�佹帶鍒舵寜閽彲鐢ㄦ��
+ /** 鎵归噺鎸夐挳绂佺敤鍒ゆ柇锛氭牴鎹�変腑琛岀殑瀹℃牳鐘舵�佹帶鍒舵寜閽彲鐢ㄦ��
* 鏈鏍�(0)锛氬彧鑳藉鏍搞�佸垹闄ゃ�佺紪杈�
* 宸插鏍�(1)锛氬彲浠ュ弽瀹°�佸叆搴撱�佸彂璐с�佸鍑恒�佹墦鍗般�佸伐鑹鸿矾绾�
- * 宸插畬鎴�(orderStatus=1)锛氭墍鏈夋搷浣滄寜閽鐢�
* 鏈�変腑浠讳綍琛屾椂鎵�鏈夋壒閲忔寜閽鐢�
*/
const isBatchButtonDisabled = (action) => {
if (selectedRows.value.length === 0) return true;
- const hasCompleted = selectedRows.value.some(r => Number(r.orderStatus) === 1);
- // 宸插畬鎴愯鍗曪細鎵�鏈夋搷浣滄寜閽鐢�
- if (hasCompleted && action !== 'markCompleted') return true;
const statuses = selectedRows.value.map(r => Number(r.reviewStatus));
const allUnreviewed = statuses.every(s => s === 0);
const allReviewed = statuses.every(s => s === 1);
@@ -4002,9 +3946,6 @@
return !allUnreviewed;
case 'print':
return !allReviewed;
- case 'markCompleted':
- // 鍙湁宸插鏍镐笖鏈畬鎴愮殑璁㈠崟鎵嶈兘鏍囪瀹屾垚
- return !allReviewed || hasCompleted;
default:
return false;
}
@@ -4123,33 +4064,7 @@
}
};
- /** 鏍囪瀹屾垚鎿嶄綔 */
- const handleMarkCompleted = async () => {
- if (selectedRows.value.length === 0) {
- proxy.$modal.msgWarning("璇烽�夋嫨瑕佹爣璁板畬鎴愮殑鏁版嵁");
- return;
- }
- const cannotComplete = selectedRows.value.filter(
- row => Number(row.reviewStatus) !== 1 || Number(row.orderStatus) === 1
- );
- if (cannotComplete.length > 0) {
- proxy.$modal.msgWarning("閫変腑鐨勬暟鎹腑鍖呭惈闈炲凡瀹℃牳鎴栧凡瀹屾垚鐨勯」锛岃閲嶆柊閫夋嫨");
- return;
- }
- try {
- await ElMessageBox.confirm(
- "鏍囪瀹屾垚鍚庤鍗曞皢鍙樹负鍙锛屽彧鑳芥煡鐪嬪拰涓婁紶涓嬭浇闄勪欢锛屼笉鍙挙閿�銆傛槸鍚︾‘璁わ紵",
- "鎻愮ず",
- { confirmButtonText: "纭畾", cancelButtonText: "鍙栨秷", type: "warning" }
- );
- const ids = selectedRows.value.map(row => row.id);
- await markOrderCompleted({ ids });
- proxy.$modal.msgSuccess("鏍囪瀹屾垚鎴愬姛");
- getList();
- } catch {
- // 鐢ㄦ埛鍙栨秷
- }
- };
+
/** 鐢ㄩ濉暟鎹墦寮�鏂板鍙拌处椤甸潰锛堥噸鏂扮敓鎴愬満鏅級 */
const openFormWithPreFill = async (detail, keepPageMode = false) => {
@@ -4690,7 +4605,6 @@
const initAddFormState = async () => {
operationType.value = "add";
- isCompletedOrder.value = false;
isReviewedEdit.value = false;
form.value = {};
productData.value = [];
@@ -4716,7 +4630,6 @@
const initEditFormState = async rowId => {
operationType.value = "edit";
- isCompletedOrder.value = false;
form.value = {};
productData.value = [];
fileList.value = [];
@@ -4792,16 +4705,12 @@
await enterEditPage(row);
return;
}
- // 宸插畬鎴愯鍗曞己鍒朵负鍙妯″紡锛屼絾闄勪欢涓婁紶浠嶅彲鐢�
- const isCompleted = Number(row?.orderStatus) === 1;
- const effectiveType = isCompleted ? 'view' : type;
- operationType.value = effectiveType;
- isCompletedOrder.value = isCompleted;
+ operationType.value = type;
form.value = {};
productData.value = [];
selectedQuotation.value = null;
- // 宸插鏍歌鍗曠紪杈戞椂锛屾爣璁板彧鑳戒慨鏀瑰崟浠凤紙宸插畬鎴愯鍗曞凡寮哄埗view锛屾澶勪笉浼氬啀鍛戒腑锛�
- isReviewedEdit.value = effectiveType === "edit" && Number(row?.reviewStatus) === 1;
+ // 宸插鏍歌鍗曠紪杈戞椂锛屾爣璁板彧鑳戒慨鏀瑰崟浠�
+ isReviewedEdit.value = type === "edit" && Number(row?.reviewStatus) === 1;
let userLists = await userListNoPage();
userList.value = userLists.data;
customerList().then(res => {
@@ -5067,7 +4976,6 @@
proxy.resetForm("formRef");
}
dialogFormVisible.value = false;
- isCompletedOrder.value = false;
isReviewedEdit.value = false;
if (!isFormPageMode.value) {
fileList.value = [];
--
Gitblit v1.9.3