From 6b8f073df16ed45ec9e710abe18d1f4ffde30540 Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期五, 19 十二月 2025 08:49:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cwxt_master' into cwxt_master
---
ui/admin-ui3/src/views/system/user/index.vue | 80 +++++++++++++++++++++++++++++++++++++++
1 files changed, 79 insertions(+), 1 deletions(-)
diff --git a/ui/admin-ui3/src/views/system/user/index.vue b/ui/admin-ui3/src/views/system/user/index.vue
index 33249f5..ff0c4e5 100644
--- a/ui/admin-ui3/src/views/system/user/index.vue
+++ b/ui/admin-ui3/src/views/system/user/index.vue
@@ -19,7 +19,7 @@
:page="page"
:permission="permissionList"
:before-open="beforeOpen"
- v-model="form"
+ v-model="form" v-model:search="queryParams"
ref="crudRef"
@row-update="rowUpdate"
@row-save="rowSave"
@@ -155,6 +155,7 @@
import {useRouter} from "vue-router";
import {getToken} from "@/utils/auth";
import {getConfigKey} from "@/api/system/config";
+import {getTmsDriver, listTmsDriver} from "@/api/tms/tmsDriver";
const {proxy} = useCurrentInstance();
@@ -303,6 +304,83 @@
label: '澶囨敞', hide: true,
type: 'textarea', minRows: 3, maxRows: 5, span: 24
},
+ isDriver: {
+ label: '鏄惁鍙告満璐﹀彿', search: true,value:'1',
+ dataType: 'string',
+ labelWidth:120,minWidth:110,searchLabelWidth:110,
+ type: 'radio', dicUrl: '/system/dict/data/type/sys_number_is',
+ rules:[
+ {required: true, message: "璇烽�夋嫨鏄惁鍙告満璐﹀彿", trigger: "blur"},
+ ],
+ change:({value}:{value:any})=>{
+ console.log(value)
+ if (value == 0){
+ option.value.column.driverId.display = true;
+ }else{
+ option.value.column.driverId.display = false;
+ }
+ }
+ },
+ driverId: {
+ label: '鍏宠仈椹鹃┒鍛�',labelWidth:120,
+ display: false,hide:true,dataType:'string',
+ rules: [
+ {
+ required: true,
+ message: "涓婚┚椹跺憳涓嶈兘涓虹┖", trigger: "change"
+ }
+ ],
+ type: 'table', suffixIcon: 'search',dataType: 'string',
+ children: {
+ border: true,
+ searchMenuSpan: 5,
+ column: {
+ vehicleProviderName: {
+ label: '杞﹁締鏈嶅姟鍟�', minWidth: 130,
+ search: true,
+ },
+ driverName: {
+ label: '椹鹃┒鍛樺鍚�', minWidth: 120,
+ search: true,
+ },
+ licenseType: {
+ label: '鍑嗛┚杞﹀瀷', minWidth: 120,
+ type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/license_type',
+ search: true,
+ },
+ },
+
+ },
+ props: {
+ label: 'driverName',
+ value: 'id'
+ },
+ onLoad: ({page, value, data}: { page: any, value: any, data: any }, callback: any) => {
+ if (value) {
+ let id = value;
+ if (Array.isArray(value)) {
+ id = value[0]
+ }
+ getTmsDriver(id).then(res => {
+ return callback(res.data || {})
+ })
+ } else {
+ listTmsDriver({pageSize: page.pageSize, pageNum: page.currentPage, ...data}).then(res => {
+ return callback({
+ total: res.total,
+ data: res.rows || [],
+ })
+ })
+ }
+
+ }
+
+
+ },
+ driverName: {
+ label: '鍏宠仈椹鹃┒鍛�', hide: false,display:false,minWidth:110,
+ search:true,searchLabelWidth:100,
+ },
}
})
--
Gitblit v1.8.0