fix: 提交

20240912_adapter_z
chenhc 1 year ago
parent bb0d25042a
commit 4500b55b94

@ -132,15 +132,15 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="6" v-if="!corpOrderIdDisabled"> <el-col :span="6" v-if="!isLinkDisabled">
<el-form-item prop="workPlaceCode" class="query-form-item" label="当前工位:" v-if="!corpOrderIdDisabled"> <el-form-item prop="workPlaceCode" class="query-form-item" label="当前工位:" >
<el-select <el-select
v-model="orderFormData.workPlaceCode" v-model="orderFormData.workPlaceCode"
placeholder="当前工位" placeholder="当前工位"
style="width: 90%" style="width: 90%"
:disabled="corpOrderIdDisabled" :disabled="corpOrderIdDisabled"
filterable filterable
@change="changeInvRemind" @change="changePlace"
> >
<el-option <el-option
v-for="item in curWorkPlaces" v-for="item in curWorkPlaces"
@ -157,6 +157,30 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6" v-if="!isLinkDisabled">
<el-form-item prop="busType" class="query-form-item" label="业务类型:" >
<el-select
v-model="orderFormData.busType"
placeholder="业务类型"
style="width: 90%"
:disabled="corpOrderIdDisabled"
filterable
>
<el-option
v-for="item in busTypeList"
:key="item.documentTypeCode"
:label="item.busName"
:value="item.documentTypeCode"
>
<span style="float: left">{{ item.busName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{
item.documentTypeCode
}}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6" v-if="splitType=='out'"> <el-col :span="6" v-if="splitType=='out'">
<el-form-item prop="fifoSplit" class="query-form-item" label="上货方式:"> <el-form-item prop="fifoSplit" class="query-form-item" label="上货方式:">
<el-radio-group v-model="orderFormData.fifoSplit" :disabled="fifoSplitEnable" @change="splitChange"> <el-radio-group v-model="orderFormData.fifoSplit" :disabled="fifoSplitEnable" @change="splitChange">
@ -315,6 +339,7 @@ import {printSplitLabel} from "@/api/collect/splitCreateOrder";
import {findInvRemind} from "@/api/inout/splitCode"; import {findInvRemind} from "@/api/inout/splitCode";
import chooseDraftOrderDialog from "./chooseDraftOrderDialog" import chooseDraftOrderDialog from "./chooseDraftOrderDialog"
import {getUserBindWork} from '@/api/basic/collectPoint/userWorkplace' import {getUserBindWork} from '@/api/basic/collectPoint/userWorkplace'
import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
export default { export default {
name: "ioCreateOrder", name: "ioCreateOrder",
@ -376,6 +401,13 @@ export default {
}, },
data() { data() {
return { return {
busTypeList: [],
busQuery: {
busKey: '',
workplaceCode: null,
page: 1,
limit: 100
},
isLinkDisabled: false, isLinkDisabled: false,
userInfo: { userInfo: {
inv: this.$store.getters.locInvName, inv: this.$store.getters.locInvName,
@ -408,6 +440,7 @@ export default {
workPlaceCode: null, workPlaceCode: null,
fifoSplit: 1, fifoSplit: 1,
splitBusType: null, splitBusType: null,
busType: null,
}, },
detailList: [], detailList: [],
@ -546,21 +579,24 @@ export default {
DialogSelectUnit, DialogSelectSpace, selectRlDialog, dialogInvProduct, chooseDraftOrderDialog DialogSelectUnit, DialogSelectSpace, selectRlDialog, dialogInvProduct, chooseDraftOrderDialog
}, },
methods: { methods: {
changeInvRemind(val) { changePlace(val) {
let post = { this.getWorkBindBusTypes(val)
workPlaceCode: val this.$refs.inputRef.focus();
} },
this.defaultSplitType() getWorkBindBusTypes(workplaceId) {
findInvRemind(post).then((response) => { this.busQuery.workplaceCode = workplaceId
if (response.code === 20000) { getWorkBindBusTypes(this.busQuery).then(res => {
this.msgTip = response.data if (res.code == 20000) {
this.$refs.inputRef.focus(); this.busTypeList = res.data.list || []
if (this.busTypeList.length == 1) {
this.orderFormData.busType = this.busTypeList[0].documentTypeCode
} else {
this.orderFormData.busType = null
}
} }
}).catch(() => { return
}); })
}, },
splitChange() { splitChange() {
this.$refs.inputRef.focus(); this.$refs.inputRef.focus();
}, },
@ -1809,8 +1845,8 @@ export default {
this.findInvListByUser(); this.findInvListByUser();
this.showSearch = true this.showSearch = true
} }
},
}
}, },
filters: {}, filters: {},
mounted() { mounted() {

@ -474,6 +474,7 @@ import { getBasicUnitMaintainsOptimize } from '@/api/basic/basicUnitMaintain'
import { listPage } from '@/api/basic/workPlace/sysWorkplaceManage' import { listPage } from '@/api/basic/workPlace/sysWorkplaceManage'
import ioSplitFifoCodeRemindSetDialog from "./ioSplitFifoCodeRemindSetDialog.vue"; import ioSplitFifoCodeRemindSetDialog from "./ioSplitFifoCodeRemindSetDialog.vue";
import destroyOutDialog from "./destroyOutDialog.vue"; import destroyOutDialog from "./destroyOutDialog.vue";
import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
export default { export default {
name: "IoSplitFifoCodePanel", name: "IoSplitFifoCodePanel",
@ -491,7 +492,14 @@ export default {
}, },
data() { data() {
return { return {
busQuery: {
busKey: '',
workplaceCode: null,
page: 1,
limit: 100
},
viewType: null,
isLinkDisabled: false,
// //
// //
tableHeader: [], tableHeader: [],
@ -519,6 +527,7 @@ export default {
billNo: null, billNo: null,
page: 1, page: 1,
limit: 10, limit: 10,
busType: null,
// key: null // key: null
}, },
@ -546,7 +555,31 @@ export default {
components: {ioSplitFifoCodeRemindSetDialog,destroyOutDialog}, components: {ioSplitFifoCodeRemindSetDialog,destroyOutDialog},
methods: { methods: {
changePlace(_this,query) {
_this.getWorkBindBusTypes(_this,query)
},
getWorkBindBusTypes(_this, query) {
_this.busQuery.workplaceCode = query
getWorkBindBusTypes(this.busQuery).then(res => {
if (res.code == 20000) {
let busTypes = res.data.list || [];
// _this.options.getWorkPlace = res.data.list || [];
let getWorkPlace = busTypes.map(busType => {
return {
code: busType.documentTypeCode,
label: busType.busName
};
});
_this.options.getBusType = getWorkPlace
if (_this.options.getBusType.length == 1) {
_this.filterQuery.busType = _this.options.getBusType[0].code
} else {
_this.filterQuery.busType = null
}
}
return
})
},
//------------ //------------
executeFuc(row, type, clickFuc, value) { executeFuc(row, type, clickFuc, value) {
return executeFuc(this, row, type, clickFuc, value); return executeFuc(this, row, type, clickFuc, value);
@ -706,6 +739,7 @@ export default {
if (this.$route.query.workplaceId != null) { if (this.$route.query.workplaceId != null) {
this.filterQuery.workPlaceCode = Number(this.$route.query.workplaceId) this.filterQuery.workPlaceCode = Number(this.$route.query.workplaceId)
this.viewType = 1 this.viewType = 1
this.isLinkDisabled = true
} }
this.findWorkPlace(this,"") this.findWorkPlace(this,"")
// console.log(this.panelType) // console.log(this.panelType)

@ -228,7 +228,8 @@ export default {
}, },
data() { data() {
return { return {
viewType: null,
isLinkDisabled: false,
// //
// //
tableHeader: [], tableHeader: [],
@ -386,6 +387,7 @@ export default {
if (this.$route.query.workplaceId != null) { if (this.$route.query.workplaceId != null) {
this.filterQuery.workPlaceCode = Number(this.$route.query.workplaceId) this.filterQuery.workPlaceCode = Number(this.$route.query.workplaceId)
this.viewType = 1 this.viewType = 1
this.isLinkDisabled = true
} }
this.findWorkPlace(this,"") this.findWorkPlace(this,"")
getHead("ioSplitFifoRemind", "1").then((re) => { getHead("ioSplitFifoRemind", "1").then((re) => {

Loading…
Cancel
Save