From b9b69ab04e9f10550c57d31e5017e482c7c96c39 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期一, 23 三月 2026 10:21:21 +0800
Subject: [PATCH] fix: 修改3.22客户提出的修改需求
---
src/views/index.vue | 6
src/views/qualityManagement/rawMaterial/components/formDia.vue | 10 ++
src/views/consumablesLogistics/stockManagement/Qualified.vue | 6 -
vite.config.js | 2
src/views/consumablesLogistics/stockManagement/New.vue | 118 +++++-----------------------
src/views/consumablesLogistics/receiptManagement/Record.vue | 29 +------
src/views/consumablesLogistics/dispatchLog/Record.vue | 23 +----
7 files changed, 47 insertions(+), 147 deletions(-)
diff --git a/src/views/consumablesLogistics/dispatchLog/Record.vue b/src/views/consumablesLogistics/dispatchLog/Record.vue
index 8e9a94d..a67fa90 100644
--- a/src/views/consumablesLogistics/dispatchLog/Record.vue
+++ b/src/views/consumablesLogistics/dispatchLog/Record.vue
@@ -72,13 +72,13 @@
show-overflow-tooltip
/>
<el-table-column
- label="鍑哄簱鏁伴噺"
- prop="stockOutNum"
+ label="鏁伴噺"
+ prop="qualitity"
show-overflow-tooltip
/>
<el-table-column
- label="鍑�閲�(鍚�)"
- prop="netWeight"
+ label="閲囪喘鍛�"
+ prop="purchaser"
show-overflow-tooltip
/>
<el-table-column
@@ -93,20 +93,7 @@
{{ getRecordType(scope.row.recordType) }}
</template>
</el-table-column> -->
- <el-table-column
- label="杞︾墝"
- prop="licensePlateNo"
- show-overflow-tooltip
- />
- <el-table-column label="鎿嶄綔"
- width="120"
- align="center">
- <template #default="scope">
- <el-button type="primary"
- size="mini"
- @click="handlePreview(scope.row)">瀵煎嚭杩囩鍗�</el-button>
- </template>
- </el-table-column>
+ <!-- 涓嶅啀灞曠ず杩囩鐩稿叧瀛楁涓庡鍑烘搷浣� -->
</el-table>
<pagination
v-show="total > 0"
diff --git a/src/views/consumablesLogistics/receiptManagement/Record.vue b/src/views/consumablesLogistics/receiptManagement/Record.vue
index 6161e67..8c5819f 100644
--- a/src/views/consumablesLogistics/receiptManagement/Record.vue
+++ b/src/views/consumablesLogistics/receiptManagement/Record.vue
@@ -70,24 +70,11 @@
<el-table-column label="鍗曚綅"
prop="unit"
show-overflow-tooltip/>
- <el-table-column label="鍏ュ簱鏁伴噺"
- prop="stockInNum"
+ <el-table-column label="鏁伴噺"
+ prop="qualitity"
show-overflow-tooltip/>
- <el-table-column label="杞︾墝鍙�"
- prop="licensePlateNo"
- v-if="type === '0'"
- show-overflow-tooltip/>
- <el-table-column label="姣涢噸(鍚�)"
- prop="grossWeight"
- v-if="type === '0'"
- show-overflow-tooltip/>
- <el-table-column label="鐨噸(鍚�)"
- prop="tareWeight"
- v-if="type === '0'"
- show-overflow-tooltip/>
- <el-table-column label="鍑�閲�(鍚�)"
- prop="netWeight"
- v-if="type === '0'"
+ <el-table-column label="閲囪喘鍛�"
+ prop="purchaser"
show-overflow-tooltip/>
<el-table-column label="鍏ュ簱浜�"
prop="createBy"
@@ -99,14 +86,6 @@
{{ getRecordType(scope.row.recordType) }}
</template>
</el-table-column> -->
- <el-table-column label="杩囩鏃ユ湡"
- prop="weighingDate"
- v-if="type === '0'"
- show-overflow-tooltip/>
- <el-table-column label="杩囩鍛�"
- prop="weighingOperator"
- v-if="type === '0'"
- show-overflow-tooltip/>
<el-table-column label="鎿嶄綔"
width="120"
align="center">
diff --git a/src/views/consumablesLogistics/stockManagement/New.vue b/src/views/consumablesLogistics/stockManagement/New.vue
index 1b3b975..2d3d7a6 100644
--- a/src/views/consumablesLogistics/stockManagement/New.vue
+++ b/src/views/consumablesLogistics/stockManagement/New.vue
@@ -37,85 +37,30 @@
<el-input v-model="formState.unit" disabled />
</el-form-item>
- <!-- productType === 0锛氬師鏉愭枡 -->
<el-form-item
- v-if="type === 'qualified' && formState.productType === 0"
- label="杞︾墝鍙�"
- prop="licensePlateNo"
- :rules="[{ required: true, message: '璇疯緭鍏ヨ溅鐗屽彿', trigger: ['blur','change'] }]"
- >
- <el-input v-model="formState.licensePlateNo" />
- </el-form-item>
-
- <el-form-item
- v-if="type === 'qualified' && formState.productType === 0"
- label="姣涢噸(鍚�)"
- prop="grossWeight"
- :rules="[{ required: true, message: '璇疯緭鍏ユ瘺閲�', trigger: ['blur','change'] }]"
+ v-if="type === 'qualified'"
+ label="鏁伴噺"
+ prop="qualitity"
+ :rules="[{ required: true, message: '璇疯緭鍏ユ暟閲�', trigger: ['blur', 'change'] }]"
>
<el-input-number
- v-model="formState.grossWeight"
- :step="0.01"
+ v-model="formState.qualitity"
:min="0"
+ :step="1"
+ :precision="0"
style="width: 100%"
- @change="computeNetWeight"
+ controls-position="right"
+ placeholder="璇疯緭鍏ユ暟閲�"
/>
</el-form-item>
<el-form-item
- v-if="type === 'qualified' && formState.productType === 0"
- label="鐨噸(鍚�)"
- prop="tareWeight"
- :rules="[{ required: true, message: '璇疯緭鍏ョ毊閲�', trigger: ['blur','change'] }]"
+ v-if="type === 'qualified'"
+ label="閲囪喘鍛�"
+ prop="purchaser"
+ :rules="[{ required: true, message: '璇疯緭鍏ラ噰璐憳', trigger: ['blur', 'change'] }]"
>
- <el-input-number
- v-model="formState.tareWeight"
- :step="0.01"
- :min="0"
- style="width: 100%"
- @change="computeNetWeight"
- />
- </el-form-item>
-
- <el-form-item
- v-if="type === 'qualified' && formState.productType === 0"
- label="鍑�閲�(鍚�)"
- prop="netWeight"
- :rules="[{ required: true, message: '璇峰厛杈撳叆姣涢噸鍜岀毊閲嶈嚜鍔ㄨ绠楀噣閲�', trigger: ['blur','change'] }]"
- >
- <el-input-number
- v-model="formState.netWeight"
- :step="0.01"
- :min="0"
- style="width: 100%"
- disabled
- />
- </el-form-item>
-
- <el-form-item
- v-if="type === 'qualified' && formState.productType === 0"
- label="杩囩鏃ユ湡"
- prop="weighingDate"
- :rules="[{ required: true, message: '璇烽�夋嫨杩囩鏃ユ湡', trigger: 'change' }]"
- >
- <el-date-picker
- style="width: 100%"
- v-model="formState.weighingDate"
- value-format="YYYY-MM-DD HH:mm:ss"
- format="YYYY-MM-DD HH:mm:ss"
- type="datetime"
- placeholder="璇烽�夋嫨杩囩鏃ユ湡"
- clearable
- />
- </el-form-item>
-
- <el-form-item
- v-if="type === 'qualified' && formState.productType === 0"
- label="杩囩鍛�"
- prop="weighingOperator"
- :rules="[{ required: true, message: '璇疯緭鍏ヨ繃纾呭憳', trigger: ['blur','change'] }]"
- >
- <el-input v-model="formState.weighingOperator" />
+ <el-input v-model="formState.purchaser" placeholder="璇疯緭鍏ラ噰璐憳" />
</el-form-item>
<el-form-item label="澶囨敞" prop="remark">
@@ -169,13 +114,8 @@
productModelName: "",
unit: "",
productType: undefined,
- // 杩囩鐩稿叧瀛楁锛堜粎鍘熸潗鏂欏悎鏍煎搧浣跨敤锛�
- licensePlateNo: "",
- grossWeight: undefined,
- tareWeight: undefined,
- netWeight: undefined,
- weighingDate: undefined,
- weighingOperator: "",
+ qualitity: undefined,
+ purchaser: "",
remark: '',
});
@@ -193,23 +133,24 @@
let { proxy } = getCurrentInstance()
const closeModal = () => {
- // 閲嶇疆琛ㄥ崟鏁版嵁
formState.value = {
productId: undefined,
productModelId: undefined,
productName: "",
productModelName: "",
- description: '',
+ unit: "",
+ productType: undefined,
+ qualitity: undefined,
+ purchaser: "",
+ remark: '',
};
isShow.value = false;
};
// 浜у搧閫夋嫨澶勭悊
const handleProductSelect = async (products) => {
- formState.value.weighingDate = undefined;
- formState.value.grossWeight = undefined;
- formState.value.tareWeight = undefined;
- formState.value.netWeight = undefined;
+ formState.value.qualitity = undefined;
+ formState.value.purchaser = "";
if (products && products.length > 0) {
const product = products[0];
formState.value.productId = product.productId;
@@ -221,19 +162,6 @@
showProductSelectDialog.value = false;
// 瑙﹀彂琛ㄥ崟楠岃瘉鏇存柊
proxy.$refs["formRef"]?.validateField('productModelId');
- }
-};
-
-// 鍑�閲� = 姣涢噸 - 鐨噸
-const computeNetWeight = () => {
- const { grossWeight, tareWeight } = formState.value;
- if (grossWeight != null && tareWeight != null) {
- const net = Number(grossWeight) - Number(tareWeight);
- // 淇濈暀涓や綅灏忔暟锛屼笖涓嶄负璐�
- const safeNet = Number(net.toFixed(2));
- formState.value.netWeight = safeNet > 0 ? safeNet : 0;
- } else {
- formState.value.netWeight = undefined;
}
};
diff --git a/src/views/consumablesLogistics/stockManagement/Qualified.vue b/src/views/consumablesLogistics/stockManagement/Qualified.vue
index c559f02..9e8101b 100644
--- a/src/views/consumablesLogistics/stockManagement/Qualified.vue
+++ b/src/views/consumablesLogistics/stockManagement/Qualified.vue
@@ -27,10 +27,8 @@
<el-table-column label="浜у搧澶х被" prop="productName" show-overflow-tooltip />
<el-table-column label="瑙勬牸鍨嬪彿" prop="model" show-overflow-tooltip />
<el-table-column label="鍗曚綅" prop="unit" show-overflow-tooltip />
- <el-table-column label="搴撳瓨鏁伴噺" prop="qualitity" show-overflow-tooltip />
- <el-table-column label="鍐荤粨鏁伴噺" prop="lockedQuantity" show-overflow-tooltip />
- <!-- <el-table-column label="搴撳瓨棰勮鏁伴噺" prop="warnNum" show-overflow-tooltip /> -->
- <el-table-column label="鍑�閲�(鍚�)" prop="netWeight" show-overflow-tooltip />
+ <el-table-column label="鏁伴噺" prop="qualitity" show-overflow-tooltip />
+ <el-table-column label="閲囪喘鍛�" prop="purchaser" show-overflow-tooltip />
<el-table-column label="澶囨敞" prop="remark" show-overflow-tooltip />
<el-table-column label="鏈�杩戞洿鏂版椂闂�" prop="updateTime" show-overflow-tooltip />
<el-table-column fixed="right" label="鎿嶄綔" min-width="60" align="center">
diff --git a/src/views/index.vue b/src/views/index.vue
index 3ed8993..bbc8dd9 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -243,7 +243,7 @@
const barSeries1 = ref([
{
- name: '鍘熸潗鏂欎笉鍚堟牸鏁�',
+ name: '鍏ュ巶涓嶅悎鏍兼暟',
type: 'bar',
barGap: 0,
emphasis: {
@@ -252,7 +252,7 @@
data: []
},
{
- name: '杩囩▼涓嶅悎鏍兼暟',
+ name: '杞﹂棿涓嶅悎鏍兼暟',
type: 'bar',
emphasis: {
focus: 'series'
@@ -284,7 +284,7 @@
}
const barLegend = {
show: true,
- data: ['鍘熸潗鏂欎笉鍚堟牸鏁�', '杩囩▼涓嶅悎鏍兼暟', '鍑哄巶涓嶅悎鏍兼暟']
+ data: ['鍏ュ巶涓嶅悎鏍兼暟', '杞﹂棿涓嶅悎鏍兼暟', '鍑哄巶涓嶅悎鏍兼暟']
}
const barLegend1 = {
show: true,
diff --git a/src/views/qualityManagement/rawMaterial/components/formDia.vue b/src/views/qualityManagement/rawMaterial/components/formDia.vue
index 5b333af..7ba5225 100644
--- a/src/views/qualityManagement/rawMaterial/components/formDia.vue
+++ b/src/views/qualityManagement/rawMaterial/components/formDia.vue
@@ -203,6 +203,14 @@
const currentProductId = ref(0);
const modelOptions = ref([]);
+const getTodayStr = () => {
+ const now = new Date();
+ const y = now.getFullYear();
+ const m = String(now.getMonth() + 1).padStart(2, "0");
+ const d = String(now.getDate()).padStart(2, "0");
+ return `${y}-${m}-${d}`;
+};
+
// 鎵撳紑寮规
const openDialog = async (type, row) => {
operationType.value = type;
@@ -211,7 +219,7 @@
})
// 鍏堥噸缃〃鍗曟暟鎹紙淇濇寔瀛楁瀹屾暣锛岄伩鍏嶅脊绐楅娆℃覆鏌撴椂瑙﹀彂蹇呭～绾㈡鈥滈棯涓�涓嬧�濓級
form.value = {
- checkTime: "",
+ checkTime: getTodayStr(),
supplier: "",
productName: "",
productId: "",
diff --git a/vite.config.js b/vite.config.js
index 9a1a484..c9ada6d 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -51,7 +51,7 @@
},
// vite 鐩稿叧閰嶇疆
server: {
- port: 80,
+ port: 8001,
host: true,
open: true,
proxy: {
--
Gitblit v1.9.3