From e00905e53ee5d91d9e488ecf5ece3e25b9889436 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 20 一月 2026 16:14:44 +0800
Subject: [PATCH] 湟水峡 1.采购模块不要项目名称 2.加一个有待回款登记的提示 3.回款登记、付款登记改成和销售订单价格关联，并且可以多个一起回款或付款 4.合同管理不要下载合同了，跟合同相关的字段可以去掉了 5.重构生产模块 6.测试流程并修改bug
---
src/views/collaborativeApproval/vehicleManagement/index.vue | 55 ++++++++++++++++++++++++++-----------------------------
1 files changed, 26 insertions(+), 29 deletions(-)
diff --git a/src/views/collaborativeApproval/vehicleManagement/index.vue b/src/views/collaborativeApproval/vehicleManagement/index.vue
index 6725a39..51e4cd5 100644
--- a/src/views/collaborativeApproval/vehicleManagement/index.vue
+++ b/src/views/collaborativeApproval/vehicleManagement/index.vue
@@ -43,7 +43,7 @@
:is-selection="true"
:border="true"
:table-loading="tableLoading"
- :table-style="{ width: '100%', height: 'calc(100vh - 21.5em)' }"
+ :table-style="{ width: '100%', height: 'calc(100vh - 18.5em)' }"
:page="{
current: page.current,
size: page.size,
@@ -248,7 +248,6 @@
<script setup>
import { onMounted, ref, reactive, toRefs, getCurrentInstance } from "vue";
import PIMTable from "@/components/PIMTable/PIMTable.vue";
-import pagination from "@/components/PIMTable/Pagination.vue";
import { ElMessageBox } from "element-plus";
import useUserStore from "@/store/modules/user";
import { userListNoPage } from "@/api/system/user.js";
@@ -352,6 +351,16 @@
size: 100,
});
const usageRecordsTotal = ref(0);
+const usageRecordsColumns = ref([
+ { label: "杞︾墝鍙�", prop: "plateNumber", width: "120" },
+ { label: "浣跨敤浜�", prop: "userName", width: "120" },
+ { label: "鐩殑鍦�", prop: "destination", width: "150" },
+ { label: "浣跨敤鏃堕棿", prop: "useTime", width: "180" },
+ { label: "杩樿溅鏃堕棿", prop: "returnTime", width: "180" },
+ { label: "浣跨敤鍓嶉噷绋�(km)", prop: "odometerBefore", width: "130" },
+ { label: "杩樿溅鏃堕噷绋�(km)", prop: "odometerAfter", width: "130" },
+ { label: "鏈琛岄┒閲岀▼(km)", prop: "travelDistance", width: "140" },
+]);
const currentVehicleId = ref(null);
// 鐢ㄦ埛淇℃伅琛ㄥ崟寮规鏁版嵁
@@ -395,18 +404,6 @@
},
]);
-// 浣跨敤璁板綍琛ㄦ牸鍒楅厤缃�
-const usageRecordsColumns = ref([
- { label: "杞︾墝鍙�", prop: "plateNumber", width: "120" },
- { label: "浣跨敤浜�", prop: "userName", width: "120" },
- { label: "鐩殑鍦�", prop: "destination", width: "150" },
- { label: "浣跨敤鏃堕棿", prop: "useTime", width: "180" },
- { label: "杩樿溅鏃堕棿", prop: "returnTime", width: "180" },
- { label: "浣跨敤鍓嶉噷绋�(km)", prop: "odometerBefore", width: "130" },
- { label: "杩樿溅鏃堕噷绋�(km)", prop: "odometerAfter", width: "130" },
- { label: "鏈琛岄┒閲岀▼(km)", prop: "travelDistance", width: "140" },
-]);
-
// 鏌ヨ鍒楄〃
const handleQuery = () => {
page.current = 1;
@@ -448,14 +445,14 @@
odometer: 0,
remark: "",
};
-
- let userLists = await userListNoPage();
+
+ const userLists = await userListNoPage();
userList.value = userLists.data || [];
if (type !== "add") {
currentId.value = row.id;
getVehicleById(row.id).then((res) => {
- form.value = { ...res.data || res };
+ form.value = { ...(res.data || res) };
});
}
dialogFormVisible.value = true;
@@ -466,14 +463,14 @@
proxy.$refs["formRef"].validate((valid) => {
if (valid) {
if (operationType.value === "add") {
- addVehicle(form.value).then((res) => {
+ addVehicle(form.value).then(() => {
proxy.$modal.msgSuccess("鏂板鎴愬姛");
closeDia();
getList();
});
} else {
form.value.id = currentId.value;
- updateVehicle(form.value).then((res) => {
+ updateVehicle(form.value).then(() => {
proxy.$modal.msgSuccess("淇敼鎴愬姛");
closeDia();
getList();
@@ -489,7 +486,7 @@
dialogFormVisible.value = false;
};
-// 鎵撳紑鍙戣揣寮规
+// 鎵撳紑浣跨敤杞﹁締寮规
const openUseForm = async (row) => {
currentUseRow.value = row;
useForm.value = {
@@ -500,10 +497,10 @@
userId: "",
remark: "",
};
-
- let userLists = await userListNoPage();
+
+ const userLists = await userListNoPage();
userList.value = userLists.data || [];
-
+
useFormVisible.value = true;
};
@@ -511,7 +508,7 @@
const submitUseForm = () => {
proxy.$refs["useFormRef"].validate((valid) => {
if (valid) {
- useVehicle(useForm.value).then((res) => {
+ useVehicle(useForm.value).then(() => {
proxy.$modal.msgSuccess("浣跨敤杞﹁締鎴愬姛");
closeUseDia();
getList();
@@ -537,10 +534,10 @@
userId: "",
remark: "",
};
-
- let userLists = await userListNoPage();
+
+ const userLists = await userListNoPage();
userList.value = userLists.data || [];
-
+
returnFormVisible.value = true;
};
@@ -548,7 +545,7 @@
const submitReturnForm = () => {
proxy.$refs["returnFormRef"].validate((valid) => {
if (valid) {
- returnVehicle(returnForm.value).then((res) => {
+ returnVehicle(returnForm.value).then(() => {
proxy.$modal.msgSuccess("杩樿溅鎴愬姛");
closeReturnDia();
getList();
@@ -630,7 +627,7 @@
type: "warning",
})
.then(() => {
- delVehicle(ids).then((res) => {
+ delVehicle(ids).then(() => {
proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
getList();
});
--
Gitblit v1.9.3