diff --git a/common/http.api.js b/common/http.api.js index 29d75ac..7e0a52d 100644 --- a/common/http.api.js +++ b/common/http.api.js @@ -216,7 +216,8 @@ const install = (Vue, vm) => { }, //查询库别资料列表 storageList: (params = {}) => vm.$u.get('/wms/storage/pda/list', params), - + //查询商品资料列表 + goodsList: (params = {}) => vm.$u.get('/wms/goods/list', params), // 查询字典数据详情 getByDicType: (params = {}) => vm.$u.get('/system/dict/data/type/goods_unit'), // 收货结论 @@ -232,7 +233,11 @@ const install = (Vue, vm) => { // 获取盘点类型的字典 getInvType: (params = {}) => vm.$u.get('/system/dict/data/type/inv_type_dict'), //获取AGV点位的字典 - getCarry:(params = {}) => vm.$u.get('/system/dict/data/type/agv_move_location') + getCarry:(params = {}) => vm.$u.get('/system/dict/data/type/agv_move_location'), + //获取托盘状态字典 + containerStatus:(params = {}) => vm.$u.get('/system/dict/data/type/base_container_status'), + //获取字典 + containerContainerType:(params = {}) => vm.$u.get('/system/dict/data/type/base_container_containerType') }; } diff --git a/pages/checkAccept/checkHomework.vue b/pages/checkAccept/checkHomework.vue index 26899f0..f45d21f 100644 --- a/pages/checkAccept/checkHomework.vue +++ b/pages/checkAccept/checkHomework.vue @@ -46,8 +46,15 @@ 验收数量： {{dataForm.actualQty}} + + + 是否缠膜： + {{dataForm.extend3 == '1'?'是':'否'}} + + + 是否验重： + {{dataForm.extend4 == '1'?'是':'否'}} - 件 数： @@ -64,14 +71,14 @@ 容 器： - + @@ -91,6 +98,9 @@ checkCaseQty: 0, checkPieceQty: 0, result: '', + extend3:'', + extend4:'', + actualQty: '', // 件数 actualCaseQty: 0, @@ -127,6 +137,8 @@ onLoad: function(options) { this.sid = options.sid this.detailId = options.did + this.dataForm.extend3 = options.extend3 + this.dataForm.extend4 = options.extend4 this.getList(options) // 收货结论 this.getByDicReceivingStatus() diff --git a/pages/checkAccept/checkHomeworks.vue b/pages/checkAccept/checkHomeworks.vue index cc28013..080c689 100644 --- a/pages/checkAccept/checkHomeworks.vue +++ b/pages/checkAccept/checkHomeworks.vue @@ -50,7 +50,14 @@ 可验收数量: {{item.ableQty}} - + + 是否缠膜： + + {{item.extend3 == '1'?'是':'否'}} + + 是否验重: + {{item.extend4 == '1'?'是':'否'}} + + + + - 是否验证重量 - {{item.extend4 == '1'?'是':'否'}} + 是否验重 + @@ -67,9 +70,10 @@ 未验数量 {{item.ableQty}} + + - - + @@ -190,6 +194,36 @@ } }, + changeFilm(item){ + if(item.extend3 == 0 ){ + item.extend3 = 1 + }else if(item.extend3 == 1 ){ + item.extend3 = 0 + }else if(item.extend3 == "" ){ + item.extend3 = 1 + } + this.orderNoList.forEach(item1=>{ + if(item1.orderNo === item.orderNo){ + item1.extend3 = item.extend3 + } + }) + + }, + changeWeight(item){ + if(item.extend4 == 0 ){ + item.extend4 = 1 + }else if(item.extend4 == 1 ){ + item.extend4 = 0 + }else if(item.extend4 == "" ){ + item.extend4 = 1 + } + this.orderNoList.forEach(item1=>{ + if(item1.orderNo === item.orderNo){ + item1.extend4 = item.extend4 + } + }) + + }, checkboxGroupChange(item2){ if(this.k == 1){ item2.isChcked=!item2.isChcked @@ -200,6 +234,7 @@ handleOrderNoOne(item){ let _ = this; let detailIds = []; + console.log(item.extend3,item.extend4); detailIds.push(item.id); let tempData = { orderNo: item.orderNo, @@ -208,10 +243,13 @@ detailIds:detailIds, goodNo:item.goodNo, bgGoodName:item.bgGoodName, + extend3:item.extend3, + extend4:item.extend4, actualQty:item.ableQty, packageQty:0 }; _.orderNoList.push(tempData); + console.log(_.orderNoList); }, //增加时多个选择 handleOrderNoMulti(item){ @@ -309,7 +347,6 @@ }, //初始化数据 getDataList() { - uni.stopPullDownRefresh(); this.loadStatus = "loadmore"; this.$u.api.acceptance.pageReceiving({ @@ -330,14 +367,15 @@ }); this.$u.toast("数据列表已刷新"); }, - goodDetail(sid, did) { - this.$u.toast("你点击了商品详情"); + goodDetail(sid, did,extend3,extend4) { this.$u.route({ url: 'pages/checkAccept/checkHomework', type: 'navigateTo', params: { sid, - did + did, + extend3, + extend4 } }) }, diff --git a/pages/index/index.vue b/pages/index/index.vue index 955efc8..58d1ff5 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -40,9 +40,17 @@ 点位释放 - + 查询容器 + + + 查询点位 + + + + 查询商品 + + + + + + + + + + + + + 点位编号: + {{item.pointNo}} + + + + + 名称名称: + {{item.pointName}} + + + + + 所属分组: + {{item.groupName}} + + + + + 是否占用: + {{item.isOccupy == '0' ? '否':(item.isOccupy == '1'?'是':'已分配')}} + + + + + + + + + + + + + + + + + diff --git a/pages/queryShop/index.scss b/pages/queryShop/index.scss new file mode 100644 index 0000000..72db624 --- /dev/null +++ b/pages/queryShop/index.scss @@ -0,0 +1,205 @@ +.sh-content { + padding: 25rpx; + background-color: #fff; + display: flex; + flex-direction: column; + font-family:test1-icon; + .u-form-item { + padding: 5rpx 0px; + } + .u-input__input { + background-color: #ffffff; + } + .sh-search { + display: flex; + padding: 10rpx 30rpx; + // background-color: #F2F2F2; + + .sh-form { + width: 100%; + } + + .sh-sub-search { + display: flex; + align-items: center; + padding: 15rpx 0 15rpx 15rpx; + + .sh-search-button { + height: 100%; + } + } + } + .all-card{ + + + .sh-card { + // background-color: red; + margin-top: 30rpx; + // padding: 20rpx 0rpx; + border: 0.5px solid #797979; + border-radius: 20rpx; + line-height: 60rpx; + + .sh-card-title { + display: flex; + flex-direction: column; + padding: 0 20px; + background-color: #f2f2f2; + border-top-left-radius: 20rpx; + border-top-right-radius: 20rpx; + .receipt-number { + display: flex; + .receipt-number-title { + color: #333333; + font-size: 24rpx; + } + .receipt-number-value { + color: #333333; + font-size: 28rpx; + font-weight: 600; + margin-left: 20rpx; + } + } + } + .sh-card-title-two{ + display: flex; + flex-direction: column; + padding: 0 20px; + background-color: #d7d7d7; + border-top-left-radius: 20rpx; + border-top-right-radius: 20rpx; + .receipt-number { + display: flex; + .receipt-number-title { + color: #333333; + font-size: 24rpx; + } + .receipt-number-value { + color: #333333; + font-size: 28rpx; + font-weight: 600; + margin-left: 20rpx; + } + } + } + .borderBottom { + border-bottom-left-radius: 20rpx; + border-bottom-right-radius: 20rpx; + } + .sh-card-title-border { + border-bottom: 2px dashed #797979; + } + .sh-card-content { + position: relative; + margin: 16rpx 0; + padding: 0rpx 70rpx; + + .detail-icon { + position: absolute; + right: 10rpx; + top: 90rpx; + } + .goods-card-content { + display: flex; + justify-content: space-between; + align-items: center; + .goods-card-content-item { + display: flex; + align-items: center; + width: 70%; + .goods-title { + font-size: 28rpx; + color: #555555; + } + .goods-value { + font-size: 28rpx; + color: #666666; + margin-left: 20rpx; + } + + } + } + } + .goods-no{ + font-weight: bold; + margin-right: 20rpx; + } + .pad-content { + padding-bottom: 16rpx; + } + + .card-content { + display: flex; + justify-content: space-between; + align-items: center; + .card-content-item { + width: 100%; + display: flex; + align-items: center; + .item-title { + + font-size: 32rpx; + color: #555555; + } + .item-value { + font-size: 32rpx; + color: #666666; + // margin-left: 20rpx; + } + } + // .card-content-item:first-child{ + // width: 80%; + // } + .sh-bold { + font-weight: bold; + word-break: break-all; + } + } + + } + margin-bottom: 100px; + } + // .sh-card:first-child{ + // margin-bottom: 50px; + // } + .loadmore-data{ + padding-top: 30rpx; + } +.recommend { + text-align: center; + height: 50rpx; + margin-top: 10rpx; +} + +.recommend-title { + display: table; + width: 100%; + line-height: 50rpx; + white-space: nowrap; + border-spacing: 2rem 0; + font-size: 30rpx; + color: gray +} + +.recommend-title::before, .recommend-title::after { + display: table-cell; + content: ""; + width: 50%; + background: linear-gradient(#eee, #eee) repeat-x center; + background-size: 0.1rem 0.1rem; +} + +.bottom{ + position:fixed; + height: 40px; + width: 100%; + bottom:38px; + button{ + height: 100%; + line-height: 40px; + width: 60%; + font-size: 16px; + } + } +} + diff --git a/pages/queryShop/index.vue b/pages/queryShop/index.vue new file mode 100644 index 0000000..4565e87 --- /dev/null +++ b/pages/queryShop/index.vue @@ -0,0 +1,196 @@ + + + + + diff --git a/pages/receive/index.vue b/pages/receive/index.vue index d7d862b..70f72f4 100644 --- a/pages/receive/index.vue +++ b/pages/receive/index.vue @@ -172,9 +172,9 @@ import { nextTick } from "vue"; if(indexOfTree === -1){ this.handleOrderNoOne(item) }else{ - this.orderNoList[indexOfTree].ableQty += item.ableQty; - this.orderNoList[indexOfTree].actualQty += item.ableQty; - this.orderNoList[indexOfTree].detailIds.push(item.id); + this.orderNoList[indexOfTree].ableQty += item.ableQty; + this.orderNoList[indexOfTree].actualQty += item.ableQty; + this.orderNoList[indexOfTree].detailIds.push(item.id); } }, diff --git a/static/icon/queryContainer.png b/static/icon/queryContainer.png new file mode 100644 index 0000000..bf1d75b Binary files /dev/null and b/static/icon/queryContainer.png differ diff --git a/static/icon/queryPoint.png b/static/icon/queryPoint.png new file mode 100644 index 0000000..8acc855 Binary files /dev/null and b/static/icon/queryPoint.png differ diff --git a/static/icon/queryShop.png b/static/icon/queryShop.png new file mode 100644 index 0000000..f387fd9 Binary files /dev/null and b/static/icon/queryShop.png differ