From 612c77e7b76e803b7604e260c41f8843694315b1 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 27 三月 2026 15:55:47 +0800
Subject: [PATCH] 军泰伟业 1.已发货数量等于总数量时，状态为已发货。已发货数量小于总数量时，状态建议新增发货中 2.产品清除工艺路线点击确定后，仍然回显绑定的工艺路线
---
src/views/basicData/product/index.vue | 16 ++++++++++++++--
src/views/salesManagement/salesLedger/index.vue | 40 +++++++++++++++++-----------------------
2 files changed, 31 insertions(+), 25 deletions(-)
diff --git a/src/views/basicData/product/index.vue b/src/views/basicData/product/index.vue
index 940c4b5..5fff5f6 100644
--- a/src/views/basicData/product/index.vue
+++ b/src/views/basicData/product/index.vue
@@ -390,7 +390,13 @@
modelForm.value = { ...data };
modelForm.value.tempFileIds = data.tempFileIds || [];
modelForm.value.salesLedgerFiles = data.salesLedgerFiles || [];
- if (data.drawingFile) {
+ // 澶勭悊鍥剧焊鏂囦欢鍙嶆樉
+ if (data.salesLedgerFiles && data.salesLedgerFiles.length > 0) {
+ drawingFileList.value = data.salesLedgerFiles.map(file => ({
+ name: file.name,
+ url: file.url
+ }));
+ } else if (data.drawingFile) {
drawingFileList.value = [{
name: data.drawingFile.split('/').pop(),
url: data.drawingFile
@@ -402,7 +408,13 @@
const submitModelForm = () => {
modelFormRef.value.validate((valid) => {
if (valid) {
- addOrEditProductModel(modelForm.value).then((res) => {
+ // 鏋勫缓鎻愪氦鏁版嵁锛岀‘淇� routeId 涓虹┖鏃朵紶 null锛屽悓鏃舵竻绌� routeName
+ const submitData = {
+ ...modelForm.value,
+ routeId: modelForm.value.routeId || 0,
+ routeName: modelForm.value.routeId ? modelForm.value.routeName : null
+ };
+ addOrEditProductModel(submitData).then((res) => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
closeModelDia();
getModelList();
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index e148094..c7e7617 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -1964,26 +1964,23 @@
// 鐘舵�佹槸瀛楃涓�
const statusStr = String(status).trim();
- // 濡傛灉鐘舵�佹槸"宸叉挙閿�"锛岀洿鎺ヨ繑鍥�
- if (statusStr === '宸叉挙閿�') {
- return '宸叉挙閿�';
- }
-
- // 濡傛灉宸插彂璐э紙鏈夊彂璐ф棩鏈熸垨杞︾墝鍙凤級锛屾樉绀�"宸插彂璐�"
- if (row.shippingDate || row.shippingCarNumber) {
- return '宸插彂璐�';
- }
-
const statusTextMap = {
'寰呭彂璐�': '寰呭彂璐�',
'寰呭鏍�': '寰呭鏍�',
'瀹℃牳涓�': '瀹℃牳涓�',
+ '鍙戣揣涓�': '鍙戣揣涓�',
'瀹℃牳鎷掔粷': '瀹℃牳鎷掔粷',
'瀹℃牳閫氳繃': '瀹℃牳閫氳繃',
'宸插彂璐�': '宸插彂璐�',
'宸叉挙閿�': '宸叉挙閿�'
};
- return statusTextMap[statusStr] || '寰呭彂璐�';
+
+ // 濡傛灉鐘舵�佸湪鏄犲皠琛ㄤ腑锛岀洿鎺ヨ繑鍥炲搴旀枃鏈�
+ if (statusTextMap[statusStr]) {
+ return statusTextMap[statusStr];
+ }
+
+ return '寰呭彂璐�';
};
/**
@@ -2002,16 +1999,6 @@
// 鐘舵�佹槸瀛楃涓�
const statusStr = String(status).trim();
- // 濡傛灉鐘舵�佹槸"宸叉挙閿�"锛屾樉绀烘鑹�
- if (statusStr === '宸叉挙閿�') {
- return 'warning';
- }
-
- // 濡傛灉宸插彂璐э紙鏈夊彂璐ф棩鏈熸垨杞︾墝鍙凤級锛屾樉绀虹豢鑹�
- if (row.shippingDate || row.shippingCarNumber) {
- return 'success';
- }
-
const typeTextMap = {
'寰呭彂璐�': 'info',
'寰呭鏍�': 'info',
@@ -2019,9 +2006,16 @@
'瀹℃牳鎷掔粷': 'danger',
'宸叉挙閿�': 'warning',
'瀹℃牳閫氳繃': 'success',
- '宸插彂璐�': 'success'
+ '宸插彂璐�': 'success',
+ '鍙戣揣涓�': 'warning'
};
- return typeTextMap[statusStr] || 'info';
+
+ // 濡傛灉鐘舵�佸湪鏄犲皠琛ㄤ腑锛岀洿鎺ヨ繑鍥炲搴旂被鍨�
+ if (typeTextMap[statusStr]) {
+ return typeTextMap[statusStr];
+ }
+
+ return 'info';
};
/**
--
Gitblit v1.9.3