diff --git a/src/views/basic/BasicEntrutsReceModify.vue b/src/views/basic/BasicEntrutsReceModify.vue index 6be2867..5eb5392 100644 --- a/src/views/basic/BasicEntrutsReceModify.vue +++ b/src/views/basic/BasicEntrutsReceModify.vue @@ -7,35 +7,36 @@
- 扫码单据类型:  + 委托仓库: 
- + - {{ item.localName }} + :value="item.code"> + {{ item.name }} + +
+
- 委托仓库:  + 扫码单据类型: 
- + - {{ item.name }} + :value="item.localAction"> + {{ item.localName }} - -
@@ -46,7 +47,8 @@
接受委托仓库: 
- + { }); }, - getOrderType() { - filterNoUseBusType().then((response) => { + getOrderType(code) { + + let query = { + locInvCode: code + } + filterNoUseBusType(query).then((response) => { this.busTypes = response.data || []; }).catch(() => { }) }, invChange(code) { - let query = { - code: code - } - this.$set(this.inputQuery, "entrustUser",""); - this.$set(this.inputQuery, "entrustInv",""); + this.getOrderType(code); + this.$set(this.inputQuery, "entrustUser", ""); + this.$set(this.inputQuery, "entrustInv", ""); this.getEntrustStorage(); }, @@ -232,7 +236,7 @@ export default { this.$forceUpdate(); //加载用户数据 warehouseUserList(query).then((res) => { - this.entrustUserArray=[]; + this.entrustUserArray = []; this.entrustUserArray = res.data; if (this.inputQuery.entrustUser != null && this.inputQuery.entrustUser != '') { this.inputQuery.entrustUser = Number(this.inputQuery.entrustUser); @@ -249,7 +253,6 @@ export default { }); - }, }, diff --git a/src/views/inout/IOCheckWaitOrder.vue b/src/views/inout/IOCheckWaitOrder.vue index ebd79c5..c53d9ff 100644 --- a/src/views/inout/IOCheckWaitOrder.vue +++ b/src/views/inout/IOCheckWaitOrder.vue @@ -841,6 +841,20 @@ export default { let start = new Date(); start.setTime(start.getTime() - 3600 * 1000 * 24 * 7); this.actDateRange = [start, end]; + + // let d = new Date + // let year1,month1,day1; + // [year1,month1,day1] = [d.getFullYear(),d.getMonth(),d.getDate()] + // let date1 = new Date(year1, month1, day1,7) + // this.actDateRange.push(date1) + // //前一天设定的日期时间 + // let year2,month2,day2 + // d.setTime(d.getTime()-7*24*60*60*1000); + // [year2,month2,day2] = [d.getFullYear(),d.getMonth(),d.getDate()] + // let date2 = new Date(year2,month2,day2,7) + // this.actDateRange.unshift(date2) + + }, }; diff --git a/src/views/thrsys/SysUdimsConfig.vue b/src/views/thrsys/SysUdimsConfig.vue index de7352e..ec78e00 100644 --- a/src/views/thrsys/SysUdimsConfig.vue +++ b/src/views/thrsys/SysUdimsConfig.vue @@ -43,7 +43,8 @@ v-model="configQuery.syncIp" :disabled="configQuery.downstreamEnable" splaceholder="请输入内容" > - 测试连通 @@ -52,6 +53,9 @@ + +