Skip to content

W
wly-APP
Commit a599e3ab authored by xiangzj's avatar xiangzj
Browse files
Options

bug修复

parent a26b8b53
Hide whitespace changes
Inline Side-by-side
Showing with 96 additions and 39 deletions
manifest.json
View file @ a599e3ab
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
// "appid" : "__UNI__EDB6A1F", // "appid" : "__UNI__EDB6A1F",
"appid" : "__UNI__EDB6A1F", "appid" : "__UNI__EDB6A1F",
"description" : "订货系统", "description" : "订货系统",
"versionName" : "1.1.25", "versionName" : "1.1.31",
"versionCode" : "10125", "versionCode" : "10131",
"transformPx" : false, "transformPx" : false,
"app-plus" : { "app-plus" : {
/* 5+App特有相关 */ /* 5+App特有相关 */
...@@ -129,33 +129,33 @@ ...@@ -129,33 +129,33 @@
// "changeOrigin": true // "changeOrigin": true
// } // }
"/sap" : { "/sap" : {
// "target" : "https://crm.wuliangye.com.cn/wlySap",
"target" : "http://221.10.127.60:5000/wlySap", "target" : "http://221.10.127.60:5000/wlySap",
// "target" : "https://218.89.67.37/wlySap",
"changeOrigin" : true "changeOrigin" : true
}, },
"/crm-app" : { "/crm-app" : {
// "target" : "https://218.89.67.37/", // "target" : "https://crm.wuliangye.com.cn",
"target" : "http://221.10.127.60:5000", "target" : "http://221.10.127.60:5000",
"changeOrigin" : true "changeOrigin" : true
}, },
"/wmdp-storeapp" : { "/wmdp-storeapp" : {
// "target" : "https://crm.wuliangye.com.cn/gateway/zdcx",
"target" : "http://221.10.127.60:5000/gateway/zdcx", "target" : "http://221.10.127.60:5000/gateway/zdcx",
// "target" : "http://10.0.134.128:8080",
"changeOrigin" : true "changeOrigin" : true
}, },
"/wmdpwebservices" : { "/wmdpwebservices" : {
// "target" : "https://crm.wuliangye.com.cn/gateway/sczx",
"target" : "http://221.10.127.60:5000/gateway/sczx", "target" : "http://221.10.127.60:5000/gateway/sczx",
// "target" : "http://10.0.134.182:9001",
"changeOrigin" : true "changeOrigin" : true
}, },
"/adapter" : { "/adapter" : {
// "target" : "https://crm.wuliangye.com.cn/gateway/cyj",
"target" : "http://221.10.127.60:5000/gateway/cyj", "target" : "http://221.10.127.60:5000/gateway/cyj",
// "target" : "http://api.c0331.dev.guanyingyun.com",
"changeOrigin" : true "changeOrigin" : true
}, },
"/uusafe" : { "/uusafe" : {
"target" : "https://zzy.ipincloud.cn:9070",
// "target" : "https://apps.wuliangye.com.cn:9076", // "target" : "https://apps.wuliangye.com.cn:9076",
"target" : "https://zzy.ipincloud.cn:9070",
"changeOrigin" : true "changeOrigin" : true
} }
} }
......
pages/login/login.nvue
View file @ a599e3ab
...@@ -208,6 +208,9 @@ ...@@ -208,6 +208,9 @@
}, },
async getIdToken(){ async getIdToken(){
uni.showLoading({
title: '加载中'
});
const params ={ const params ={
"uuid": "f3eea700a3686e47038a4b047af6d934DsRudwTZSRY", "uuid": "f3eea700a3686e47038a4b047af6d934DsRudwTZSRY",
"accessToken": this.accessToken "accessToken": this.accessToken
...@@ -216,6 +219,7 @@ ...@@ -216,6 +219,7 @@
const res = await getIdToken(params) const res = await getIdToken(params)
console.log(res,res.errorNumber-0===0) console.log(res,res.errorNumber-0===0)
if(res.errorNumber - 0 === 0){ if(res.errorNumber - 0 === 0){
uni.hideLoading();
const parmasObj = { const parmasObj = {
account: res.accounts[0].account, account: res.accounts[0].account,
idToken: res.accounts[0].idToken, idToken: res.accounts[0].idToken,
...@@ -223,14 +227,12 @@ ...@@ -223,14 +227,12 @@
} }
this.goLogin(parmasObj, false) this.goLogin(parmasObj, false)
}else{ }else{
uni.showLoading({ uni.hideLoading();
title: '加载中' // uni.showToast({
}); // title: '登录异常',
uni.showToast({ // icon: 'none',
title: '登录异常', // duration: 1500
icon: 'none', // });
duration: 1500
});
console.log(res.errorNumber - 0 === 0,'非') console.log(res.errorNumber - 0 === 0,'非')
return return
} }
...@@ -241,10 +243,17 @@ ...@@ -241,10 +243,17 @@
}, },
// 登录 // 登录
loginBtn(){ loginBtn(){
if (this.flag) {
this.authEx()
return
}
const parmas = { const parmas = {
username: this.account, username: this.account,
password: this.password, password: this.password,
loginType: 'App' loginType: 'App',
// account: this.account,
// idToken: this.password,
// loginType: 'ystoken'
} }
this.goLogin(parmas) this.goLogin(parmas)
}, },
......
pages/my-purchase/my-purchase.nvue
View file @ a599e3ab
...@@ -151,6 +151,9 @@ ...@@ -151,6 +151,9 @@
}, },
...mapState(['sysinfo']) ...mapState(['sysinfo'])
}, },
created() {
this.handleFilter('week')
},
onReady() { onReady() {
this._lastTabIndex = 0; this._lastTabIndex = 0;
this.swiperWidth = 0; this.swiperWidth = 0;
...@@ -344,7 +347,7 @@ ...@@ -344,7 +347,7 @@
this.filterActiveIndex = item this.filterActiveIndex = item
this.condition.startDate = this.handleDate(timeRangeFormat(item)) this.condition.startDate = this.handleDate(timeRangeFormat(item))
} }
this.condition.endDate = this.handleDate(timeRangeFormat('now')) this.condition.endDate = this.handleDate(timeRangeFormat('tomorrow'))
this.pageList[this.tabIndex].refreshData() this.pageList[this.tabIndex].refreshData()
}, },
handleDate(date){ handleDate(date){
......
pages/order-detail-quota/order-detail-quota.nvue
View file @ a599e3ab
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
</view> </view>
</view> </view>
<view class="middle view"> <view class="middle view" v-if='ITEM_OUTER && ITEM_OUTER.length>0'>
<view class="item-block item-block-name"> <view class="item-block item-block-name">
<text class="item-block-label">计划外</text> <text class="item-block-label">计划外</text>
</view> </view>
......
pages/order-trends/order-trends.nvue
View file @ a599e3ab
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
<text class="detal-item-value">{{item.zzfld000007}}/{{item.zzfld000009}}</text> <text class="detal-item-value">{{item.zzfld000007}}/{{item.zzfld000009}}</text>
</view> </view>
<view class="block-detal-item"> <view class="block-detal-item">
<text class="detal-item-label">本单可发货量(件)</text> <text class="detal-item-label">本单可发货量(瓶)</text>
<text class="detal-item-value">{{item.zzfld000007}}</text> <text class="detal-item-value">{{item.zzfld000007}}</text>
</view> </view>
<view class="block-detal-item block-detal-item-last"> <view class="block-detal-item block-detal-item-last">
...@@ -120,7 +120,6 @@ ...@@ -120,7 +120,6 @@
} from '@/servers/breakwords.js' } from '@/servers/breakwords.js'
import noData from '@/components/nodata.nvue'; import noData from '@/components/nodata.nvue';
import orderItem from './order-item.nvue';
export default { export default {
data() { data() {
return { return {
...@@ -273,7 +272,7 @@ ...@@ -273,7 +272,7 @@
processType: PROCESS_TYPE, processType: PROCESS_TYPE,
estat: ESTAT, estat: ESTAT,
objectId: OBJECT_ID, objectId: OBJECT_ID,
postingDate: POSTING_DATE postingDate: POSTING_DATE.replace(/-/g,'')
} }
uni.showLoading({ uni.showLoading({
title: '加载中' title: '加载中'
......
pages/produce-material/produce-plan.nvue
View file @ a599e3ab
...@@ -325,6 +325,11 @@ ...@@ -325,6 +325,11 @@
this.HEADINFO.preorder = e.detail.value === false ? 0 : 1 this.HEADINFO.preorder = e.detail.value === false ? 0 : 1
}, },
async submit() { async submit() {
const webView = this.$scope.$getAppWebview();
webView.setTitleNViewButtonStyle(0, {
"width": 0,
'fontSize': 0
});
let res1 = null let res1 = null
try{ try{
const params = { const params = {
...@@ -334,6 +339,10 @@ ...@@ -334,6 +339,10 @@
} }
res1 = await apiUpdateProduceMaterialOrder(params) res1 = await apiUpdateProduceMaterialOrder(params)
if(res1.msgtype !== 'S'){ if(res1.msgtype !== 'S'){
webView.setTitleNViewButtonStyle(0, {
"width": 30,
'fontSize': 14
});
return return
} }
}catch(e){ }catch(e){
...@@ -352,8 +361,16 @@ ...@@ -352,8 +361,16 @@
// this.planinnerLists = ITEM2 // this.planinnerLists = ITEM2
const res2 = await apiSubmitProduceMaterialOrder(params2) const res2 = await apiSubmitProduceMaterialOrder(params2)
if(res2.msgtype !== 'S'){ if(res2.msgtype !== 'S'){
webView.setTitleNViewButtonStyle(0, {
"width": 30,
'fontSize': 14
});
return return
} }
webView.setTitleNViewButtonStyle(0, {
"width": 0,
'fontSize': 0
});
this.orderInfo = {...res2.head} this.orderInfo = {...res2.head}
this.$refs.popup.open('center') this.$refs.popup.open('center')
}catch(e){ }catch(e){
......
pages/produce-order/produce-plan.nvue
View file @ a599e3ab
...@@ -315,6 +315,11 @@ ...@@ -315,6 +315,11 @@
this.HEADINFO.preorder = e.detail.value === false ? 0 : 1 this.HEADINFO.preorder = e.detail.value === false ? 0 : 1
}, },
async submit() { async submit() {
const webView = this.$scope.$getAppWebview();
webView.setTitleNViewButtonStyle(0, {
"width": 0,
'fontSize': 0
});
// const flag = this.planinnerLists.every(function(item){ // const flag = this.planinnerLists.every(function(item){
// console.log(item,'') // console.log(item,'')
// return item.description // return item.description
...@@ -336,6 +341,10 @@ ...@@ -336,6 +341,10 @@
} }
res1 = await apiUpdateProduceOrder(params) res1 = await apiUpdateProduceOrder(params)
if(res1.msgtype !== 'S'){ if(res1.msgtype !== 'S'){
webView.setTitleNViewButtonStyle(0, {
"width": 30,
'fontSize': 14
});
return return
} }
}catch(e){ }catch(e){
...@@ -353,8 +362,16 @@ ...@@ -353,8 +362,16 @@
// this.planinnerLists = ITEM2 // this.planinnerLists = ITEM2
const res2 = await apiSubmitProduceOrder(params2) const res2 = await apiSubmitProduceOrder(params2)
if(res2.msgtype !== 'S'){ if(res2.msgtype !== 'S'){
webView.setTitleNViewButtonStyle(0, {
"width": 30,
'fontSize': 14
});
return return
} }
webView.setTitleNViewButtonStyle(0, {
"width": 0,
'fontSize': 0
});
this.orderInfo = {...res1.data.head} this.orderInfo = {...res1.data.head}
this.$refs.popup.open('center') this.$refs.popup.open('center')
}catch(e){ }catch(e){
...@@ -367,6 +384,11 @@ ...@@ -367,6 +384,11 @@
this.salesCenterIndex = -1 this.salesCenterIndex = -1
this.selectedSalesCenter = {} this.selectedSalesCenter = {}
this.initProducePlanData() this.initProducePlanData()
const webView = this.$scope.$getAppWebview();
webView.setTitleNViewButtonStyle(0, {
"width": 30,
'fontSize': 14
});
} }
} }
} }
......
pages/purchase-receive/purchase-receive.nvue
View file @ a599e3ab
...@@ -247,14 +247,14 @@ ...@@ -247,14 +247,14 @@
}) })
uni.$on('selectShuntAdressAccountInfo', function(data) { uni.$on('selectShuntAdressAccountInfo', function(data) {
console.log('监听到事件来自 selectShuntAdressAccountInfo ，携带参数 msg 为：', data); console.log('监听到事件来自 selectShuntAdressAccountInfo ，携带参数 msg 为：', data);
_this.orderItem.shuntReceiveUnitName = data.selectShuntAdressAccountInfo.partner_name _this.orderItem.shuntReceiveUnitName = data.selectShuntAdressAccountInfo.PARTNER_NAME
_this.orderItem.shuntReceiveUnitCode = data.selectShuntAdressAccountInfo.partner _this.orderItem.shuntReceiveUnitCode = data.selectShuntAdressAccountInfo.PARTNER
_this.orderItem.receiveCityCode = data.selectShuntAdressAccountInfo.city_code _this.orderItem.receiveCityCode = data.selectShuntAdressAccountInfo.CITY_CODE
_this.orderItem.receiveCityName = data.selectShuntAdressAccountInfo.city_name _this.orderItem.receiveCityName = data.selectShuntAdressAccountInfo.CITY_NAME
_this.orderItem.receiveAddress = data.selectShuntAdressAccountInfo.street _this.orderItem.receiveAddress = data.selectShuntAdressAccountInfo.STREET
_this.orderItem.contactNumber = data.selectShuntAdressAccountInfo.tel_number _this.orderItem.contactNumber = data.selectShuntAdressAccountInfo.TEL_NUMBER
_this.orderItem.contacPerson = data.selectShuntAdressAccountInfo.c_o_name _this.orderItem.contacPerson = data.selectShuntAdressAccountInfo.C_O_NAME
_this.orderItem.spurtCodeUnitName = data.selectShuntAdressAccountInfo.partner_name _this.orderItem.spurtCodeUnitName = data.selectShuntAdressAccountInfo.PARTNER_NAME
_this.getReceipt(_this.orderItem.shuntDealer) _this.getReceipt(_this.orderItem.shuntDealer)
}) })
uni.$on('selectShuntCode', function(data) { uni.$on('selectShuntCode', function(data) {
......
pages/select-shunt-adress/select-shunt-adress.nvue
View file @ a599e3ab
...@@ -31,19 +31,19 @@ ...@@ -31,19 +31,19 @@
<cell v-for="(item,index) in lists" :key="item.guid" @click="handleChecked(item)"> <cell v-for="(item,index) in lists" :key="item.guid" @click="handleChecked(item)">
<view class="scroll-item"> <view class="scroll-item">
<view class="item-block item-block-code"> <view class="item-block item-block-code">
<text class="item-block-label">收货方单位编号：{{item.partner}}</text> <text class="item-block-label">收货方单位编号：{{item.PARTNER}}</text>
</view> </view>
<view class="item-block item-block-code"> <view class="item-block item-block-code">
<text class="item-block-label">收货方单位名称：{{item.partner_name}}</text> <text class="item-block-label">收货方单位名称：{{item.PARTNER_NAME}}</text>
</view> </view>
<view class="item-block item-block-code"> <view class="item-block item-block-code">
<text class="item-block-label">联系人：{{item.c_o_name}}</text> <text class="item-block-label">联系人：{{item.C_O_NAME}}</text>
</view> </view>
<view class="item-block item-block-code"> <view class="item-block item-block-code">
<text class="item-block-label">联系电话：{{item.tel_number}}</text> <text class="item-block-label">联系电话：{{item.TEL_NUMBER}}</text>
</view> </view>
<view class="item-block item-block-code"> <view class="item-block item-block-code">
<text class="item-block-label detal-item-value3">收货地址：{{item.street}}</text> <text class="item-block-label detal-item-value3">收货地址：{{item.STREET}}</text>
</view> </view>
</view> </view>
</cell> </cell>
...@@ -135,8 +135,12 @@ ...@@ -135,8 +135,12 @@
uni.navigateBack() uni.navigateBack()
}, },
search() { search() {
let num = null
if(!this.searchName){
num = this.addressType - 1 === 0 ? this.orderItem.shuntDealer : this.orderItem.customerCode
}
this.reset() this.reset()
this.getSalesPlan(true, this.searchName); this.getSalesPlan(true, num);
}, },
async getSalesPlan(isRefresh, customerCode = this.addressType - 1 === 0 ? this.orderItem.shuntDealer : this.orderItem.customerCode) { async getSalesPlan(isRefresh, customerCode = this.addressType - 1 === 0 ? this.orderItem.shuntDealer : this.orderItem.customerCode) {
if (this.loadParams.isDone) { if (this.loadParams.isDone) {
...@@ -158,10 +162,10 @@ ...@@ -158,10 +162,10 @@
uni.hideLoading(); uni.hideLoading();
if (isRefresh) { if (isRefresh) {
this.lists = res.data this.lists = res.DATA
this.loadParams.isDone = false this.loadParams.isDone = false
} else { } else {
this.lists = this.lists.concat(res.data) this.lists = this.lists.concat(res.DATA)
} }
setTimeout(() => { setTimeout(() => {
......
servers/api.helper.js
View file @ a599e3ab
...@@ -146,7 +146,7 @@ class Request { ...@@ -146,7 +146,7 @@ class Request {
constructor() { constructor() {
this.config = { this.config = {
baseUrl: 'http://221.10.127.60:5000', // 请求的根域名 baseUrl: 'https://crm.wuliangye.com.cn', // 请求的根域名
// 默认的请求头 // 默认的请求头
header: {}, header: {},
method: 'POST', method: 'POST',
......
utils/date.js
View file @ a599e3ab
...@@ -11,6 +11,9 @@ function timeRangeFormat(range) { ...@@ -11,6 +11,9 @@ function timeRangeFormat(range) {
sameElse: 'YYYYMMDD' sameElse: 'YYYYMMDD'
}) })
break; break;
case 'tomorrow':
timeRange = momentJs().add(1, 'days').format('YYYYMMDD')
break;
case '1': case '1':
timeRange = momentJs().subtract(1, 'M').calendar({ timeRange = momentJs().subtract(1, 'M').calendar({
sameElse: 'YYYYMMDD' sameElse: 'YYYYMMDD'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment