From 0c4c9676b576ba4baa69d2ecbb2d69be9f0f982b Mon Sep 17 00:00:00 2001 From: Zy <1448159279@qq.com> Date: Tue, 21 Jul 2026 17:32:22 +0800 Subject: [PATCH] =?UTF-8?q?7/17=20=E6=B7=BB=E5=8A=A0=E5=85=AC=E5=8C=BA?= =?UTF-8?q?=E6=94=B6=E7=9B=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- .../resident/index.ts | 2 +- .../resident/type.ts | 0 src/api/system/revenueNotice/index.ts | 63 ++++ src/api/system/revenueNotice/type.ts | 140 +++++++++ src/api/workflow/index.ts | 27 ++ src/assets/icons/svg/gongqushouyi.svg | 1 + src/components/Editor/index.vue | 297 +++++++++++++++--- src/components/Holder/index.vue | 4 +- src/components/Holder/repairUser.vue | 2 +- src/layout/components/Navbar.vue | 2 +- src/utils/money.ts | 9 +- src/utils/print.ts | 151 +++++++++ src/utils/request.ts | 4 +- src/views/system/Complaint/complainMain.vue | 2 +- src/views/system/HandleLog/addHandleLog.vue | 45 ++- src/views/system/NoticePc/addNoticePc.vue | 7 +- src/views/system/NoticePc/index.vue | 19 +- .../system/Questionnaire/addQuestionnaire.vue | 2 +- src/views/system/Sdb/SdbCashier/index.vue | 10 +- src/views/system/cars/addCars.vue | 1 - src/views/system/cars/index.vue | 2 +- .../system/houseRental/addhouseResident.vue | 2 +- src/views/system/inspection/Daily/index.vue | 28 +- src/views/system/inspection/Monthly/index.vue | 28 +- src/views/system/inspection/Weekly/index.vue | 29 +- src/views/system/resident/ResidentMain.vue | 4 +- src/views/system/resident/addResident.vue | 4 +- src/views/system/resident/index.vue | 4 +- .../system/revenueNotice/addRevenueNotice.vue | 259 +++++++++++++++ src/views/system/revenueNotice/index.vue | 276 ++++++++++++++++ src/views/system/statistics/Payment/index.vue | 6 +- .../system/warehouse/Inventory/index.vue | 3 +- .../system/warehouse/Material/addMaterial.vue | 2 - .../system/warehouse/Supplier/addSupplier.vue | 8 +- .../warehouse/Warehouse/addWarehouse.vue | 18 +- .../workbench/components/feeOverview.vue | 210 +++++++++++++ .../workbench/components/repairechartsAll.vue | 2 +- src/views/workbench/components/todo.vue | 32 +- src/views/workbench/components/usertable.vue | 2 +- src/views/workbench/index2.vue | 4 +- 41 files changed, 1583 insertions(+), 132 deletions(-) rename src/api/system/{ => residentReviewProcess}/resident/index.ts (98%) rename src/api/system/{ => residentReviewProcess}/resident/type.ts (100%) create mode 100644 src/api/system/revenueNotice/index.ts create mode 100644 src/api/system/revenueNotice/type.ts create mode 100644 src/assets/icons/svg/gongqushouyi.svg create mode 100644 src/views/system/revenueNotice/addRevenueNotice.vue create mode 100644 src/views/system/revenueNotice/index.vue create mode 100644 src/views/workbench/components/feeOverview.vue diff --git a/.env.development b/.env.development index 1b230d8..7230ff9 100644 --- a/.env.development +++ b/.env.development @@ -9,9 +9,9 @@ VITE_APP_ENV='development' # 开发环境 VITE_APP_BASE_API='/dev-api' # # 开发环境 接口代理地址 -VITE_APP_PROXY_API='http://192.168.1.222:8080' +#VITE_APP_PROXY_API='http://192.168.1.222:8080' # 开发环境 接口代理地址 -#VITE_APP_PROXY_API='http://192.168.1.6:8080' +VITE_APP_PROXY_API='http://192.168.1.6:8080' # 图片基础地址 VITE_IMG_URL='http://192.168.1.222:8080' diff --git a/src/api/system/resident/index.ts b/src/api/system/residentReviewProcess/resident/index.ts similarity index 98% rename from src/api/system/resident/index.ts rename to src/api/system/residentReviewProcess/resident/index.ts index fc610f3..54fe0ae 100644 --- a/src/api/system/resident/index.ts +++ b/src/api/system/residentReviewProcess/resident/index.ts @@ -1,6 +1,6 @@ import request from '@/utils/request'; import { AxiosPromise } from 'axios'; -import { ResidentVO, ResidentForm, ResidentQuery } from '@/api/system/resident/type'; +import { ResidentVO, ResidentForm, ResidentQuery } from '@/api/system/residentReviewProcess/resident/type'; /** * 查询住户管理列表 diff --git a/src/api/system/resident/type.ts b/src/api/system/residentReviewProcess/resident/type.ts similarity index 100% rename from src/api/system/resident/type.ts rename to src/api/system/residentReviewProcess/resident/type.ts diff --git a/src/api/system/revenueNotice/index.ts b/src/api/system/revenueNotice/index.ts new file mode 100644 index 0000000..18b189b --- /dev/null +++ b/src/api/system/revenueNotice/index.ts @@ -0,0 +1,63 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { RevenueNoticeVO, RevenueNoticeForm, RevenueNoticeQuery } from './type'; + +/** + * 查询公区收益通知列表 + * @param query + * @returns {*} + */ + +export const listRevenueNotice = (query?: RevenueNoticeQuery): AxiosPromise => { + return request({ + url: '/revenueNotice/list', + method: 'get', + params: query + }); +}; + +/** + * 查询公区收益通知详细 + * @param noticeId + */ +export const getRevenueNotice = (noticeId: string | number): AxiosPromise => { + return request({ + url: '/revenueNotice/' + noticeId, + method: 'get' + }); +}; + +/** + * 新增公区收益通知 + * @param data + */ +export const addRevenueNotice = (data: RevenueNoticeForm) => { + return request({ + url: '/revenueNotice', + method: 'post', + data: data + }); +}; + +/** + * 修改公区收益通知 + * @param data + */ +export const updateRevenueNotice = (data: RevenueNoticeForm) => { + return request({ + url: '/revenueNotice', + method: 'put', + data: data + }); +}; + +/** + * 删除公区收益通知 + * @param noticeId + */ +export const delRevenueNotice = (noticeId: string | number | Array) => { + return request({ + url: '/revenueNotice/' + noticeId, + method: 'delete' + }); +}; diff --git a/src/api/system/revenueNotice/type.ts b/src/api/system/revenueNotice/type.ts new file mode 100644 index 0000000..1f3c8c6 --- /dev/null +++ b/src/api/system/revenueNotice/type.ts @@ -0,0 +1,140 @@ +export interface RevenueNoticeVO { + /** + * 公告ID + */ + noticeId: string | number; + + /** + * 公告标题 + */ + noticeTitle: string; + + /** + * 公告内容 + */ + noticeContent: string; + + /** + * 作者 + */ + author: string; + + /** + * 紧急程度 0=普通 1=紧急 2=非常紧急 + */ + urgencyLevel: number; + + /** + * 发布状态 0=草稿 1=已发布 + */ + publishStatus: number; + + /** + * 发布人 + */ + publishBy: string; + + /** + * 发布日期 + */ + publishTime: string; + + /** + * 所属小区id + */ + villageId: string | number; +} + +export interface RevenueNoticeForm extends BaseEntity { + /** + * 公告ID + */ + noticeId?: string | number; + + /** + * 公告标题 + */ + noticeTitle?: string; + + /** + * 公告内容 + */ + noticeContent?: string; + + /** + * 作者 + */ + author?: string; + + /** + * 紧急程度 0=普通 1=紧急 2=非常紧急 + */ + urgencyLevel?: number; + + /** + * 发布状态 0=草稿 1=已发布 + */ + publishStatus?: number; + + /** + * 发布人 + */ + publishBy?: string; + + /** + * 发布日期 + */ + publishTime?: string; + + /** + * 所属小区id + */ + villageId?: string | number; +} + +export interface RevenueNoticeQuery extends PageQuery { + /** + * 公告标题 + */ + noticeTitle?: string; + + /** + * 公告内容 + */ + noticeContent?: string; + + /** + * 作者 + */ + author?: string; + + /** + * 紧急程度 0=普通 1=紧急 2=非常紧急 + */ + urgencyLevel?: number; + + /** + * 发布状态 0=草稿 1=已发布 + */ + publishStatus?: number; + + /** + * 发布人 + */ + publishBy?: string; + + /** + * 发布日期 + */ + publishTime?: string; + + /** + * 所属小区id + */ + villageId?: string | number; + + /** + * 日期范围参数 + */ + params?: any; +} diff --git a/src/api/workflow/index.ts b/src/api/workflow/index.ts index 86a1b0c..11253df 100644 --- a/src/api/workflow/index.ts +++ b/src/api/workflow/index.ts @@ -65,6 +65,33 @@ export const workSpaceIncomeTrendListApi = ( } }); }; +/** + * 收费率统计 + * @returns {*} + */ +export const paymentRateApi = ( + startDate: string, + endDate: string +): Promise<{ + data: { + 'receivableAmount': string; + 'receivablePercent': string; + 'receivedAmount': string; + 'receivedPercent': string; + 'unpaidAmount': string; + 'unpaidPercent': string; + }; +}> => { + return request({ + url: '/workSpace/paymentRate', + method: 'GET', + params: { + startDate: startDate, + endDate: endDate + } + }); +}; + /** * 查询近一周支出趋势 * @returns {*} diff --git a/src/assets/icons/svg/gongqushouyi.svg b/src/assets/icons/svg/gongqushouyi.svg new file mode 100644 index 0000000..afd4619 --- /dev/null +++ b/src/assets/icons/svg/gongqushouyi.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components/Editor/index.vue b/src/components/Editor/index.vue index 77584b7..2f906ea 100644 --- a/src/components/Editor/index.vue +++ b/src/components/Editor/index.vue @@ -1,17 +1,37 @@ @@ -27,9 +47,11 @@ +const handleUploadRequest: UploadRequestHandler = async (options: UploadRequestOptions) => { + const file = options.file as File; + const quill = toRaw(quillEditorRef.value)?.getQuill(); + if (!quill) { + proxy?.$modal.msgError('编辑器未就绪'); + proxy?.$modal.closeLoading(); + return Promise.reject(new Error('editor not ready')); + } + const range = quill.selection?.savedRange; + const insertIndex = range ? range.index : quill.getLength(); - + +`; + + // 只复制票据内部innerHTML，不带外层el-dialog多余结构 + const printContent = el.innerHTML; + + win.document.write(` + + + + ${title} + + ${styles} + ${printScopeStyle} + + +
${printContent}
+ + + `); + win.document.close(); win.onload = () => { setTimeout(() => { win.print(); diff --git a/src/utils/request.ts b/src/utils/request.ts index 341f4f4..fdfc3af 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -245,13 +245,13 @@ service.interceptors.response.use( } ); // 通用下载方法 -export function download(url: string, params: any, fileName: string) { +export function download(url: string, params: any, fileName: string, format: boolean = true) { downloadLoadingInstance = ElLoading.service({ text: '正在下载数据，请稍候', background: 'rgba(0, 0, 0, 0.7)' }); // prettier-ignore return service.post(url, params, { transformRequest: [ (params: any) => { - return tansParams(params); + return format ? tansParams(params) : JSON.stringify(params); } ], headers: { 'Content-Type': 'application/x-www-form-urlencoded',silentError: 'true' }, diff --git a/src/views/system/Complaint/complainMain.vue b/src/views/system/Complaint/complainMain.vue index 04cc5a6..b84b6f7 100644 --- a/src/views/system/Complaint/complainMain.vue +++ b/src/views/system/Complaint/complainMain.vue @@ -108,7 +108,7 @@ import repairUser from '@/components/Holder/repairUser.vue'; import PageHeader from '@/components/Pageheader/index.vue'; import { getComplaint, updateComplaint } from '@/api/system/Complaint'; import { listComplaintType } from '@/api/system/ComplainType'; -import { ResidentVO } from '@/api/system/resident/type'; +import { ResidentVO } from '@/api/system/residentReviewProcess/resident/type'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { com_complaint_status } = toRefs(proxy?.useDict('com_complaint_status')); diff --git a/src/views/system/HandleLog/addHandleLog.vue b/src/views/system/HandleLog/addHandleLog.vue index 9e49e62..3016636 100644 --- a/src/views/system/HandleLog/addHandleLog.vue +++ b/src/views/system/HandleLog/addHandleLog.vue @@ -57,23 +57,25 @@
上传文件
+ @@ -144,14 +146,16 @@ const handleAvatarRemove: UploadProps['onRemove'] = (uploadFile: UploadUserFile, // 定义大小限制常量 (单位: MB) const MAX_SINGLE_FILE_SIZE = 10 * 1024 * 1024; // 10MB in bytes const MAX_TOTAL_FILE_SIZE = 20 * 1024 * 1024; // 20MB in bytes -// 禁止的危险文件后缀 -const forbidSuffix = ['exe', 'msi', 'bat', 'cmd', 'sh', 'apk', 'dmg']; +const uploadRef = ref(); // 添加一个锁，防止 on-change 递归调用导致重复提示 const isChecking = ref(false); const handleProgress: UploadProps['onChange'] = (uploadFile: UploadUserFile, uploadFiles: UploadFiles) => { // 如果正在校验中，直接返回，避免重复执行 + if (!beforeAvatarUpload(uploadFile)) { + uploadRef.value.handleRemove(uploadFile); + return; + } if (isChecking.value) return; - // 加锁 isChecking.value = true; // 创建一个新数组来存储校验通过的文件 @@ -229,12 +233,41 @@ const handleProgress: UploadProps['onChange'] = (uploadFile: UploadUserFile, upl }; const blockedExts = ['.exe', '.bat', '.cmd', '.msi']; -const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile: UploadRawFile) => { +const allowExts = [ + // word + '.doc', + '.docx', + '.dot', + '.dotx', + // excel + '.xls', + '.xlsx', + '.xlsm', + '.xlsb', + // img + '.jpg', + '.jpeg', + '.png', + '.gif', + '.bmp', + '.webp', + // 专业/矢量图 + '.psd', + '.ai', + '.svg', + '.tif', + '.tiff' +]; +const beforeAvatarUpload = (rawFile: UploadUserFile) => { const ext = rawFile.name.toLowerCase().slice(rawFile.name.lastIndexOf('.')); if (blockedExts.includes(ext)) { ElMessage.warning(`禁止上传 ${ext} 文件`); return false; } + if (!allowExts.includes(ext)) { + ElMessage.warning('只能上传word,excel,图片等文件'); + return false; + } return true; }; diff --git a/src/views/system/NoticePc/addNoticePc.vue b/src/views/system/NoticePc/addNoticePc.vue index dfde51f..6527a4b 100644 --- a/src/views/system/NoticePc/addNoticePc.vue +++ b/src/views/system/NoticePc/addNoticePc.vue @@ -48,6 +48,7 @@ :height="500" :min-height="300" :read-only="false" + type="url" :file-size="5" /> @@ -71,7 +72,6 @@ import PageHeader from '@/components/Pageheader/index.vue'; import { addNotice, getNotice } from '@/api/system/NoticePc'; import { updateNotice } from '@/api/system/NoticePc'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; -const { com_noticepc_level } = toRefs(proxy?.useDict('com_noticepc_level')); const { com_publish_status } = toRefs(proxy?.useDict('com_publish_status')); const route = useRoute(); @@ -94,6 +94,7 @@ const rules = { const userid = ref(); // ! 富文本 ============================================================================================================= function handleContent(val: string) { + console.log(val); form.value.noticeContent = val.trim(); } // ! 富文本 ============================================================================================================= @@ -134,9 +135,7 @@ const submitForm = () => { // 返回 function handleBack() { - router.push({ - path: '/repair/noticepc' - }); + router.back(); } diff --git a/src/views/system/NoticePc/index.vue b/src/views/system/NoticePc/index.vue index afa1211..21e03dc 100644 --- a/src/views/system/NoticePc/index.vue +++ b/src/views/system/NoticePc/index.vue @@ -47,23 +47,23 @@ - + - + - - - - - + + + + + + + -
+
{{ print_form.title }}
单据日期：{{ print_form.printDate }}
@@ -254,7 +254,7 @@ 优免金额 实收金额 收款方式 - 备注 + 备注 @@ -283,7 +283,7 @@

说明：本收据收款单位和收款具签章方为有效，本收据手写无效

-
+
交款人：
收款人： @@ -488,6 +488,7 @@ function initInComeFrom() { discount: 0, // 优惠金额 residentName: '' // 缴费人 }; + totalDiscountAmount.value = 0; isMore = false; } // 改变优惠方式 @@ -598,6 +599,7 @@ function handleIncome(row: billlistType | false) { inComeFrom.value.allCost = row.amount; inComeFrom.value.billResidentId = [row]; inComeFrom.value.residentName = row.residentName; + totalDiscountAmount.value = Number(row.amount); } else { if (ids.value.length <= 0) return ElMessage.warning('请选择账单'); const set = new Set(); diff --git a/src/views/system/cars/addCars.vue b/src/views/system/cars/addCars.vue index 39492f5..a61803a 100644 --- a/src/views/system/cars/addCars.vue +++ b/src/views/system/cars/addCars.vue @@ -267,7 +267,6 @@ function handleChange(pop) { holderInfo.value = pop; form.value.userId = ''; form.value.userName = ''; - console.log(pop); if (pop !== null) { form.value.userId = pop.user_id; form.value.userName = pop.user_name; diff --git a/src/views/system/cars/index.vue b/src/views/system/cars/index.vue index bb2444e..8b00f7e 100644 --- a/src/views/system/cars/index.vue +++ b/src/views/system/cars/index.vue @@ -66,7 +66,7 @@ import Pageheader from '@/components/Pageheader/index.vue'; import { listCar, delCar } from '@/api/system/cars/index'; import { CarVO, CarQuery, CarForm } from '@/api/system/cars/type'; -import { listResident } from '@/api/system/resident'; +import { listResident } from '@/api/system/residentReviewProcess/resident'; import { checkPermi } from '@/utils/permission'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; diff --git a/src/views/system/houseRental/addhouseResident.vue b/src/views/system/houseRental/addhouseResident.vue index 04aacfc..c70a48f 100644 --- a/src/views/system/houseRental/addhouseResident.vue +++ b/src/views/system/houseRental/addhouseResident.vue @@ -299,7 +299,7 @@ const handleChangeFile = (uploadFile: UploadFile, uploadFiles: UploadFiles) => { const ext = uploadFile.name.toLowerCase().slice(uploadFile.name.lastIndexOf('.')); if (blockedExts.includes(ext)) { ElMessage.warning(`禁止上传 ${ext} 文件`); - fileList.value = uploadFiles.filter((f) => f.uid !== uploadFile.uid); + uploadRef.value.handleRemove(uploadFile); return; } fileList.value = uploadFiles; diff --git a/src/views/system/inspection/Daily/index.vue b/src/views/system/inspection/Daily/index.vue index d83adc3..8dc2ed8 100644 --- a/src/views/system/inspection/Daily/index.vue +++ b/src/views/system/inspection/Daily/index.vue @@ -34,12 +34,14 @@ - 导出当前页 - 导出所有 + 导出选中 + 导出当前页 + 导出所有 - + + @@ -126,6 +128,26 @@ const exportAll = () => { `巡检日报_${new Date().toLocaleString()}.xlsx` ); }; +const multipleSelection = ref([]); +function handleChange(val) { + multipleSelection.value = val; +} +const exportChecked = () => { + if (multipleSelection.value.length > 0) { + const listValue = multipleSelection.value.map((item) => item.id); + console.log(listValue); + proxy?.download( + '/inspection/data/export/selected', + { + list: listValue.join(','), + dataType: '1' + }, + `巡检日报_选中${listValue.length}条数据_${new Date().toLocaleString()}.xlsx`, + ); + } else { + ElMessage.warning('请选择数据'); + } +}; onMounted(() => { getList(); diff --git a/src/views/system/inspection/Monthly/index.vue b/src/views/system/inspection/Monthly/index.vue index fa2f1a3..07d2d62 100644 --- a/src/views/system/inspection/Monthly/index.vue +++ b/src/views/system/inspection/Monthly/index.vue @@ -34,13 +34,15 @@ - 导出当前页 - 导出所有 + 导出当前页 + 导出所有 + 导出选中 - + + @@ -125,6 +127,26 @@ const exportAll = () => { `巡检月报_${new Date().toLocaleString()}.xlsx` ); }; +const multipleSelection = ref([]); +function handleChange(val) { + multipleSelection.value = val; +} +const exportChecked = () => { + if (multipleSelection.value.length > 0) { + const listValue = multipleSelection.value.map((item) => item.id); + console.log(listValue); + proxy?.download( + '/inspection/data/export/selected', + { + list: listValue.join(','), + dataType: '3' + }, + `巡检月报_选中${listValue.length}条数据_${new Date().toLocaleString()}.xlsx` + ); + } else { + ElMessage.warning('请选择数据'); + } +}; onMounted(() => { getList(); }); diff --git a/src/views/system/inspection/Weekly/index.vue b/src/views/system/inspection/Weekly/index.vue index 2e22104..c279f76 100644 --- a/src/views/system/inspection/Weekly/index.vue +++ b/src/views/system/inspection/Weekly/index.vue @@ -34,13 +34,15 @@ - 导出当前页 - 导出所有 + 导出当前页 + 导出所有 + 导出选中 - + + @@ -129,6 +131,27 @@ const exportAll = () => { onMounted(() => { getList(); }); + +const multipleSelection = ref([]); +function handleChange(val) { + multipleSelection.value = val; +} +const exportChecked = () => { + if (multipleSelection.value.length > 0) { + const listValue = multipleSelection.value.map((item) => item.id); + console.log(listValue); + proxy?.download( + '/inspection/data/export/selected', + { + list: listValue.join(','), + dataType: '2' + }, + `巡检周报_选中${listValue.length}条数据_${new Date().toLocaleString()}.xlsx` + ); + } else { + ElMessage.warning('请选择数据'); + } +}; diff --git a/src/views/system/revenueNotice/index.vue b/src/views/system/revenueNotice/index.vue new file mode 100644 index 0000000..d06c1a2 --- /dev/null +++ b/src/views/system/revenueNotice/index.vue @@ -0,0 +1,276 @@ + + + + + diff --git a/src/views/system/statistics/Payment/index.vue b/src/views/system/statistics/Payment/index.vue index ae972c2..a9a64c5 100644 --- a/src/views/system/statistics/Payment/index.vue +++ b/src/views/system/statistics/Payment/index.vue @@ -19,9 +19,9 @@
收入来源
-
应缴费用：{{ formatMoneyWithUnit(sourceFrom.totalPayable) }}
-
已收：{{ formatMoneyWithUnit(sourceFrom.totalReceived) }}
-
待收：{{ formatMoneyWithUnit(sourceFrom.totalPending) }}
+
应缴费用：{{ formatMoneyWithUnit(sourceFrom.totalPayable, 3) }}
+
已收：{{ formatMoneyWithUnit(sourceFrom.totalReceived, 3) }}
+
待收：{{ formatMoneyWithUnit(sourceFrom.totalPending, 3) }}
diff --git a/src/views/system/warehouse/Inventory/index.vue b/src/views/system/warehouse/Inventory/index.vue index 3868ef2..c7dfff5 100644 --- a/src/views/system/warehouse/Inventory/index.vue +++ b/src/views/system/warehouse/Inventory/index.vue @@ -72,7 +72,6 @@ import { listStock } from '@/api/system/Tstock'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; const router = useRouter(); const materialList = ref([]); -const buttonLoading = ref(false); const loading = ref(true); const showSearch = ref(true); const ids = ref>([]); @@ -135,7 +134,7 @@ const handleAdd = () => { }); }; /** 修改按钮操作 */ -const handleUpdate = async (row?: MaterialVO) => { +const handleUpdate = (row?: MaterialVO) => { const _ids = row?.materialId; router.push({ path: '/warehouse/editInventory', diff --git a/src/views/system/warehouse/Material/addMaterial.vue b/src/views/system/warehouse/Material/addMaterial.vue index 1a9df94..9588eb1 100644 --- a/src/views/system/warehouse/Material/addMaterial.vue +++ b/src/views/system/warehouse/Material/addMaterial.vue @@ -35,8 +35,6 @@ import { ref } from 'vue'; import PageHeader from '@/components/Pageheader/index.vue'; import { getMaterial, updateMaterial, addMaterial } from '@/api/system/Tmaterial'; -const { proxy } = getCurrentInstance() as ComponentInternalInstance; - const router = useRouter(); const route = useRoute(); diff --git a/src/views/system/warehouse/Supplier/addSupplier.vue b/src/views/system/warehouse/Supplier/addSupplier.vue index 8eab7dd..de2e00a 100644 --- a/src/views/system/warehouse/Supplier/addSupplier.vue +++ b/src/views/system/warehouse/Supplier/addSupplier.vue @@ -8,13 +8,13 @@ - + - + - + @@ -39,8 +39,6 @@ import PageHeader from '@/components/Pageheader/index.vue'; import { getSupplier, updateSupplier, addSupplier } from '@/api/system/Tsupplier'; import { validator } from '@/utils/Reg'; -const { proxy } = getCurrentInstance() as ComponentInternalInstance; - const router = useRouter(); const route = useRoute(); diff --git a/src/views/system/warehouse/Warehouse/addWarehouse.vue b/src/views/system/warehouse/Warehouse/addWarehouse.vue index 886f50e..e5ab04b 100644 --- a/src/views/system/warehouse/Warehouse/addWarehouse.vue +++ b/src/views/system/warehouse/Warehouse/addWarehouse.vue @@ -10,13 +10,13 @@ - + - + - + @@ -42,8 +42,6 @@ import { getCommunitylistAPI } from '@/api/system/community'; import { addWarehouse, getWarehouse, updateWarehouse } from '@/api/system/Twarehouse'; import { validator } from '@/utils/Reg'; -const { proxy } = getCurrentInstance() as ComponentInternalInstance; - const router = useRouter(); const route = useRoute(); @@ -63,7 +61,7 @@ const rules = ref({ contactPhone: [ { required: true, message: '请输入 联系电话', trigger: 'blur' }, { - validator: (_, value) => validator(value, 'phone'), + validator: (_: any, value: string | number) => validator(value, 'phone'), message: '请输入正确的电话号码', trigger: 'blur' } @@ -74,10 +72,10 @@ const rules = ref({ const userid = ref(null); // 小区列表 -const cummunitylist = ref([]); +const communityList = ref([]); function init() { getCommunitylistAPI().then((res) => { - cummunitylist.value = res.rows; + communityList.value = res.rows; }); if (route.query.id) { userid.value = route.query.id; @@ -103,12 +101,12 @@ const submitForm = () => { formRef.value?.validate(async (valid: boolean) => { if (valid) { if (userid.value) { - updateWarehouse(form.value).then((res) => { + updateWarehouse(form.value).then(() => { ElMessage.success('编辑成功'); cancelForm(); }); } else { - addWarehouse(form.value).then((res) => { + addWarehouse(form.value).then(() => { ElMessage.success('添加成功'); cancelForm(); }); diff --git a/src/views/workbench/components/feeOverview.vue b/src/views/workbench/components/feeOverview.vue new file mode 100644 index 0000000..994123c --- /dev/null +++ b/src/views/workbench/components/feeOverview.vue @@ -0,0 +1,210 @@ + + + + diff --git a/src/views/workbench/components/repairechartsAll.vue b/src/views/workbench/components/repairechartsAll.vue index 900b448..7429f66 100644 --- a/src/views/workbench/components/repairechartsAll.vue +++ b/src/views/workbench/components/repairechartsAll.vue @@ -31,7 +31,7 @@ const handleRoute = () => { .echarts { margin-right: 20px; flex: 1; - height: 450px; + height: 512px; background: linear-gradient(180deg, rgba(255, 255, 255, 0.2) 0%, #ffffff 70%); border: 2px solid #ffffff; border-radius: 12px; diff --git a/src/views/workbench/components/todo.vue b/src/views/workbench/components/todo.vue index 88ae4d5..01549f2 100644 --- a/src/views/workbench/components/todo.vue +++ b/src/views/workbench/components/todo.vue @@ -71,6 +71,31 @@ function headerToken() { }; } const blockedExts = ['.exe', '.bat', '.cmd', '.msi']; +const allowExts = [ + // word + '.doc', + '.docx', + '.dot', + '.dotx', + // excel + '.xls', + '.xlsx', + '.xlsm', + '.xlsb', + // img + '.jpg', + '.jpeg', + '.png', + '.gif', + '.bmp', + '.webp', + // 专业/矢量图 + '.psd', + '.ai', + '.svg', + '.tif', + '.tiff' +]; const handleAvatarRemove: UploadProps['onRemove'] = (uploadFile: UploadFile, uploadFiles: UploadFiles) => { fileList.value = uploadFiles; }; @@ -78,7 +103,12 @@ const handleProgress: UploadProps['onChange'] = (uploadFile: UploadFile, uploadF const ext = uploadFile.name.toLowerCase().slice(uploadFile.name.lastIndexOf('.')); if (blockedExts.includes(ext)) { ElMessage.warning(`禁止上传 ${ext} 文件`); - fileList.value = uploadFiles.filter((f) => f.uid !== uploadFile.uid); + uploadRef.value.handleRemove(uploadFile); + return; + } + if (!allowExts.includes(ext)) { + ElMessage.warning('只允许上传word,excel和图片文件'); + uploadRef.value.handleRemove(uploadFile); return; } fileList.value = uploadFiles; diff --git a/src/views/workbench/components/usertable.vue b/src/views/workbench/components/usertable.vue index b71298d..c750655 100644 --- a/src/views/workbench/components/usertable.vue +++ b/src/views/workbench/components/usertable.vue @@ -57,7 +57,7 @@