From 8a4c1addc899e1ad8ddc0e78d64a9587882fa79b Mon Sep 17 00:00:00 2001
From: zhang_12370 <z2864490065@outlook.com>
Date: 星期六, 19 七月 2025 17:15:25 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/zd-before into dev
---
src/views/procureMent/index.vue | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/src/views/procureMent/index.vue b/src/views/procureMent/index.vue
index 763ef87..2dfe17d 100644
--- a/src/views/procureMent/index.vue
+++ b/src/views/procureMent/index.vue
@@ -20,9 +20,9 @@
<el-button type="primary" :icon="Plus" @click="handleAdd"
>鏂板缓
</el-button>
- <el-button type="danger" :icon="Delete" @click="handleDelete"
+ <!-- <el-button type="danger" :icon="Delete" @click="handleDelete"
>鍒犻櫎
- </el-button>
+ </el-button> -->
</el-row>
<!-- 琛ㄦ牸缁勪欢 -->
<data-table
@@ -76,12 +76,18 @@
delPR
} from "@/api/procureMent";
import { useDelete } from "@/hooks/useDelete";
-
+const userStore = useUserStore();
import useUserStore from "@/store/modules/user";
+let userList = ref([]);
+userStore.getUserList().then((res) => {
+ userList.value = res;
+});
// 寮曞叆瀛楀吀鏁版嵁
const { proxy } = getCurrentInstance();
const dialogFormVisible = ref(false);
-const form = ref({});
+const form = ref({
+ taxRate: "13"
+});
const title = ref("");
// 鐘舵�佸彉閲�
const loading = ref(false);
@@ -106,10 +112,12 @@
// 鏂规硶瀹氫箟
const handleQuery = () => {
loading.value = true;
+ current.value = 1;
+ pageSize.value = 10;
// 杩欓噷娣诲姞瀹為檯鐨勬煡璇㈤�昏緫
getList();
};
-const userStore = useUserStore();
+
// 鑾峰彇鐢ㄦ埛淇℃伅
const userInfo = ref({});
onMounted(async () => {
@@ -148,7 +156,13 @@
{ prop: "totalPriceIncludingTax", label: "鎬讳环锛堝惈绋庯級", minWidth: 100 },
{ prop: "taxRate", label: "绋庣巼", minWidth: 100 },
{ prop: "priceExcludingTax", label: "涓嶅惈绋庡崟浠�", minWidth: 100 },
- { prop: "registrantId", label: "鐧昏浜�", minWidth: 100 },
+ { prop: "registrantId", label: "鐧昏浜�", minWidth: 100,
+ formatter: (row) => {
+ // 鍖归厤鐢ㄦ埛淇℃伅
+ const user = userList.value.find((user) => user.userId === row.registrantId);
+ return user ? user.nickName : "鏈煡鐢ㄦ埛";
+ },
+ },
{ prop: "registrationDate", label: "鐧昏鏃ユ湡", minWidth: 100 },
]);
@@ -201,13 +215,13 @@
form.value = {
supplierName: "",
coal: "",
- unit: "t",
+ unit: "鍚�",
purchaseQuantity: "",
priceExcludingTax: "",
totalPriceExcludingTax: "",
priceIncludingTax: "",
totalPriceIncludingTax: "",
- taxRate: "",
+ taxRate: "13",
registrantId: userInfo.value.userId,
registrationDate: new Date().toISOString().split("T")[0],
};
@@ -252,6 +266,7 @@
});
const handleDeleteSuccess = (row) => {
ElMessage.success("鍒犻櫎鎴愬姛锛�" + row.supplierName);
+ handleQuery()
};
// 鎴愬姛
const handleSuccess = (val) => {
--
Gitblit v1.9.3