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

工位优化

Browse Source
20240912_adapter_z
wangwei 8 months ago
parent 2ab3282abc
commit b8f0702a4a
2 changed files with 256 additions and 34 deletions
Show Stats Download Patch File Download Diff File

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

@ -33,28 +33,28 @@
<el-table-column label="用户账号" prop="userName"></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="employeeName"></el-table-column>
<el-table-column label="备注" prop="remark"></el-table-column> <el-table-column label="备注" prop="remark"></el-table-column>
<el-table-column label="操作" fixed="right" width="100"> <!--<el-table-column label="操作" fixed="right" width="100">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<!--<el-button--> <!-- &lt;!&ndash;<el-button&ndash;&gt;-->
<!-- type="text"--> <!-- &lt;!&ndash; type="text"&ndash;&gt;-->
<!-- size="small"--> <!-- &lt;!&ndash; size="small"&ndash;&gt;-->
<!-- @click.native.stop="printLabel(scope.row)"--> <!-- &lt;!&ndash; @click.native.stop="printLabel(scope.row)"&ndash;&gt;-->
<!--&gt;打印--> <!-- &lt;!&ndash;&gt;打印&ndash;&gt;-->
<!--</el-button>--> <!-- &lt;!&ndash;</el-button>&ndash;&gt;-->
<el-button <!-- &lt;!&ndash;<el-button&ndash;&gt;-->
type="text" <!-- &lt;!&ndash; type="text"&ndash;&gt;-->
size="small" <!-- &lt;!&ndash; size="small"&ndash;&gt;-->
@click.native.stop="editCollectionPoints(scope.row)" <!-- &lt;!&ndash; @click.native.stop="editCollectionPoints(scope.row)"&ndash;&gt;-->
>编辑 <!-- &lt;!&ndash;&gt;详情&ndash;&gt;-->
</el-button> <!-- &lt;!&ndash;</el-button>&ndash;&gt;-->
<el-button <!-- &lt;!&ndash;<el-button&ndash;&gt;-->
type="text" <!-- &lt;!&ndash; type="text"&ndash;&gt;-->
size="small" <!-- &lt;!&ndash; size="small"&ndash;&gt;-->
@click.native.stop="deleteCollectionPoints(scope.row)" <!-- &lt;!&ndash; @click.native.stop="deleteCollectionPoints(scope.row)"&ndash;&gt;-->
>删除 <!-- &lt;!&ndash;&gt;删除&ndash;&gt;-->
</el-button> <!-- &lt;!&ndash;</el-button>&ndash;&gt;-->
</template> <!-- </template>-->
</el-table-column> <!--</el-table-column>-->
</el-table> </el-table>
</div> </div>
@ -121,6 +121,7 @@
<el-button <el-button
type="text" type="text"
size="small" size="small"
@click="workDetail(scope.row)"
>详情 >详情
</el-button> </el-button>
<el-button <el-button
@ -134,6 +135,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<el-dialog <el-dialog
@ -151,6 +153,170 @@
</selectWorkplace> </selectWorkplace>
</el-dialog> </el-dialog>
<el-dialog
title="工位详情"
:visible.sync="addWorkplaceDialogVisible"
width="60%"
v-if="addWorkplaceDialogVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<el-form :model="formData" style="width: 80%;" ref="dataForm" :rules="formRules"
label-width="auto"
>
<el-row :gutter="24" class="el-row">
<el-col :span="12" class="el-col">
<el-form-item label="工位编码:" prop="workplaceId" class="query-form-item">
<el-input
disabled
v-model="formData.workplaceId" style="width: 100%"
auto-complete="off"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="工位名称:" prop="workplaceName" class="query-form-item">
<el-input
disabled
v-model="formData.workplaceName" style="width: 100%"
auto-complete="off"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24" class="el-row">
<el-col :span="12" class="el-col">
<el-form-item label="作业方式:" prop="operationType" class="query-form-item">
<el-select v-model="formData.operationType" style="width: 100%" placeholder="选择扫码方式" clearable disabled>
<el-option label="扫码生成业务单(必须插入)" :value="1"></el-option>
<el-option label="按单校验三期（是否插入可选" :value="2"></el-option>
<el-option label="按单不校验三期（是否插入可选" :value="3"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="结果处理:" prop="checkInsert" class="query-form-item">
<el-select v-model="formData.checkInsert" style="width: 100%" placeholder="选择扫码方式" clearable disabled>
<el-option label="不插入" :value="1"></el-option>
<el-option label="插入" :value="2"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24" class="el-row">
<el-col :span="12" class="el-col">
<el-form-item label="提醒方式:" prop="warnType" class="query-form-item">
<el-select v-model="formData.warnType" style="width: 100%" placeholder="选择扫码方式" clearable disabled>
<el-option label="信息提醒" :value="1"></el-option>
<el-option label="禁止录入" :value="2"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="往来类型标题:" prop="remake" class="query-form-item">
<el-input
disabled
v-model="formData.unitTittle" style="width: 100%"
auto-complete="off"
></el-input>
</el-form-item>
</el-col>
<!--<el-col :span="24" class="el-col">-->
<!-- <el-form-item label="所属仓库:" prop="invCode" class="query-form-item">-->
<!-- <el-select v-model="formData.invCode" placeholder="请选择所属仓库"-->
<!-- style="width: 80%"-->
<!-- clearable-->
<!-- @change="handleInvChange"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in invList"-->
<!-- :key="item.name"-->
<!-- :label="item.name"-->
<!-- :value="item.code"-->
<!-- >-->
<!-- <span style="float: left">{{ item.name }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!--</el-col>-->
<el-col :span="12" class="el-col">
<el-form-item label="工位负责人:" prop="chargeUser" class="query-form-item">
<el-input
disabled
v-model="formData.employeeName" style="width: 100%"
auto-complete="off"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="作业方式:" prop="chargeUser" class="query-form-item">
<el-input
disabled
v-model="operationTypes[formData.operationType]" style="width: 100%"
auto-complete="off"
></el-input>
</el-form-item>
</el-col>
<!--<el-col :span="24" class="el-col">-->
<!-- <el-form-item label="单据类型:" prop="busType" class="query-form-item">-->
<!-- <el-select v-model="formData.orderId" placeholder="请选择单据类型"-->
<!-- style="width: 80%"-->
<!-- clearable-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in busTypes"-->
<!-- :key="item.name"-->
<!-- :label="item.name"-->
<!-- :value="item.code"-->
<!-- >-->
<!-- <span style="float: left">{{ item.name }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!--</el-col>-->
<!--<el-col :span="24" class="el-col">-->
<!-- <el-form-item label="所属组别:" prop="grouping" class="query-form-item">-->
<!-- <el-select v-model="formData.constituencies" placeholder="请选择所属组别"-->
<!-- style="width: 80%"-->
<!-- clearable-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in fromDeptOptions"-->
<!-- :key="item.code"-->
<!-- :label="item.label"-->
<!-- :value="item.code"-->
<!-- >-->
<!-- <span style="float: left">{{ item.label }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!--</el-col>-->
<el-col :span="24" class="el-col">
<el-form-item label="备注:" prop="unitTittle" class="query-form-item">
<el-input
disabled
v-model="formData.remake" style="width: 100%"
auto-complete="off"
></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-dialog>
</div> </div>
</template> </template>
@ -191,7 +357,10 @@ export default {
1: '信息提醒', 1: '信息提醒',
2: '禁止录入' 2: '禁止录入'
}, },
userId: '' userId: '',
addWorkplaceDialogVisible: false,
formData: null,
} }
}, },
methods: { methods: {
@ -213,11 +382,17 @@ export default {
}, },
onUserReset() { onUserReset() {
this.workQuery = {} this.workQuery = {}
let query = {
userId: this.rowData.id
}
this.getUserBindWork(query)
}, },
loadWorkList() { loadWorkList() {
// if (this.rowData.id == null){ let query = {
// return this.$message.error("请先选择用户") userId: this.rowData.id,
// } workKey:this.workQuery.key
}
this.getUserBindWork(query)
}, },
getUsers() { getUsers() {
getUsers(this.userQuery).then(res => { getUsers(this.userQuery).then(res => {
@ -233,6 +408,9 @@ export default {
let query = { let query = {
userId: row.id userId: row.id
} }
this.getUserBindWork(query)
},
getUserBindWork(query){
getUserBindWork(query).then(res => { getUserBindWork(query).then(res => {
if (res.code == 20000) { if (res.code == 20000) {
this.workList = res.data || [] this.workList = res.data || []
@ -281,6 +459,10 @@ export default {
}) })
},
workDetail(row){
this.formData = row
this.addWorkplaceDialogVisible = true
} }
}, },
created() { created() {

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

@ -154,14 +154,39 @@
</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" <el-form :inline="true" :model="userQuery" class="query-form" size="mini" style="margin-top: 30px;margin-bottom: 10px" v-if="rowData != null">
<el-form-item class="query-form-item" label="工位编码/工位名称:">
<el-input
v-model="userQuery.key"
placeholder="请输入工位编码/名称"
clearable
></el-input>
</el-form-item>
<el-form-item>
<el-button-group>
<el-button
type="primary"
icon="el-icon-refresh"
@click="onUserReset"
>重置
</el-button>
<el-button type="primary" @click="loadUserList"
icon="el-icon-search"
>查询
</el-button
>
</el-button-group>
</el-form-item>
</el-form>
<el-table v-loading="userLoading" :data="userList" style="width: 100%;" :row-style="{height: '32px' }" v-if="rowData != null"
highlight-current-row 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>
<el-table-column label="用名称" prop="employeeName"></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="备注" prop="remark"></el-table-column>
<el-table-column label="操作" fixed="right" width="100"> <el-table-column label="操作" fixed="right" width="50">
<template slot-scope="scope"> <template slot-scope="scope">
<!--<el-button--> <!--<el-button-->
<!-- type="text"--> <!-- type="text"-->
@ -169,12 +194,12 @@
<!-- @click.native.stop="printLabel(scope.row)"--> <!-- @click.native.stop="printLabel(scope.row)"-->
<!--&gt;打印--> <!--&gt;打印-->
<!--</el-button>--> <!--</el-button>-->
<el-button <!--<el-button-->
type="text" <!-- type="text"-->
size="small" <!-- size="small"-->
@click.native.stop="editCollectionPoints(scope.row)" <!-- @click.native.stop="editCollectionPoints(scope.row)"-->
>详情 <!--&gt;详情-->
</el-button> <!--</el-button>-->
<el-button <el-button
type="text" type="text"
size="small" size="small"
@ -436,6 +461,7 @@ export default {
userList: [], userList: [],
userLoading: false, userLoading: false,
rowData: null, rowData: null,
userQuery: {}
} }
}, },
methods: { methods: {
@ -636,6 +662,20 @@ export default {
} }
this.getUserBindWork(query) this.getUserBindWork(query)
}, },
loadUserList(){
let query = {
workplaceId: this.rowData.workplaceId,
userKey : this.userQuery.key
}
this.getUserBindWork(query)
},
onUserReset(){
this.userQuery = {}
let query = {
workplaceId: this.rowData.workplaceId,
}
this.getUserBindWork(query)
},
getUserBindWork(query){ getUserBindWork(query){
getUserBindWork(query).then(res => { getUserBindWork(query).then(res => {
if (res.code == 20000) { if (res.code == 20000) {

Write Preview
Loading…
Cancel
Save