From 736a4b462e06a3335cb8235c0211bc8f5547bfd6 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 12 七月 2025 14:47:59 +0800
Subject: [PATCH] 1.来票台账删除功能联调
---
src/views/collaborativeApproval/approvalProcess/index.vue | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/src/views/collaborativeApproval/approvalProcess/index.vue b/src/views/collaborativeApproval/approvalProcess/index.vue
index ab98ab8..c2b4fc8 100644
--- a/src/views/collaborativeApproval/approvalProcess/index.vue
+++ b/src/views/collaborativeApproval/approvalProcess/index.vue
@@ -2,11 +2,11 @@
<div class="app-container">
<div class="search_form">
<div>
- <span class="search_title">渚涘簲鍟嗭細</span>
+ <span class="search_title">娴佺▼缂栧彿锛�</span>
<el-input
- v-model="searchForm.supplier"
+ v-model="searchForm.approveId"
style="width: 240px"
- placeholder="璇疯緭鍏ヤ緵搴斿晢鎼滅储"
+ placeholder="璇疯緭鍏ユ祦绋嬬紪鍙锋悳绱�"
@change="handleQuery"
clearable
:prefix-icon="Search"
@@ -43,14 +43,16 @@
import { Search } from "@element-plus/icons-vue";
import {onMounted, ref} from "vue";
import {ElMessageBox} from "element-plus";
-import {qualityInspectDel, qualityInspectListPage} from "@/api/qualityManagement/rawMaterialInspection.js";
import InfoFormDia from "@/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue";
import ApprovalDia from "@/views/collaborativeApproval/approvalProcess/components/approvalDia.vue";
-import {approveProcessDelete, approveProcessListPage} from "../../../api/collaborativeApproval/approvalProcess.js";
+import {approveProcessDelete, approveProcessListPage} from "@/api/collaborativeApproval/approvalProcess.js";
+import useUserStore from "@/store/modules/user";
+const userStore = useUserStore();
+
const data = reactive({
searchForm: {
- supplier: "",
+ approveId: "",
},
});
const { searchForm } = toRefs(data);
@@ -59,6 +61,7 @@
label: "瀹℃壒鐘舵��",
prop: "approveStatus",
dataType: "tag",
+ width: 100,
formatData: (params) => {
if (params == 0) {
return "寰呭鏍�";
@@ -85,23 +88,26 @@
{
label: "娴佺▼缂栧彿",
prop: "approveId",
- width: 230
+ width: 170
},
{
label: "鐢宠閮ㄩ棬",
prop: "approveDeptName",
+ width: 220
},
{
label: "瀹℃壒浜嬬敱",
prop: "approveReason",
+ width: 200
},
{
label: "鐢宠浜�",
- prop: "approveUser",
+ prop: "approveUserName",
},
{
label: "鐢宠鏃ユ湡",
prop: "approveTime",
+ width: 120
},
{
label: "缁撴潫鏃ユ湡",
@@ -110,7 +116,7 @@
},
{
label: "褰撳墠瀹℃壒浜�",
- prop: "checkCompany",
+ prop: "approveUserCurrentName",
width: 120
},
{
@@ -126,6 +132,7 @@
clickFun: (row) => {
openForm("edit", row);
},
+ disabled: (row) => row.approveStatus == 2 || row.approveStatus == 1
},
{
name: "瀹℃牳",
@@ -133,6 +140,7 @@
clickFun: (row) => {
openApprovalDia("approval", row);
},
+ disabled: (row) => row.approveUserCurrentId == null || row.approveStatus == 2 || row.approveStatus == 3 || row.approveUserCurrentId !== userStore.id
},
{
name: "璇︽儏",
@@ -199,7 +207,7 @@
const handleDelete = () => {
let ids = [];
if (selectedRows.value.length > 0) {
- ids = selectedRows.value.map((item) => item.id);
+ ids = selectedRows.value.map((item) => item.approveId);
} else {
proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
return;
--
Gitblit v1.9.3