Skip to content

S
saas-manage
Commit c203978a by qinjianhui
Options

fix: 问题修改

parent 7bb15d1d
Showing with 19 additions and 98 deletions
src/views/home/navMenu.vue
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
</el-menu> </el-menu>
<div class="user-area"> <div class="user-area">
<span class="user-name">{{ <span class="user-name">{{
userInfo && userInfo.userName userInfo && userInfo.realName
}}</span> }}</span>
<el-button <el-button
type="text" type="text"
......
src/views/system/users.vue
...@@ -14,51 +14,19 @@ ...@@ -14,51 +14,19 @@
placeholder="用户名/姓名" placeholder="用户名/姓名"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="功能角色">
<el-select
style="width: 120px"
clearable
filterable
v-model="searchForm.functionRoleId"
placeholder="请选择"
>
<el-option
v-for="item in funcRoleList"
:key="item.value"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="数据角色">
<el-select
style="width: 120px"
clearable
filterable
v-model="searchForm.dataRoleId"
placeholder="请选择"
>
<el-option
v-for="item in dataRoleList"
:key="item.value"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="启用状态"> <el-form-item label="启用状态">
<el-select <el-select
clearable clearable
:class="{ :class="{
green: searchForm.enable === '1', green: searchForm.enable ,
red: searchForm.enable === '0', red: !searchForm.enable,
}" }"
v-model="searchForm.enable" v-model="searchForm.enable"
style="width: 120px" style="width: 120px"
placeholder="请选择" placeholder="请选择"
> >
<el-option label="启用" value="1"></el-option> <el-option label="启用" :value="true"></el-option>
<el-option label="禁用" value="0"></el-option> <el-option label="禁用" :value="false"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -155,42 +123,6 @@ ...@@ -155,42 +123,6 @@
> >
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="功能角色" prop="funcRoleIds">
<el-select
style="width: 164px"
v-model="addcurrencyform.funcRoleIds"
placeholder="请选择角色"
multiple
filterable
>
<el-option
v-for="item in funcRoleList"
:key="item.id"
:label="item.name"
:value="item.id"
>
{{ item.name }}
</el-option>
</el-select>
</el-form-item>
<el-form-item label="数据角色" prop="dataRoleIds">
<el-select
style="width: 164px"
v-model="addcurrencyform.dataRoleIds"
placeholder="请选择角色"
multiple
filterable
>
<el-option
v-for="item in dataRoleList"
:key="item.id"
:label="item.name"
:value="item.id"
>
{{ item.name }}
</el-option>
</el-select>
</el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button <el-button
...@@ -247,7 +179,7 @@ export default { ...@@ -247,7 +179,7 @@ export default {
sourceData: [], sourceData: [],
searchForm: { searchForm: {
employeeName: '', employeeName: '',
enable: '1', enable: true,
platform: '', platform: '',
}, },
dialogVisible: false, dialogVisible: false,
...@@ -362,15 +294,11 @@ export default { ...@@ -362,15 +294,11 @@ export default {
key: 'realName', key: 'realName',
width: '', width: '',
}, },
{ label: '功能角色', key: 'functionNames' },
{ label: '数据角色', key: 'dataNames' },
{ {
label: '相关操作', label: '相关操作',
key: '', key: '',
fixed: 'right', fixed: 'right',
width: '', width: '130',
render: (item) => ( render: (item) => (
<div> <div>
<span title="编辑" class="icon-view "> <span title="编辑" class="icon-view ">
......
src/views/taskManage/index.vue
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
<div class="step-bar"> <div class="step-bar">
<!-- step-pass 已经完成,step-active当前步骤 --> <!-- step-pass 已经完成,step-active当前步骤 -->
<div <div
class="step step-after step-pass" class="step step-after"
:class="{ :class="{
'step-pass': 'step-pass':
detail.orderStatus === 'TO_BE_ASSIGN' || detail.orderStatus === 'TO_BE_ASSIGN' ||
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
detail.orderStatus === 'PRE_HANDLING', detail.orderStatus === 'PRE_HANDLING',
}" }"
> >
<span>已受理</span> <span>待受理</span>
</div> </div>
<div <div
class="step step-after step-before" class="step step-after step-before"
...@@ -295,9 +295,9 @@ ...@@ -295,9 +295,9 @@
</el-input> </el-input>
</div> </div>
<div style="margin-top: 10px; text-align: right"> <div style="margin-top: 10px; text-align: right">
<!-- <el-button size="mini" type="success" <el-button size="mini" type="success" @click="confirm"
>确认执行</el-button >受理</el-button
> --> >
<el-button <el-button
size="mini" size="mini"
type="primary" type="primary"
...@@ -360,7 +360,7 @@ import { ...@@ -360,7 +360,7 @@ import {
} from '@/common/api/order' } from '@/common/api/order'
import { getSystemUserList } from '@/common/api/system' import { getSystemUserList } from '@/common/api/system'
import { mapState } from 'vuex' import { mapState } from 'vuex'
import confirmWork from '@/assets/work/confirm.png' // import confirmWork from '@/assets/work/confirm.png'
import assignWork from '@/assets/work/assign.png' import assignWork from '@/assets/work/assign.png'
import startWork from '@/assets/work/start.png' import startWork from '@/assets/work/start.png'
import archiveWork from '@/assets/work/archive.png' import archiveWork from '@/assets/work/archive.png'
...@@ -478,16 +478,6 @@ export default { ...@@ -478,16 +478,6 @@ export default {
></i> ></i>
</span> </span>
)} )}
{item.orderStatus === 'PRE_HANDLING' && (
<span title="确认" class="icon-view">
<img
width="24"
height="24"
src={confirmWork}
onClick={() => this.confirm(item)}
/>
</span>
)}
{item.orderStatus === 'TO_BE_ASSIGN' && ( {item.orderStatus === 'TO_BE_ASSIGN' && (
<span title="指派给" class="icon-view"> <span title="指派给" class="icon-view">
<img <img
...@@ -553,7 +543,7 @@ export default { ...@@ -553,7 +543,7 @@ export default {
} }
}, },
// 确认 // 确认
async confirm(item) { async confirm() {
try { try {
await this.$confirm('确定执行吗？', '提示', { await this.$confirm('确定执行吗？', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
...@@ -564,10 +554,12 @@ export default { ...@@ -564,10 +554,12 @@ export default {
return return
} }
try { try {
const res = await workConfirmed(item.id) const res = await workConfirmed(this.currentRowId)
if (res.code === 200) { if (res.code === 200) {
this.getlist() this.getlist()
this.getOrderTree() this.getOrderTree()
this.detailVisible = false
this.$message.success('操作成功')
} }
} catch (e) { } catch (e) {
console.error(e) console.error(e)
...@@ -843,10 +835,11 @@ export default { ...@@ -843,10 +835,11 @@ export default {
.step-bar { .step-bar {
margin-bottom: 10px; margin-bottom: 10px;
display: flex;
} }
.step { .step {
position: relative; position: relative;
width: 25%; flex: 1;
font-size: 14px; font-size: 14px;
height: 32px; height: 32px;
line-height: 32px; line-height: 32px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment