From feaeb3e3ac6d9e7606fce5e3ae80de3cca9c846f Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 20 五月 2026 09:30:54 +0800
Subject: [PATCH] feat:1.库存成品展示电压，工序类别 2.销售页面调整
---
src/views/inventoryManagement/stockManagement/New.vue | 109 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 99 insertions(+), 10 deletions(-)
diff --git a/src/views/inventoryManagement/stockManagement/New.vue b/src/views/inventoryManagement/stockManagement/New.vue
index 1f86fd6..940b734 100644
--- a/src/views/inventoryManagement/stockManagement/New.vue
+++ b/src/views/inventoryManagement/stockManagement/New.vue
@@ -31,10 +31,75 @@
</el-form-item>
<el-form-item
+ label="鏂欏彿"
+ prop="materialCode"
+ >
+ <el-input v-model="formState.materialCode" disabled />
+ </el-form-item>
+
+ <el-form-item
label="鍗曚綅"
prop="unit"
>
<el-input v-model="formState.unit" disabled />
+ </el-form-item>
+
+ <el-form-item
+ v-if="props.isFinishedProduct"
+ label="宸ュ簭绫诲埆"
+ prop="processCategory"
+ :rules="[
+ {
+ required: true,
+ message: '璇烽�夋嫨宸ュ簭绫诲埆',
+ trigger: 'change',
+ }
+ ]"
+ >
+ <el-select v-model="formState.processCategory" placeholder="璇烽�夋嫨宸ュ簭绫诲埆" clearable>
+ <el-option label="閾滄瀬" value="閾滄瀬" />
+ <el-option label="閾舵瀬" value="閾舵瀬" />
+ </el-select>
+ </el-form-item>
+
+ <el-form-item
+ v-if="props.isFinishedProduct"
+ label="鐢靛帇"
+ prop="voltage"
+ :rules="[
+ {
+ required: true,
+ message: '璇疯緭鍏ョ數鍘�',
+ trigger: 'blur',
+ }
+ ]"
+ >
+ <el-input v-model="formState.voltage" clearable placeholder="璇疯緭鍏ョ數鍘�" />
+ </el-form-item>
+
+ <el-form-item
+ label="搴撳瓨绫诲瀷"
+ prop="type"
+ :rules="[
+ {
+ required: true,
+ message: '璇烽�夋嫨搴撳瓨绫诲瀷',
+ trigger: 'change',
+ }
+ ]"
+ >
+ <el-select v-model="formState.type" placeholder="璇烽�夋嫨搴撳瓨绫诲瀷">
+ <el-option label="鍚堟牸搴撳瓨" value="qualified" />
+ <el-option label="涓嶅悎鏍煎簱瀛�" value="unqualified" />
+ </el-select>
+ </el-form-item>
+
+ <el-form-item label="鎵瑰彿" prop="batchNo">
+ <el-input
+ v-model="formState.batchNo"
+ clearable
+ placeholder="鍙緭鍏ユ壒鍙凤紝鐣欑┖灏嗚嚜鍔ㄧ敓鎴�"
+ />
</el-form-item>
<el-form-item
@@ -45,7 +110,7 @@
</el-form-item>
<el-form-item
- v-if="type === 'qualified'"
+ v-if="formState.type === 'qualified'"
label="搴撳瓨棰勮鏁伴噺"
prop="warnNum"
>
@@ -84,12 +149,14 @@
type: Boolean,
required: true,
},
-
- type: {
- type: String,
- required: true,
- default: 'qualified',
+ topProductParentId: {
+ type: Number,
+ default: 0,
},
+ isFinishedProduct: {
+ type: Boolean,
+ default: false,
+ }
});
const emit = defineEmits(['update:visible', 'completed']);
@@ -100,7 +167,12 @@
productModelId: undefined,
productName: "",
productModelName: "",
+ materialCode: "",
unit: "",
+ processCategory: "",
+ voltage: "",
+ batchNo: "",
+ type: undefined,
qualitity: 0,
warnNum: 0,
remark: '',
@@ -126,7 +198,15 @@
productModelId: undefined,
productName: "",
productModelName: "",
- description: '',
+ materialCode: "",
+ unit: "",
+ processCategory: "",
+ voltage: "",
+ batchNo: "",
+ type: undefined,
+ qualitity: 0,
+ warnNum: 0,
+ remark: "",
};
isShow.value = false;
};
@@ -140,6 +220,7 @@
formState.value.productModelName = product.model;
formState.value.productModelId = product.id;
formState.value.unit = product.unit;
+ formState.value.materialCode = product.materialCode;
showProductSelectDialog.value = false;
// 瑙﹀彂琛ㄥ崟楠岃瘉鏇存柊
proxy.$refs["formRef"]?.validateField('productModelId');
@@ -158,8 +239,16 @@
proxy.$modal.msgError("璇烽�夋嫨瑙勬牸");
return;
}
- if (props.type === 'qualified') {
- createStockInventory(formState.value).then(res => {
+ const payload = { ...formState.value };
+ const bn = (payload.batchNo || "").trim();
+ payload.batchNo = bn;
+ payload.voltage = (payload.voltage || "").trim();
+ if (!props.isFinishedProduct) {
+ delete payload.processCategory;
+ delete payload.voltage;
+ }
+ if (payload.type === 'qualified') {
+ createStockInventory(payload).then(res => {
// 鍏抽棴妯℃�佹
isShow.value = false;
// 鍛婄煡鐖剁粍浠跺凡瀹屾垚
@@ -167,7 +256,7 @@
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
})
} else {
- createStockUnInventory(formState.value).then(res => {
+ createStockUnInventory(payload).then(res => {
// 鍏抽棴妯℃�佹
isShow.value = false;
// 鍛婄煡鐖剁粍浠跺凡瀹屾垚
--
Gitblit v1.9.3