From 5c30f301d6d4a5b8fc1183e06aaea8dc366d3540 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期五, 29 五月 2026 17:56:25 +0800
Subject: [PATCH] feat: 调整
---
src/views/salesManagement/deliveryLedger/index.vue | 5 ++
src/views/collaborativeApproval/shipmentReview/index.vue | 42 +++------------------
src/views/collaborativeApproval/approvalProcess/index.vue | 24 ++++++++++++
3 files changed, 35 insertions(+), 36 deletions(-)
diff --git a/src/views/collaborativeApproval/approvalProcess/index.vue b/src/views/collaborativeApproval/approvalProcess/index.vue
index 13523a0..cb2dfdf 100644
--- a/src/views/collaborativeApproval/approvalProcess/index.vue
+++ b/src/views/collaborativeApproval/approvalProcess/index.vue
@@ -22,6 +22,15 @@
clearable
:prefix-icon="Search"
/>
+ <span class="search_title ml10" v-if="currentApproveType === 7">閿�鍞崟鍙凤細</span>
+ <el-input
+ v-if="currentApproveType === 7"
+ v-model="searchForm.salesContractNo"
+ style="width: 240px"
+ placeholder="璇疯緭鍏ラ攢鍞崟鍙锋悳绱�"
+ @change="handleQuery"
+ clearable
+ />
<span class="search_title ml10">瀹℃壒鐘舵�侊細</span>
<el-select v-model="searchForm.approveStatus" clearable @change="handleQuery" style="width: 240px">
<el-option label="寰呭鏍�" :value="0" />
@@ -95,6 +104,7 @@
// 鍒囨崲鏍囩椤垫椂閲嶇疆鎼滅储鏉′欢鍜屽垎椤碉紝骞堕噸鏂板姞杞芥暟鎹�
searchForm.value.approveId = '';
searchForm.value.approveStatus = '';
+ searchForm.value.salesContractNo = '';
page.current = 1;
getList();
};
@@ -104,6 +114,7 @@
searchForm: {
approveId: "",
approveStatus: "",
+ salesContractNo: "",
},
});
const { searchForm } = toRefs(data);
@@ -170,6 +181,19 @@
}
];
+ // 鍙戣揣瀹℃壒鏄剧ず閿�鍞崟鍙峰垪
+ if (currentApproveType.value === 7) {
+ // 鍦ㄧ敵璇烽儴闂ㄥ悗闈㈡彃鍏ラ攢鍞崟鍙峰垪
+ const deptIndex = baseColumns.findIndex(col => col.prop === 'approveDeptName');
+ if (deptIndex !== -1) {
+ baseColumns.splice(deptIndex + 1, 0, {
+ label: "閿�鍞崟鍙�",
+ prop: "salesContractNo",
+ width: 170
+ });
+ }
+ }
+
// 閲戦鍒楋紙浠呮姤閿�绠＄悊鏄剧ず锛�
if (isReimburseType) {
baseColumns.push({
diff --git a/src/views/collaborativeApproval/shipmentReview/index.vue b/src/views/collaborativeApproval/shipmentReview/index.vue
index 38f6ea0..76791c6 100644
--- a/src/views/collaborativeApproval/shipmentReview/index.vue
+++ b/src/views/collaborativeApproval/shipmentReview/index.vue
@@ -73,7 +73,7 @@
const data = reactive({
searchForm: {
- approveId: "",
+ salesContractNo: "",
approveStatus: "",
},
});
@@ -108,6 +108,11 @@
return 'danger';
}
},
+ },
+ {
+ label: "鐢宠閮ㄩ棬",
+ prop: "approveDeptName",
+ width: 150
},
{
label: "閿�鍞崟鍙�",
@@ -145,11 +150,6 @@
width: 120,
},
{
- label: "鐢宠浜�",
- prop: "approveUserId",
- width: 120,
- },
- {
label: "鐢宠鏃ユ湡",
prop: "executionDate",
width: 200
@@ -182,36 +182,6 @@
},
disabled: (row) => row.approveStatus !== 2
},
- // {
- // name: "缂栬緫",
- // type: "text",
- // clickFun: (row) => {
- // openForm("edit", row);
- // },
- // disabled: (row) => row.approveStatus == 2 || row.approveStatus == 1 || row.approveStatus == 4
- // },
- // {
- // name: "瀹℃牳",
- // type: "text",
- // clickFun: (row) => {
- // openApprovalDia("approval", row);
- // },
- // disabled: (row) => row.approveUserCurrentId == null || row.approveStatus == 2 || row.approveStatus == 3 || row.approveStatus == 4 || row.approveUserCurrentId !== userStore.id
- // },
- // {
- // name: "璇︽儏",
- // type: "text",
- // clickFun: (row) => {
- // openApprovalDia('view', row);
- // },
- // },
- // {
- // name: "闄勪欢",
- // type: "text",
- // clickFun: (row) => {
- // downLoadFile(row);
- // },
- // },
],
},
]);
diff --git a/src/views/salesManagement/deliveryLedger/index.vue b/src/views/salesManagement/deliveryLedger/index.vue
index 23fe97a..d442b7f 100644
--- a/src/views/salesManagement/deliveryLedger/index.vue
+++ b/src/views/salesManagement/deliveryLedger/index.vue
@@ -6,6 +6,10 @@
<el-input v-model="searchForm.salesContractNo" placeholder="璇疯緭鍏�" clearable prefix-icon="Search" style="width: 200px"
@change="handleQuery" />
</el-form-item>
+ <el-form-item label="鍙戣揣璁㈠崟鍙凤細">
+ <el-input v-model="searchForm.shippingNo" placeholder="璇疯緭鍏�" clearable prefix-icon="Search" style="width: 200px"
+ @change="handleQuery" />
+ </el-form-item>
<el-form-item label="杞︾墝鍙凤細">
<el-input v-model="searchForm.shippingCarNumber" placeholder="璇疯緭鍏�" clearable prefix-icon="Search" style="width: 200px"
@change="handleQuery" />
@@ -279,6 +283,7 @@
const data = reactive({
searchForm: {
salesContractNo: "", // 閿�鍞鍗曞彿
+ shippingNo: "", // 鍙戣揣璁㈠崟鍙�
shippingCarNumber: "", // 杞︾墝鍙�
expressNumber: "", // 蹇�掑崟鍙�
},
--
Gitblit v1.9.3