UDI
/
udiwms-vue-frame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

工位维护

Browse Source
20240912_adapter_z
wangwei 11 months ago
parent 3f6a01eac1
commit 2ab3282abc
4 changed files with 371 additions and 192 deletions
Show Stats Download Patch File Download Diff File

25
src/api/basic/collectPoint/userWorkplace.js
Unescape Escape View File

@ -12,10 +12,31 @@ export function getUsers(query) {
} }
export function getUserBindWork(query) { export function getUserBindWork(query) {
return axios({ return axios({
url: "/udiwms/sysWorkplace/getUserBindWork", url: '/udiwms/sysWorkplace/getUserBindWork',
method: "get", method: 'get',
params: query
})
}
export function userBindWork(query) {
return axios({
url: "/udiwms/sysWorkplace/userBindWork",
method: "post",
data: query data: query
}); });
} }
export function delUserBindWork(query) {
return axios({
url: "/udiwms/sysWorkplace/delUserBindWork",
method: "post",
data: query
});
}

36
src/views/basic/collectPoint/selectWorkplace.vue
Unescape Escape View File

@ -32,7 +32,7 @@
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button> <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button> <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button> <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
<el-button type="primary" icon="el-icon-search" @click="">选入</el-button> <el-button type="primary" icon="el-icon-plus" @click="addWork">选入工位</el-button>
</el-button-group> </el-button-group>
</div> </div>
<el-table v-loading="loading" :data="list" style="width: 100%" :row-style="{height: '32px' }" highlight-current-row @current-change="handCurrentChange" <el-table v-loading="loading" :data="list" style="width: 100%" :row-style="{height: '32px' }" highlight-current-row @current-change="handCurrentChange"
@ -93,9 +93,20 @@ import {
import { getInvListByUser } from '@/api/system/invWarehouse' import { getInvListByUser } from '@/api/system/invWarehouse'
import { getTree } from '@/api/basic/collectPoint/collectPointManage' import { getTree } from '@/api/basic/collectPoint/collectPointManage'
import { getCollectBusType } from '@/api/basic/collectPoint/gatherOrderType' import { getCollectBusType } from '@/api/basic/collectPoint/gatherOrderType'
import { userBindWork } from '@/api/basic/collectPoint/userWorkplace'
import panelGroup from '@/views/dashboard/PanelGroup' import panelGroup from '@/views/dashboard/PanelGroup'
export default { export default {
props: {
closeDialog: {
type: Function,
required: true,
},
userId: {
type: Object,
required: true,
},
},
data() { data() {
return { return {
query: { query: {
@ -104,6 +115,10 @@ export default {
limit: 20, limit: 20,
code: null code: null
}, },
workQuery: {
userId: null,
workplaceId: null
},
showSearch: true, showSearch: true,
Dictionary: true, Dictionary: true,
loading: false, loading: false,
@ -147,7 +162,8 @@ export default {
1: '信息提醒', 1: '信息提醒',
2: '禁止录入', 2: '禁止录入',
}, },
radioCheck: '' radioCheck: '',
rowData: {}
} }
}, },
methods: { methods: {
@ -337,17 +353,31 @@ export default {
var treeList = response.data || [] var treeList = response.data || []
const filteredList = treeList.filter(item => item.parentCode != null) const filteredList = treeList.filter(item => item.parentCode != null)
this.fromDeptOptions = filteredList this.fromDeptOptions = filteredList
console.log('jjsjsjsj', this.fromDeptOptions)
}) })
.catch(() => { .catch(() => {
}) })
}, },
handCurrentChange(row){ handCurrentChange(row){
this.radioCheck = row.workplaceId this.radioCheck = row.workplaceId
this.rowData = row
}, },
handleNodeClick(row){ handleNodeClick(row){
this.query.code = row.code this.query.code = row.code
this.getList() this.getList()
},
//选入工位
addWork(){
this.workQuery.userId = this.userId
this.workQuery.workplaceId = this.rowData.workplaceId
userBindWork(this.workQuery).then(res => {
if (res.code == 20000){
this.closeDialog()
this.$message.success("成功!!")
}else {
this.$message.error(res.message)
}
})
} }
}, },
created() { created() {

169
src/views/basic/collectPoint/userWorkplace.vue
Unescape Escape View File

@ -26,7 +26,8 @@
<el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button> <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
</el-button-group> </el-button-group>
</div> </div>
<el-table v-loading="loading" :data="userList" style="width: 100%" :row-style="{height: '32px' }" @current-change="handCurrentChange" highlight-current-row <el-table v-loading="loading" :data="userList" style="width: 100%" :row-style="{height: '32px' }"
@current-change="handCurrentChange" highlight-current-row
> >
<el-table-column type="index" label="序号"></el-table-column> <el-table-column type="index" label="序号"></el-table-column>
<el-table-column label="用户账号" prop="userName"></el-table-column> <el-table-column label="用户账号" prop="userName"></el-table-column>
@ -90,6 +91,48 @@
</el-button-group> </el-button-group>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="loading" :data="workList" style="width: 100%" :row-style="{height: '32px' }"
>
<el-table-column type="index" label="序号"></el-table-column>
<el-table-column label="工位编码" prop="workplaceId" width="90"></el-table-column>
<el-table-column label="工位名称" prop="workplaceName" width="90"></el-table-column>
<!--<el-table-column label="所属仓库" prop="invName" width="90"></el-table-column>-->
<el-table-column label="作业方式" prop="operationType" width="90">
<template slot-scope="scope">
<span>{{ operationTypes[scope.row.operationType] }}</span>
</template>
</el-table-column>
<el-table-column label="结果处理(是否插入)" prop="checkInsert" width="150">
<template slot-scope="scope">
<span>{{ checkInserts[scope.row.checkInsert] }}</span>
</template>
</el-table-column>
<el-table-column label="提醒方式" prop="warnType" width="90">
<template slot-scope="scope">
<span>{{ warnTypeMap[scope.row.warnType] }}</span>
</template>
</el-table-column>
<el-table-column label="负责人" prop="employeeName" width="90"></el-table-column>
<el-table-column label="往来单位标题" prop="unitTittle" width="90"></el-table-column>
<el-table-column label="创建时间" prop="createTime" width="90"></el-table-column>
<el-table-column label="备注" prop="remake" width="90"></el-table-column>
<el-table-column label="操作" fixed="right" width="100">
<template slot-scope="scope">
<el-button
type="text"
size="small"
>详情
</el-button>
<el-button
type="text"
size="small"
@click="remove(scope.row)"
>移除
</el-button>
<!--@click.native.stop="printLabel(scope.row)"-->
</template>
</el-table-column>
</el-table>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
@ -101,70 +144,19 @@
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
> >
<selectWorkplace> <selectWorkplace
:userId="userId"
:closeDialog="closeDialog"
>
</selectWorkplace> </selectWorkplace>
</el-dialog> </el-dialog>
<!--<el-card>-->
<!-- <el-form :model="query" label-width="auto" v-show="showSearch1" size="mini" class="order-el-form">-->
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label="当前仓库:" class="query-form-item">-->
<!-- <invSelect :value.sync="query.invCode" :params.sync="filterBadInv" :changeValue.sync="invChange"/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label="编码/名称:" class="query-form-item">-->
<!-- <el-input v-model="query.key" placeholder="请输入编号/采集点名称" clearable>-->
<!-- </el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- </el-form>-->
<!-- <el-table v-loading="loading" :data="collectPointList" style="width: 100%" :row-style="{height: '32px' }"-->
<!-- >-->
<!-- <el-table-column type="index" label="序号"></el-table-column>-->
<!-- <el-table-column label="采集点编号" prop="code"></el-table-column>-->
<!-- <el-table-column label="采集点名称" prop="name"></el-table-column>-->
<!-- &lt;!&ndash;<el-table-column label="采集点负责人" prop="employeeName"></el-table-column>&ndash;&gt;-->
<!-- <el-table-column label="单据类型" prop="busType"></el-table-column>-->
<!-- <el-table-column label="扫码方式" prop="scanType">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scanTypeEnum[scope.row.scanType].desc }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="备注" prop="remark"></el-table-column>-->
<!-- <el-table-column label="操作" fixed="right" width="100">-->
<!-- <template slot-scope="scope">-->
<!-- &lt;!&ndash;<el-button&ndash;&gt;-->
<!-- &lt;!&ndash; type="text"&ndash;&gt;-->
<!-- &lt;!&ndash; size="small"&ndash;&gt;-->
<!-- &lt;!&ndash; @click.native.stop="printLabel(scope.row)"&ndash;&gt;-->
<!-- &lt;!&ndash;&gt;打印&ndash;&gt;-->
<!-- &lt;!&ndash;</el-button>&ndash;&gt;-->
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- @click.native.stop="editCollectionPoints(scope.row)"-->
<!-- >编辑-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- @click.native.stop="deleteCollectionPoints(scope.row)"-->
<!-- >删除-->
<!-- </el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table>-->
<!--</el-card>-->
</div> </div>
</template> </template>
<script> <script>
import { getUserBindWork, getUsers } from '@/api/basic/collectPoint/userWorkplace' import { getUserBindWork, getUsers,delUserBindWork } from '@/api/basic/collectPoint/userWorkplace'
import selectWorkplace from "./selectWorkplace" import selectWorkplace from './selectWorkplace'
export default { export default {
components: { selectWorkplace }, components: { selectWorkplace },
@ -177,14 +169,29 @@ export default {
collectPointList: [], collectPointList: [],
query: {}, query: {},
userList: [], userList: [],
workList: [],
rowData: { rowData: {
employeeName: '用户' employeeName: '用户'
}, },
userQuery: { userQuery: {
invCode: this.$store.getters.locInvCode, invCode: this.$store.getters.locInvCode
}, },
workQuery: {}, workQuery: {},
selectUserWorkDialogVisible: false selectUserWorkDialogVisible: false,
operationTypes: {
1: '扫码生成业务单(必须插入）',
2: '按单校验三期（是否插入可选）',
3: '按单不校验三期（是否插入可选）'
},
checkInserts: {
1: '不插入',
2: '插入'
},
warnTypeMap: {
1: '信息提醒',
2: '禁止录入'
},
userId: ''
} }
}, },
methods: { methods: {
@ -217,7 +224,7 @@ export default {
if (res.code == 20000) { if (res.code == 20000) {
this.userList = res.data || [] this.userList = res.data || []
} else { } else {
this.$message.error("获取错误") this.$message.error('获取错误')
} }
}) })
}, },
@ -228,15 +235,51 @@ export default {
} }
getUserBindWork(query).then(res => { getUserBindWork(query).then(res => {
if (res.code == 20000) { if (res.code == 20000) {
console.log("djjddjdjdjd",res.data) this.workList = res.data || []
} else {
this.$message.error('获取失败')
} }
}) })
}, },
addWork() { addWork() {
if (this.rowData.id == null) { if (this.rowData.id == null) {
return this.$message.error("请先选择用户") return this.$message.error('请先选择用户')
} }
this.userId = this.rowData.id
this.selectUserWorkDialogVisible = true this.selectUserWorkDialogVisible = true
},
closeDialog() {
let query = {
userId: this.userId
}
getUserBindWork(query).then(res => {
if (res.code == 20000) {
this.workList = res.data || []
} else {
this.$message.error('获取失败')
}
})
this.selectUserWorkDialogVisible = false
},
remove(row) {
this.$confirm('确定移除该工位？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let query = {
id : row.id
}
delUserBindWork(query).then(res => {
if (res.code == 20000) {
this.$message.success('移除成功')
}else {
this.$message.error(res.message)
}
})
}).catch(() => {
})
} }
}, },

