From 0412113740afa90cc55e6d3fd8f122b336d2ae8a Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Fri, 22 Dec 2023 14:13:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mycomponents/recommend/recommend.vue | 6 +++- pages.json | 33 ++++++++++++------- pages/login/index.vue | 3 +- pages/setter/index.vue | 6 ++-- .../coms/comRecordDetailCard.vue | 6 +++- .../record/supplierDeliverRecordDetail.vue | 24 +++----------- static/config.json | 2 +- 7 files changed, 42 insertions(+), 38 deletions(-) diff --git a/mycomponents/recommend/recommend.vue b/mycomponents/recommend/recommend.vue index 1999ba99..3923c217 100644 --- a/mycomponents/recommend/recommend.vue +++ b/mycomponents/recommend/recommend.vue @@ -13,7 +13,7 @@ + :isShowStdPack="false" :isShowStatus="isShowStatus"> @@ -69,6 +69,10 @@ type: Boolean, default: false }, + isShowStatus: { + type: Boolean, + default: true + }, locationTitle: { type: String, diff --git a/pages.json b/pages.json index 124bc585..20fed244 100644 --- a/pages.json +++ b/pages.json @@ -14,7 +14,14 @@ "path": "pages/message/index", "style": { "navigationBarTitleText": "消息", - "enablePullDownRefresh": true + "enablePullDownRefresh": true, + "titleNView": { + // "autoBackButton": "true", + "buttons": [ + + + ] + } } }, @@ -35,17 +42,12 @@ "navigationBarTitleText": "登录", "titleNView": { // "autoBackButton": "true", - // "buttons": [ - // // 右边按钮 - // { - // "float": "right", - // "fontSize": "52rpx", //按钮上文字的大小 - // "text": "\ue706", - // "fontSrc": "/static/ali_icon/iconfont.ttf" - // } - - // ] + "buttons": [ + + + ] } + } }, { @@ -1704,7 +1706,14 @@ "path": "pages/setter/index", "style": { "navigationBarTitleText": "设置", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "titleNView": { + // "autoBackButton": "true", + "buttons": [ + + + ] + } } }, { diff --git a/pages/login/index.vue b/pages/login/index.vue index f49e3f31..c2553f96 100644 --- a/pages/login/index.vue +++ b/pages/login/index.vue @@ -67,7 +67,7 @@ style="background-color: lightgray;padding-top: 40rpx;padding-bottom: 40rpx;margin-right: 20rpx;" /> --> - @@ -143,6 +143,7 @@ url:"/pages/config/config" }) } + }, onLoad() { getCaptchaImage().then(res => { diff --git a/pages/setter/index.vue b/pages/setter/index.vue index 973b000d..ab58b855 100644 --- a/pages/setter/index.vue +++ b/pages/setter/index.vue @@ -20,10 +20,10 @@ thumb="/static/icon_personal_password.png"> - - + diff --git a/pages/supplierDeliver/coms/comRecordDetailCard.vue b/pages/supplierDeliver/coms/comRecordDetailCard.vue index 4081821f..4ec59cc3 100644 --- a/pages/supplierDeliver/coms/comRecordDetailCard.vue +++ b/pages/supplierDeliver/coms/comRecordDetailCard.vue @@ -10,7 +10,11 @@ - + diff --git a/pages/supplierDeliver/record/supplierDeliverRecordDetail.vue b/pages/supplierDeliver/record/supplierDeliverRecordDetail.vue index b6450fc9..2961d0ac 100644 --- a/pages/supplierDeliver/record/supplierDeliverRecordDetail.vue +++ b/pages/supplierDeliver/record/supplierDeliverRecordDetail.vue @@ -5,20 +5,19 @@ - 发货单号 : + 发货单号 :{{dataContent.asnNumber}} - 供应商 : + 供应商代码 :{{dataContent.supplierCode}} - - @@ -80,9 +79,8 @@ id: '', receiptJob: {}, received: false, - scanCount: 0, - jobContent: {}, //任务内容 + dataContent: {}, //任务内容 subList: [], //接口返回的任务subList detailSource: [], //绑定在页面上的数据源 locationTypeList: [], @@ -121,7 +119,7 @@ that.showMessage('未获取到详情'); } else { if (res.data.subList.length > 0) { - that.jobContent = res.data; + that.dataContent = res.data; that.subList = res.data.subList; that.subList.forEach(res => { res.packingNumber = res.toPackingNumber @@ -181,18 +179,6 @@ calcHandleQty(this.detailSource); }, - scanLocationCode(location, code) { - this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => { - this.toLocationCode = code - this.detailSource.forEach(item => { - item.subList.forEach(detail => { - detail.toLocationCode = code - }) - }) - }) - }, - - showMessage(message) { setTimeout(r => { this.$refs.comMessage.showMessage(message, res => { diff --git a/static/config.json b/static/config.json index f1ce854b..7426682e 100644 --- a/static/config.json +++ b/static/config.json @@ -18,7 +18,7 @@ "request_url": { "name": "request_url", - "value": "http://192.168.0.180:12080/admin-api", + "value": "http://dev.ccwin-in.com:25100/api/admin-api", "dev2": "http://192.168.0.157:12080/admin-api", "chefang": "http://192.168.0.180:12080/admin-api", "chenxinming": "http://192.168.0.230:12080/admin-api",