From fe6ce692ca0461a417236d47f972bfdc288383f1 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 25 六月 2025 09:29:39 +0800
Subject: [PATCH] 1.库存管理审核，合并表单修改
---
src/views/warehouseManagement/index.vue | 58 ++++++++++++++++++++++++++++++++++++++++++++++++----------
src/views/inspectionUpload/index.vue | 2 +-
2 files changed, 49 insertions(+), 11 deletions(-)
diff --git a/src/views/inspectionUpload/index.vue b/src/views/inspectionUpload/index.vue
index aacdf00..85e92a9 100644
--- a/src/views/inspectionUpload/index.vue
+++ b/src/views/inspectionUpload/index.vue
@@ -54,7 +54,7 @@
</div>
</div>
<div>
- <el-table ref="table" :data="tableData" height="480" v-loading="tableLoading" v-if="activeTab !== 'qrCode'" border style="width: 100%;height: calc(100vh - 23em)">
+ <el-table ref="table" :data="tableData" height="480" v-loading="tableLoading" v-if="activeTab !== 'qrCode'" border style="width: 100%;height: calc(100vh - 20em)">
<el-table-column label="搴忓彿" type="index" width="60" align="center" />
<el-table-column prop="taskName" label="宸℃浠诲姟鍚嶇О" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="port" label="鍦扮偣" :show-overflow-tooltip="true"></el-table-column>
diff --git a/src/views/warehouseManagement/index.vue b/src/views/warehouseManagement/index.vue
index 0996680..a9016ea 100644
--- a/src/views/warehouseManagement/index.vue
+++ b/src/views/warehouseManagement/index.vue
@@ -82,13 +82,17 @@
<el-form :model="form" :rules="rules" ref="formRef" label-width="180px">
<el-row>
<el-col :span="12">
- <el-form-item label="渚涜揣鍟嗗悕绉�" prop="supplierName">
- <el-input v-model="form.supplierName" placeholder="璇疯緭鍏ヤ緵璐у晢鍚嶇О" maxlength="30" />
+ <el-form-item label="渚涘簲鍟嗗悕绉�" prop="supplierId">
+ <el-select v-model="form.supplierId" placeholder="璇烽�夋嫨渚涘簲鍟�">
+ <el-option :label="item.label" v-for="item in supplyList" :key="item.value" :value="item.value"/>
+ </el-select>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鐓ょ" prop="coal">
- <el-input v-model="form.coal" placeholder="璇疯緭鍏ョ叅绉�" maxlength="30" />
+ <el-form-item label="鐓ょ" prop="coalId">
+ <el-select v-model="form.coalId" placeholder="璇烽�夋嫨鐓ょ">
+ <el-option :label="item.label" v-for="item in coalList" :key="item.value" :value="item.value"/>
+ </el-select>
</el-form-item>
</el-col>
</el-row>
@@ -163,13 +167,17 @@
<el-form :model="mergeForm" :rules="mergeRules" ref="mergeRef" label-width="100px">
<el-row>
<el-col :span="12">
- <el-form-item label="渚涜揣鍟嗗悕绉�" prop="supplierName">
- <el-input v-model="mergeForm.supplierName" placeholder="璇疯緭鍏ヤ緵璐у晢鍚嶇О" maxlength="30" />
+ <el-form-item label="渚涘簲鍟嗗悕绉�" prop="supplierId">
+ <el-select v-model="mergeForm.supplierId" placeholder="璇烽�夋嫨渚涘簲鍟�">
+ <el-option :label="item.label" v-for="item in supplyList" :key="item.value" :value="item.value"/>
+ </el-select>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鐓ょ" prop="coal">
- <el-input v-model="mergeForm.coal" placeholder="璇疯緭鍏ョ叅绉�" maxlength="30" />
+ <el-form-item label="鐓ょ" prop="coalId">
+ <el-select v-model="mergeForm.coalId" placeholder="璇烽�夋嫨鐓ょ">
+ <el-option :label="item.label" v-for="item in coalList" :key="item.value" :value="item.value"/>
+ </el-select>
</el-form-item>
</el-col>
</el-row>
@@ -239,6 +247,8 @@
pendingInventoryList
} from "@/api/warehouseManagement/index.js";
import {editOfficial, merge} from "../../api/warehouseManagement/index.js";
+import {getSupplyList} from "@/api/procureMent/index.js";
+import {getCoalInfoList} from "@/api/production/index.js";
const { proxy } = getCurrentInstance()
@@ -273,8 +283,8 @@
pId: '',
},
mergeForm: {
- supplierName: '',
- coal: '',
+ supplierId: '',
+ coalId: '',
unit: '',
inventoryQuantity: '',
priceIncludingTax: '',
@@ -313,6 +323,33 @@
coal: "",
})
const columnTitle = ref([])
+const supplyList = ref([]);
+const coalList = ref([]);
+
+// 鑾峰彇渚涘簲鍟嗕笅鎷夊拰鐓ょ涓嬫媺
+const getDropdownData = async () => {
+ try {
+ const [supplyRes, coalRes] = await Promise.all([
+ getSupplyList(),
+ getCoalInfoList(),
+ ]);
+ let supplyData = supplyRes.data;
+ let coalData = coalRes.data;
+ supplyList.value = supplyData.map((item) => ({
+ value: item.id,
+ label: item.supplierName,
+ }));
+ coalList.value = coalData.map((item) => ({
+ value: item.id,
+ label: item.coal,
+ }));
+ } catch (error) {
+ ElMessage.error("鑾峰彇涓嬫媺鏁版嵁澶辫触锛岃绋嶅悗閲嶈瘯");
+ }
+};
+defineExpose({
+ getDropdownData,
+});
onMounted(() => {
handleTabClick({ props: { name: "pendingInbound" } });
});
@@ -386,6 +423,7 @@
form.value = {...row}
form.value.pId = row.id
inventoryQuantity.value = row.inventoryQuantity
+ getDropdownData()
coalPlanListOptions()
}
// 鏌ヨ鐓よ川鏂规涓嬫媺妗�
--
Gitblit v1.9.3