From 045fbc240ced1e1bc005b734098e59779b67bb1c Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期一, 29 九月 2025 10:42:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
ui/admin-ui3/src/views/cwgl/returnLog/index.vue | 21 +++
ui/admin-ui3/src/views/cwgl/requestStatusLog/index.vue | 24 +++-
ui/admin-ui3/src/views/cwgl/smartLockerApplication/index.vue | 70 ++++++++++---
ui/admin-ui3/src/views/cwgl/keyCollectionInfo/index.vue | 64 +++++++++++-
ui/admin-ui3/src/views/cwgl/pendingSettlementBusiness/index.vue | 47 +++++++--
ui/admin-ui3/src/views/cwgl/estimatedReceivable/index.vue | 21 +++
6 files changed, 198 insertions(+), 49 deletions(-)
diff --git a/ui/admin-ui3/src/views/cwgl/estimatedReceivable/index.vue b/ui/admin-ui3/src/views/cwgl/estimatedReceivable/index.vue
index 5da6fa1..742acea 100644
--- a/ui/admin-ui3/src/views/cwgl/estimatedReceivable/index.vue
+++ b/ui/admin-ui3/src/views/cwgl/estimatedReceivable/index.vue
@@ -245,11 +245,22 @@
},
orderDate: {
label: '涓嬪崟鏃ユ湡',
- search: true,
minWidth: 180,
type: 'datetime', // 鏀逛负 datetime 绫诲瀷
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
+ },
+ orderDateArray: {
+ label: '涓嬪崟鏃ユ湡',
+ search: true,
+ searchRange: true,
+ type: 'daterange',
+ startPlaceholder: '寮�濮嬫棩鏈�',
+ endPlaceholder: '缁撴潫鏃ユ湡',
+ valueFormat: 'YYYY-MM-DD',
+ hide: true,
+ addDisplay: false,
+ editDisplay: false,
},
feeName: {
label: '璐圭敤鍚嶇О',
@@ -411,9 +422,13 @@
},
getBeginListFunc: (params = {}) => {
- params.feeType = 0;
- return params
+ let newParams = { ...params };
+ newParams.feeType = 0;
+ newParams = proxy.addDateRangeNew(newParams, newParams?.orderDateArray, 'orderDate') || [];
+ delete newParams.orderDateArray;
+
+ return newParams
}
})
diff --git a/ui/admin-ui3/src/views/cwgl/keyCollectionInfo/index.vue b/ui/admin-ui3/src/views/cwgl/keyCollectionInfo/index.vue
index 50ce33f..e92f1fe 100644
--- a/ui/admin-ui3/src/views/cwgl/keyCollectionInfo/index.vue
+++ b/ui/admin-ui3/src/views/cwgl/keyCollectionInfo/index.vue
@@ -6,12 +6,12 @@
@search-reset="searchReset" @selection-change="selectionChange" @current-change="currentChange"
@size-change="sizeChange" @on-load="onLoad">
<template #menu-left>
- <el-button type="success" icon="Edit" :disabled="pageF.single" v-hasPermi="['cwgl:keyCollectionInfo:edit']"
+ <!-- <el-button type="success" icon="Edit" :disabled="pageF.single" v-hasPermi="['cwgl:keyCollectionInfo:edit']"
@click="handleUpdate">淇敼
</el-button>
<el-button type="danger" icon="Delete" :disabled="pageF.multiple" @click="handleDelete"
v-hasPermi="['cwgl:keyCollectionInfo:remove']">鍒犻櫎
- </el-button>
+ </el-button> -->
<el-button type="warning" plain icon="Download" @click="handleExport"
v-hasPermi="['cwgl:keyCollectionInfo:export']">瀵煎嚭
</el-button>
@@ -69,8 +69,9 @@
// },
customerName: {
label: '瀹㈡埛鍚嶇О',
- minWidth: 200,
- search: true,
+ minWidth: 220,
+ search: true,
+ showOverflowTooltip: true,
},
carrier: {
label: '鎵胯繍鍟�',
@@ -80,7 +81,7 @@
dispatchNo: {
label: '璋冨害鍗曞彿',
minWidth: 200,
- search: true,
+ search: true,
},
driverName: {
label: '鍙告満鍚嶇О',
@@ -96,29 +97,62 @@
orderTime: {
label: '璁㈠崟涓嬪崟鏃堕棿',
minWidth: 180,
- search: true,
type: 'datetime', // 鏀逛负 datetime 绫诲瀷
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
minWidth: 200,
+ },
+ orderTimeArray: {
+ label: '璁㈠崟涓嬪崟鏃堕棿',
+ search: true,
+ searchRange: true,
+ type: 'daterange',
+ startPlaceholder: '寮�濮嬫棩鏈�',
+ endPlaceholder: '缁撴潫鏃ユ湡',
+ valueFormat: 'YYYY-MM-DD',
+ hide: true,
+ addDisplay: false,
+ editDisplay: false,
},
orderCreatedTime: {
label: '璁㈠崟鍒涘缓鏃堕棿',
minWidth: 180,
- search: true,
type: 'datetime', // 鏀逛负 datetime 绫诲瀷
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
minWidth: 200,
},
+ orderCreatedTimeArray: {
+ label: '璁㈠崟鍒涘缓鏃堕棿',
+ search: true,
+ searchRange: true,
+ type: 'daterange',
+ startPlaceholder: '寮�濮嬫棩鏈�',
+ endPlaceholder: '缁撴潫鏃ユ湡',
+ valueFormat: 'YYYY-MM-DD',
+ hide: true,
+ addDisplay: false,
+ editDisplay: false,
+ },
dispatchCreatedTime: {
label: '璋冨害鍗曞垱寤烘椂闂�',
minWidth: 180,
- search: true,
type: 'datetime', // 鏀逛负 datetime 绫诲瀷
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
minWidth: 200,
+ },
+ dispatchCreatedTimeArray: {
+ label: '璋冨害鍗曞垱寤烘椂闂�',
+ search: true,
+ searchRange: true,
+ type: 'daterange',
+ startPlaceholder: '寮�濮嬫棩鏈�',
+ endPlaceholder: '缁撴潫鏃ユ湡',
+ valueFormat: 'YYYY-MM-DD',
+ hide: true,
+ addDisplay: false,
+ editDisplay: false,
},
keyCollectionTime: {
label: '閽ュ寵棰嗗彇鏃堕棿',
@@ -205,7 +239,21 @@
},
handleSelectionChangeFunc: (selection: any) => {
selectionList.value = selection;
+ },
+ getBeginListFunc: (params = {}) => {
+ let newParams = { ...params };
+
+ newParams = proxy.addDateRangeNew(newParams, newParams?.orderTimeArray, 'orderTime') || [];
+ newParams = proxy.addDateRangeNew(newParams, newParams?.orderCreatedTimeArray, 'orderCreatedTime') || [] ;
+ newParams = proxy.addDateRangeNew(newParams, newParams?.dispatchCreatedTimeArray, 'dispatchCreatedTime') || [];
+
+ delete newParams.orderTimeArray;
+ delete newParams.orderCreatedTimeArray;
+ delete newParams.dispatchCreatedTimeArray;
+
+ return newParams;
}
+
})
diff --git a/ui/admin-ui3/src/views/cwgl/pendingSettlementBusiness/index.vue b/ui/admin-ui3/src/views/cwgl/pendingSettlementBusiness/index.vue
index 8169e7b..38ded24 100644
--- a/ui/admin-ui3/src/views/cwgl/pendingSettlementBusiness/index.vue
+++ b/ui/admin-ui3/src/views/cwgl/pendingSettlementBusiness/index.vue
@@ -204,14 +204,28 @@
vehicleType: {
label: '杞﹀瀷', search: true,
},
+ // createdTime: {
+ // label: '涓嬪崟鏃堕棿',
+ // display: false,
+ // search: true,
+ // type: 'date',
+ // format: 'YYYY-MM-DD',
+ // searchSpan: 5, minWidth: 120,
+ // valueFormat: 'YYYY-MM-DD',
+ // },
+ createdTimeArray: {
+ label: '涓嬪崟鏃堕棿',
+ search: true,
+ searchRange: true,
+ type: 'daterange',
+ startPlaceholder: '寮�濮嬫棩鏈�',
+ endPlaceholder: '缁撴潫鏃ユ湡',
+ valueFormat: 'YYYY-MM-DD',
+ hide: true
+ },
createdTime: {
label: '涓嬪崟鏃堕棿',
- display: false,
- search: true,
- type: 'date',
- format: 'YYYY-MM-DD',
- searchSpan: 5, minWidth: 120,
- valueFormat: 'YYYY-MM-DD',
+ minWidth: 180,
},
operationMode: {
label: '杩愯惀妯″紡',
@@ -256,7 +270,7 @@
},
arrivalLocation: {
label: '鐩殑鍦�',
- minWidth: 220,
+ minWidth: 220,
showOverflowTooltip: true,
},
@@ -311,7 +325,7 @@
minWidth: 120,
},
- isCreate: {
+ isCreate: {
label: '鏄惁宸插叆璐�', dataType: 'string',
type: 'select',
fixed: 'right',
@@ -330,7 +344,7 @@
type: 'select',
dataType: 'string',
minWidth: 120,
-
+
dicUrl: '/system/dict/data/type/sys_matching_status',
},
isCostMatched: {
@@ -468,7 +482,16 @@
generateDisabled.value = false;
}
selectionList.value = selection;
+ },
+ getBeginListFunc: (params = {}) => {
+ // 鍒涘缓鏂板弬鏁板璞�
+ let newParams = { ...params };
+ newParams = proxy.addDateRangeNew(newParams, newParams?.createdTimeArray, 'createdTime') || [];
+ delete newParams.createdTimeArray;
+
+ return newParams;
}
+
})
const dialog = reactive({
visible: false,
@@ -556,7 +579,7 @@
dispatchNo.value = row.dispatchNo;
dialog.title = '璐圭敤鏄庣粏';
if (activeName.value == 'first') {
- listEstimatedReceivable({ dispatchNo: row.dispatchNo, feeType: 1,isConfirmed:1 }).then((res) => {
+ listEstimatedReceivable({ dispatchNo: row.dispatchNo, feeType: 1, isConfirmed: 1 }).then((res) => {
if (res.code === 200) {
dialog.detail = true;
tableDataList.value = res.rows || [];
@@ -564,7 +587,7 @@
})
} else if (activeName.value == 'second') {
// 杩欓噷鍙互娣诲姞鏌ヨ鏀跺叆鐩稿叧鐨勯�昏緫
- listEstimatedReceivable({ dispatchNo: row.dispatchNo, feeType: 0,isConfirmed:1 }).then((res) => {
+ listEstimatedReceivable({ dispatchNo: row.dispatchNo, feeType: 0, isConfirmed: 1 }).then((res) => {
if (res.code === 200) {
dialog.detail = true;
tableDataList.value = res.rows || [];
@@ -573,7 +596,7 @@
}
}
const getListVable = (dispatchNo, feeType) => {
- listEstimatedReceivable({ dispatchNo: dispatchNo, feeType: feeType,isConfirmed:1 }).then((res) => {
+ listEstimatedReceivable({ dispatchNo: dispatchNo, feeType: feeType, isConfirmed: 1 }).then((res) => {
if (res.code === 200) {
tableDataList.value = res.rows || [];
}
diff --git a/ui/admin-ui3/src/views/cwgl/requestStatusLog/index.vue b/ui/admin-ui3/src/views/cwgl/requestStatusLog/index.vue
index 6e1b521..f1a4f99 100644
--- a/ui/admin-ui3/src/views/cwgl/requestStatusLog/index.vue
+++ b/ui/admin-ui3/src/views/cwgl/requestStatusLog/index.vue
@@ -96,6 +96,18 @@
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
+ reqTimeArray: {
+ label: '璇锋眰寮�闂ㄦ椂闂�',
+ search: true,
+ searchRange: true,
+ type: 'daterange',
+ startPlaceholder: '寮�濮嬫棩鏈�',
+ endPlaceholder: '缁撴潫鏃ユ湡',
+ valueFormat: 'YYYY-MM-DD',
+ hide: true,
+ addDisplay: false,
+ editDisplay: false,
+ },
// reqTime: {
// label: '璇锋眰鏃堕棿',
// minWidth: 150,
@@ -133,11 +145,13 @@
handleSelectionChangeFunc: (selection: any) => {
selectionList.value = selection;
},
- getBeginListFunc: (params = {}) => {
- params.type = 0;
- return params
-
- }
+ getBeginListFunc: (params = {}) => {
+ let newParams = { ...params };
+ newParams.type = 0;
+ newParams = proxy.addDateRangeNew(newParams, newParams?.reqTimeArray, 'reqTime') || [];
+ delete newParams.reqTimeArray;
+ return newParams
+ }
})
diff --git a/ui/admin-ui3/src/views/cwgl/returnLog/index.vue b/ui/admin-ui3/src/views/cwgl/returnLog/index.vue
index a29dc93..938a30e 100644
--- a/ui/admin-ui3/src/views/cwgl/returnLog/index.vue
+++ b/ui/admin-ui3/src/views/cwgl/returnLog/index.vue
@@ -92,10 +92,21 @@
reqTime: {
label: '瀛樺叆鏃堕棿',
minWidth: 150,
- search: true,
type: 'datetime', // 鏀逛负 datetime 绫诲瀷
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
+ },
+ reqTimeArray: {
+ label: '瀛樺叆鏃堕棿',
+ search: true,
+ searchRange: true,
+ type: 'daterange',
+ startPlaceholder: '寮�濮嬫棩鏈�',
+ endPlaceholder: '缁撴潫鏃ユ湡',
+ valueFormat: 'YYYY-MM-DD',
+ hide: true,
+ addDisplay: false,
+ editDisplay: false,
},
// reqTime: {
// label: '璇锋眰鏃堕棿',
@@ -135,9 +146,11 @@
selectionList.value = selection;
},
getBeginListFunc: (params = {}) => {
- params.type = 1;
- return params
-
+ let newParams = { ...params };
+ newParams.type = 1;
+ newParams = proxy.addDateRangeNew(newParams, newParams?.reqTimeArray, 'reqTime') || [];
+ delete newParams.reqTimeArray;
+ return newParams
}
})
diff --git a/ui/admin-ui3/src/views/cwgl/smartLockerApplication/index.vue b/ui/admin-ui3/src/views/cwgl/smartLockerApplication/index.vue
index d90556d..df4f40c 100644
--- a/ui/admin-ui3/src/views/cwgl/smartLockerApplication/index.vue
+++ b/ui/admin-ui3/src/views/cwgl/smartLockerApplication/index.vue
@@ -16,13 +16,25 @@
v-hasPermi="['cwgl:smartLockerApplication:export']">瀵煎嚭
</el-button> -->
</template>
+
+
+ <template #itemName-form="{ row, size, }">
+ <div style="cursor: pointer;">
+ <el-input v-if="itemTypeIShow" v-model="form.itemName" placeholder="璇疯緭鍏� 鐗╁搧鍚嶇О">
+ </el-input>
+ <el-input v-if="!itemTypeIShow" v-model="form.itemName" @click="debouncedItemNameChange"
+ placeholder="璇疯緭鍏� 杞︾墝鍙�">
+ </el-input>
+ </div>
+ </template>
+
<template #menu="{ size, row, index }">
- <el-link class="link-btn" type="primary" :underline="false" plain :size="size"
- @click="handleEditBtn(row, index)" v-if="row.status == 0"
- v-hasPermi="['cwgl:smartLockerApplication:cancel']"> 缂栬緫
+ <el-link class="link-btn" type="primary" :underline="false" plain :size="size"
+ @click="handleEditBtn(row, index)" v-if="row.status == 0" v-hasPermi="['cwgl:smartLockerApplication:cancel']">
+ 缂栬緫
</el-link>
- <el-link class="link-btn" v-if="row.status == 0" type="primary" :underline="false" plain @click="handleInvalid(row)"
- v-hasPermi="['cwgl:smartLockerApplication:invalid']"> 浣滃簾
+ <el-link class="link-btn" v-if="row.status == 0" type="primary" :underline="false" plain
+ @click="handleInvalid(row)" v-hasPermi="['cwgl:smartLockerApplication:invalid']"> 浣滃簾
</el-link>
</template>
</avue-crud>
@@ -30,9 +42,10 @@
</template>
<script setup name="smartLockerApplication" lang="ts">
-import { SmartLockerApplicationI, addSmartLockerApplication, delSmartLockerApplication, exportSmartLockerApplication, getSmartLockerApplication, listSmartLockerApplication, updateSmartLockerApplication, smartLockerApplicationQuery,
+import {
+ SmartLockerApplicationI, addSmartLockerApplication, delSmartLockerApplication, exportSmartLockerApplication, getSmartLockerApplication, listSmartLockerApplication, updateSmartLockerApplication, smartLockerApplicationQuery,
smartLockerApplicationInvalid
- } from "@/api/cwgl/smartLockerApplication";
+} from "@/api/cwgl/smartLockerApplication";
import useCurrentInstance from "@/utils/useCurrentInstance";
import { computed, reactive, ref, toRefs } from "vue";
import { PagesInterface, PageQueryInterface } from "@/utils/globalInterface";
@@ -60,8 +73,10 @@
currentPage: 1,
},
selectionList: [],
+ itemTypeIShow: true, // 鎺у埗 itemType 鏄剧ず闅愯棌
+ itemTypeIcon: '鐗╁搧鍚嶇О涓嶈兘涓虹┖',
})
-const { queryParams, form, page, selectionList } = toRefs(data);
+const { queryParams, form, page, selectionList, itemTypeIShow, itemTypeIcon } = toRefs(data);
const option = ref({
pageKey: 'SmartLockerApplication',
rowKey: 'id',
@@ -122,6 +137,27 @@
// editDisplay: false, // 淇敼鏃朵笉鏄剧ず
dicUrl: '/system/dict/data/type/sys_item_type',
change: (val: any) => {
+ if (val.value === '0') {
+ itemTypeIShow.value = false;
+ itemTypeIcon.value = '杞︾墝鍙蜂笉鑳戒负绌�'
+ } else {
+ itemTypeIShow.value = true;
+ itemTypeIcon.value = '鐗╁搧鍚嶇О涓嶈兘涓虹┖'
+
+ }
+ option.value.column.itemName.rules = [
+ {
+ required: true,
+ message: itemTypeIcon.value,
+ trigger: "blur"
+ }
+ ];
+
+ // 娓呴櫎涔嬪墠鐨勬牎楠岀姸鎬�
+ if (crudRef.value) {
+ crudRef.value.clearValidate('itemName');
+ }
+
if (val.value === '1') {
if (form.value.itemName !== '' && form.value.itemName !== undefined) {
@@ -137,7 +173,7 @@
rules: [
{
required: true,
- message: "鐗╁搧鍚嶇О涓嶈兘涓虹┖", trigger: "blur"
+ message: itemTypeIcon.value, trigger: "blur"
}
],
change: (val: any) => {
@@ -182,7 +218,7 @@
valueFormat: 'YYYY-MM-DD HH:mm:ss',
addDisplay: true, // 鏂板鏃朵笉鏄剧ず
minWidth: 200,
- rules: [
+ rules: [
{
required: true,
message: "棰嗗彇鎴鏃堕棿涓嶈兘涓虹┖", trigger: "change"
@@ -276,9 +312,9 @@
handleBeforeOpenFunc: (done: Function, type: string) => {
if (done == 'add') {
option.value.column.lockerNo.value = '鎺ラ┏绔欐櫤鑳介挜鍖欐煖'
- option.value.column.deadlineTime.value =formatDateTime(new Date(Date.now() + 24 * 60 * 60 * 1000));
-
-
+ option.value.column.deadlineTime.value = formatDateTime(new Date(Date.now() + 24 * 60 * 60 * 1000));
+
+
}
},
handleSelectionChangeFunc: (selection: any) => {
@@ -286,7 +322,7 @@
}
})
- const formatDateTime = (date) => {
+const formatDateTime = (date) => {
const year = date.getFullYear();
const month = String(date.getMonth() + 1).padStart(2, '0');
const day = String(date.getDate()).padStart(2, '0');
@@ -328,8 +364,8 @@
if (form.value.itemType === '0' && val) {
// 鍦ㄨ繖閲屾坊鍔犱綘鐨勮姹傛帴鍙ｉ�昏緫
smartLockerApplicationQuery({ licensePlateNumber: val }).then(response => {
- if(response.code == 200){
- form.value.lockerPort = response.data || '';
+ if (response.code == 200) {
+ form.value.lockerPort = response.data || '';
}
// 澶勭悊鍝嶅簲
})
@@ -347,7 +383,7 @@
})
}
-const handleEditBtn = (row, index) => {
+const handleEditBtn = (row:any, index:any) => {
crudRef.value.rowEdit(row, index)
// option.value.editBtn = true;
}
--
Gitblit v1.8.0