ruanqi 4 years ago
parent
commit
c3f0a17bc1
  1. 2
      index.html
  2. 2
      src/store/modules/user.js
  3. 72
      src/views/modules/sys/user.vue

2
index.html

@ -4,7 +4,7 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge"> <meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>Alteams-MES</title>
<title>XJ-MES</title>
<% if (process.env.NODE_ENV === 'production') { %> <% if (process.env.NODE_ENV === 'production') { %>
<!-- 生产环境 --> <!-- 生产环境 -->
<script>document.write('<script src="./config/index.js?t=' + new Date().getTime() + '"><\/script>');</script> <script>document.write('<script src="./config/index.js?t=' + new Date().getTime() + '"><\/script>');</script>

2
src/store/modules/user.js

@ -6,7 +6,7 @@ export default {
site: 0, site: 0,
languageDefault: '', languageDefault: '',
userDisplay: '', userDisplay: '',
userDev: false
userDev: true
}, },
mutations: { mutations: {
updateId (state, id) { updateId (state, id) {

72
src/views/modules/sys/user.vue

@ -85,7 +85,6 @@
width="150" width="150"
label="操作"> label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<a v-if="isAuth('sys:user:workcenter')" type="text" size="small" @click="userWorkCenterAuthorize(scope.row)">加工中心</a>
<a v-if="isAuth('sys:user:update')" type="text" size="small" <a v-if="isAuth('sys:user:update')" type="text" size="small"
@click="addOrUpdateHandle(scope.row.userId)">修改</a> @click="addOrUpdateHandle(scope.row.userId)">修改</a>
<a v-if="isAuth('sys:user:delete')" type="text" size="small" @click="deleteHandle(scope.row.userId)">删除</a> <a v-if="isAuth('sys:user:delete')" type="text" size="small" @click="deleteHandle(scope.row.userId)">删除</a>
@ -104,30 +103,13 @@
<!-- 弹窗, 新增 / 修改 --> <!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update> <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
<!-- 加工中心授权-->
<el-dialog
style="font-size: 12px"
v-drag
:title="'加工中心'"
:visible.sync="workCenterVisible"
width="620px"
:append-to-body="true">
<el-transfer v-model="selectWorkCenterList" :data="workCenterList" :titles="['未授权加工中心', '已授权加工中心']"></el-transfer>
<span slot="footer" class="dialog-footer">
<div style="margin-top: 5px">
<el-button type="primary" @click="saveUserWorkCenter()">确定</el-button>
<el-button @click="workCenterVisible = false" type="primary">取消</el-button>
</div>
</span>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import AddOrUpdate from './user-add-or-update' import AddOrUpdate from './user-add-or-update'
import {workCenterList} from "@/api/ifsapp/ifsWorkCenter.js"
import {userWorkCenterList,saveBatchUserWorkCenter} from "@/api/userwork/userWorkCenter.js"
import {debounce, throttle} from "../../../utils/common"; import {debounce, throttle} from "../../../utils/common";
@ -233,64 +215,16 @@
this.selectUser = val this.selectUser = val
this.showButton = false this.showButton = false
}, },
//
userWorkCenterAuthorize(val) {
this.workCenterVisible = true
this.searchWorkCenterList()
},
// //
saveUserWorkCenter() { saveUserWorkCenter() {
let workCenterList = this.selectWorkCenterList.map( item => {
let newItem = {
site: this.site,
userName: this.selectUser.username,
workCenterNo: item,
createdBy:this.selectUser.username,
}
return newItem;
})
let dto ={
workCenterList: workCenterList,
site: this.site,
userName: this.selectUser.username,
}
saveBatchUserWorkCenter(dto).then(({data}) =>{
if (data && data.code == 0){
this.$message.success('操作成功')
this.workCenterVisible = false;
}else {
this.$message.error(data.msg)
}
})
}, },
// //
searchUserWorkCenterList() { searchUserWorkCenterList() {
userWorkCenterList({site: this.site,userName: this.selectUser.username}).then(({data}) => {
if (data && data.code == 0) {
this.selectWorkCenterList = data.data.map(item => {
return item.workCenterNo
})
}
})
},
//
searchWorkCenterList() {
workCenterList({contract: this.site}).then(({data}) => {
if (data && data.code == 0) {
this.workCenterList = data.data.map(item => {
let newItem = {
key: item.workCenterNo,
label: item.workCenterNo +" - " + item.description,
}
return newItem
})
this.searchUserWorkCenterList()
}
})
}, },
// //
getDataList: throttle(function () { getDataList: throttle(function () {
this.dataListLoading = true this.dataListLoading = true

Loading…
Cancel
Save