diff --git a/pages/ProductManage/EmptyPipeInStore.vue b/pages/ProductManage/EmptyPipeInStore.vue index a4356fc..fcb8aef 100644 --- a/pages/ProductManage/EmptyPipeInStore.vue +++ b/pages/ProductManage/EmptyPipeInStore.vue @@ -98,16 +98,12 @@ /** 生产区域下拉框查询 */ async _queryProductArea () { let res = await queryProductArea() - this.options = [...res.rows] + this.options = [...res.data] }, /** 初始化查询 */ async _queryMaterialInfo () { - let area = '' - if (this.index !== '') { - area = this.options[this.index].value - } - let res = await queryMaterialInfo1(this.val1, this.val2, area) - this.dataList = [...res.rows] + let res = await queryMaterialInfo1(this.val1, this.val2, this.index) + this.dataList = [...res.data] }, /** 确认 */ async _emptyConfirm () { @@ -140,6 +136,6 @@ width 92rpx .slide_new table td:nth-child(2), .slide_new table th:nth-child(2) position sticky - left 92rpx + left 89rpx z-index 102 diff --git a/pages/ProductManage/ZjCasing.vue b/pages/ProductManage/ZjCasing.vue index 4bf1ba6..1311698 100644 --- a/pages/ProductManage/ZjCasing.vue +++ b/pages/ProductManage/ZjCasing.vue @@ -115,19 +115,15 @@ /** 生产区域下拉框查询 */ async _queryProductArea () { let res = await queryProductArea() - this.options = [...res.rows] + this.options = [...res.data] }, /** 初始化查询 */ async _queryMaterialInfo () { - let area = '' - if (this.index !== '') { - area = this.options[this.index].value - } - let res = await queryMaterialInfo2(this.val1, area) - res.rows.map(el => { + let res = await queryMaterialInfo2(this.val1, this.index) + res.data.map(el => { this.$set(el, 'checked', false) }) - this.dataList = [...res.rows] + this.dataList = [...res.data] }, /** 确认 */ async _casingConfirm () { @@ -160,11 +156,11 @@ width 92rpx .slide_new table td:nth-child(2), .slide_new table th:nth-child(2) position sticky - left 92rpx + left 89rpx width 92rpx z-index 102 .slide_new table td:nth-child(3), .slide_new table th:nth-child(3) position sticky - left 184rpx + left 176rpx z-index 103 diff --git a/pages/ProductManage/ZjDelivery.vue b/pages/ProductManage/ZjDelivery.vue index 08a3988..fbae4e3 100644 --- a/pages/ProductManage/ZjDelivery.vue +++ b/pages/ProductManage/ZjDelivery.vue @@ -117,19 +117,15 @@ /** 生产区域下拉框查询 */ async _queryProductArea () { let res = await queryProductArea() - this.options = [...res.rows] + this.options = [...res.data] }, /** 初始化查询 */ async _queryMaterialInfo () { - let area = '' - if (this.index !== '') { - area = this.options[this.index].value - } - let res = await queryMaterialInfo3(this.val1, this.val2, area) - res.rows.map(el => { + let res = await queryMaterialInfo3(this.val1, this.val2, this.index) + res.data.map(el => { this.$set(el, 'checked', false) }) - this.dataList = [...res.rows] + this.dataList = [...res.data] }, /** 呼叫载具 */ async _needVehicle () { @@ -180,11 +176,11 @@ width 92rpx .slide_new table td:nth-child(2), .slide_new table th:nth-child(2) position sticky - left 92rpx + left 89rpx width 92rpx z-index 102 .slide_new table td:nth-child(3), .slide_new table th:nth-child(3) position sticky - left 184rpx + left 176rpx z-index 103 diff --git a/pages/ProductManage/ZjOutStore.vue b/pages/ProductManage/ZjOutStore.vue index 80e6766..5007835 100644 --- a/pages/ProductManage/ZjOutStore.vue +++ b/pages/ProductManage/ZjOutStore.vue @@ -105,19 +105,15 @@ /** 生产区域下拉框查询 */ async _queryProductArea () { let res = await queryProductArea() - this.options = [...res.rows] + this.options = [...res.data] }, /** 初始化查询 */ async _queryMaterialInfo () { - let area = '' - if (this.index !== '') { - area = this.options[this.index].value - } - let res = await queryMaterialInfo4(this.val1, area) - res.rows.map(el => { + let res = await queryMaterialInfo4(this.val1, this.index) + res.data.map(el => { this.$set(el, 'checked', false) }) - this.dataList = [...res.rows] + this.dataList = [...res.data] }, /** 确认 */ async _outConfirm () { @@ -150,11 +146,11 @@ width 92rpx .slide_new table td:nth-child(2), .slide_new table th:nth-child(2) position sticky - left 92rpx + left 89rpx width 92rpx z-index 102 .slide_new table td:nth-child(3), .slide_new table th:nth-child(3) position sticky - left 184rpx + left 176rpx z-index 103 diff --git a/pages/login/login.vue b/pages/login/login.vue index 36947d7..994aafd 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -124,4 +124,6 @@ border-radius 46rpx _font(36rpx,92rpx,#fff,,center) background-color $red +.content + height: 100%