From a563ea879ef5fb6897e76d2df661e465dce2ab9b Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 01 六月 2026 15:02:27 +0800
Subject: [PATCH] Merge branch 'dev_新疆_大罗素马铃薯new' of http://114.132.189.42:9002/r/product-inventory-management into dev_新疆_大罗素马铃薯new
---
src/views/officeProcessAutomation/ApproveManage/approve-list/index.vue | 47 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/src/views/officeProcessAutomation/ApproveManage/approve-list/index.vue b/src/views/officeProcessAutomation/ApproveManage/approve-list/index.vue
index bbfa56a..282bdc5 100644
--- a/src/views/officeProcessAutomation/ApproveManage/approve-list/index.vue
+++ b/src/views/officeProcessAutomation/ApproveManage/approve-list/index.vue
@@ -172,7 +172,7 @@
class="approve-detail-dialog"
>
<div class="approve-detail-body">
- <ApproveDetailPanel :row="detailRow" />
+ <ApproveDetailPanel :row="detailRow" :detail-data="detailData" />
<div class="detail-block">
<div class="detail-block-title">
瀹℃壒娴佺▼锛坽{ detailRow.tasks?.length || detailRow.flowNodes?.length || 0 }} 椤癸級
@@ -290,7 +290,7 @@
destroy-on-close
@closed="approveOpinion = ''"
>
- <ApproveDetailPanel :row="approveDialog.row" />
+ <ApproveDetailPanel :row="approveDialog.row" :detail-data="detailData" />
<div class="detail-block mt16">
<div class="detail-block-title">
瀹℃壒娴佺▼锛坽{ approveDialog.row?.tasks?.length || approveDialog.row?.flowNodes?.length || 0 }} 椤癸級
@@ -298,6 +298,20 @@
<InstanceFlowDisplay :tasks="approveDialog.row?.tasks" :nodes="approveDialog.row?.flowNodes" />
</div>
<el-form label-width="100px" class="mt16">
+ <el-form-item label="浠撳簱" v-if="isPurchaseApproval">
+ <el-select
+ v-model="approveDialog.warehouse"
+ placeholder="璇烽�夋嫨浠撳簱"
+ clearable
+ >
+ <el-option
+ v-for="item in warehouseOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ </el-form-item>
<el-form-item label="瀹℃壒鎰忚" required>
<el-input
v-model="approveOpinion"
@@ -335,7 +349,8 @@
<script setup>
import { Plus, RefreshRight } from "@element-plus/icons-vue";
import { ElMessage } from "element-plus";
-import { computed, onMounted, ref } from "vue";
+import { computed, onMounted, ref, reactive } from "vue";
+import { getDicts } from "@/api/system/dict/data";
import { APPROVAL_MODULE_KEYS } from "../approve-shared/approvalModuleRegistry.js";
import FinReimburseApprovePanel from "../../ReimburseManage/shared/components/FinReimburseApprovePanel.vue";
import ApprovalTemplateFormSection from "../approve-shared/components/ApprovalTemplateFormSection.vue";
@@ -369,6 +384,10 @@
tableColumn,
detailDialog,
detailRow,
+ detailData,
+ quotationLoading,
+ purchaseLoading,
+ deliveryLoading,
reimburseDialog,
approveDialog,
approveOpinion,
@@ -396,6 +415,25 @@
openDetail,
openApprove,
} = al;
+
+// 浠撳簱閫夐」
+const warehouseOptions = ref([]);
+
+// 鑾峰彇浠撳簱瀛楀吀鏁版嵁
+const loadWarehouseOptions = async () => {
+ const res = await getDicts("warehouse");
+ if (res.code === 200) {
+ warehouseOptions.value = res.data.map((item) => ({
+ label: item.dictLabel,
+ value: item.dictValue,
+ }));
+ }
+};
+
+// 鏄惁涓洪噰璐鎵�
+const isPurchaseApproval = computed(() => {
+ return Number(approveDialog.row?.businessType) === 5;
+});
const { flowUserOptions, loadFlowUsers } = useFlowUserOptions();
@@ -469,6 +507,7 @@
onMounted(() => {
loadFlowUsers();
loadSearchBusinessTypeOptions();
+ loadWarehouseOptions();
handleQuery();
});
</script>
@@ -610,4 +649,4 @@
border-left: 3px solid var(--el-color-primary);
line-height: 1.4;
}
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.9.3