103
src/views/basic/workplace/workplaceManage.vue
Unescape Escape View File

@ -20,13 +20,14 @@
type="text" type="text"
size="mini" size="mini"
style="margin-left: 10px" style="margin-left: 10px"
:disabled="data.parentCode != null" v-if="data.parentCode == null"
@click="() => append(data,'add')"> @click="() => append(data,'add')">
新增 新增
</el-button> </el-button>
<el-button <el-button
type="text" type="text"
size="mini" size="mini"
style="margin-left: 10px"
:disabled="data.parentCode == null" :disabled="data.parentCode == null"
@click="() => append(data, 'edit')"> @click="() => append(data, 'edit')">
编辑 编辑
@ -152,6 +153,38 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-table v-loading="userLoading" :data="userList" style="width: 100%;margin-top: 30px;margin-bottom: 10px" :row-style="{height: '32px' }" v-if="rowData != null"
highlight-current-row
>
<el-table-column type="index" label="序号"></el-table-column>
<el-table-column label="用户账号" prop="userName"></el-table-column>
<el-table-column label="用名称" prop="employeeName"></el-table-column>
<el-table-column label="备注" prop="remark"></el-table-column>
<el-table-column label="操作" fixed="right" width="100">
<template slot-scope="scope">
<!--<el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- @click.native.stop="printLabel(scope.row)"-->
<!--&gt;打印-->
<!--</el-button>-->
<el-button
type="text"
size="small"
@click.native.stop="editCollectionPoints(scope.row)"
>详情
</el-button>
<el-button
type="text"
size="small"
@click.native.stop="removeUser(scope.row)"
>移除
</el-button>
</template>
</el-table-column>
</el-table>
</el-col> </el-col>
@ -189,7 +222,7 @@
<el-col :span="24" class="el-col"> <el-col :span="24" class="el-col">
<el-form-item label="作业方式:" prop="scanType" class="query-form-item"> <el-form-item label="作业方式:" prop="operationType" class="query-form-item">
<el-select v-model="formData.operationType" style="width: 80%" placeholder="选择扫码方式" clearable> <el-select v-model="formData.operationType" style="width: 80%" placeholder="选择扫码方式" clearable>
<el-option label="扫码生成业务单(必须插入)" :value="1"></el-option> <el-option label="扫码生成业务单(必须插入)" :value="1"></el-option>
<el-option label="按单校验三期（是否插入可选" :value="2"></el-option> <el-option label="按单校验三期（是否插入可选" :value="2"></el-option>
@ -200,7 +233,7 @@
<el-col :span="24" class="el-col"> <el-col :span="24" class="el-col">
<el-form-item label="结果处理:" prop="scanType" class="query-form-item"> <el-form-item label="结果处理:" prop="checkInsert" class="query-form-item">
<el-select v-model="formData.checkInsert" style="width: 80%" placeholder="选择扫码方式" clearable> <el-select v-model="formData.checkInsert" style="width: 80%" placeholder="选择扫码方式" clearable>
<el-option label="不插入" :value="1"></el-option> <el-option label="不插入" :value="1"></el-option>
<el-option label="插入" :value="2"></el-option> <el-option label="插入" :value="2"></el-option>
@ -209,7 +242,7 @@
</el-col> </el-col>
<el-col :span="24" class="el-col"> <el-col :span="24" class="el-col">
<el-form-item label="提醒方式:" prop="scanType" class="query-form-item"> <el-form-item label="提醒方式:" prop="warnType" class="query-form-item">
<el-select v-model="formData.warnType" style="width: 80%" placeholder="选择扫码方式" clearable> <el-select v-model="formData.warnType" style="width: 80%" placeholder="选择扫码方式" clearable>
<el-option label="信息提醒" :value="1"></el-option> <el-option label="信息提醒" :value="1"></el-option>
<el-option label="禁止录入" :value="2"></el-option> <el-option label="禁止录入" :value="2"></el-option>
@ -218,7 +251,7 @@
</el-col> </el-col>
<el-col :span="24" class="el-col"> <el-col :span="24" class="el-col">
<el-form-item label="所属仓库:" prop="busType" class="query-form-item"> <el-form-item label="所属仓库:" prop="invCode" class="query-form-item">
<el-select v-model="formData.invCode" placeholder="请选择所属仓库" <el-select v-model="formData.invCode" placeholder="请选择所属仓库"
style="width: 80%" style="width: 80%"
clearable clearable
@ -337,6 +370,7 @@ import { getInvListByUser } from '@/api/system/invWarehouse'
import { getTree } from '@/api/basic/collectPoint/collectPointManage' import { getTree } from '@/api/basic/collectPoint/collectPointManage'
import { getCollectBusType } from '@/api/basic/collectPoint/gatherOrderType' import { getCollectBusType } from '@/api/basic/collectPoint/gatherOrderType'
import panelGroup from '@/views/dashboard/PanelGroup' import panelGroup from '@/views/dashboard/PanelGroup'
import { delUserBindWork, getUserBindWork } from '@/api/basic/collectPoint/userWorkplace'
export default { export default {
data() { data() {
@ -368,12 +402,21 @@ export default {
workplaceName: [ workplaceName: [
{ required: true, message: '请输入工位名称', trigger: 'blur' } { required: true, message: '请输入工位名称', trigger: 'blur' }
], ],
operationType: [
{ required: true, message: '请选择作业方式', trigger: 'blur' }
],
checkInsert: [
{ required: true, message: '处理结果是否插入', trigger: 'blur' }
],
warnType: [
{ required: true, message: '提醒方式', trigger: 'blur' }
],
invCode: [ invCode: [
{ required: true, message: '请选择仓库', trigger: 'blur' } { required: true, message: '请选择仓库', trigger: 'blur' }
] ]
}, },
invQuery: { invQuery: {
code: '' invCode: ''
}, },
users: [], users: [],
busTypes: [], busTypes: [],
@ -390,6 +433,9 @@ export default {
1: '信息提醒', 1: '信息提醒',
2: '禁止录入', 2: '禁止录入',
}, },
userList: [],
userLoading: false,
rowData: null,
} }
}, },
methods: { methods: {
@ -527,7 +573,7 @@ export default {
}) })
}, },
handleInvChange(invCode) { handleInvChange(invCode) {
this.invQuery.code = invCode this.invQuery.invCode = invCode
getUsers(this.invQuery).then(res => { getUsers(this.invQuery).then(res => {
if (res.code == 20000) { if (res.code == 20000) {
this.users = res.data || [] this.users = res.data || []
@ -579,16 +625,55 @@ export default {
var treeList = response.data || [] var treeList = response.data || []
const filteredList = treeList.filter(item => item.parentCode != null) const filteredList = treeList.filter(item => item.parentCode != null)
this.fromDeptOptions = filteredList this.fromDeptOptions = filteredList
console.log('jjsjsjsj', this.fromDeptOptions)
}) })
.catch(() => { .catch(() => {
}) })
}, },
handCurrentChange(row){ handCurrentChange(row){
console.log(row) this.rowData = row
let query = {
workplaceId: row.workplaceId
}
this.getUserBindWork(query)
},
getUserBindWork(query){
getUserBindWork(query).then(res => {
if (res.code == 20000) {
this.userList = res.data || []
} else {
this.$message.error('获取失败')
}
})
},
removeUser(row) {
this.$confirm('确定移除该用户？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let query = {
id : row.id
}
delUserBindWork(query).then(res => {
if (res.code == 20000) {
let query = {
workplaceId: this.rowData.workplaceId
}
this.getUserBindWork(query)
this.$message.success('移除成功')
}else {
this.$message.error(res.message)
}
})
}).catch(() => {
})
}, },
handleNodeClick(row){ handleNodeClick(row){
this.query.code = row.code this.query.code = row.code
if (this.query.code == 1001){
this.query.code = null
}
this.getList() this.getList()
} }
}, },

Write Preview
Loading…
Cancel
Save