From 1cf342fa23a6c34bd9dd1ff4e416cd255c044fdd Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期四, 02 四月 2026 11:41:17 +0800
Subject: [PATCH] Merge branch 'dev_银川_中盛建材' of http://114.132.189.42:9002/r/product-inventory-management into dev_银川_中盛建材
---
src/views/productionManagement/productStructure/Detail/index.vue | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/src/views/productionManagement/productStructure/Detail/index.vue b/src/views/productionManagement/productStructure/Detail/index.vue
index 2ed9507..8fb474f 100644
--- a/src/views/productionManagement/productStructure/Detail/index.vue
+++ b/src/views/productionManagement/productStructure/Detail/index.vue
@@ -42,7 +42,6 @@
style="margin: 0">
<el-select v-model="row.model"
placeholder="璇烽�夋嫨瑙勬牸"
- clearable
:disabled="!dataValue.isEdit"
style="width: 100%"
@visible-change="(v) => { if (v) openDialog(row.tempId) }">
@@ -81,7 +80,6 @@
style="margin: 0">
<el-input-number v-model="row.unitQuantity"
:min="0"
- :precision="2"
:step="1"
controls-position="right"
style="width: 100%"
@@ -116,6 +114,21 @@
placeholder="璇疯緭鍏ュ崟浣�"
clearable
:disabled="!dataValue.isEdit" />
+ </el-form-item>
+ </template>
+ </el-table-column>
+ <el-table-column prop="unitPrice"
+ label="鍗曚环">
+ <template #default="{ row, $index }">
+ <el-form-item v-if="dataValue.isEdit"
+ :rules="[{ required: true, message: '璇疯緭鍏ュ崟浠�', trigger: ['blur','change'] }]"
+ style="margin: 0">
+ <el-input-number v-model="row.unitPrice"
+ :min="0"
+ :step="1"
+ controls-position="right"
+ style="width: 100%"
+ :disabled="!dataValue.isEdit" />
</el-form-item>
</template>
</el-table-column>
@@ -261,7 +274,7 @@
};
const fetchProcessOptions = async () => {
- const { data } = await list();
+ const { data } = await list({ dateType: 1 });
dataValue.processOptions = data as any;
};
@@ -343,6 +356,11 @@
}
if (!item.unitQuantity) {
ElMessage.error("璇疯緭鍏ュ崟浣嶄骇鍑烘墍闇�鏁伴噺");
+ isValid = false;
+ return;
+ }
+ if (!item.unitPrice) {
+ ElMessage.error("璇疯緭鍏ュ崟浠�");
isValid = false;
return;
}
@@ -441,6 +459,7 @@
processId: "",
processName: "",
unitQuantity: 0,
+ unitPrice: 0,
demandedQuantity: 0,
unit: "",
children: [],
@@ -463,6 +482,7 @@
processId: "",
processName: "",
unitQuantity: 0,
+ unitPrice: 0,
demandedQuantity: 0,
unit: "",
children: [],
@@ -489,6 +509,7 @@
productModelId: undefined,
processId: "",
unitQuantity: 0,
+ unitPrice: 0,
demandedQuantity: 0,
children: [],
unit: "",
--
Gitblit v1.9.3