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

代码备份

Browse Source
20240912_adapter
yewj 7 months ago
parent bbffde0d58
commit e4d23e1a52
5 changed files with 64 additions and 58 deletions
Show Stats Download Patch File Download Diff File

70
src/views/basic/collectPoint/timerSetting.vue
Unescape Escape View File

@ -4,7 +4,7 @@
<el-form :model="formData" :rules="formRules" label-width="160px" ref="dataForm"> <el-form :model="formData" :rules="formRules" label-width="160px" ref="dataForm">
<el-button-group style="display: flex;margin: 0px 0 10px 90%; "> <el-button-group style="display: flex;margin: 0px 0 10px 90%; ">
<!-- <el-button type="primary" @click.native="saveTest()">测试货架组件</el-button>--> <!-- <el-button type="primary" @click.native="saveTest()">测试货架组件</el-button>-->
<el-button type="primary" @click.native="save()">保存</el-button> <el-button type="primary" @click.native="save()">保存</el-button>
</el-button-group> </el-button-group>
@ -165,72 +165,72 @@ export default {
return { return {
num: 1, num: 1,
ShelfDisplayFlag: false, ShelfDisplayFlag: false,
shelfData:[ shelfData: [
{ {
row: 1, row: 1,
height: 50, height: 50,
slots: [ slots: [
{ id: 1, item: 'Item A1' }, {id: 1, item: 'Item A1'},
{ id: 2, item: 'Item A2' }, {id: 2, item: 'Item A2'},
{ id: 3, item: 'Item 3' }, {id: 3, item: 'Item 3'},
{ id: 4, item: 'Item 4' }, {id: 4, item: 'Item 4'},
] ]
}, },
{ {
row: 2, row: 2,
height: 80, height: 80,
slots: [ slots: [
{ id: 1, item: 'Item B1' }, {id: 1, item: 'Item B1'},
{ id: 2, item: 'Item B2' }, {id: 2, item: 'Item B2'},
{ id: 3, item: 'Item 3' }, {id: 3, item: 'Item 3'},
{ id: 4, item: 'Item 4' }, {id: 4, item: 'Item 4'},
{ id: 5, item: 'Item 3' }, {id: 5, item: 'Item 3'},
] ]
}, },
{ {
row: 3, row: 3,
height: 80, height: 80,
slots: [ slots: [
{ id: 1, item: 'Item B1' }, {id: 1, item: 'Item B1'},
{ id: 2, item: 'Item B2' }, {id: 2, item: 'Item B2'},
{ id: 3, item: 'Item 3' }, {id: 3, item: 'Item 3'},
{ id: 4, item: 'Item 4' }, {id: 4, item: 'Item 4'},
{ id: 5, item: 'Item 3' }, {id: 5, item: 'Item 3'},
] ]
}, },
{ {
row: 6, row: 6,
height: 80, height: 80,
slots: [ slots: [
{ id: 1, item: 'Item B1' }, {id: 1, item: 'Item B1'},
{ id: 2, item: 'Item B2' }, {id: 2, item: 'Item B2'},
{ id: 3, item: 'Item 3' }, {id: 3, item: 'Item 3'},
{ id: 4, item: 'Item 4' }, {id: 4, item: 'Item 4'},
{ id: 5, item: 'Item 3' }, {id: 5, item: 'Item 3'},
{ id: 5, item: 'Item 3' }, {id: 5, item: 'Item 3'},
{ id: 5, item: 'Item 3' }, {id: 5, item: 'Item 3'},
{ id: 5, item: 'Item 3' }, {id: 5, item: 'Item 3'},
{ id: 5, item: 'Item 3' }, {id: 5, item: 'Item 3'},
{ id: 5, item: 'Item 3' }, {id: 5, item: 'Item 3'},
] ]
}, },
{ {
row: 5, row: 5,
height: 200, height: 200,
slots: [ slots: [
{ id: 1, item: 'Item B1' }, {id: 1, item: 'Item B1'},
{ id: 2, item: 'Item B2' }, {id: 2, item: 'Item B2'},
] ]
}, },
{ {
row: 4, row: 4,
height: 80, height: 80,
slots: [ slots: [
{ id: 1, item: 'Item B1' }, {id: 1, item: 'Item B1'},
{ id: 2, item: 'Item B2' }, {id: 2, item: 'Item B2'},
{ id: 3, item: 'Item 3' }, {id: 3, item: 'Item 3'},
{ id: 4, item: 'Item 4' }, {id: 4, item: 'Item 4'},
{ id: 5, item: 'Item 3' }, {id: 5, item: 'Item 3'},
] ]
}, },
], ],
@ -243,7 +243,7 @@ export default {
} }
}, },
components:{ components: {
ShelfDisplay ShelfDisplay
}, },
methods: { methods: {
@ -259,7 +259,7 @@ export default {
} }
}) })
}, },
saveTest(){ saveTest() {
this.ShelfDisplayFlag = true this.ShelfDisplayFlag = true
}, },
save() { save() {

18
src/views/collect/DealOrder.vue
Unescape Escape View File

@ -141,7 +141,7 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<!-- :label="this.formDataVisible.unitTittle + ':'"--> <!-- :label="this.formDataVisible.unitTittle + ':'"-->
<el-form-item class="query-form-item" label="收货方"> <el-form-item class="query-form-item" label="收货方:">
<el-select v-model="formData.fromCorp" <el-select v-model="formData.fromCorp"
filterable filterable
:disabled="formData.billNo" :disabled="formData.billNo"
@ -468,7 +468,7 @@ export default {
formDataVisible: { formDataVisible: {
scanType: null, scanType: null,
unitTittle: "往来单位", unitTittle: "往来单位",
corpType: 1, corpType: 3,
}, },
curWorkPlaces: [], curWorkPlaces: [],
erpList: [], erpList: [],
@ -631,7 +631,7 @@ export default {
}, },
findFromInvList(val) { findFromInvList(val) {
let cQuery = { let cQuery = {
corpType: this.formDataVisible.corpType, corpType: 3,
invCode: this.formData.invCode invCode: this.formData.invCode
}; };
findFromCorp(cQuery) findFromCorp(cQuery)
@ -829,7 +829,7 @@ export default {
//todo 拆零扫码确认 //todo 拆零扫码确认
const codeArray = this.filterQuery.code.split(";"); const codeArray = this.filterQuery.code.split(";");
let query = { let query = {
orderId: this.formData.billNo, billNo: this.formData.billNo,
codeList: codeArray codeList: codeArray
} }
//更新扫码确认 //更新扫码确认
@ -839,6 +839,7 @@ export default {
this.$message.success('确认成功') this.$message.success('确认成功')
this.result = '' this.result = ''
this.$refs.inputRef.focus() this.$refs.inputRef.focus()
this.$refs.inputRef.select()
this.getBizDetailList(); this.getBizDetailList();
} else { } else {
this.$message.error(response.message) this.$message.error(response.message)
@ -1048,7 +1049,6 @@ export default {
}, },
saveDraftOrder() { saveDraftOrder() {
this.$confirm('此操作将挂起当前正在处理单据，是否继续?', '提示', { this.$confirm('此操作将挂起当前正在处理单据，是否继续?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
@ -1308,6 +1308,10 @@ export default {
if (!this.autoFinishOrderFlag) { if (!this.autoFinishOrderFlag) {
return return
} }
if (this.formDataVisible.scanType == 1)
return;
vailOrderFinish(this.formData).then(res => { vailOrderFinish(this.formData).then(res => {
this.loading = false this.loading = false
if (res.code == 20000) { if (res.code == 20000) {
@ -1422,7 +1426,7 @@ export default {
let corp = this.fromInvOptions.find(item => item.code === this.formData.fromCorp); let corp = this.fromInvOptions.find(item => item.code === this.formData.fromCorp);
this.formData.fromCorpName = corp.name this.formData.fromCorpName = corp.name
}, },
changeShipper(){ changeShipper() {
let corp = this.invList.find(item => item.code === this.formData.shipper); let corp = this.invList.find(item => item.code === this.formData.shipper);
this.formData.shipperName = corp.name this.formData.shipperName = corp.name
}, },
@ -1647,6 +1651,8 @@ export default {
} }
}, },
overdeleteCode() { overdeleteCode() {
this.warnVisible = false
this.warnResult = "";
this.labelName = 1 this.labelName = 1
this.scanStatus = null this.scanStatus = null
this.scanTip = "扫码录入:" this.scanTip = "扫码录入:"

18
src/views/collect/IoCreateOrder.vue
Unescape Escape View File

@ -9,8 +9,9 @@
> >
<el-card> <el-card>
<el-row style="margin-bottom: 8px"> <el-row style="margin-bottom: 8px">
<span style="font-size: 18px;font-weight: bold;color: red" v-if="redMesg && this.splitType == 'out'">请先扫取货槽编码</span> <span style="font-size: 18px;font-weight: bold;color: red"
<span style="font-size: 18px;font-weight: bold">{{curQueueName }}</span> v-if="redMesg && this.splitType == 'out'">请先扫取货槽编码</span>
<span style="font-size: 18px;font-weight: bold">{{ curQueueName }}</span>
<el-button-group <el-button-group
style="display: flex; margin-top: 5px; float: right" style="display: flex; margin-top: 5px; float: right"
> >
@ -639,7 +640,7 @@ export default {
redMesg: false, redMesg: false,
redMesgOld: false, redMesgOld: false,
productName: null, productName: null,
orderStatus:false,//是否调用子组件 orderStatus: false,//是否调用子组件
} }
}, },
components: { components: {
@ -1394,7 +1395,6 @@ export default {
this.errVisible = false this.errVisible = false
this.isCodeAlive = false this.isCodeAlive = false
this.isBizDetailAlive = false this.isBizDetailAlive = false
this.isCodeDetailAlive = false this.isCodeDetailAlive = false
@ -1425,7 +1425,7 @@ export default {
this.orderStatus = false this.orderStatus = false
} }
}, },
getOrderData(orderDetail){ getOrderData(orderDetail) {
this.productName = orderDetail.coName this.productName = orderDetail.coName
this.curQueueName = "当前取货槽:" + this.productName + "(" + this.curQueue.code + ")" this.curQueueName = "当前取货槽:" + this.productName + "(" + this.curQueue.code + ")"
this.orderStatus = true this.orderStatus = true
@ -1782,7 +1782,7 @@ export default {
// return // return
// } // }
this.saveLoading = true this.saveLoading = true
if (this.orderFormData.billNo != null){ if (this.orderFormData.billNo != null) {
deleteByOrderId(tQuery).then((response) => { deleteByOrderId(tQuery).then((response) => {
this.saveLoading = false this.saveLoading = false
if (response.code === 20000) { if (response.code === 20000) {
@ -1796,7 +1796,7 @@ export default {
this.loading = false this.loading = false
this.saveLoading = false this.saveLoading = false
}) })
}else { } else {
this.successCloseData() this.successCloseData()
this.result = '' this.result = ''
this.$refs.inputRef.focus() this.$refs.inputRef.focus()
@ -2041,9 +2041,9 @@ export default {
if (response.code == 20000) { if (response.code == 20000) {
this.curQueue = response.data; this.curQueue = response.data;
this.productName = this.curQueue.cpmctymc this.productName = this.curQueue.cpmctymc
if (isBlank(this.productName)){ if (isBlank(this.productName)) {
this.curQueueName = "当前取货槽:" + this.curQueue.code this.curQueueName = "当前取货槽:" + this.curQueue.code
}else { } else {
this.curQueueName = "当前取货槽:" + this.productName + "(" + this.curQueue.code + ")" this.curQueueName = "当前取货槽:" + this.productName + "(" + this.curQueue.code + ")"
} }

6
src/views/collect/IoSplitOperateCode.vue
Unescape Escape View File

@ -945,7 +945,7 @@ export default {
onReset() { onReset() {
this.filterQuery = { this.filterQuery = {
statusType: 'draft', statusType:null,
busType: null, busType: null,
id: "", id: "",
billNo: null, billNo: null,
@ -1313,10 +1313,10 @@ export default {
this.filterQuery.statusType = 'split_finish'; this.filterQuery.statusType = 'split_finish';
} else if (this.splitType == "out") { } else if (this.splitType == "out") {
this.filterQuery.action = 'SC72197936495755'; this.filterQuery.action = 'SC72197936495755';
this.filterQuery.statusType = 'scan_code'; this.filterQuery.statusType = null;//'scan_code'
} else if (this.splitType == "return") { } else if (this.splitType == "return") {
this.filterQuery.action = 'SC72249388338364'; this.filterQuery.action = 'SC72249388338364';
this.filterQuery.statusType = 'scan_code'; this.filterQuery.statusType =null;
} }
getHead("IoSplitFinishCode", "1").then((re) => { getHead("IoSplitFinishCode", "1").then((re) => {

2
src/views/collect/SelectCollectOrderEndDialog.vue
Unescape Escape View File

@ -505,7 +505,7 @@ export default {
key: val, key: val,
page: 1, page: 1,
limit: 10, limit: 10,
workPlaceClass:1 workPlaceClass: 1
} }
filterWorkOptimize(query) filterWorkOptimize(query)
.then((response) => { .then((response) => {

Write Preview
Loading…
Cancel
Save