From 3145a4847f8dbd378c932e9bacb0376fd3fe1e54 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 03 四月 2026 11:10:06 +0800
Subject: [PATCH] 军泰伟业 1.部署修改
---
src/views/collaborativeApproval/approvalProcess/index.vue | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/views/collaborativeApproval/approvalProcess/index.vue b/src/views/collaborativeApproval/approvalProcess/index.vue
index bd281dd..75044f3 100644
--- a/src/views/collaborativeApproval/approvalProcess/index.vue
+++ b/src/views/collaborativeApproval/approvalProcess/index.vue
@@ -6,7 +6,7 @@
<el-tab-pane label="璇峰亣绠＄悊" name="2"></el-tab-pane>
<el-tab-pane label="鍑哄樊绠＄悊" name="3"></el-tab-pane>
<el-tab-pane label="鎶ラ攢绠＄悊" name="4"></el-tab-pane>
- <el-tab-pane label="閲囪喘瀹℃壒" name="5"></el-tab-pane>
+ <el-tab-pane label="閲囪喘鍏ュ簱瀹℃壒" name="5"></el-tab-pane>
<el-tab-pane label="鎶ヤ环瀹℃壒" name="6"></el-tab-pane>
<el-tab-pane label="鍙戣揣瀹℃壒" name="7"></el-tab-pane>
</el-tabs>
@@ -45,7 +45,7 @@
type="danger"
plain
@click="handleDelete"
- v-if="currentApproveType !== 7"
+ v-if="currentApproveType !== 5 && currentApproveType !== 6 && currentApproveType !== 7"
>鍒犻櫎</el-button>
</div>
</div>
@@ -64,6 +64,7 @@
</div>
<info-form-dia ref="infoFormDia" @close="handleQuery" :approveType="currentApproveType"></info-form-dia>
<approval-dia ref="approvalDia" @close="handleQuery" :approveType="currentApproveType"></approval-dia>
+ <purchase-inbound-dia ref="purchaseInboundDia" @close="handleQuery" :approveType="currentApproveType"></purchase-inbound-dia>
<FileList ref="fileListRef" />
</div>
</template>
@@ -76,6 +77,7 @@
import { useRoute } from 'vue-router';
import InfoFormDia from "@/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue";
import ApprovalDia from "@/views/collaborativeApproval/approvalProcess/components/approvalDia.vue";
+import PurchaseInboundDia from "@/views/collaborativeApproval/approvalProcess/components/purchaseInboundDia.vue";
import {approveProcessDelete, approveProcessListPage} from "@/api/collaborativeApproval/approvalProcess.js";
import useUserStore from "@/store/modules/user";
@@ -231,6 +233,14 @@
},
disabled: (row) => row.approveUserCurrentId == null || row.approveStatus == 2 || row.approveStatus == 3 || row.approveStatus == 4 || row.approveUserCurrentId !== userStore.id
},
+ ...(isPurchaseType ? [{
+ name: "鍏ュ簱",
+ type: "text",
+ clickFun: (row) => {
+ openPurchaseInboundDia(row);
+ },
+ disabled: (row) => row.approveStatus != 2
+ }] : []),
{
name: "璇︽儏",
type: "text",
@@ -260,6 +270,7 @@
});
const infoFormDia = ref()
const approvalDia = ref()
+const purchaseInboundDia = ref()
const { proxy } = getCurrentInstance()
// 鏌ヨ鍒楄〃
@@ -333,6 +344,12 @@
})
};
+const openPurchaseInboundDia = (row) => {
+ nextTick(() => {
+ purchaseInboundDia.value?.openDialog('inbound', row)
+ })
+};
+
// 鍒犻櫎
const handleDelete = () => {
let ids = [];
--
Gitblit v1.9.3