From 392f9468875a8721c17c4e15c288333017cac4a1 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 16 七月 2022 15:11:44 +0800
Subject: [PATCH] 1.修改bug2.工序检验实现部分3.缺陷定义实现部分
---
src/views/jcsz/jsqd.vue | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index 3c2a826..4a554be 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -23,8 +23,8 @@
filterable
style="width: 200px"
placeholder="璇烽�夋嫨"
- @focus="getRoleTypeSearch2"
>
+ <!-- @focus="getRoleTypeSearch2"-->
<el-option
v-for="item in RoleTypeCodeArr2"
:key="item.roletype_code"
@@ -47,7 +47,7 @@
<div style="margin-left: 10px;display: flex">
<el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
<el-button type="primary" icon="el-icon-setting" @click="settingButton">璁剧疆</el-button>
- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>
+ <!-- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
</div>
<el-divider />
<div class="elTableDiv">
@@ -104,23 +104,25 @@
sortable="custom"
/>
<el-table-column
- prop="lm_date"
+ prop="is_user"
label="鍏宠仈鐢ㄦ埛"
width="120"
sortable="custom"
>
<template slot-scope="{row}">
- <i class="el-icon-user-solid" @click="userClick(row)" />
+ <i v-if="row.is_user==='Y'" class="el-icon-user-solid" @click="userClick(row)" />
+ <i v-if="row.is_user==='N'" class="el-icon-user-solid" style="color: #E4E7ED" @click="userClick(row)" />
</template>
</el-table-column>
<el-table-column
- prop="lm_date"
+ prop="is_right"
label="鍒嗛厤鏉冮檺"
sortable="custom"
width="120"
>
<template slot-scope="{row}">
- <i class="el-icon-share" @click="rightClick(row)" />
+ <i v-if="row.is_right==='Y'" class="el-icon-share" @click="rightClick(row)" />
+ <i v-if="row.is_right==='N'" class="el-icon-share" style="color: #E4E7ED" @click="rightClick(row)" />
</template>
</el-table-column>
<el-table-column
@@ -311,10 +313,10 @@
:options="StuOrgArr"
:props="defaultProps"
style="width: 200px;"
- @focus="getUserOrganization"
+
@change="dialogCascaderChange"
/>
-
+ <!-- @focus="getUserOrganization"-->
</el-form-item>
<el-form-item label="鍏宠仈瑙掕壊">
<el-select
@@ -509,6 +511,7 @@
} from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
import $ from 'jquery'
+import clearAllChildren from '@/utils/global'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
@@ -635,8 +638,8 @@
},
created() {
this.getRoleSearch()
- // this.getRoleTypeSearch2()
- // this.getUserOrganization()
+ this.getRoleTypeSearch2()
+ this.getUserOrganization()
},
mounted() {
window.addEventListener('resize', this.getHeight)
@@ -669,7 +672,7 @@
// 鑾峰彇鎵�灞炵粍缁�
async getUserOrganization() {
const { data: res } = await UserOrganization()
- this.StuOrgArr = res
+ this.StuOrgArr = clearAllChildren(res)
},
// 鎺掑簭鏀瑰彉鏃�
sortChange({ column, prop, order }) {
@@ -940,6 +943,7 @@
const res = await SaveRoleAssoctUser(userMultipleArr, this.dialogFormUser.rolecode)
if (res.code === '200') {
this.$message.success('淇濆瓨鎴愬姛锛�')
+ await this.getRoleSearch()
this.userDialogVisible = false
}
},
@@ -954,6 +958,7 @@
this.dialogFormUser.orgcode = ''
this.dialogFormUser.isrole = ''
this.$refs.dialogCascaderUser.checkedValue = ''
+ this.getRoleAssociationUser()
},
/* 瑙掕壊鍏宠仈鏉冮檺瀵硅瘽妗嗛儴鍒�*/
@@ -1186,6 +1191,7 @@
const res = await SaveUserAssoctRight(rightSubmit, rolecode, usercode)
if (res.code === '200') {
this.$message.success('淇濆瓨鎴愬姛锛�')
+ await this.getRoleSearch()
this.dialogVisibleRight = false
}
},
--
Gitblit v1.9.3