From e03ff28fb1dbaa19571b7ea0414e0161f178cf26 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 20 一月 2026 16:48:08 +0800
Subject: [PATCH] 浪潮对接单点登录:浪潮配置调整
---
src/api/collaborativeApproval/enterpriseBook.js | 67 +++++
src/api/procurementManagement/procurementLedger.js | 117 ++++++---
src/api/collaborativeApproval/planTemplate.js | 64 +++++
src/api/collaborativeApproval/rulesRegulationsManagementFile.js | 28 ++
src/views/inventoryManagement/stockWarningLedger/index.vue | 12
src/api/collaborativeApproval/attendanceManagement.js | 134 +++++++++++
src/api/collaborativeApproval/noticeManagement.js | 95 ++++---
src/api/personnelManagement/staffOnJob.js | 54 ++++
src/views/inventoryManagement/stockManagement/index.vue | 23 +
.env.production | 2
src/api/collaborativeApproval/officeSupplies.js | 37 +++
src/views/inventoryManagement/stockManagement/components/FormDiaManual.vue | 2
src/api/collaborativeApproval/notificationManagement.js | 63 +++++
src/api/inventoryManagement/stockWarningLedger.js | 2
14 files changed, 592 insertions(+), 108 deletions(-)
diff --git a/.env.production b/.env.production
index 663d6f7..ce7dfa1 100644
--- a/.env.production
+++ b/.env.production
@@ -1,5 +1,5 @@
# 椤甸潰鏍囬
-VITE_APP_TITLE =鑺-璐㈠姟绠＄悊绯荤粺
+VITE_APP_TITLE =鑺-浠撳偍鐗╂祦绯荤粺
#10.136.58.65 鑺-璐㈠姟绠＄悊绯荤粺 cwglxt
#10.136.58.66 鑺-璁惧绠＄悊绯荤粺 sbglxt
#10.136.58.67 鑺-鐢熶骇绠℃帶绯荤粺 scgkxt
diff --git a/src/api/collaborativeApproval/attendanceManagement.js b/src/api/collaborativeApproval/attendanceManagement.js
new file mode 100644
index 0000000..f9529c2
--- /dev/null
+++ b/src/api/collaborativeApproval/attendanceManagement.js
@@ -0,0 +1,134 @@
+import request from "@/utils/request";
+
+// 鏌ヨ鍋囨湡璁剧疆鍒楄〃
+export function listHolidaySettings(query) {
+ return request({
+ url: "/holidaySettings/getList",
+ method: "get",
+ params: query,
+ });
+}
+//鏌ヨ骞村亣瑙勫垯鍒楄〃
+export function listAnnualLeaveSettingList(query) {
+ return request({
+ url: "/holidaySettings/getAnnualLeaveSettingList",
+ method: "get",
+ params: query,
+ });
+}
+//鏌ヨ鍔犵彮瑙勫垯鍒楄〃
+export function listOvertimeSettingList(query) {
+ return request({
+ url: "/holidaySettings/getOvertimeSettingList",
+ method: "get",
+ params: query,
+ });
+}
+//鏌ヨ宸ヤ綔鏃堕棿瑙勫垯鍒楄〃
+export function listWorkingHoursSettingList(query) {
+ return request({
+ url: "/holidaySettings/getWorkingHoursSettingList",
+ method: "get",
+ params: query,
+ });
+}
+
+// 鏂板鍋囨湡璁剧疆
+export function addHolidaySettings(data) {
+ return request({
+ url: "/holidaySettings/add",
+ method: "post",
+ data: data,
+ });
+}
+//鏂板骞村亣瑙勫垯
+export function addAnnualLeaveSetting(data) {
+ return request({
+ url: "/holidaySettings/addAnnualLeaveSetting",
+ method: "post",
+ data: data,
+ });
+}
+//鏂板鍔犵彮瑙勫垯
+export function addOvertimeSetting(data) {
+ return request({
+ url: "/holidaySettings/addOvertimeSetting",
+ method: "post",
+ data: data,
+ });
+}
+//鏂板宸ヤ綔鏃堕棿瑙勫垯
+export function addWorkingHoursSetting(data) {
+ return request({
+ url: "/holidaySettings/addWorkingHoursSetting",
+ method: "post",
+ data: data,
+ });
+}
+
+
+// 淇敼鍋囨湡璁剧疆
+export function updateHolidaySettings(data) {
+ return request({
+ url: "/holidaySettings/update",
+ method: "post",
+ data: data,
+ });
+}
+// 淇敼骞村亣瑙勫垯
+export function updateAnnualLeaveSetting(data) {
+ return request({
+ url: "/holidaySettings/updateAnnualLeaveSetting",
+ method: "post",
+ data: data,
+ });
+}
+// 淇敼鍔犵彮瑙勫垯
+export function updateOvertimeSetting(data) {
+ return request({
+ url: "/holidaySettings/updateOvertimeSetting",
+ method: "post",
+ data: data,
+ });
+}
+// 淇敼宸ヤ綔鏃堕棿瑙勫垯
+export function updateWorkingHoursSetting(data) {
+ return request({
+ url: "/holidaySettings/updateWorkingHoursSetting",
+ method: "post",
+ data: data,
+ });
+}
+
+// 鎵归噺鍒犻櫎鍋囨湡璁剧疆
+export function delHolidaySettings(query) {
+ return request({
+ url: "/holidaySettings/delete",
+ method: "delete",
+ data: query,
+ });
+}
+// 鎵归噺鍒犻櫎骞村亣瑙勫垯
+export function delAnnualLeaveSetting(query) {
+ return request({
+ url: "/holidaySettings/deleteAnnualLeaveSetting",
+ method: "delete",
+ data: query,
+ });
+}
+// 鎵归噺鍒犻櫎鍔犵彮瑙勫垯
+export function delOvertimeSetting(query) {
+ return request({
+ url: "/holidaySettings/deleteOvertimeSetting",
+ method: "delete",
+ data: query,
+ });
+}
+// 鎵归噺鍒犻櫎宸ヤ綔鏃堕棿瑙勫垯
+export function delWorkingHoursSetting(query) {
+ return request({
+ url: "/holidaySettings/deleteWorkingHoursSetting",
+ method: "delete",
+ data: query,
+ });
+}
diff --git a/src/api/collaborativeApproval/enterpriseBook.js b/src/api/collaborativeApproval/enterpriseBook.js
new file mode 100644
index 0000000..da6a139
--- /dev/null
+++ b/src/api/collaborativeApproval/enterpriseBook.js
@@ -0,0 +1,67 @@
+import request from '@/utils/request'
+
+// 鏌ヨ涓汉閫氳褰�
+// 涓汉閫氳褰曢�氬父鏄敤鎴锋敹钘忔垨棰戠箒鑱旂郴鐨勪汉鍛�
+export function getPersonalContacts(page,query) {
+ return request({
+ url: '/staffContactsPersonal/getList',
+ method: 'get',
+ params: {
+ ...page,
+ ...query
+ }
+ })
+}
+
+// 娣诲姞鑱旂郴浜哄埌涓汉閫氳褰�
+export function addPersonalContact(data) {
+ return request({
+ url: '/staffContactsPersonal/add',
+ method: 'post',
+ data: data
+ })
+}
+
+// 浠庝釜浜洪�氳褰曠Щ闄よ仈绯讳汉
+export function removePersonalContact(id) {
+ return request({
+ url: '/staffContactsPersonal/delete/' + id,
+ method: 'delete'
+ })
+}
+
+// 鏌ヨ鍏叡閫氳褰�
+// 鍏叡閫氳褰曢�氬父鏄墍鏈夊憳宸ュ彲瑙佺殑鑱旂郴鏂瑰紡
+export function getPublicContacts(query) {
+ return request({
+ url: '/staff/contacts/public/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 鏌ヨ鍗曚綅閫氳褰�
+// 鍗曚綅閫氳褰曢�氬父鎸夐儴闂ㄧ粍缁囩殑鍛樺伐鑱旂郴鏂瑰紡
+export function getCompanyContacts(query) {
+ return request({
+ url: '/staff/contacts/company/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 鏌ヨ閮ㄩ棬閫氳褰曟爲缁撴瀯
+export function getDepartmentTree() {
+ return request({
+ url: '/staff/contacts/department/tree',
+ method: 'get'
+ })
+}
+
+// 鑾峰彇鍛樺伐璇︾粏淇℃伅
+export function getEmployeeDetail(employeeId) {
+ return request({
+ url: '/staff/staffOnJob/' + employeeId,
+ method: 'get'
+ })
+}
diff --git a/src/api/collaborativeApproval/noticeManagement.js b/src/api/collaborativeApproval/noticeManagement.js
index fa1caec..aae4db7 100644
--- a/src/api/collaborativeApproval/noticeManagement.js
+++ b/src/api/collaborativeApproval/noticeManagement.js
@@ -2,68 +2,77 @@
// 鏌ヨ鍏憡鍒楄〃
export function listNotice(query) {
- return request({
- url: '/collaborativeApproval/notice/list',
- method: 'get',
- params: query
- })
+ return request({
+ url: '/collaborativeApproval/notice/page',
+ method: 'get',
+ params: query
+ })
}
// 鏌ヨ鍏憡璇︾粏
export function getNotice(noticeId) {
- return request({
- url: '/collaborativeApproval/notice/' + noticeId,
- method: 'get'
- })
+ return request({
+ url: '/collaborativeApproval/notice/' + noticeId,
+ method: 'get'
+ })
}
// 鏂板鍏憡
export function addNotice(data) {
- return request({
- url: '/collaborativeApproval/notice',
- method: 'post',
- data: data
- })
+ return request({
+ url: '/collaborativeApproval/notice/add',
+ method: 'post',
+ data: data
+ })
}
// 淇敼鍏憡
export function updateNotice(data) {
- return request({
- url: '/collaborativeApproval/notice',
- method: 'put',
- data: data
- })
+ return request({
+ url: '/collaborativeApproval/notice/update',
+ method: 'put',
+ data: data
+ })
}
// 鍒犻櫎鍏憡
-export function delNotice(noticeId) {
- return request({
- url: '/collaborativeApproval/notice/' + noticeId,
- method: 'delete'
- })
+export function delNotice(ids) {
+ return request({
+ url: '/collaborativeApproval/notice/' + ids,
+ method: 'delete',
+ })
}
-// 鎵归噺鍒犻櫎鍏憡
-export function delNoticeBatch(noticeIds) {
- return request({
- url: '/collaborativeApproval/notice/batch',
- method: 'delete',
- data: noticeIds
- })
+// 鑾峰彇鍏憡鏁伴噺
+export function getCount() {
+ return request({
+ url: '/collaborativeApproval/notice/count',
+ method: 'get',
+ })
}
-// 鍙戝竷鍏憡
-export function publishNotice(noticeId) {
- return request({
- url: '/collaborativeApproval/notice/publish/' + noticeId,
- method: 'put'
- })
+// 鏌ヨ鍏憡绫诲瀷鍒楄〃
+export function listNoticeType() {
+ return request({
+ url: '/noticeType/list',
+ method: 'get'
+ })
}
-// 涓嬬嚎鍏憡
-export function offlineNotice(noticeId) {
- return request({
- url: '/collaborativeApproval/notice/offline/' + noticeId,
- method: 'put'
- })
+// 鏂板鍏憡绫诲瀷
+export function addNoticeType(data) {
+ return request({
+ url: '/noticeType/add',
+ method: 'post',
+ data: data
+ })
}
+
+// 鍒犻櫎鍏憡绫诲瀷
+export function delNoticeType(id) {
+ return request({
+ url: '/noticeType/del',
+ method: 'delete',
+ data: { id }
+ })
+}
\ No newline at end of file
diff --git a/src/api/collaborativeApproval/notificationManagement.js b/src/api/collaborativeApproval/notificationManagement.js
new file mode 100644
index 0000000..abaeaa4
--- /dev/null
+++ b/src/api/collaborativeApproval/notificationManagement.js
@@ -0,0 +1,63 @@
+import request from "@/utils/request";
+
+// 鏌ヨ閫氱煡鍒楄〃
+export function listNotification(query) {
+ return request({
+ url: "/notificationManagement/getList",
+ method: "get",
+ params: query,
+ });
+}
+
+// 鏂板閫氱煡
+export function addNotification(data) {
+ return request({
+ url: "/notificationManagement/add",
+ method: "post",
+ data: data,
+ });
+}
+//鏂板浼氳
+export function addOnlineMeeting(data) {
+ return request({
+ url: "/notificationManagement/addOnlineMeeting",
+ method: "post",
+ data: data,
+ });
+}
+//鏂板鏂囦欢鍏变韩
+export function addFileSharing(data) {
+ return request({
+ url: "/notificationManagement/addFileSharing",
+ method: "post",
+ data: data,
+ });
+}
+
+// 淇敼閫氱煡
+export function updateNotification(data) {
+ return request({
+ url: "/notificationManagement/update",
+ method: "post",
+ data: data,
+ });
+}
+
+// 鎵归噺鍒犻櫎閫氱煡
+export function delNotification(query) {
+ return request({
+ url: "/notificationManagement/delete",
+ method: "delete",
+ data: query,
+ });
+}
+
+// // 鎵归噺鍒犻櫎鐭ヨ瘑搴�
+// export function delKnowledgeBaseBatch(knowledgeBaseIds) {
+// return request({
+// url: "/knowledgeBase/batch",
+// method: "delete",
+// data: knowledgeBaseIds,
+// });
+// }
+
diff --git a/src/api/collaborativeApproval/officeSupplies.js b/src/api/collaborativeApproval/officeSupplies.js
new file mode 100644
index 0000000..340293b
--- /dev/null
+++ b/src/api/collaborativeApproval/officeSupplies.js
@@ -0,0 +1,37 @@
+import request from '@/utils/request'
+
+// 鏌ヨ鍔炲叕鐗╄祫鍒楄〃
+export function listPage(query) {
+ return request({
+ url: '/officeSupplies/listPage',
+ method: 'get',
+ params: query
+ })
+}
+
+// 鏂板鍔炲叕鐗╄祫
+export function add(data) {
+ return request({
+ url: '/officeSupplies/add',
+ method: 'post',
+ data
+ })
+}
+
+// 淇敼鍔炲叕鐗╄祫
+export function update(data) {
+ return request({
+ url: '/officeSupplies/update',
+ method: 'post',
+ data
+ })
+}
+
+// 鍒犻櫎鍔炲叕鐗╄祫
+export function deleteOff(data) {
+ return request({
+ url: '/officeSupplies/delete',
+ method: 'delete',
+ data
+ })
+}
diff --git a/src/api/collaborativeApproval/planTemplate.js b/src/api/collaborativeApproval/planTemplate.js
new file mode 100644
index 0000000..24a6ac4
--- /dev/null
+++ b/src/api/collaborativeApproval/planTemplate.js
@@ -0,0 +1,64 @@
+import request from "@/utils/request";
+
+// 鏌ヨ璁″垝鍒楄〃
+export function listDutyPlan(query) {
+ return request({
+ url: "/dutyPlan/getList",
+ method: "get",
+ params: query
+ });
+}
+//鏁版嵁
+export function NumDutyPlan(query) {
+ return request({
+ url: "/dutyPlan/getNum",
+ method: "get",
+ params: query
+ });
+}
+
+// 鏂板璁″垝
+export function addDutyPlan(data) {
+ return request({
+ url: "/dutyPlan/add",
+ method: "post",
+ data: data,
+ });
+}
+
+
+// 淇敼璁″垝
+export function updateDutyPlan(data) {
+ return request({
+ url: "/dutyPlan/update",
+ method: "post",
+ data: data,
+ });
+}
+
+// 鍒犻櫎璁″垝
+export function delDutyPlan(query) {
+ return request({
+ url: "/dutyPlan/delete",
+ method: "delete",
+ data: query,
+ });
+}
+// 瀵煎嚭璁″垝
+export function exportDutyPlan(query) {
+ return request({
+ url: "/dutyPlan/export",
+ method: "post",
+ params: query,
+ });
+}
+
+// // 鎵归噺鍒犻櫎璁″垝
+// export function delDutyPlanBatch(dutyPlanIds) {
+// return request({
+// url: "/dutyPlan/batch",
+// method: "delete",
+// data: dutyPlanIds,
+// });
+// }
+
diff --git a/src/api/collaborativeApproval/rulesRegulationsManagementFile.js b/src/api/collaborativeApproval/rulesRegulationsManagementFile.js
new file mode 100644
index 0000000..791b6a7
--- /dev/null
+++ b/src/api/collaborativeApproval/rulesRegulationsManagementFile.js
@@ -0,0 +1,28 @@
+import request from "@/utils/request";
+
+// 闄勪欢鍒楄〃
+export function listRuleFiles(query) {
+ return request({
+ url: "/rulesRegulationsManagementFile/listPage",
+ method: "get",
+ params: query,
+ });
+}
+
+// 鏂板闄勪欢
+export function addRuleFile(data) {
+ return request({
+ url: "/rulesRegulationsManagementFile/add",
+ method: "post",
+ data,
+ });
+}
+
+// 鍒犻櫎闄勪欢锛堟敮鎸佷紶閫� id 鏁扮粍锛�
+export function delRuleFile(ids) {
+ return request({
+ url: "/rulesRegulationsManagementFile/del",
+ method: "delete",
+ data: ids,
+ });
+}
diff --git a/src/api/inventoryManagement/stockWarningLedger.js b/src/api/inventoryManagement/stockWarningLedger.js
index 6d14808..0cdeb2d 100644
--- a/src/api/inventoryManagement/stockWarningLedger.js
+++ b/src/api/inventoryManagement/stockWarningLedger.js
@@ -3,7 +3,7 @@
// 鏌ヨ搴撳瓨棰勮鍙拌处鍒楄〃
export const getStockWarningLedgerPage = (params) => {
return request({
- url: "/stockWarningLedger/listPage",
+ url: "/customStorageWarning/pageList",
method: "get",
params,
});
diff --git a/src/api/personnelManagement/staffOnJob.js b/src/api/personnelManagement/staffOnJob.js
new file mode 100644
index 0000000..7da5469
--- /dev/null
+++ b/src/api/personnelManagement/staffOnJob.js
@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 鏌ヨ鍦ㄨ亴鍛樺伐鍙拌处
+export function staffOnJobListPage(query) {
+ return request({
+ url: '/staff/staffOnJob/listPage',
+ method: 'get',
+ params: query,
+ })
+}
+// 鏌ヨ鍛樺伐鍏ヨ亴淇℃伅
+export function staffOnJobInfo(id, query) {
+ return request({
+ url: '/staff/staffOnJob/' + id,
+ method: 'get',
+ params: query,
+ })
+}
+
+// 鏂板鍛樺伐
+export function createStaffOnJob(params) {
+ return request({
+ url: "/staff/staffOnJob",
+ method: "post",
+ data: params,
+ });
+}
+
+// 淇敼鍛樺伐
+export function updateStaffOnJob(id, params) {
+ return request({
+ url: "/staff/staffOnJob/" + id,
+ method: "put",
+ data: params,
+ });
+}
+
+// 鍒犻櫎鍛樺伐
+export function batchDeleteStaffOnJobs(query) {
+ return request({
+ url: "/staff/staffOnJob/del",
+ method: "delete",
+ data: query,
+ });
+}
+
+// 缁鍚堝悓
+export function renewContract(id, params) {
+ return request({
+ url: "/staff/staffOnJob/renewContract/" + id,
+ method: "post",
+ data: params,
+ });
+}
diff --git a/src/api/procurementManagement/procurementLedger.js b/src/api/procurementManagement/procurementLedger.js
index 9fb284e..5b6327d 100644
--- a/src/api/procurementManagement/procurementLedger.js
+++ b/src/api/procurementManagement/procurementLedger.js
@@ -3,72 +3,99 @@
// 鍒嗛〉鏌ヨ
export function purchaseList(query) {
- return request({
- url: "/purchase/ledger/list",
- method: "get",
- params: query,
- });
+ return request({
+ url: "/purchase/ledger/list",
+ method: "get",
+ params: query,
+ });
}
// 鏌ヨ鍚堝悓鍙�
export function getSalesNo(query) {
- return request({
- url: "/purchase/ledger/getSalesNo",
- method: "get",
- params: query,
- });
+ return request({
+ url: "/purchase/ledger/getSalesNo",
+ method: "get",
+ params: query,
+ });
}
// 瀛愯〃鏍兼煡璇�
export function productList(query) {
- return request({
- url: "/sales/product/list",
- method: "get",
- params: query,
- });
+ return request({
+ url: "/sales/product/list",
+ method: "get",
+ params: query,
+ });
}
// 鏂板銆佺紪杈�
export function addOrEditPurchase(query) {
- return request({
- url: "/purchase/ledger/addOrEditPurchase",
- method: "post",
- data: query,
- });
+ return request({
+ url: "/purchase/ledger/addOrEditPurchase",
+ method: "post",
+ data: query,
+ });
}
// 鍒犻櫎
export function delPurchase(query) {
- return request({
- url: "/purchase/ledger/delPurchase",
- method: "delete",
- data: query,
- });
+ return request({
+ url: "/purchase/ledger/delPurchase",
+ method: "delete",
+ data: query,
+ });
}
// 鏌ヨ璇︽儏
export function getPurchaseById(query) {
- return request({
- url: "/purchase/ledger/getPurchaseById",
- method: "get",
- params: query,
- });
+ return request({
+ url: "/purchase/ledger/getPurchaseById",
+ method: "get",
+ params: query,
+ });
}
// 鏌ヨ璇︽儏
export function getOptions(query) {
- return request({
- url: "/system/supplier/getOptions",
- method: "get",
- params: query,
- });
+ return request({
+ url: "/system/supplier/getOptions",
+ method: "get",
+ params: query,
+ });
}
-
+// 鏌ヨ閲囪喘鍙拌处鍒楄〃
export function purchaseListPage(query) {
- return request({
- url: "/purchase/ledger/listPage",
- method: "get",
- params: query,
- });
+ return request({
+ url: "/purchase/ledger/listPage",
+ method: "get",
+ params: query,
+ });
}
export function createPurchaseNo() {
- return request({
- url: "/purchase/ledger/createPurchaseNo",
- method: "get",
- });
+ return request({
+ url: "/purchase/ledger/createPurchaseNo",
+ method: "get",
+ });
+}
+export function updateApprovalStatus(query) {
+ return request({
+ url: "/purchase/ledger/updateApprovalStatus",
+ method: "post",
+ data: query,
+ });
+}
+
+// 淇濆瓨閲囪喘妯℃澘
+// /purchase/ledger/addPurchaseTemplate
+export function addPurchaseTemplate(data) {
+ return request({
+ url: "/purchase/ledger/addPurchaseTemplate",
+ method: "post",
+ data: data,
+ });
+}
+
+// 鏌ヨ閲囪喘妯℃澘
+// /purchase/ledger/getPurchaseTemplateList
+export function getPurchaseTemplateList(query) {
+ return request({
+ url: "/purchase/ledger/getPurchaseTemplateList",
+ method: "get",
+ params: query,
+ });
}
diff --git a/src/views/inventoryManagement/stockManagement/components/FormDiaManual.vue b/src/views/inventoryManagement/stockManagement/components/FormDiaManual.vue
index fcbfd77..e052ef9 100644
--- a/src/views/inventoryManagement/stockManagement/components/FormDiaManual.vue
+++ b/src/views/inventoryManagement/stockManagement/components/FormDiaManual.vue
@@ -160,4 +160,4 @@
.dialog-footer {
text-align: center;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/inventoryManagement/stockManagement/index.vue b/src/views/inventoryManagement/stockManagement/index.vue
index 174a64a..658aeda 100644
--- a/src/views/inventoryManagement/stockManagement/index.vue
+++ b/src/views/inventoryManagement/stockManagement/index.vue
@@ -163,7 +163,7 @@
boundTime: [{ required: true, message: '璇烽�夋嫨搴撳瓨鏃堕棿', trigger: 'change' }],
inboundTime: [{ required: true, message: '璇烽�夋嫨鍏ュ簱鏃堕棿', trigger: 'change' }],
inboundPerson: [{ required: true, message: '璇烽�夋嫨鍑哄簱浜�', trigger: 'change' }],
- warnNum: [{ required: true, message: '璇疯緭鍏ユ渶浣庡簱瀛�', trigger: 'blur' }],
+ warnNum: [{ required: true, message: '璇疯緭鍏ユ渶浣庡簱瀛�', trigger: 'blur' }],
}
})
const { searchForm, form, rules } = toRefs(data)
@@ -194,21 +194,21 @@
getStockManagePageByCustom(params).then(res => {
tableLoading.value = false
tableData.value = res.data.records
-
+
// 涓鸿〃鏍兼暟鎹嚜鍔ㄨ绠楁�讳环
tableData.value = tableData.value.map(item => {
// 璁＄畻鍓╀綑搴撳瓨
const stockQuantity = parseFloat(item.inboundNum) || 0
const outboundQuantity = parseFloat(item.totalInboundNum) || 0
const remainingStock = Math.max(stockQuantity - outboundQuantity, 0)
-
+
// 鏉愭枡搴撳瓨锛氬惈绋庢�讳环 = 鍚◣鍗曚环 脳 鍓╀綑搴撳瓨
const taxInclusiveUnitPrice = parseFloat(item.taxInclusiveUnitPrice) || 0
item.taxInclusiveTotalPrice = (taxInclusiveUnitPrice * remainingStock).toFixed(2)
-
+
return item
})
-
+
total.value = res.data.total
// 鏁版嵁鍔犺浇瀹屾垚鍚庢鏌ュ簱瀛�
// checkStockAndCreatePurchase();
@@ -243,6 +243,7 @@
// 鎵撳紑寮规
const openForm = async (type, row) => {
+ console.log(row)
operationType.value = type
form.value = {}
productData.value = []
@@ -262,7 +263,7 @@
})
}
form.value.entryDate = getCurrentDate() // 璁剧疆榛樿褰曞叆鏃ユ湡涓哄綋鍓嶆棩鏈�
-
+
// 浠呮潗鏂欏簱瀛樺脊妗�
manualDialogVisible.value = true
}
@@ -270,17 +271,17 @@
// 鎻愪氦琛ㄥ崟
const submitForm = (submittedData) => {
console.log('瀛愮粍浠舵彁浜ょ殑鏁版嵁:', submittedData)
-
+
// 浣跨敤瀛愮粍浠舵彁浜ょ殑鏁版嵁锛岃�屼笉鏄埗缁勪欢鐨刦orm瀵硅薄
const submitData = { ...submittedData }
-
+
// 鏉愭枡搴撳瓨锛氱Щ闄ゅ惈绋庢�讳环瀛楁
delete submitData.taxInclusiveTotalPrice
// 绉婚櫎鍏朵粬鍙兘鐨勬�讳环瀛楁
delete submitData.taxExclusiveTotalPrice
-
+
console.log('鎻愪氦缁欏悗绔殑鏁版嵁锛堝凡绉婚櫎鎬讳环瀛楁锛�:', submitData)
-
+
// 鏉愭枡搴撳瓨浣跨敤 updateManagementByCustom 鎺ュ彛
updateManagementByCustom(submitData).then(res => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛")
@@ -385,4 +386,4 @@
:deep(.row-low-stock:hover > td) {
background-color: #fcd4d4;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/inventoryManagement/stockWarningLedger/index.vue b/src/views/inventoryManagement/stockWarningLedger/index.vue
index ada44f4..d78ea30 100644
--- a/src/views/inventoryManagement/stockWarningLedger/index.vue
+++ b/src/views/inventoryManagement/stockWarningLedger/index.vue
@@ -138,13 +138,13 @@
if (res.code === 200) {
tableData.value = res.data.records || []
total.value = res.data.total || 0
-
+
// 璁＄畻棰勮绾у埆鍜岀姸鎬�
tableData.value = tableData.value.map(item => {
const currentStock = parseFloat(item.inboundNum0 || item.currentStock || 0)
const warnNum = parseFloat(item.warnNum || 0)
const safetyStock = parseFloat(item.safetyStock || warnNum * 1.2)
-
+
// 璁＄畻棰勮绾у埆
if (currentStock <= 0) {
item.warningLevel = '绱ф��'
@@ -159,7 +159,7 @@
item.warningLevel = ''
item.warningStatus = '姝ｅ父'
}
-
+
// 璁＄畻棰勮缂鸿揣鏃堕棿锛堝熀浜庢棩鍧囨秷鑰楅噺锛岃繖閲岀畝鍖栧鐞嗭級
if (item.warningStatus === '宸查璀�' && currentStock > 0 && warnNum > 0) {
const dailyConsumption = warnNum / 30 // 鍋囪30澶╂秷鑰楀畬鏈�浣庡簱瀛�
@@ -170,10 +170,10 @@
item.expectedShortageTime = date.toISOString().split('T')[0]
}
}
-
+
item.currentStock = currentStock
item.safetyStock = safetyStock
-
+
return item
})
}
@@ -209,7 +209,7 @@
const getStockClass = (row) => {
const currentStock = parseFloat(row.currentStock || row.inboundNum0 || 0)
const warnNum = parseFloat(row.warnNum || 0)
-
+
if (currentStock <= 0) {
return 'text-danger'
} else if (currentStock < warnNum) {
--
Gitblit v1.9.3