From 749cb2f4ad815c5a68c19fe961d5ca2149a84dd4 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 17 九月 2026 11:28:54 +0800
Subject: [PATCH] feat(mes): 新增员工排班明细页面，修复计划排程菜单404
---
src/api/crm/contract/index.ts | 63 ++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 15 deletions(-)
diff --git a/src/api/crm/contract/index.ts b/src/api/crm/contract/index.ts
index f245bb9..d2af0de 100644
--- a/src/api/crm/contract/index.ts
+++ b/src/api/crm/contract/index.ts
@@ -1,4 +1,4 @@
-import type { PageParam, PageResult } from '../../../packages/effects/request/src';
+import type { PageParam, PageResult } from '@vben/request';
import type { CrmPermissionApi } from '#/api/crm/permission';
@@ -18,8 +18,12 @@
ownerUserId: number;
ownerUserName?: string;
ownerUserDeptName?: string;
- processInstanceId: number;
auditStatus: number;
+ // 浠ヤ笅涓哄鏍告淳鐢熷瓧娈碉紝鐢卞悗绔湪瀹℃牳鏃跺啓鍏ワ紝鍓嶇鍙灞曠ず
+ reviewerId?: number; // 瀹℃牳浜篒D锛堝疄闄呮墽琛屽鏍哥殑鐢ㄦ埛锛�
+ reviewerName?: string; // 瀹℃牳浜哄鍚�
+ reviewTime?: Date; // 瀹℃牳鏃堕棿
+ reviewRemark?: string; // 瀹℃牳鎰忚锛堝鏍搁�氳繃鏃剁殑鎰忚 / 瀹℃牳涓嶉�氳繃鏃剁殑鍘熷洜锛�
orderDate: Date;
startTime: Date;
endTime: Date;
@@ -28,6 +32,8 @@
totalPrice: number;
depositPrice?: number; // 瀹氶噾閲戦锛屽崟浣嶏細鍏�
totalReceivablePrice: number;
+ totalInvoicePrice?: number; // 宸插紑绁ㄩ噾棰濓紙鍚鎵逛腑锛夛紝鍗曚綅锛氬厓
+ unInvoicePrice?: number; // 鏈紑绁ㄩ噾棰濓紝鍗曚綅锛氬厓
signContactId: number;
signContactName?: string;
signUserId: number;
@@ -41,6 +47,14 @@
contactName?: string;
orderId?: number; // 鍏宠仈 ERP 閿�鍞鍗曠紪鍙�
orderNo?: string; // ERP 閿�鍞鍗曞崟鍙�
+ contractType?: string; // 鍚堝悓绫诲瀷锛堜緵鐢ㄧ數/鑳芥簮鏈嶅姟绛夛級
+ voltageLevel?: string; // 鐢靛帇绛夌骇
+ electricityType?: string; // 鐢ㄧ數绫诲瀷
+ contractCapacity?: number; // 鍚堝悓瀹归噺锛坘VA锛�
+ tariffMode?: string; // 鐢典环妯″紡
+ meterMode?: string; // 璁￠噺鏂瑰紡
+ payCycle?: number; // 缂磋垂鍛ㄦ湡锛堟湀锛�
+ commandCount?: number; // 鎸囦护鏁伴噺
}
/** 鍚堝悓浜у搧淇℃伅 */
@@ -60,11 +74,6 @@
totalPrice: number;
}
- /** 瀹℃壒娴佺▼ */
- export interface ApproveProcess {
- key: string;
- name: string;
- }
}
/** 鏌ヨ鍚堝悓鍒楄〃 */
@@ -125,18 +134,42 @@
return requestClient.download('/crm/contract/export-excel', { params });
}
-/** 鎻愪氦瀹℃牳 */
-export function submitContract(id: number, processDefinitionKey: string) {
+/**
+ * 鎻愪氦鍚堝悓瀹℃壒锛堟湭鎻愪氦 / 瀹℃牳涓嶉�氳繃 鈫� 瀹℃壒涓級
+ *
+ * 瀹℃壒浜虹敱銆岀郴缁熺鐞� - 瀹℃壒閰嶇疆銆嶆寜涓氬姟绫诲瀷缁熶竴閰嶇疆锛屾彁浜ゆ椂鏃犻渶鎸囧畾锛�
+ * 鏈惎鐢ㄥ鎵规垨鏈厤缃湁鏁堝鎵逛汉鏃跺悗绔細鎶涘嚭涓氬姟寮傚父銆�
+ */
+export function submitContract(id: number) {
return requestClient.put('/crm/contract/submit', null, {
- params: { id, processDefinitionKey },
+ params: { id },
});
}
-/** 鑾峰彇鍚堝悓瀹℃壒娴佺▼鍒楄〃 */
-export function getContractApproveProcessList() {
- return requestClient.get<CrmContractApi.ApproveProcess[]>(
- '/crm/contract/approve-process-list',
- );
+/**
+ * 鑾峰緱鍚堝悓鐨勫鎵逛汉缂栧彿闆嗗悎
+ *
+ * 渚涘垪琛ㄩ〉鍒ゆ柇褰撳墠鐧诲綍鐢ㄦ埛鏄惁搴斿睍绀恒�屽鏍� / 瀹℃牳涓嶉�氳繃銆嶆寜閽紱鏈厤缃椂杩斿洖绌烘暟缁勩��
+ */
+export function getContractApproverIds() {
+ return requestClient.get<number[]>('/crm/contract/approver-ids');
+}
+
+/**
+ * 瀹℃牳鍚堝悓锛堝鎵逛腑 鈫� 瀹℃牳閫氳繃 / 瀹℃牳涓嶉�氳繃锛�
+ *
+ * 浠呭鎵归厤缃腑鐨勫鎵逛汉鍙皟鐢紙澶氫汉鏃舵垨绛撅級锛沺ass=false 鏃� reviewRemark锛堜笉閫氳繃鍘熷洜锛夊繀濉��
+ */
+export function auditContract(
+ id: number,
+ pass: boolean,
+ reviewRemark?: string,
+) {
+ return requestClient.put('/crm/contract/audit', {
+ id,
+ pass,
+ reviewRemark,
+ });
}
/** 鍚堝悓杞Щ */
--
Gitblit v1.9.3