From 5e9fb57f959d6cccbb3a3c56d0ccdd241855ad06 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 11 七月 2025 16:06:07 +0800
Subject: [PATCH] 1、技术鉴定工单页面基础功能 2、新增技术鉴定设备选择组件 3、
---
src/views/system/UserList.vue | 145 ++++++++++-------------------------------------
1 files changed, 32 insertions(+), 113 deletions(-)
diff --git a/src/views/system/UserList.vue b/src/views/system/UserList.vue
index 6e4d7d2..b186bbc 100644
--- a/src/views/system/UserList.vue
+++ b/src/views/system/UserList.vue
@@ -14,48 +14,25 @@
</a-col>
<a-col :md="6" :sm="8">
- <a-form-item label="鎬у埆">
- <a-select v-model="queryParam.sex" placeholder="璇烽�夋嫨鎬у埆">
- <a-select-option value="">璇烽�夋嫨</a-select-option>
- <a-select-option value="1">鐢�</a-select-option>
- <a-select-option value="2">濂�</a-select-option>
- </a-select>
+ <a-form-item label="鐪熷疄鍚嶅瓧">
+ <a-input placeholder="璇疯緭鍏ョ湡瀹炲悕瀛�" v-model="queryParam.realname"></a-input>
</a-form-item>
</a-col>
-
- <template v-if="toggleSearchStatus">
- <a-col :md="6" :sm="8">
- <a-form-item label="鐪熷疄鍚嶅瓧">
- <a-input placeholder="璇疯緭鍏ョ湡瀹炲悕瀛�" v-model="queryParam.realname"></a-input>
- </a-form-item>
- </a-col>
-
- <a-col :md="6" :sm="8">
- <a-form-item label="鎵嬫満鍙风爜">
- <a-input placeholder="璇疯緭鍏ユ墜鏈哄彿鐮佹煡璇�" v-model="queryParam.phone"></a-input>
- </a-form-item>
- </a-col>
-
- <a-col :md="6" :sm="8">
- <a-form-item label="鐢ㄦ埛鐘舵��">
- <a-select v-model="queryParam.status" placeholder="璇烽�夋嫨">
- <a-select-option value="">璇烽�夋嫨</a-select-option>
- <a-select-option value="1">姝ｅ父</a-select-option>
- <a-select-option value="2">鍐荤粨</a-select-option>
- </a-select>
- </a-form-item>
- </a-col>
- </template>
+ <a-col :md="6" :sm="8">
+ <a-form-item label="鐢ㄦ埛鐘舵��">
+ <a-select v-model="queryParam.status" placeholder="璇烽�夋嫨">
+ <a-select-option value="">璇烽�夋嫨</a-select-option>
+ <a-select-option value="1">姝ｅ父</a-select-option>
+ <a-select-option value="2">鍐荤粨</a-select-option>
+ </a-select>
+ </a-form-item>
+ </a-col>
<a-col :md="6" :sm="8">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
- <a @click="handleToggleSearch" style="margin-left: 8px">
- {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
- <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
- </a>
</span>
</a-col>
@@ -209,16 +186,6 @@
queryParam: {},
recycleBinVisible: false,
columns: [
- /*{
- title: '#',
- dataIndex: '',
- key:'rowIndex',
- width:60,
- align:"center",
- customRender:function (t,r,index) {
- return parseInt(index)+1;
- }
- },*/
{
title: '鐢ㄦ埛璐﹀彿',
align: "center",
@@ -239,26 +206,6 @@
dataIndex: 'avatar',
scopedSlots: {customRender: "avatarslot"}
},
-
- // {
- // title: '鎬у埆',
- // align: "center",
- // width: 80,
- // dataIndex: 'sex_dictText',
- // sorter: true
- // },
- // {
- // title: '鐢熸棩',
- // align: "center",
- // width: 100,
- // dataIndex: 'birthday'
- // },
- // {
- // title: '鎵嬫満鍙风爜',
- // align: "center",
- // width: 100,
- // dataIndex: 'phone'
- // },
{
title: '閮ㄩ棬',
align: "center",
@@ -269,7 +216,15 @@
title: '杞﹂棿',
align: "center",
width: 240,
- dataIndex: 'productionName'
+ dataIndex: 'productionName',
+ ellipsis: true,
+ },
+ {
+ title: '缁翠慨閮ㄩ棬',
+ align: "center",
+ width: 240,
+ dataIndex: 'repairDepartName',
+ ellipsis: true,
},
{
title: '鐘舵��',
@@ -339,31 +294,12 @@
dataIndex: 'avatar',
scopedSlots: {customRender: "avatarslot"}
},
-
- // {
- // title: '鎬у埆',
- // align: "center",
- // width: 80,
- // dataIndex: 'sex_dictText',
- // sorter: true
- // },
- // {
- // title: '鐢熸棩',
- // align: "center",
- // width: 100,
- // dataIndex: 'birthday'
- // },
- // {
- // title: '鎵嬫満鍙风爜',
- // align: "center",
- // width: 100,
- // dataIndex: 'phone'
- // },
{
title: '杞﹂棿',
align: "center",
width: 240,
- dataIndex: 'productionName'
+ dataIndex: 'productionName',
+ ellipsis: true,
},
{
title: '鐘舵��',
@@ -403,26 +339,6 @@
dataIndex: 'avatar',
scopedSlots: {customRender: "avatarslot"}
},
-
- // {
- // title: '鎬у埆',
- // align: "center",
- // width: 80,
- // dataIndex: 'sex_dictText',
- // sorter: true
- // },
- // {
- // title: '鐢熸棩',
- // align: "center",
- // width: 100,
- // dataIndex: 'birthday'
- // },
- // {
- // title: '鎵嬫満鍙风爜',
- // align: "center",
- // width: 100,
- // dataIndex: 'phone'
- // },
{
title: '閮ㄩ棬',
align: "center",
@@ -433,7 +349,8 @@
title: '杞﹂棿',
align: "center",
width: 240,
- dataIndex: 'productionName'
+ dataIndex: 'productionName',
+ ellipsis: true,
},
{
title: '鐝粍',
@@ -454,13 +371,9 @@
align: "center",
width: 80
}
-
-
]
}
-
} else {
- // this.$message.warn(res.message)
this.$notification.warning({
message:'娑堟伅',
description:res.message
@@ -532,10 +445,16 @@
}
frozenBatch({ids: id, status: status}).then((res) => {
if (res.success) {
- that.$message.success(res.message);
+ that.$notification.success({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loadData();
} else {
- that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
});
},
--
Gitblit v1.9.3