From 32ec691abab0c837f34ce2c4908a40a10b9dbec7 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 29 七月 2022 17:20:15 +0800
Subject: [PATCH] 1.优化项目2.综合看板静态页面初步实现
---
src/views/jcsz/yhqd.vue | 105 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 78 insertions(+), 27 deletions(-)
diff --git a/src/views/jcsz/yhqd.vue b/src/views/jcsz/yhqd.vue
index 4ad0f23..966c620 100644
--- a/src/views/jcsz/yhqd.vue
+++ b/src/views/jcsz/yhqd.vue
@@ -23,12 +23,19 @@
popper-class="elCascader"
:options="StuOrgArr"
:props="defaultProps"
- @focus="getUserOrganization"
@change="cascaderChange"
/>
+ <!-- @focus="getUserOrganization"-->
+
</el-form-item>
<el-form-item label="宸ヨ祫绫诲瀷" style=" display: flex;">
- <el-select v-model="form.wagetype" :popper-append-to-body="false" filterable style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-select
+ v-model="form.wagetype"
+ :popper-append-to-body="false"
+ filterable
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
<el-option
v-for="item in wagetypeArr"
:key="item.value"
@@ -38,7 +45,13 @@
</el-select>
</el-form-item>
<el-form-item label="鍦ㄨ亴鐘舵��" style=" display: flex;">
- <el-select v-model="form.Enable" :popper-append-to-body="false" filterable style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-select
+ v-model="form.Enable"
+ :popper-append-to-body="false"
+ filterable
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
<el-option
v-for="item in EnableArr"
:key="item.value"
@@ -81,36 +94,43 @@
prop="RowNum"
width="50"
label="搴忓彿"
+ fixed
/>
<el-table-column
prop="usercode"
label="鐢ㄦ埛缂栫爜"
+ min-width="110"
sortable="custom"
/>
<el-table-column
prop="username"
label="鐢ㄦ埛鍚嶇О"
+ min-width="110"
sortable="custom"
/>
<el-table-column
prop="password"
label="鐢ㄦ埛瀵嗙爜"
+ min-width="110"
sortable="custom"
/>
<el-table-column
prop="org_name"
label="鎵�灞炵粍缁�"
+ min-width="110"
sortable="custom"
/>
<el-table-column
prop="group_name"
label="鐢熶骇鐝粍"
+ min-width="110"
sortable="custom"
/>
<el-table-column
prop="wagetype"
label="宸ヨ祫绫诲瀷"
sortable="custom"
+ width="110"
>
<template slot-scope="{row}">
<div v-if="row.wagetype==='1'">璁℃椂鍒�</div>
@@ -120,6 +140,7 @@
<el-table-column
prop="mobile"
label="鑱旂郴鏂瑰紡"
+ min-width="110"
sortable="custom"
>
<template slot-scope="{row}">
@@ -131,6 +152,7 @@
prop="email"
label="鐢靛瓙閭"
sortable="custom"
+ min-width="110"
>
<template slot-scope="{row}">
<div v-if="row.email===''">/</div>
@@ -138,8 +160,9 @@
</template>
</el-table-column>
<el-table-column
- prop=""
+ prop="enable"
label="鍦ㄨ亴鐘舵��"
+ width="110"
sortable="custom"
>
<template slot-scope="{row}">
@@ -150,24 +173,28 @@
<el-table-column
prop="lm_user"
label="鍒涘缓浜哄憳"
+ width="110"
sortable="custom"
/>
<el-table-column
prop="lm_date"
label="鍒涘缓鏃堕棿"
- width="200"
+ width="160"
sortable="custom"
/>
<el-table-column
prop="is_role"
label="鍏宠仈瑙掕壊"
+ width="110"
>
<template slot-scope="{row}">
- <i class="el-icon-share" @click="roleClick({row})" />
+ <i v-if="row.is_role==='Y'" class="el-icon-share" @click="roleClick({row})" />
+ <i v-if="row.is_role==='N'" class="el-icon-share" style="color: rgb(180 ,181, 185)" @click="roleClick({row})" />
</template>
</el-table-column>
<el-table-column
label="鎿嶄綔"
+ fixed="right"
>
<template slot-scope="{row}">
<div class="operationClass">
@@ -447,16 +474,20 @@
</div>
</span>
</el-dialog>
+
+ <!--瀵煎叆缁勪欢-->
+ <import-picker ref="importPickerFunc" :shows.sync="shows" :title="title_value" :colos="colos" :code="code" />
+
</div>
</template>
<script>
import Pagination from '@/components/Pagination'
+import ImportPicker from '@/components/ImportPicker'
+
import {
AddUpdateUser,
DeleteUser,
- RoleTypeAdd,
- RoleTypeDelete,
SaveUserAssoctRole,
UserAssociationRole,
UserGroupAdd,
@@ -474,7 +505,7 @@
export default {
name: 'YYQD',
components: {
- Pagination
+ Pagination, ImportPicker
},
data() {
const validateName = (rule, value, callback) => {
@@ -553,7 +584,7 @@
UserCode: '',
UserName: '',
Password: '',
- Enable: '',
+ Enable: 'Y',
StuOrg: '',
Mobile: '',
Email: '',
@@ -621,12 +652,23 @@
page: 1,
prop: 'group_code',
order: 'desc'
+ },
+
+ title_value: '鏁版嵁瀵煎叆 / 鐢ㄦ埛娓呭崟',
+ code: '2',
+ shows: false
+ }
+ },
+ watch: {
+ shows() {
+ if (!this.shows) {
+ this.getUserSearch()
}
}
},
created() {
this.getUserSearch()
- // this.getUserOrganization()
+ this.getUserOrganization()
},
mounted() {
window.addEventListener('resize', this.getHeight)
@@ -645,13 +687,17 @@
this.StuOrgArr = clearAllChildren(res)
},
// 鑾峰彇鎵�灞炵粍缁囧璇濇
- async getUserOrganization2() {
+ async getUserOrganization2() {
const { data: res } = await UserOrganization()
this.StuOrgArr2 = clearAllChildren(res)
},
// 瀵煎叆鎸夐挳
upload() {
-
+ this.shows = true
+ this.$refs.importPickerFunc.newDataFunc()
+ },
+ colos() {
+ this.shows = false
},
// 鎺掑簭鏀瑰彉鏃�
sortChange({ column, prop, order }) {
@@ -675,7 +721,7 @@
this.form.UserCode = ''
this.form.UserName = ''
this.form.StuOrg = ''
- this.form.Enable = ''
+ this.form.Enable = 'Y'
this.form.wagetype = ''
this.$refs.cascader.checkedValue = ''// 绾ц仈閫夋嫨鍣ㄧ殑娓呯┖
this.getUserSearch()
@@ -688,7 +734,7 @@
this.dialogForm.StuOrg = val[val.length - 1]
},
// 鑾峰彇涓嬫媺鐢熶骇鐝粍
- async getMesOrderStepReportSelectUserGroup() {
+ async getMesOrderStepReportSelectUserGroup() {
const { data: res } = await MesOrderStepReportSelectUserGroup()
this.usergroupArr = res
},
@@ -744,7 +790,7 @@
this.dialogForm.UserCode = ''
this.dialogForm.UserName = ''
this.dialogForm.Password = ''
- this.dialogForm.Enable = ''
+ this.dialogForm.Enable = 'Y'
this.$refs.dialogCascader.checkedValue = ''
this.dialogForm.StuOrg = ''
this.dialogForm.Mobile = ''
@@ -867,6 +913,7 @@
const res = await SaveUserAssoctRole(this.dialogFormRoles.roleTreeSelectedArr, this.dialogFormRoles.usercode)
if (res.code === '200') {
this.$message.success('淇濆瓨鎴愬姛锛�')
+ await this.getUserSearch()
this.dialogVisibleRoles = false
}
},
@@ -926,7 +973,8 @@
if (i.Code === checkedFatherCode) {
this.dialogFormRoles.roleTreeSelectedArr[ind].Data.forEach((i1, ind2) => {
if (i1 === a[0]) {
- this.dialogFormRoles.roleTreeSelectedArr[ind].Data.splice(ind2, 1)// 褰撳瓙code涓庣幇鍦ㄧ殑code鐩稿悓鏃舵墽琛�
+ // this.dialogFormRoles.roleTreeSelectedArr[ind].Data.splice(ind2, 1)// 褰撳瓙code涓庣幇鍦ㄧ殑code鐩稿悓鏃舵墽琛�
+ this.dialogFormRoles.roleTreeSelectedArr[ind].Data = this.dialogFormRoles.roleTreeSelectedArr[ind].Data.filter(i2 => i2 !== a[0])
} else {
this.dialogFormRoles.roleTreeSelectedArr[ind].Data.push(a[0])// //褰撳瓙code涓庣幇鍦ㄧ殑code涓嶇浉鍚屾椂鎵ц
}
@@ -1113,7 +1161,7 @@
this.getUserGroupSearch()
},
// 鑾峰彇鐢熶骇鐝粍鍒楄〃
- async getUserGroupSearch() {
+ async getUserGroupSearch() {
const res = await UserGroupSearch(this.formWorking)
this.workingTableData = res.data
this.workingTableDataLength = res.count
@@ -1146,16 +1194,16 @@
})
},
// 淇濆瓨
- async saveWorking(row) {
+ async saveWorking(row) {
if (row.group_code.trim().length < 1) {
return this.$message.info('鐝粍缂栫爜涓嶈兘涓虹┖锛�')
}
if (row.group_name.trim().length < 1) {
return this.$message.info('鐝粍鍚嶇О涓嶈兘涓虹┖锛�')
}
- if (row.description.trim().length < 1) {
- return this.$message.info('鐝粍鎻忚堪涓嶈兘涓虹┖锛�')
- }
+ // if (row.description.trim().length < 1) {
+ // return this.$message.info('鐝粍鎻忚堪涓嶈兘涓虹┖锛�')
+ // }
const data = {
code: row.group_code,
name: row.group_name,
@@ -1194,6 +1242,7 @@
border: none;
padding: 0 20px;
}
+
::v-deep .el-button--primary:hover {
border: none;
}
@@ -1236,7 +1285,7 @@
padding: 20px 100px !important;
}
-.workingDialogVisible ::v-deep .el-dialog__body{
+.workingDialogVisible ::v-deep .el-dialog__body {
padding: 20px 20px !important;
}
@@ -1385,15 +1434,15 @@
border-color: $main_color;
}
-::v-deep .el-select .el-input__inner:focus{
+::v-deep .el-select .el-input__inner:focus {
border-color: $main_color;
}
-::v-deep .el-select-dropdown__item.selected{
+::v-deep .el-select-dropdown__item.selected {
color: $main_color;
}
-::v-deep .el-input__inner:focus {
+::v-deep .el-input__inner:focus {
border-color: #42b983 !important;
}
@@ -1414,10 +1463,12 @@
background-color: #42b983;
border-color: #42b983;
}
+
.el-radio__input.is-checked .el-radio__inner:hover {
border-color: #42b983;
}
- .el-input__inner{
+
+ .el-input__inner {
border-color: #42b983 !important;
}
--
Gitblit v1.9.3