From 40d6c83a9a8b94d5676fc83d3f6224d69d895078 Mon Sep 17 00:00:00 2001 From: nyoung <12190070+nyoungo@user.noreply.gitee.com> Date: Tue, 3 Sep 2024 23:13:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=A3=E8=BD=A6=E7=AE=A1=E7=90=861?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/rescue/info.js | 7 + src/utils/createUniqueCode.js | 9 + src/utils/dict.js | 2 + .../inspection/inspectionGoods/index.vue | 2 +- src/views/partner/delWorkOrder.vue | 6 +- src/views/partner/workOrder.vue | 6 +- src/views/rescue/buckleList.vue | 411 ++++++++++++++++++ src/views/system/tenant/index.vue | 2 +- 8 files changed, 437 insertions(+), 8 deletions(-) create mode 100644 src/views/rescue/buckleList.vue diff --git a/src/api/rescue/info.js b/src/api/rescue/info.js index fbc190c..a76edd1 100644 --- a/src/api/rescue/info.js +++ b/src/api/rescue/info.js @@ -110,3 +110,10 @@ export function exportManagement(params) { }) } +export function listBuckle() { + return request({ + url: "/system/rescueInfo/buckle", + method:"get" + }) +} + diff --git a/src/utils/createUniqueCode.js b/src/utils/createUniqueCode.js index eb411cb..4ffdd8d 100644 --- a/src/utils/createUniqueCode.js +++ b/src/utils/createUniqueCode.js @@ -1,9 +1,18 @@ import { v4 as uuidv4 } from 'uuid' +/** + * 生成UUID + * @returns {string} + */ export function createUUID() { return uuidv4().replace(/-/g, '') } +/** + * 通过字符串生成唯一编码,可能有hash碰撞问题 + * @param str + * @returns {number|string} + */ export function createHashCodeByStr(str) { let hash = 0 if (str.length === 0) return hash diff --git a/src/utils/dict.js b/src/utils/dict.js index b8c035c..4bb2047 100644 --- a/src/utils/dict.js +++ b/src/utils/dict.js @@ -171,6 +171,8 @@ export const DICT_TYPE = { ARCHIVES_TYPE: 'archives_type', // 档案项分类 ARCHIVES_ITEM_TYPE: 'archives_item_type', + // 扣车状态 + RESCUE_STATUS: 'rescue_status', } /** diff --git a/src/views/inspection/inspectionGoods/index.vue b/src/views/inspection/inspectionGoods/index.vue index 630fed3..88dd48d 100644 --- a/src/views/inspection/inspectionGoods/index.vue +++ b/src/views/inspection/inspectionGoods/index.vue @@ -280,7 +280,7 @@ dialogFormVisible: false, froms: { id:0, - listingStatus:2, + listingStatus:'2', rejectReason:'', name: '', region: '', diff --git a/src/views/partner/delWorkOrder.vue b/src/views/partner/delWorkOrder.vue index 9cd83c8..d2878f4 100644 --- a/src/views/partner/delWorkOrder.vue +++ b/src/views/partner/delWorkOrder.vue @@ -21,9 +21,9 @@ diff --git a/src/views/partner/workOrder.vue b/src/views/partner/workOrder.vue index 280295c..a35bded 100644 --- a/src/views/partner/workOrder.vue +++ b/src/views/partner/workOrder.vue @@ -21,9 +21,9 @@ diff --git a/src/views/rescue/buckleList.vue b/src/views/rescue/buckleList.vue new file mode 100644 index 0000000..edbcde2 --- /dev/null +++ b/src/views/rescue/buckleList.vue @@ -0,0 +1,411 @@ + + + + + + 当前选择的是: {{ chooseData.buckleName }} + + + + + + + + {{ truncateText(data.buckleName, 15) }}({{ data.buckleCount }}) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 搜索 + 重置 + + + + + + + 导出 + + + + + + + + + {{ scope.$index + 1 }} + + + + + {{ getBuckleName(scope.row.deptId) }} + + + + + + + + + {{ scope.row.licenseNum }} + + + + + + + + + + + {{ scope.row.driverCarNum }} + + + + + + {{ parseTime(scope.row.rescueTime, '{y}-{m}-{d} {h}:{m}') }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 未成单 + + + + + + + + + {{ scope.row.setMoney / 100 }} + + + + + {{ scope.row.payMoney / 100 }} + + + + + {{ scope.row.payTime }} + + + + + 删除 + + + + + + + + + + + + + + + diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue index 6992d93..889f6e8 100644 --- a/src/views/system/tenant/index.vue +++ b/src/views/system/tenant/index.vue @@ -74,7 +74,7 @@ {{ parseTime(scope.row.createTime) }} - + 修改