From d88003aa8f32ea8ab981988161fd6485bca2855e Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期一, 27 七月 2026 15:34:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁
---
src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue | 4 +-
src/views/salesManagement/deliveryLedger/index.vue | 21 +++++-----
src/views/customerService/feedbackRegistration/components/formDia.vue | 4 +-
src/views/reportAnalysis/PSIDataAnalysis/components/ProductTypeSwitch.vue | 2
src/views/productionManagement/productionTraceability/index.vue | 3 +
src/views/reportAnalysis/productionAnalysis/components/left-top.vue | 2
src/views/customerService/components/viewDia.vue | 4 +-
src/views/salesManagement/salesLedger/index.vue | 44 ++++++++++-----------
src/views/salesManagement/paymentShipping/index.vue | 4 +-
src/views/collaborativeApproval/approvalManagement/index.vue | 2 -
10 files changed, 43 insertions(+), 47 deletions(-)
diff --git a/src/views/collaborativeApproval/approvalManagement/index.vue b/src/views/collaborativeApproval/approvalManagement/index.vue
index 3d6ca0b..4638392 100644
--- a/src/views/collaborativeApproval/approvalManagement/index.vue
+++ b/src/views/collaborativeApproval/approvalManagement/index.vue
@@ -203,7 +203,6 @@
{ value: '5', label: '閲囪喘瀹℃壒', icon: 'ShoppingCart', color: '#909399' },
{ value: '6', label: '鎶ヤ环瀹℃壒', icon: 'DocumentChecked', color: '#9B59B6' },
{ value: '7', label: '鍙戣揣瀹℃壒', icon: 'Van', color: '#1ABC9C' },
- { value: '8', label: '鍗遍櫓浣滀笟瀹℃壒', icon: 'Van', color: '#3b12d3' },
];
// 瀹℃壒绫诲瀷鍚嶇О鏄犲皠
@@ -215,7 +214,6 @@
5: '閲囪喘瀹℃壒',
6: '鎶ヤ环瀹℃壒',
7: '鍙戣揣瀹℃壒',
- 8: '鍗遍櫓浣滀笟瀹℃壒',
};
// 瀹℃壒绫诲瀷鍥炬爣鏄犲皠
diff --git a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
index e4cc4c0..e8908e6 100644
--- a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
+++ b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
@@ -201,9 +201,9 @@
<el-descriptions-item label="鍙戣揣鏃ユ湡">{{ currentDelivery.shippingInfo.shippingDate || '--' }}</el-descriptions-item>
<el-descriptions-item label="瀹℃牳鐘舵��">{{ currentDelivery.shippingInfo.status || '--' }}</el-descriptions-item>
<el-descriptions-item label="鍙戣揣杞︾墝鍙�">{{ currentDelivery.shippingInfo.shippingCarNumber || '--' }}</el-descriptions-item>
- <el-descriptions-item label="蹇�掑叕鍙�" v-if="false">{{ currentDelivery.shippingInfo.expressCompany || '--' }}</el-descriptions-item>
+ <el-descriptions-item label="蹇�掑叕鍙�">{{ currentDelivery.shippingInfo.expressCompany || '--' }}</el-descriptions-item>
<el-descriptions-item label="蹇�掑崟鍙�"
- :span="2" v-if="false">{{ currentDelivery.shippingInfo.expressNumber || '--' }}</el-descriptions-item>
+ :span="2">{{ currentDelivery.shippingInfo.expressNumber || '--' }}</el-descriptions-item>
</el-descriptions>
<div style="margin-top: 20px;">
<h4>浜у搧鏄庣粏</h4>
diff --git a/src/views/customerService/components/viewDia.vue b/src/views/customerService/components/viewDia.vue
index 29fe7c3..96452b4 100644
--- a/src/views/customerService/components/viewDia.vue
+++ b/src/views/customerService/components/viewDia.vue
@@ -34,8 +34,8 @@
<el-table-column prop="productCategory" label="浜у搧澶х被" align="center" />
<el-table-column prop="specificationModel" label="瑙勬牸鍨嬪彿" align="center" />
<el-table-column prop="unit" label="鍗曚綅" align="center" />
- <el-table-column prop="expressCompany" label="蹇�掑叕鍙�" align="center" v-if="false" />
- <el-table-column prop="expressNumber" label="蹇�掑崟鍙�" align="center" v-if="false" />
+ <el-table-column prop="expressCompany" label="蹇�掑叕鍙�" align="center" />
+ <el-table-column prop="expressNumber" label="蹇�掑崟鍙�" align="center" />
<el-table-column prop="shippingCarNumber" label="鍙戣揣杞︾墝" align="center" />
<el-table-column prop="shippingDate" label="鍙戣揣鏃ユ湡" align="center" />
<el-table-column prop="quantity" label="鍞悗鏁伴噺" align="center" />
diff --git a/src/views/customerService/feedbackRegistration/components/formDia.vue b/src/views/customerService/feedbackRegistration/components/formDia.vue
index fcbc94c..e606107 100644
--- a/src/views/customerService/feedbackRegistration/components/formDia.vue
+++ b/src/views/customerService/feedbackRegistration/components/formDia.vue
@@ -235,8 +235,8 @@
dataType: "slot",
slot: "shippingStatus",
},
- // { label: "蹇�掑叕鍙�", prop: "expressCompany", width: 140 },
- // { label: "蹇�掑崟鍙�", prop: "expressNumber", width: 160 },
+ { label: "蹇�掑叕鍙�", prop: "expressCompany", width: 140 },
+ { label: "蹇�掑崟鍙�", prop: "expressNumber", width: 160 },
{
label: "鍙戣揣杞︾墝",
prop: "shippingCarNumber",
diff --git a/src/views/productionManagement/productionTraceability/index.vue b/src/views/productionManagement/productionTraceability/index.vue
index 09a6c2a..19f7ed9 100644
--- a/src/views/productionManagement/productionTraceability/index.vue
+++ b/src/views/productionManagement/productionTraceability/index.vue
@@ -235,11 +235,12 @@
border>
<el-descriptions-item label="妫�娴嬫棩鏈�">{{ parseTime(record.createTime, '{y}-{m}-{d}') || '-' }}</el-descriptions-item>
<el-descriptions-item label="鎶ュ伐鍗曞彿">{{ record.reportNo || '-' }}</el-descriptions-item>
- <el-descriptions-item label="妫�楠屽憳">{{ record.userName || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="鎶ュ伐浜哄憳">{{ record.userName || '-' }}</el-descriptions-item>
<el-descriptions-item label="浜у搧鍚嶇О">{{ record.productName || '-' }}</el-descriptions-item>
<el-descriptions-item label="瑙勬牸鍨嬪彿">{{ record.model || '-' }}</el-descriptions-item>
<el-descriptions-item label="鏁伴噺">{{ record.quantity || 0 }} {{ record.unit || '-' }}</el-descriptions-item>
<el-descriptions-item label="妫�娴嬪崟浣�">{{ record.checkCompany || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="妫�楠屽憳">{{ record.checkName || '-' }}</el-descriptions-item>
<el-descriptions-item label="鍚堟牸鐜�">
<el-tag :type="getPassRateTagType(record)">
{{ getPassRateDisplay(record) }}
diff --git a/src/views/reportAnalysis/PSIDataAnalysis/components/ProductTypeSwitch.vue b/src/views/reportAnalysis/PSIDataAnalysis/components/ProductTypeSwitch.vue
index 87cde44..327bd72 100644
--- a/src/views/reportAnalysis/PSIDataAnalysis/components/ProductTypeSwitch.vue
+++ b/src/views/reportAnalysis/PSIDataAnalysis/components/ProductTypeSwitch.vue
@@ -5,7 +5,7 @@
@change="handleChange"
>
<el-radio-button :label="1">鍘熸潗鏂�</el-radio-button>
- <el-radio-button :label="3">鍗婃垚鍝�</el-radio-button>
+ <!-- <el-radio-button :label="3">鍗婃垚鍝�</el-radio-button> -->
<el-radio-button :label="2">鎴愬搧</el-radio-button>
</el-radio-group>
</template>
diff --git a/src/views/reportAnalysis/productionAnalysis/components/left-top.vue b/src/views/reportAnalysis/productionAnalysis/components/left-top.vue
index 8b25973..c4532ad 100644
--- a/src/views/reportAnalysis/productionAnalysis/components/left-top.vue
+++ b/src/views/reportAnalysis/productionAnalysis/components/left-top.vue
@@ -33,7 +33,7 @@
const pieWrapperRef = ref(null)
const pieBackgroundRef = ref(null)
-const dateType = ref(1) // 1=鍛� 2=鏈� 3=瀛ｅ害
+const dateType = ref(3) // 1=鍛� 2=鏈� 3=瀛ｅ害
function array2obj(array, key) {
const resObj = {}
diff --git a/src/views/salesManagement/deliveryLedger/index.vue b/src/views/salesManagement/deliveryLedger/index.vue
index 48406cb..07cf066 100644
--- a/src/views/salesManagement/deliveryLedger/index.vue
+++ b/src/views/salesManagement/deliveryLedger/index.vue
@@ -22,7 +22,7 @@
@change="handleQuery"
/>
</el-form-item>
- <el-form-item label="蹇�掑崟鍙凤細" >
+ <el-form-item label="蹇�掑崟鍙凤細">
<el-input
v-model="searchForm.expressNumber"
placeholder="璇疯緭鍏�"
@@ -95,7 +95,6 @@
label="鍙戣揣杞︾墝鍙�"
prop="shippingCarNumber"
show-overflow-tooltip
- v-if="false"
/>
<el-table-column
label="蹇�掑叕鍙�"
@@ -181,8 +180,8 @@
style="width: 100%"
@change="handleShippingTypeChange"
>
+ <el-option label="璐ц溅" value="璐ц溅" />
<el-option label="蹇��" value="蹇��" />
- <el-option label="璐ц溅" value="璐ц溅" v-if="false"/>
</el-select>
</el-form-item>
</el-col>
@@ -204,7 +203,7 @@
</el-row>
<el-row :gutter="30">
<el-col :span="24" v-if="form.type === '璐ц溅'">
- <el-form-item label="鍙戣揣杞︾墝鍙凤細" prop="shippingCarNumber" v-if="false">
+ <el-form-item label="鍙戣揣杞︾墝鍙凤細" prop="shippingCarNumber">
<el-input
v-model="form.shippingCarNumber"
placeholder="璇疯緭鍏ュ彂璐ц溅鐗屽彿"
@@ -212,7 +211,7 @@
/>
</el-form-item>
</el-col>
- <el-col :span="24" v-else-if="false">
+ <el-col :span="24" v-else>
<el-form-item label="蹇�掑叕鍙革細" prop="expressCompany">
<el-input
v-model="form.expressCompany"
@@ -222,7 +221,7 @@
</el-form-item>
</el-col>
</el-row>
- <el-row :gutter="30" >
+ <el-row :gutter="30" v-if="form.type === '蹇��'">
<el-col :span="24">
<el-form-item label="蹇�掑崟鍙凤細" prop="expressNumber">
<el-input
@@ -282,13 +281,13 @@
<el-descriptions-item label="瀹℃牳鐘舵��">{{
getApprovalStatusText(detailRow.status)
}}</el-descriptions-item>
- <el-descriptions-item label="鍙戣揣杞︾墝鍙�" v-if="false">{{
+ <el-descriptions-item label="鍙戣揣杞︾墝鍙�">{{
detailRow.shippingCarNumber || "--"
}}</el-descriptions-item>
- <el-descriptions-item label="蹇�掑叕鍙�" >{{
+ <el-descriptions-item label="蹇�掑叕鍙�">{{
detailRow.expressCompany || "--"
}}</el-descriptions-item>
- <el-descriptions-item label="蹇�掑崟鍙�" :span="2" >{{
+ <el-descriptions-item label="蹇�掑崟鍙�" :span="2">{{
detailRow.expressNumber || "--"
}}</el-descriptions-item>
<el-descriptions-item label="鍑哄簱鍗曞彿" :span="2">
@@ -386,7 +385,7 @@
customerName: "",
specificationModel: "",
productName: "",
- type: "蹇��", // 璐ц溅, 蹇��
+ type: "璐ц溅", // 璐ц溅, 蹇��
shippingDate: "",
shippingCarNumber: "",
expressCompany: "",
@@ -477,7 +476,7 @@
id: row.id ?? null,
salesContractNo: row.salesContractNo ?? "",
customerName: row.customerName ?? "",
- type: row.type || "蹇��",
+ type: row.type || "璐ц溅",
shippingDate: row.shippingDate || getCurrentDate(),
shippingCarNumber: row.shippingCarNumber ?? "",
expressCompany: row.expressCompany ?? "",
diff --git a/src/views/salesManagement/paymentShipping/index.vue b/src/views/salesManagement/paymentShipping/index.vue
index 854ae6e..56caf3b 100644
--- a/src/views/salesManagement/paymentShipping/index.vue
+++ b/src/views/salesManagement/paymentShipping/index.vue
@@ -239,8 +239,8 @@
<el-select v-model="logisticsCompany" placeholder="璇烽�夋嫨鐗╂祦鍏徃" style="width: 100%">
<el-option label="椤轰赴閫熻繍" value="椤轰赴閫熻繍"></el-option>
<el-option label="鍦嗛�氶�熼��" value="鍦嗛�氶�熼��"></el-option>
- <el-option label="涓�氬揩閫�" value="涓�氬揩閫�" v-if="false"></el-option>
- <el-option label="鐢抽�氬揩閫�" value="鐢抽�氬揩閫�" v-if="false"></el-option>
+ <el-option label="涓�氬揩閫�" value="涓�氬揩閫�"></el-option>
+ <el-option label="鐢抽�氬揩閫�" value="鐢抽�氬揩閫�"></el-option>
<el-option label="闊佃揪閫熼��" value="闊佃揪閫熼��"></el-option>
</el-select>
</el-form-item>
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 35ed6c9..0077850 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -129,8 +129,7 @@
show-overflow-tooltip />
<el-table-column label="鍙戣揣杞︾墝"
minWidth="100px"
- align="center"
- v-if="false">
+ align="center">
<template #default="scope">
<div>
<el-tag type="success"
@@ -714,12 +713,12 @@
<el-form-item label="鏄惁鐢熶骇锛�"
prop="isProduction">
<div style="display: flex; align-items: center; width: 100%;">
- <el-radio-group v-model="productForm.isProduction">
- <el-radio label="鏄�"
- :value="true" />
- <el-radio label="鍚�"
- :value="false" />
- </el-radio-group>
+ <el-radio-group v-model="productForm.isProduction">
+ <el-radio label="鏄�"
+ :value="true" />
+ <el-radio label="鍚�"
+ :value="false" />
+ </el-radio-group>
<div
v-if="currentStock !== null"
:style="{
@@ -823,7 +822,7 @@
<span class="label">鍙戣揣鏃ユ湡锛�</span>
<span class="value">{{ formatDate(item.createTime) }}</span>
</div>
- <div v-if="false">
+ <div>
<span class="label">鍙戣揣杞︾墝鍙凤細</span>
<span class="value">{{ item.shippingCarNumber }}</span>
</div>
@@ -926,11 +925,10 @@
placeholder="璇烽�夋嫨鍙戣揣绫诲瀷"
style="width: 100%"
@change="handleDeliveryTypeChange">
+ <el-option label="璐ц溅"
+ value="璐ц溅" />
<el-option label="蹇��"
value="蹇��" />
- <el-option v-if="false"
- label="璐ц溅"
- value="璐ц溅" />
</el-select>
</el-form-item>
</el-col>
@@ -952,7 +950,7 @@
</el-form-item>
</el-col>
<el-col :span="24"
- v-else-if="false">
+ v-else>
<el-form-item label="蹇�掑叕鍙革細"
prop="expressCompany">
<el-input v-model="deliveryForm.expressCompany"
@@ -962,7 +960,7 @@
</el-col>
</el-row>
<el-row :gutter="30"
- >
+ v-if="deliveryForm.type === '蹇��'">
<el-col :span="24">
<el-form-item label="蹇�掑崟鍙凤細"
prop="expressNumber">
@@ -1322,7 +1320,7 @@
shippingCarNumber: "",
expressCompany: "",
expressNumber: "",
- type: "蹇��", // 璐ц溅, 蹇��
+ type: "璐ц溅", // 璐ц溅, 蹇��
},
deliveryRules: {
shippingCarNumber: [
@@ -1621,9 +1619,9 @@
param,
["contractAmount", "taxInclusiveTotalPrice", "taxExclusiveTotalPrice"],
buildAmountSummaryFormat([
- "contractAmount",
- "taxInclusiveTotalPrice",
- "taxExclusiveTotalPrice",
+ "contractAmount",
+ "taxInclusiveTotalPrice",
+ "taxExclusiveTotalPrice",
])
);
};
@@ -1650,9 +1648,9 @@
return proxy.summarizeTable(
param,
[
- "taxInclusiveUnitPrice",
- "taxInclusiveTotalPrice",
- "taxExclusiveTotalPrice",
+ "taxInclusiveUnitPrice",
+ "taxInclusiveTotalPrice",
+ "taxExclusiveTotalPrice",
],
buildAmountSummaryFormat([
"taxInclusiveUnitPrice",
@@ -2103,7 +2101,7 @@
const data = res.data || res;
companyName = data.companyName || companyName;
orders.push(data.ledger);
- }
+ }
printSalesMulti(companyName, orders);
} catch (e) {
console.error('鎵撳嵃澶辫触:', e);
@@ -2483,7 +2481,7 @@
shippingCarNumber: "",
expressCompany: "",
expressNumber: "",
- type: "蹇��",
+ type: "璐ц溅",
batchNo: [],
batchNoList,
};
--
Gitblit v1.9.3