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

8/16 工位界面优化

Browse Source
20240912_adapter_z
wangwei 1 year ago
parent 54be1e8778
commit 7cc82ec060
4 changed files with 96 additions and 46 deletions
Show Stats Download Patch File Download Diff File

19
src/views/basic/collectPoint/gatherOrderType.vue
Unescape Escape View File

@ -124,13 +124,13 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="el-col"> <!--<el-col :span="12" class="el-col">-->
<el-form-item label="所属仓库:" prop="invCode" class="query-form-item"> <!-- <el-form-item label="所属仓库:" prop="invCode" class="query-form-item">-->
<invSelect :value.sync="formData.invCode" :params.sync="filterBadInv" :changeValue.sync="invChange" <!-- <invSelect :value.sync="formData.invCode" :params.sync="filterBadInv" :changeValue.sync="invChange"-->
style="width: 80%" <!-- style="width: 80%"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!--</el-col>-->
</el-row> </el-row>
<el-row :gutter="24" class="el-row"> <el-row :gutter="24" class="el-row">
<el-col :span="22" class="el-col"> <el-col :span="22" class="el-col">
@ -247,7 +247,9 @@ export default {
genCode().then(res => { genCode().then(res => {
if (res.code == 20000){ if (res.code == 20000){
this.code = res.data this.code = res.data
this.formData.code = res.data this.formData = {
code: res.data
}
this.addCollectionPointsDialogVisible = true this.addCollectionPointsDialogVisible = true
} }
}) })
@ -288,6 +290,7 @@ export default {
this.addCollectionPointsDialogVisible = false this.addCollectionPointsDialogVisible = false
}, },
formSubmit() { formSubmit() {
this.formData.invCode = this.$store.getters.locInvCode
if (this.fromName == 'add') { if (this.fromName == 'add') {
this.$refs['dataForm'].validate((valid) => { this.$refs['dataForm'].validate((valid) => {
if (valid) { if (valid) {

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

@ -359,12 +359,14 @@ export default {
3: '按单不校验三期' 3: '按单不校验三期'
}, },
checkInserts: { checkInserts: {
1: '不插入', 1: '插入',
2: '插入', 2: '不插入',
3: '提醒不插入'
}, },
warnTypeMap: { warnTypeMap: {
1: '信息提醒', 1: '信息提醒',
2: '禁止录入', 2: '信息弹框提醒',
3: '不提醒'
}, },
corpTypeMap: { corpTypeMap: {
1: '客户', 1: '客户',

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

@ -387,12 +387,14 @@ export default {
3: '按单不校验三期' 3: '按单不校验三期'
}, },
checkInserts: { checkInserts: {
1: '不插入', 1: '插入',
2: '插入' 2: '不插入',
3: '提醒不插入'
}, },
warnTypeMap: { warnTypeMap: {
1: '信息提醒', 1: '信息提醒',
2: '禁止录入' 2: '信息弹框提醒',
3: '不提醒'
}, },
corpTypeMap: { corpTypeMap: {
1: '客户', 1: '客户',

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

@ -278,7 +278,7 @@
<el-row :gutter="24" class="el-row"> <el-row :gutter="24" class="el-row">
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<el-form-item label="作业方式:" prop="operationType" 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 @change="changeCheckInsert">
<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>
<el-option label="按单不校验三期" :value="3"></el-option> <el-option label="按单不校验三期" :value="3"></el-option>
@ -289,9 +289,10 @@
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<el-form-item label="结果处理:" prop="checkInsert" 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 :disabled="formData.operationType == 1">
<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>
<el-option label="提醒不插入" :value="3"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -300,14 +301,31 @@
<el-form-item label="提醒方式:" prop="warnType" 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>
<el-option label="不提醒" :value="3"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="deptCode" label="当前部门:">
<el-select v-model="formData.deptCode" placeholder="请选择部门" clearable
style="width: 80%"
@change="deptChange">
<el-option
v-for="item in deptList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<el-form-item label="所属仓库:" prop="invCode" 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
@change="handleInvChange" @change="handleInvChange"
@ -509,7 +527,7 @@ import {
deleteWorkplace, deleteWorkplace,
createWorkplaceId, printWorkLabel, getUsers createWorkplaceId, printWorkLabel, getUsers
} from '@/api/basic/sysWorkplaceManage' } from '@/api/basic/sysWorkplaceManage'
import { getInvListByUser } from '@/api/system/invWarehouse' import { filterAllByUser, getInvListByUser } from '@/api/system/invWarehouse'
import { addTree, deleteTree, getTree, updateTree } from '@/api/basic/collectPoint/collectPointManage' import { addTree, deleteTree, getTree, updateTree } 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'
@ -542,7 +560,8 @@ export default {
'edit': '编辑工位' 'edit': '编辑工位'
}, },
formData: { formData: {
operationType: 1 operationType: 1,
deptCode: null
}, },
workplaceCode: '6001', workplaceCode: '6001',
unitStorageList: [], unitStorageList: [],
@ -553,21 +572,21 @@ export default {
workplaceName: [ workplaceName: [
{ required: true, message: '请输入工位名称', trigger: 'blur' } { required: true, message: '请输入工位名称', trigger: 'blur' }
], ],
operationType: [ // operationType: [
{ required: true, message: '请选择作业方式', trigger: 'blur' } // { required: true, message: '请选择作业方式', trigger: 'blur' }
], // ],
checkInsert: [ // checkInsert: [
{ required: true, message: '处理结果是否插入', trigger: 'blur' } // { required: true, message: '处理结果是否插入', trigger: 'blur' }
], // ],
warnType: [ // warnType: [
{ required: true, message: '提醒方式', trigger: 'blur' } // { required: true, message: '提醒方式', trigger: 'blur' }
], // ],
invCode: [ // invCode: [
{ required: true, message: '请选择仓库', trigger: 'blur' } // { required: true, message: '请选择仓库', trigger: 'blur' }
], // ],
orderId: [ // orderId: [
{ required: true, message: '请选择单据类型', trigger: 'blur' } // { required: true, message: '请选择单据类型', trigger: 'blur' }
], // ],
}, },
invQuery: { invQuery: {
invCode: '' invCode: ''
@ -586,12 +605,14 @@ export default {
4: '特殊往来', 4: '特殊往来',
}, },
checkInserts: { checkInserts: {
1: '不插入', 1: '插入',
2: '插入' 2: '不插入',
3: '提醒不插入'
}, },
warnTypeMap: { warnTypeMap: {
1: '信息提醒', 1: '信息提醒',
2: '禁止录入' 2: '信息弹框提醒',
3: '不提醒'
}, },
userList: [], userList: [],
userLoading: false, userLoading: false,
@ -614,7 +635,8 @@ export default {
groupData: null, groupData: null,
total: 0, total: 0,
userTotal: 0, userTotal: 0,
workplaceName: '用户' workplaceName: '用户',
deptList:[]
} }
}, },
computed: {}, computed: {},
@ -654,13 +676,13 @@ export default {
if (res.data == null) { if (res.data == null) {
this.formData.workplaceId = this.workplaceCode + 1001 this.formData.workplaceId = this.workplaceCode + 1001
this.formData.operationType = 1 this.formData.operationType = 1
this.formData.checkInsert = 2 this.formData.checkInsert = 1
this.addWorkplaceDialogVisible = true this.addWorkplaceDialogVisible = true
this.getTree() this.getTree()
} else { } else {
this.formData = { this.formData = {
operationType: 1, operationType: 1,
checkInsert: 2 checkInsert: 1
} }
this.getTree() this.getTree()
this.formData.workplaceId = res.data this.formData.workplaceId = res.data
@ -768,7 +790,8 @@ export default {
}, },
getInvList() { getInvList() {
let query = { let query = {
advanceType: 1 advanceType: 1,
deptCode: this.formData.deptCode
} }
getInvListByUser(query) getInvListByUser(query)
.then((response) => { .then((response) => {
@ -951,14 +974,34 @@ export default {
}) })
} }
},
getDeptList() {
this.deptList = [];
filterAllByUser()
.then((response) => {
this.deptList = response.data || [];
this.getInvList();
})
.catch(() => {
});
},
deptChange() {
this.getInvList();
this.formData.invCode = "";
},
changeCheckInsert(){
if (this.formData.operationType == 1){
this.formData.checkInsert = 1
}
} }
}, },
created() { created() {
this.getList() this.getList()
this.getInvList() // this.getInvList()
this.getBusType() this.getBusType()
this.getTree() this.getTree()
this.getLstTree() this.getLstTree()
this.getDeptList()
} }
} }
</script> </script>

Write Preview
Loading…
Cancel
Save