From c831574708e199a909b569b625fd92707bc660fd Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 27 三月 2026 16:21:04 +0800
Subject: [PATCH] 军泰伟业 1.已发货数量等于总数量时，状态为已发货。已发货数量小于总数量时，状态建议新增发货中 2.产品清除工艺路线点击确定后，仍然回显绑定的工艺路线 3.新增退货单时，退一部分货后，继续对此退货单进行退货操作，展示数据有误
---
src/views/salesManagement/salesLedger/index.vue | 58 ++++++++++++++++++++++++++--------------------------------
1 files changed, 26 insertions(+), 32 deletions(-)
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 05bd78d..c7e7617 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -45,7 +45,7 @@
<el-table :data="props.row.children" border show-summary :summary-method="summarizeChildrenTable">
<el-table-column align="center" label="搴忓彿" type="index"/>
<el-table-column label="浜у搧澶х被" prop="productCategory" />
- <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" />
+ <el-table-column label="鍥剧焊缂栧彿" prop="specificationModel" />
<el-table-column label="鍗曚綅" prop="unit" />
<el-table-column label="浜у搧鐘舵��"
width="100px"
@@ -215,7 +215,7 @@
:selectable="(row) => !isProductShipped(row)" />
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
<el-table-column label="浜у搧澶х被" prop="productCategory" />
- <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" />
+ <el-table-column label="鍥剧焊缂栧彿" prop="specificationModel" />
<el-table-column label="鍗曚綅" prop="unit" />
<el-table-column label="鏁伴噺" prop="quantity" />
<el-table-column label="绋庣巼(%)" prop="taxRate" />
@@ -334,7 +334,7 @@
</el-row>
<el-row :gutter="30">
<el-col :span="24">
- <el-form-item label="瑙勬牸鍨嬪彿锛�" prop="productModelId">
+ <el-form-item label="鍥剧焊缂栧彿锛�" prop="productModelId">
<el-select v-model="productForm.productModelId" placeholder="璇烽�夋嫨" clearable @change="getProductModel" filterable>
<el-option v-for="item in modelOptions" :key="item.id" :label="item.model" :value="item.id" />
</el-select>
@@ -491,7 +491,7 @@
<thead>
<tr>
<th>浜у搧鍚嶇О</th>
- <th>瑙勬牸鍨嬪彿</th>
+ <th>鍥剧焊缂栧彿</th>
<th>鍗曚綅</th>
<th>鍗曚环</th>
<th>闆跺敭鏁伴噺</th>
@@ -1639,7 +1639,7 @@
<thead>
<tr>
<th>浜у搧鍚嶇О</th>
- <th>瑙勬牸鍨嬪彿</th>
+ <th>鍥剧焊缂栧彿</th>
<th>鍗曚綅</th>
<th>鍗曚环</th>
<th>闆跺敭鏁伴噺</th>
@@ -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';
};
/**
@@ -2194,19 +2188,19 @@
margin-left: 10px;
}
-::v-deep .yellow {
+:deep(.yellow) {
background-color: #FAF0DE;
}
-::v-deep .pink {
+:deep(.pink) {
background-color: #FAE1DE;
}
-::v-deep .red {
+:deep(.red) {
background-color: #FAE1DE;
}
-::v-deep .purple{
+:deep(.purple){
background-color: #F4DEFA;
}
--
Gitblit v1.9.3