From f92e790af99264551dd13cfa10abd1f833ee8429 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 19 三月 2026 17:35:19 +0800
Subject: [PATCH] Merge branch 'dev_KTHG' of http://114.132.189.42:9002/r/product-inventory-management into dev_KTHG
---
src/views/index.vue | 34 +++++++++++++++-
src/views/inventoryManagement/dispatchLog/Record.vue | 2
src/views/safeProduction/safeQualifications/index.vue | 11 +++--
src/views/inventoryManagement/stockManagement/New.vue | 2
src/views/qualityManagement/InspectItem/index.vue | 1
src/views/consumablesLogistics/stockManagement/Subtract.vue | 8 +++
vite.config.js | 16 ++++----
src/views/inventoryManagement/stockManagement/Subtract.vue | 8 +++
src/views/qualityManagement/nonconformingManagement/index.vue | 8 ++--
src/views/consumablesLogistics/dispatchLog/Record.vue | 2
10 files changed, 67 insertions(+), 25 deletions(-)
diff --git a/src/views/consumablesLogistics/dispatchLog/Record.vue b/src/views/consumablesLogistics/dispatchLog/Record.vue
index 1e78893..8e9a94d 100644
--- a/src/views/consumablesLogistics/dispatchLog/Record.vue
+++ b/src/views/consumablesLogistics/dispatchLog/Record.vue
@@ -29,7 +29,7 @@
<div>
<el-button @click="handleOut">瀵煎嚭</el-button>
<el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
- <el-button type="primary" plain @click="handlePrint">鎵撳嵃</el-button>
+ <!-- <el-button type="primary" plain @click="handlePrint">鎵撳嵃</el-button> -->
</div>
</div>
<div class="table_list">
diff --git a/src/views/consumablesLogistics/stockManagement/Subtract.vue b/src/views/consumablesLogistics/stockManagement/Subtract.vue
index 8e7961d..29fa533 100644
--- a/src/views/consumablesLogistics/stockManagement/Subtract.vue
+++ b/src/views/consumablesLogistics/stockManagement/Subtract.vue
@@ -229,7 +229,13 @@
const computedNet = safeNet > 0 ? safeNet : 0;
const maxNet = ledgerNetWeight.value;
if (Number.isFinite(maxNet) && maxNet > 0 && computedNet > maxNet) {
- formState.value.netWeight = Number(maxNet.toFixed(2));
+ const cappedNet = Number(maxNet.toFixed(2));
+ formState.value.netWeight = cappedNet;
+ // 鍚屾姣涢噸锛屼繚鎸侊細鍑�閲� = 姣涢噸 - 鐨噸
+ const tare = Number(tareWeight);
+ if (Number.isFinite(tare)) {
+ formState.value.grossWeight = Number((tare + cappedNet).toFixed(2));
+ }
proxy?.$modal?.msgWarning?.(`棰嗙敤鍑�閲嶄笉鑳借秴杩囧彴璐﹀噣閲嶏紙${maxNet.toFixed(2)} 鍚級`);
return;
}
diff --git a/src/views/index.vue b/src/views/index.vue
index bf488c5..3ed8993 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -47,6 +47,22 @@
</div>
</div>
+ <div class="top-middle2">
+ <div class="data-card consumables">
+ <div class="data-title">鑰楁潗鏁版嵁</div>
+ <div class="data-num">
+ <div>
+ <div class="data-desc">褰撳墠鑰楁潗鎬婚噺/浠�</div>
+ <div class="data-value">{{ businessInfo.consumablesQuantityTotal || 0 }}</div>
+ </div>
+ <div>
+ <div class="data-desc">浠婃棩鑰楁潗鍏ュ簱/浠�</div>
+ <div class="data-value">{{ businessInfo.consumablesTodayNum || 0 }}</div>
+ </div>
+ </div>
+ </div>
+ </div>
+
<div class="top-right">
<div class="todo-panel">
<div class="section-title">寰呭姙浜嬮」</div>
@@ -158,9 +174,9 @@
</el-radio-group>
</div>
<div class="quality-cards">
- <div class="quality-card one">鍘熸潗鏂欏凡妫�娴嬫暟 <span>{{ qualityStatisticsObject.supplierNum }}浠�</span></div>
- <div class="quality-card two">杩囩▼妫�楠屾暟閲� <span>{{ qualityStatisticsObject.processNum }}浠�</span></div>
- <div class="quality-card three">鍑哄巶宸叉鏁伴噺 <span>{{ qualityStatisticsObject.factoryNum }}浠�</span></div>
+ <div class="quality-card one">鍏ュ巶妫�娴嬫暟 <span>{{ qualityStatisticsObject.supplierNum }}浠�</span></div>
+ <div class="quality-card two">杞﹂棿妫�娴嬫暟 <span>{{ qualityStatisticsObject.processNum }}浠�</span></div>
+ <div class="quality-card three">鍑哄巶妫�鏁� <span>{{ qualityStatisticsObject.factoryNum }}浠�</span></div>
</div>
<Echarts ref="chart" :chartStyle="chartStyle" :grid="grid" :legend="barLegend" :series="barSeries1"
:tooltip="tooltip" :xAxis="xAxis1" :yAxis="yAxis1" style="height: 260px"></Echarts>
@@ -195,11 +211,13 @@
const businessInfo = ref({
inventoryNum: 0,
+ consumablesQuantityTotal: 0,
monthPurchaseHaveMoney: 0,
monthPurchaseMoney: 0,
monthSaleHaveMoney: 0,
monthSaleMoney: 0,
todayInventoryNum: 0,
+ consumablesTodayNum: 0,
})
const qualityStatisticsObject = ref({
supplierNum: 0,
@@ -806,6 +824,10 @@
background-repeat: no-repeat;
}
+.data-card.consumables {
+ background: linear-gradient(135deg, #f59e0b 0%, #f97316 100%);
+}
+
.data-desc {
font-weight: 500;
font-size: 16px;
@@ -821,9 +843,15 @@
.top-left,
.top-middle,
+.top-middle2,
.top-right {
flex: 1;
display: flex;
+ min-width: 0;
+}
+
+.dashboard-top {
+ gap: 12px;
}
.todo-panel {
diff --git a/src/views/inventoryManagement/dispatchLog/Record.vue b/src/views/inventoryManagement/dispatchLog/Record.vue
index 80a1bff..ac648c1 100644
--- a/src/views/inventoryManagement/dispatchLog/Record.vue
+++ b/src/views/inventoryManagement/dispatchLog/Record.vue
@@ -29,7 +29,7 @@
<div>
<el-button @click="handleOut">瀵煎嚭</el-button>
<el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
- <el-button type="primary" plain @click="handlePrint">鎵撳嵃</el-button>
+ <!-- <el-button type="primary" plain @click="handlePrint">鎵撳嵃</el-button> -->
</div>
</div>
<div class="table_list">
diff --git a/src/views/inventoryManagement/stockManagement/New.vue b/src/views/inventoryManagement/stockManagement/New.vue
index 22e73ac..e1b378c 100644
--- a/src/views/inventoryManagement/stockManagement/New.vue
+++ b/src/views/inventoryManagement/stockManagement/New.vue
@@ -39,7 +39,7 @@
<!-- 鍗婃垚鍝侊細鍏佽鎵嬪姩濉啓鏁伴噺鍏ュ簱 -->
<el-form-item
- v-if="type === 'qualified' && (formState.parentName === '鍗婃垚鍝�' || formState.productType === 1)"
+ v-if="type === 'qualified' && (formState.parentName === '鍗婃垚鍝�' || formState.parentName === '鎴愬搧' || formState.productType === 1)"
label="鏁伴噺"
prop="qualitity"
:rules="[
diff --git a/src/views/inventoryManagement/stockManagement/Subtract.vue b/src/views/inventoryManagement/stockManagement/Subtract.vue
index 88cfad3..2766910 100644
--- a/src/views/inventoryManagement/stockManagement/Subtract.vue
+++ b/src/views/inventoryManagement/stockManagement/Subtract.vue
@@ -229,7 +229,13 @@
const computedNet = safeNet > 0 ? safeNet : 0;
const maxNet = ledgerNetWeight.value;
if (Number.isFinite(maxNet) && maxNet > 0 && computedNet > maxNet) {
- formState.value.netWeight = Number(maxNet.toFixed(2));
+ const cappedNet = Number(maxNet.toFixed(2));
+ formState.value.netWeight = cappedNet;
+ // 鍚屾姣涢噸锛屼繚鎸侊細鍑�閲� = 姣涢噸 - 鐨噸
+ const tare = Number(tareWeight);
+ if (Number.isFinite(tare)) {
+ formState.value.grossWeight = Number((tare + cappedNet).toFixed(2));
+ }
proxy?.$modal?.msgWarning?.(`棰嗙敤鍑�閲嶄笉鑳借秴杩囧彴璐﹀噣閲嶏紙${maxNet.toFixed(2)} 鍚級`);
return;
}
diff --git a/src/views/qualityManagement/InspectItem/index.vue b/src/views/qualityManagement/InspectItem/index.vue
index faeb847..93d62cc 100644
--- a/src/views/qualityManagement/InspectItem/index.vue
+++ b/src/views/qualityManagement/InspectItem/index.vue
@@ -9,7 +9,6 @@
placeholder="璇疯緭鍏ユ娴嬮」鐩悕绉�"
clearable
:prefix-icon="Search"
- @change="handleQuery"
@clear="handleQuery"
/>
<el-button type="primary" style="margin-left: 10px" @click="handleQuery">鎼滅储</el-button>
diff --git a/src/views/qualityManagement/nonconformingManagement/index.vue b/src/views/qualityManagement/nonconformingManagement/index.vue
index 630148b..ba6c7a1 100644
--- a/src/views/qualityManagement/nonconformingManagement/index.vue
+++ b/src/views/qualityManagement/nonconformingManagement/index.vue
@@ -4,19 +4,19 @@
<div style="display: flex;flex-direction: row;align-items: center;">
<div>
<span class="search_title">绫诲瀷锛�</span>
- <el-select v-model="searchForm.inspectType" clearable style="width: 200px" @change="handleQuery">
+ <el-select v-model="searchForm.checkType" clearable style="width: 200px" @change="handleQuery">
<el-option label="鍏ュ巶妫�" :value="0" />
<el-option label="杞﹂棿妫�" :value="1" />
<el-option label="鍑哄巶妫�" :value="2" />
</el-select>
</div>
- <div style="margin-left: 10px">
+ <!-- <div style="margin-left: 10px">
<span class="search_title">鐘舵�侊細</span>
<el-select v-model="searchForm.inspectState" clearable style="width: 200px" @change="handleQuery">
<el-option label="寰呭鐞�" :value="0" />
<el-option label="宸插鐞�" :value="1" />
</el-select>
- </div>
+ </div> -->
<div style="margin-left: 10px">
<span class="search_title">浜у搧鍚嶇О锛�</span>
<el-input
@@ -69,7 +69,7 @@
const data = reactive({
searchForm: {
- inspectType: "",
+ checkType: "",
inspectState: "",
productName: "",
entryDate: undefined, // 褰曞叆鏃ユ湡
diff --git a/src/views/safeProduction/safeQualifications/index.vue b/src/views/safeProduction/safeQualifications/index.vue
index e61a39c..1d067d9 100644
--- a/src/views/safeProduction/safeQualifications/index.vue
+++ b/src/views/safeProduction/safeQualifications/index.vue
@@ -408,7 +408,9 @@
executionDate: "",
};
} else {
- form.value = row;
+ // 鍏抽敭锛氱紪杈戞椂涓嶈鐩存帴寮曠敤琛ㄦ牸琛屽璞★紝閬垮厤鍙栨秷/閲嶇疆鏃舵妸鍒楄〃鏁版嵁涓�璧锋竻绌�
+ // 浣跨敤娣辨嫹璐濇柇寮�寮曠敤鍏崇郴
+ form.value = JSON.parse(JSON.stringify(row || {}));
}
dialogFormVisible.value = true;
};
@@ -453,6 +455,7 @@
// 鍏抽棴寮规
const closeDia = () => {
proxy.resetForm("formRef");
+ form.value = {};
dialogFormVisible.value = false;
};
// 鍏抽棴浜у搧寮规
@@ -724,9 +727,9 @@
background-color: #fef0f0 !important;
}
- :deep(.warning-row td) {
- // color: #cf1322 !important;
- }
+ /* :deep(.warning-row td) {
+ color: #cf1322 !important;
+ } */
.actions {
display: flex;
diff --git a/vite.config.js b/vite.config.js
index dc687a8..9a1a484 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -7,16 +7,16 @@
const env = loadEnv(mode, process.cwd());
const { VITE_APP_ENV } = env;
const baseUrl =
- env.VITE_APP_ENV === "development"
- ? "http://1.15.17.182:9003"
- : env.VITE_BASE_API;
+ env.VITE_APP_ENV === "development"
+ ? "http://1.15.17.182:9011"
+ : env.VITE_BASE_API;
const javaUrl =
- env.VITE_APP_ENV === "development"
- ? "http://1.15.17.182:9002"
- : env.VITE_JAVA_API;
+ env.VITE_APP_ENV === "development"
+ ? "http://1.15.17.182:9010"
+ : env.VITE_JAVA_API;
return {
- define:{
- __BASE_API__: JSON.stringify(javaUrl)
+ define: {
+ __BASE_API__: JSON.stringify(javaUrl),
},
// 閮ㄧ讲鐢熶骇鐜鍜屽紑鍙戠幆澧冧笅鐨刄RL銆�
// 榛樿鎯呭喌涓嬶紝vite 浼氬亣璁句綘鐨勫簲鐢ㄦ槸琚儴缃插湪涓�涓煙鍚嶇殑鏍硅矾寰勪笂
--
Gitblit v1.9.3