diff --git a/src/views/basic/business/stockOrder.vue b/src/views/basic/business/stockOrder.vue index 53fb8fd2..697c36ad 100644 --- a/src/views/basic/business/stockOrder.vue +++ b/src/views/basic/business/stockOrder.vue @@ -478,6 +478,7 @@ export default { startTime: "", endTime: "", inCodeStatus: '0', + productType:1 }, detailQuery: { orderIdFk: "", @@ -604,6 +605,7 @@ export default { startTime: "", endTime: "", inCodeStatus: '0', + productType:1 }; this.haveDistributionVisible = true; this.actDateRange = []; diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue index bad4248b..d5bba5ba 100644 --- a/src/views/collect/DealOrder.vue +++ b/src/views/collect/DealOrder.vue @@ -187,7 +187,7 @@ type="primary" size="mini" icon="el-icon-search" - @click.native.stop="addCode()" + @click.native.stop="enterKey($event)" style="margin-left: 15px" > diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue index 64cbee9c..685a12c1 100644 --- a/src/views/inout/DialogCreateOrder.vue +++ b/src/views/inout/DialogCreateOrder.vue @@ -1713,6 +1713,7 @@ export default { JSON.parse(JSON.stringify(this.orderFormData)) ); tQuery.billNo = this.orderFormData.billNo; + tQuery.productType = 1; console.log("tQuery:"); console.log(tQuery); if (this.orderFormData.billNo == null) { diff --git a/src/views/inout/IoCheckSuccessOrder.vue b/src/views/inout/IoCheckSuccessOrder.vue index 540ba8a6..27ce9c50 100644 --- a/src/views/inout/IoCheckSuccessOrder.vue +++ b/src/views/inout/IoCheckSuccessOrder.vue @@ -945,6 +945,7 @@ export default { fromCorp: null, keyWords: null, invCode: this.$store.getters.locInvCode, + productType:1 }, fromOptions: [], reviewType: 2, @@ -1091,6 +1092,7 @@ export default { startTime: null, endTime: null, invCode: this.$store.getters.locInvCode, + productType:1 }; this.actDateRange = []; this.getList(); diff --git a/src/views/inout/IoCreateErrorOrder.vue b/src/views/inout/IoCreateErrorOrder.vue index b10b7a9c..f8e7dc33 100644 --- a/src/views/inout/IoCreateErrorOrder.vue +++ b/src/views/inout/IoCreateErrorOrder.vue @@ -382,6 +382,7 @@ export default { startTime: null, endTime: null, invCode: this.$store.getters.locInvCode, + productType:1 }, checkStatus: { 1: "草稿", @@ -492,6 +493,7 @@ export default { startTime: null, endTime: null, invCode: this.$store.getters.locInvCode, + productType:1 }; this.actDateRange = []; this.getList(); diff --git a/src/views/inout/IoCreateOrder.vue b/src/views/inout/IoCreateOrder.vue index 8f173935..ff78225d 100644 --- a/src/views/inout/IoCreateOrder.vue +++ b/src/views/inout/IoCreateOrder.vue @@ -439,6 +439,7 @@ export default { fromCorp: null, // deptCode: this.$store.getters.locDeptCode, invCode: this.$store.getters.locInvCode, + productType:1 }, viewType: 3, @@ -562,6 +563,7 @@ export default { endTime: null, fromCorp: null, invCode: this.$store.getters.locInvCode, + productType:1 }; this.actDateRange = []; this.getList(); diff --git a/src/views/inout/IoCreateScanOrder.vue b/src/views/inout/IoCreateScanOrder.vue index 67b1fabe..e137664a 100644 --- a/src/views/inout/IoCreateScanOrder.vue +++ b/src/views/inout/IoCreateScanOrder.vue @@ -437,6 +437,7 @@ export default { endTime: null, keyWords: null, invCode: this.$store.getters.locInvCode, + productType:1 }, fromOptions: [], checkStatus: { @@ -550,6 +551,7 @@ export default { startTime: null, endTime: null, invCode: this.$store.getters.locInvCode, + productType:1 }; this.actDateRange = []; this.getList(); diff --git a/src/views/inout/IoDealCheckOrder.vue b/src/views/inout/IoDealCheckOrder.vue index 05265c35..2239b0ec 100644 --- a/src/views/inout/IoDealCheckOrder.vue +++ b/src/views/inout/IoDealCheckOrder.vue @@ -353,6 +353,7 @@ export default { keyWords: null, invCode: this.$store.getters.locInvCode, vueType: "waitCheck", + productType:1 }, viewType: 7, checkStatus: { @@ -474,6 +475,7 @@ export default { endTime: null, vueType: "waitCheck", invCode: this.$store.getters.locInvCode, + productType:1 }; this.actDateRange = []; this.getList(); diff --git a/src/views/inout/IoDealOrder.vue b/src/views/inout/IoDealOrder.vue index b295ba34..0d5566cf 100644 --- a/src/views/inout/IoDealOrder.vue +++ b/src/views/inout/IoDealOrder.vue @@ -539,6 +539,7 @@ export default { keyWords: null, invCode: this.$store.getters.locInvCode, vueType: "waitDeal", + productType:1 }, viewType: 3, checkStatus: { @@ -669,6 +670,7 @@ export default { endTime: null, vueType: "waitDeal", invCode: this.$store.getters.locInvCode, + productType:1 }; this.actDateRange = []; this.getList();