From 056593f1b3ed16b2b6130ce688cf5575645778e9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期日, 04 一月 2026 16:20:46 +0800
Subject: [PATCH] 双奇点 1.生产管理bug修改 2.采购台账二维码功能隐藏
---
src/views/procurementManagement/procurementLedger/index.vue | 16 ++++++++--------
src/views/productionManagement/productionCosting/index.vue | 2 +-
src/views/productionManagement/productionOrder/index.vue | 2 +-
src/views/inventoryManagement/stockManagement/index.vue | 8 ++++----
src/views/productionManagement/productionReporting/components/formDia.vue | 18 +++++++++++++-----
5 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/src/views/inventoryManagement/stockManagement/index.vue b/src/views/inventoryManagement/stockManagement/index.vue
index 21a459a..fa3f58b 100644
--- a/src/views/inventoryManagement/stockManagement/index.vue
+++ b/src/views/inventoryManagement/stockManagement/index.vue
@@ -14,7 +14,7 @@
clearable
@change="handleQuery"
/>
- <span class="search_title ml10">浜у搧澶х被锛�</span>
+ <span class="search_title ml10">浜у搧鍚嶇О锛�</span>
<el-input
v-model="searchForm.productCategory"
style="width: 240px"
@@ -35,7 +35,7 @@
<el-table-column align="center" type="selection" width="55" />
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
<el-table-column label="鍏ュ簱鏃ユ湡" prop="createTime" width="100" show-overflow-tooltip />
- <el-table-column label="浜у搧澶х被" prop="productCategory" show-overflow-tooltip />
+ <el-table-column label="浜у搧鍚嶇О" prop="productCategory" show-overflow-tooltip />
<el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" show-overflow-tooltip />
<el-table-column label="鍗曚綅" prop="unit" width="80" show-overflow-tooltip />
<el-table-column label="鍏ュ簱鏁伴噺" prop="inboundNum" width="100" show-overflow-tooltip />
@@ -60,7 +60,7 @@
<span class="search_title ml10">鍏ュ簱鏃ユ湡锛�</span>
<el-date-picker v-model="searchForm.timeStr" type="date" placeholder="璇烽�夋嫨鏃ユ湡" value-format="YYYY-MM-DD"
format="YYYY-MM-DD" clearable @change="handleQuery" />
- <span class="search_title ml10">浜у搧澶х被锛�</span>
+ <span class="search_title ml10">浜у搧鍚嶇О锛�</span>
<el-input v-model="searchForm.productCategory" style="width: 240px" placeholder="璇疯緭鍏�" clearable />
<el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
</div>
@@ -103,7 +103,7 @@
<span class="search_title ml10">鍏ュ簱鏃ユ湡锛�</span>
<el-date-picker v-model="searchForm.timeStr" type="date" placeholder="璇烽�夋嫨鏃ユ湡" value-format="YYYY-MM-DD"
format="YYYY-MM-DD" clearable @change="handleQuery" />
- <span class="search_title ml10">浜у搧澶х被锛�</span>
+ <span class="search_title ml10">浜у搧鍚嶇О锛�</span>
<el-input v-model="searchForm.productCategory" style="width: 240px" placeholder="璇疯緭鍏�" clearable />
<el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
</div>
diff --git a/src/views/procurementManagement/procurementLedger/index.vue b/src/views/procurementManagement/procurementLedger/index.vue
index 3711ed2..fff44de 100644
--- a/src/views/procurementManagement/procurementLedger/index.vue
+++ b/src/views/procurementManagement/procurementLedger/index.vue
@@ -146,7 +146,7 @@
<el-table-column
fixed="right"
label="鎿嶄綔"
- min-width="150"
+ min-width="100"
align="center"
>
<template #default="scope">
@@ -158,13 +158,13 @@
:disabled="scope.row.receiptPaymentAmount>0 || scope.row.recorderName !== userStore.nickName"
>缂栬緫</el-button
>
- <el-button
- link
- type="success"
- size="small"
- @click="showQRCode(scope.row)"
- >鐢熸垚浜岀淮鐮�</el-button
- >
+<!-- <el-button-->
+<!-- link-->
+<!-- type="success"-->
+<!-- size="small"-->
+<!-- @click="showQRCode(scope.row)"-->
+<!-- >鐢熸垚浜岀淮鐮�</el-button-->
+<!-- >-->
</template>
</el-table-column>
diff --git a/src/views/productionManagement/productionCosting/index.vue b/src/views/productionManagement/productionCosting/index.vue
index 76e7414..71e4a12 100644
--- a/src/views/productionManagement/productionCosting/index.vue
+++ b/src/views/productionManagement/productionCosting/index.vue
@@ -171,7 +171,7 @@
type: "warning",
})
.then(() => {
- proxy.download("/basic/customer/export", {}, "鐢熶骇鏍哥畻.xlsx");
+ proxy.download("/salesLedger/productionAccounting/export", {}, "鐢熶骇鏍哥畻.xlsx");
})
.catch(() => {
proxy.$modal.msg("宸插彇娑�");
diff --git a/src/views/productionManagement/productionOrder/index.vue b/src/views/productionManagement/productionOrder/index.vue
index 9928d46..f35670a 100644
--- a/src/views/productionManagement/productionOrder/index.vue
+++ b/src/views/productionManagement/productionOrder/index.vue
@@ -78,7 +78,7 @@
width:300
},
{
- label: "浠樻鐘舵��",
+ label: "鐢熶骇鐘舵��",
prop: "status",
dataType: "tag",
formatType: (params) => {
diff --git a/src/views/productionManagement/productionReporting/components/formDia.vue b/src/views/productionManagement/productionReporting/components/formDia.vue
index 89f6c76..3986865 100644
--- a/src/views/productionManagement/productionReporting/components/formDia.vue
+++ b/src/views/productionManagement/productionReporting/components/formDia.vue
@@ -31,7 +31,7 @@
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="寰呯敓浜ф暟閲忥細" prop="pendingNum">
- <el-input v-model="form.pendingNum" placeholder="璇疯緭鍏�" clearable disabled/>
+ <el-input :value="form.pendingNum !== undefined && form.pendingNum !== null ? Number(form.pendingNum).toFixed(2) : ''" placeholder="璇疯緭鍏�" clearable disabled/>
</el-form-item>
</el-col>
</el-row>
@@ -88,6 +88,7 @@
const userList = ref([])
const dialogFormVisible = ref(false);
const operationType = ref('')
+const pendingFinishNum = ref(0) // 澶栭儴浼犲叆鐨勫緟鐢熶骇鏁伴噺锛堝墿浣欏彲鎶ュ伐鏁伴噺锛�
const data = reactive({
form: {
successNum: "",
@@ -110,14 +111,21 @@
userList.value = res.data;
});
form.value = {...row}
+ pendingFinishNum.value = Number(row?.pendingFinishNum || 0)
+ // 灏嗗緟鐢熶骇鏁伴噺甯﹀叆琛ㄥ崟锛屾柟渚垮睍绀轰笌鏍￠獙锛屼繚鐣欎袱浣嶅皬鏁�
+ form.value.pendingNum = Number(pendingFinishNum.value.toFixed(2))
}
const changeNum = (value) => {
- if (value > form.value.schedulingNum) {
- form.value.finishedNum = form.value.schedulingNum;
- proxy.$modal.msgWarning('鏈鐢熶骇鏁伴噺涓嶅彲澶т簬鎺掍骇鏁伴噺')
+ const maxPending = Number(pendingFinishNum.value) || 0
+ // 涓婇檺锛氫笉鑳借秴杩囧緟鐢熶骇鏁伴噺
+ if (Number(value) > maxPending) {
+ form.value.finishedNum = Number(maxPending.toFixed(2));
+ proxy.$modal.msgWarning('鏈鐢熶骇鏁伴噺涓嶅彲澶т簬寰呯敓浜ф暟閲�')
}
- form.value.pendingNum = form.value.schedulingNum - form.value.finishedNum;
+ // 閲嶆柊璁＄畻鍓╀綑寰呯敓浜ф暟閲忥紝淇濈暀涓や綅灏忔暟
+ const finishedNum = Number(form.value.finishedNum) || 0
+ form.value.pendingNum = Number((maxPending - finishedNum).toFixed(2));
}
// 鎻愪氦浜у搧琛ㄥ崟
const submitForm = () => {
--
Gitblit v1.9.3