From f7165c61dd8a808132c09096f5a367565387f3e4 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 29 八月 2025 11:59:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_JLMY' into dev_JLMY
---
src/views/warehouseManagement/index.vue | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/src/views/warehouseManagement/index.vue b/src/views/warehouseManagement/index.vue
index 02d226f..1f4bcba 100644
--- a/src/views/warehouseManagement/index.vue
+++ b/src/views/warehouseManagement/index.vue
@@ -68,6 +68,7 @@
style="width: 100%; height: calc(100vh - 30em)"
show-summary
:summary-method="summarizeChildrenTable"
+ :row-class-name="tableRowClassName"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column
@@ -77,11 +78,21 @@
align="center"
/>
<el-table-column
+ prop="code"
+ label="缂栧彿"
+ width="180"
+ />
+ <el-table-column
prop="supplierName"
label="渚涜揣鍟嗗悕绉�"
width="180"
sortable
/>
+ <el-table-column prop="type" label="鐓ゆ枡绫诲瀷">
+ <template #default="scope">
+ {{scope.row.type == 1 ? '鎴愬搧' : '鍘熸枡'}}
+ </template>
+ </el-table-column>
<el-table-column prop="coal" label="鐓ょ" sortable />
<el-table-column prop="unit" label="鍗曚綅" width="70" />
<el-table-column
@@ -440,6 +451,22 @@
</el-select>
</el-form-item>
</el-col>
+ <el-col :span="12">
+ <el-form-item label="鐓ゆ枡绫诲瀷" prop="type">
+ <el-select
+ v-model="mergeForm.type"
+ placeholder="璇烽�夋嫨鐓ゆ枡绫诲瀷"
+ :disabled="operationType === 'view'"
+ >
+ <el-option
+ :label="item.label"
+ v-for="item in typeList"
+ :key="item.value"
+ :value="item.value"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
</el-row>
<el-divider></el-divider>
<el-row>
@@ -499,6 +526,16 @@
// 鍚堝苟寮规
const mergeVisible = ref(false);
const operationType = ref("");
+const typeList = ref([
+ {
+ label: "鎴愬搧",
+ value: 1,
+ },
+ {
+ label: "鍘熸枡",
+ value: 2,
+ },
+]);
const data = reactive({
form: {
supplierName: "",
@@ -724,6 +761,7 @@
"鏁版嵁锛�"
)
.then((res) => {
+ console.log(res);
if (res) {
ElMessage.success("姝ｅ湪瀵煎嚭鏁版嵁锛岃绋嶅��...");
exportData(config.api, config.name);
@@ -742,9 +780,9 @@
const mergeRows = (type, row) => {
getDropdownData();
coalPlanListOptions();
- if (type === "edit") {
+ if (type === "edit" || type === "view") {
mergeVisible.value = true;
- }
+ }
operationType.value = type;
if (type !== "merge") {
mergeForm.value = { ...row };
@@ -860,6 +898,14 @@
}
});
};
+
+// 娣诲姞鍒ゆ柇琛岀被鍚嶇殑鍑芥暟
+const tableRowClassName = (row) => {
+ if (activeTab.value === 'officialInventory' && row.row.inventoryQuantity < 3) {
+ return 'low-inventory-row';
+ }
+ return '';
+};
// 鍏抽棴瀹℃牳寮规
const cancelReview = () => {
proxy.$refs.formRef.resetFields();
@@ -871,4 +917,8 @@
:deep(.el-table) {
margin: 20px 0;
}
+
+:deep(.low-inventory-row) {
+ background-color: #ffcccc;
+}
</style>
--
Gitblit v1.9.3