Skip to content

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

终端直配

parent 29491080
Expand all Show whitespace changes
Inline Side-by-side
Showing with 51388 additions and 48064 deletions
manifest.json
View file @ 7a637b55
......@@ -3,8 +3,8 @@
// "appid" : "__UNI__EDB6A1F",
"appid" : "__UNI__EDB6A1F",
"description" : "订货系统",
"versionName" : "1.1.29",
"versionCode" : "10129",
"versionName" : "1.1.38",
"versionCode" : 10138,
"transformPx" : false,
"app-plus" : {
/* 5+App特有相关 */
......
package-lock.json
View file @ 7a637b55
......@@ -48,7 +48,7 @@
},
"image-tools": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/image-tools/-/image-tools-1.4.0.tgz",
"resolved": "https://registry.npmmirror.com/image-tools/-/image-tools-1.4.0.tgz",
"integrity": "sha512-TKtvJ6iUwM0mfaD4keMnk1ENHFC470QEjBfA3IlvKdEOufzvWbjbaoNcoyYq6HlViF8+d5tOS1ooE6j7CHf1lQ=="
},
"js-base64": {
......
pages.json
View file @ 7a637b55
......@@ -297,6 +297,24 @@
"enablePullDownRefresh": true
}
},
{
"path": "pages/select-agent/select-agent",
"style": {
"app-plus": {
"titleNView": {
"titleAlign": "left",
"titleColor": "#333",
"titleSize": "17px",
"backgroundColor": "#fff",
"titleText": "经销商选择",
"autoBackButton": true
},
"bounce": "none"
},
"enablePullDownRefresh": true
}
},
{
"path": "pages/select-paint-design/select-paint-design",
"style": {
......
pages/go-order/go-order.nvue
View file @ 7a637b55
<template>
<view class="order view">
<view class="status_bar" :style="navHeight"></view>
<view class="listview">
<view class="listview" v-if="!isChildCustomer">
<view class="cell-list">
<view class="cell-list-block" @click="goOrder('quota')">
<image class="icon-address" src="@/static/image/order_quota@3x.png" mode="aspectFit"></image>
......@@ -29,6 +29,9 @@
</view>
</view>
</view>
<view v-else class="no-list">
暂无功能
</view>
</view>
</template>
......@@ -50,7 +53,7 @@
'height': `${this.sysinfo.safeArea.top + 44}px`
}
},
...mapState(['sysinfo'])
...mapState(['sysinfo','isChildCustomer'])
},
methods: {
goOrder(type) {
......@@ -137,4 +140,8 @@
padding: 0 36rpx 0 16rpx;
align-items: center;
}
.no-list{
font-weight: 600;
font-size: 14px;
}
</style>
pages/home/home.vue
View file @ 7a637b55
......@@ -22,28 +22,28 @@
<view class="todo-box block">
<text class="title">常用操作</text>
<view class="amount-block">
<view class="order-amount" @click="goHandle('go-order')">
<view class="order-amount" @click="goHandle('go-order')" v-if='!isChildCustomer'>
<view class="order-amount--wrapper">
<image class="entry-icon" src="@/static/image/order.png" mode="aspectFit">
</image>
<text class="order-amount--num">下单</text>
</view>
</view>
<view class="order-amount" @click="goHandle('purchase')">
<view class="order-amount" @click="goHandle('purchase')" :style="isChildCustomer?'flex:0':''">
<view class="order-amount--wrapper">
<image class="entry-icon" src="@/static/image/purchase.png" mode="aspectFit">
</image>
<text class="order-amount--num">要货</text>
</view>
</view>
<view class="order-amount" @click="entryHandle('purchase-plan')">
<view class="order-amount" @click="entryHandle('purchase-plan')" v-if='!isChildCustomer'>
<view class="order-amount--wrapper">
<image class="entry-icon" src="@/static/image/plan.png" mode="aspectFit">
</image>
<text class="order-amount--num">销售计划</text>
</view>
</view>
<view class="order-amount" @click="entryHandle('my-order')">
<view class="order-amount" @click="entryHandle('my-order')" v-if='!isChildCustomer'>
<view class="order-amount--wrapper">
<image class="entry-icon" src="@/static/image/sale.png" mode="aspectFit">
</image>
......@@ -91,7 +91,7 @@
background="none" />
</view> -->
</view>
<view class="check-block">
<view class="check-block" v-if='!isChildCustomer'>
<text class="check-date">选择产品:</text>
<view class="check-date-des uni-list picker-year">
<view class="uni-list-cell">
......@@ -107,7 +107,7 @@
<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image>
</view>
</view>
<view class="uni-margin-wrap">
<view class="uni-margin-wrap" v-if='!isChildCustomer'>
<swiper class="swiper" circular indicator-dots="true" autoplay="true" interval="4000000">
<swiper-item class="swiper-item">
<view class="swiper-title">
......@@ -159,19 +159,19 @@
</swiper>
</view>
<view class="uni-margin-wrap" style="padding: 20px 10px;">
<view class="uni-margin-wrap" style="padding: 20px 10px;" v-if='!isChildCustomer'>
<view class="swiper-title">
<text class="item-block__label">红包活动看板</text>
<text class="item-block__label item-more" @click="entryHandle('out-web-site')">查看更多 ></text>
</view>
</view>
<view class="uni-margin-wrap" style="padding: 20px 10px;">
<view class="uni-margin-wrap" style="padding: 20px 10px;" v-if='!isChildCustomer'>
<view class="swiper-title">
<text class="item-block__label">宴会管理</text>
<text class="item-block__label item-more" @click="entryHandle('meeting-manage')">查看更多 ></text>
</view>
</view>
<view class="uni-margin-wrap" style="padding: 20px 10px;">
<view class="uni-margin-wrap" style="padding: 20px 10px;" v-if='!isChildCustomer'>
<view class="swiper-title">
<text class="item-block__label">资讯</text>
<text class="item-block__label item-more" @click="entryHandle('information')">查看更多 ></text>
......@@ -296,7 +296,7 @@
this.statisticsData.forEach(item => num += item.INFO.PRICE_OD)
return num / 10000
},
...mapState(['sysinfo', 'userInfo']),
...mapState(['sysinfo', 'userInfo','isChildCustomer']),
scrollHeight() {
return {
'height': `${this.sysinfo.safeArea.height - 15}px`
......
pages/login/login.nvue
View file @ 7a637b55
......@@ -301,6 +301,11 @@
...res.data.userBpData
}
});
const isChildCustomer = res.data.userBpData.ROLES.some(user => user.ROLE_ID === 'WLY027');
this.$uStore({
name: 'isChildCustomer',
value: isChildCustomer
});
this.$uStore({
name: 'vuex_token',
value: res.data.token
......
pages/my-purchase/order-page.nvue
View file @ 7a637b55
......@@ -26,6 +26,7 @@
</template>
<script>
import { mapState } from 'vuex'
import uniList from '@/components/uni-list.vue';
import uniCell from '@/components/uni-cell.vue';
import uniRefresh from '@/components/uni-refresh.vue';
......@@ -33,7 +34,7 @@
import noData from '@/components/nodata.nvue';
import orderItem from './order-item.nvue';
import saveItem from './save-item.nvue';
import { findAppGoodsSingle, findSavedApplyBill, doQuery } from '@/servers/purchaseList.js'
import { findAppGoodsSingle, findSavedApplyBill, doQuery, findChildGoodsSingle } from '@/servers/purchaseList.js'
export default {
components: {
uniList,
......@@ -92,6 +93,9 @@
}
}
},
computed: {
...mapState(['isChildCustomer']),
},
created() {
this.pullTimer = null;
this.requestParams = {
......@@ -142,7 +146,8 @@
if(this.conditions.status - 4 === 0){
res = await findSavedApplyBill(params)
}else{
res = await findAppGoodsSingle(params)
const api = this.isChildCustomer ? findChildGoodsSingle : findAppGoodsSingle
res = await api(params)
}
if(res.status - 1 === 0){
this.isLoading = false;
......
pages/out-web-site/out-web-site.vue
View file @ 7a637b55
......@@ -34,7 +34,8 @@
const res = await getClientByApp({code: this.userInfo.code})
if(res){
// this.src = 'https://yingxiao.wuliangye.com.cn/webroot/login/jxsLogin_test.html?'+res //测试环境
this.src = 'https://yingxiao.wuliangye.com.cn/webroot/login/jxsLogin.html?'+res //生产环境
// this.src = 'https://yingxiao.wuliangye.com.cn/webroot/login/jxsLogin.html?'+res //生产环境
this.src = 'https://vls.wuliangyegroup.com.cn:8090/webroot/decision?'+res //25.6.23生产环境
}else{
uni.showToast({
title: '权限校验不通过',
......
pages/purchase-main/purchase-main.nvue
View file @ 7a637b55
......@@ -167,6 +167,10 @@
<text class="middle-date">传统当年剩余量</text>
<text class="middle-date-des">{{ele.annualLeftQty}}</text>
</view> -->
<!-- <view class="text-block">
<text class="middle-date">可放行数量</text>
<text class="middle-date-des">{{releaseNum}}</text>
</view> -->
<view class="text-block text-block-last">
<text class="middle-date">本次要货件数</text>
<input class="middle-date-address" type="number" v-model="ele.wantQuantity" placeholder="请输入" />
......@@ -248,6 +252,10 @@
terminalRobotArrs: {
type: Array,
default: () => []
},
releaseNum: {
type: Number,
default: 0
}
},
computed: {
......
pages/purchase-receive/purchase-receive.nvue
View file @ 7a637b55
......@@ -99,7 +99,7 @@
<text class="middle-date-add">收货地址</text>
<text class="middle-date-des-add">{{orderItem.receiveAddress}}</text>
</view>
<!-- <text class="edit-add" @click="handleAdd" v-if="isTerminalType">修改</text> -->
<text class="edit-add" @click="handleAdd" v-if="isTerminalType">修改</text>
<view class="text-block text-block-last">
<text class="middle-date">备注</text>
</view>
......@@ -187,7 +187,8 @@
doQuery,
attachmentDownFile,
findShuntAnyByDealer,
findFirstByTerminalId
findFirstByTerminalId,
exceedMonthPlan
} from '@/servers/purchaseList.js'
import { pathToBase64, base64ToPath } from 'image-tools'
export default {
......@@ -328,9 +329,9 @@
if(this.sourceType === 'myPurchase'){
this.getFiles(this.orderItem.id)
}
if(this.isTerminalType){
this.changeTerminal()
}
// if(this.isTerminalType){
// this.changeTerminal()
// }
},
onUnload() {
uni.$off('selectShuntAccountInfo')
......@@ -763,6 +764,45 @@
}
}
if (status == 1 || flagStatus) {
try{
const res = await exceedMonthPlan(JSON.parse(JSON.stringify(obj)))
this.flag = false
const that = this
if(res.status == 0){
// 弹框确认
uni.showModal({
title: '提示',
content: '当前申请量超出当月发货计划量，是否确认提交？？',
confirmText: '确定',
cancelText: '取消',
success: function (res) {
if (res.confirm) {
console.log('用户点击确定',params,data);
// 执行确认操作
that.submit(params,data)
return
} else if (res.cancel) {
console.log('用户点击取消');
// 执行取消操作
that.flag = false
}
}
});
that.flag = false
return
}
this.submit(params,data)
}catch(e){
this.flag = false
}
}else{
this.flag = false
}
} catch (e) {
this.flag = false
}
},
async submit(params,data){
if(!params.id){
Object.assign(params, data.bizData)
params.bizId = data.bizId
......@@ -778,22 +818,9 @@
if (res.status == 1) {
this.objectId = res.data.bizData.wantCode
this.$refs.popup.open('center')
// uni.showToast({
// title: '要货成功',
// duration: 2000,
// icon: 'none'
// });
// uni.switchTab({
// url: '/pages/purchase/purchase'
// })
}
}else{
this.flag = false
}
} catch (e) {
this.flag = false
}
}
}
}
</script>
......
pages/purchase/purchase-apply.nvue
View file @ 7a637b55
......@@ -2,7 +2,7 @@
<view class="apply-history view" :style="winHeight">
<view class="status_bar" :style="navHeight"></view>
<view class="apply-history-wrapper view">
<component :style="componentHeight" :sourceType='sourceType' :orderItem='detail' :channelTypeArr='channelTypeArr' :is="currentTabComponent" @click="changeComponent" @submit="submit" ></component>
<component :style="componentHeight" :sourceType='sourceType' :orderItem='detail' :channelTypeArr='channelTypeArr' :releaseNum='releaseNum' :is="currentTabComponent" @click="changeComponent" @submit="submit" ></component>
</view>
</view>
</template>
......@@ -10,7 +10,7 @@
import {
mapState
} from 'vuex'
import { initAppWantGoods, getChannelType, findById, generateUUID, queryDirectStore } from '@/servers/purchaseList.js'
import { initAppWantGoods, getChannelType, findById, generateUUID, queryDirectStore,queryPledgeQuantity } from '@/servers/purchaseList.js'
import purchaseMain from '../purchase-main/purchase-main'
import purchaseReceive from '../purchase-receive/purchase-receive'
......@@ -26,6 +26,7 @@
},
data() {
return {
releaseNum: 0,
terminalRobotArrs: [],
demandType: '1',
sourceType: '',
......@@ -161,6 +162,21 @@
this.getChannelType()
// res.data.demandType == 'ZDZG' && this.getTerminalRobot()
},
async getPledgeQuantity(){
const { customerCode, customerName,wantGoodsDetailList } = this.detail
const params = {
customerCode,
customerName,
productCode: wantGoodsDetailList[0].productCode,
productName: wantGoodsDetailList[0].productDesc,
}
try {
const {data} = await queryPledgeQuantity(params)
this.releaseNum = data.quantity || 0
} catch (error) {
}
},
async getChannelType(){
const res = await getChannelType({'salePlan': this.detail.planType})
this.channelTypeArr = res.data
......@@ -205,6 +221,7 @@
receiveUnitName: res.data.demandType == 'ZDZG' ? '' : res.data.receiveUnitName,
}
this.getChannelType()
// this.getPledgeQuantity()
this.sourceType === 'purchase' && this.generateUUID()
// this.demandType == 2 && this.getTerminalRobot()
},
......
pages/purchase/purchase-list.nvue
View file @ 7a637b55
<template>
<view class="lists">
<selectAgent v-if="active == 'agent'" @changeActive="changeActive"/>
<view class="lists" v-else>
<view class="status_bar" :style="navHeight"></view>
<view class="header-bg">
<image class="header-bg-img" src="@/static/image/nav_bg@3x.png" mode="scaleToFill"></image>
......@@ -8,7 +9,6 @@
<list ref="list" class="scroll-area view" loadmoreoffset='100' @loadmore="scrolltolower"
:show-scrollbar='false'>
<refresh @refresh="refresh" :display="refreshing ? 'show' : 'hide'">
<!-- <loading-indicator></loading-indicator> -->
</refresh>
<cell v-for="(item,index) in lists" :key="item.plan_number">
<view class="scroll-item">
......@@ -83,7 +83,6 @@
<text class="empty-text">暂无数据</text>
</view>
</cell>
<!-- <view class="planout-block-item__last"> </view> -->
</list>
<view class="bottom-box" v-if="isWine">
<button class="btn" type="default" @tap="nextStep">
......@@ -106,8 +105,11 @@
} from '@/servers/purchaseList.js'
import timeFormat from '@/uview-ui/libs/function/timeFormat.js'
import selectAgent from '../select-agent/select-agent'
export default {
components: {
selectAgent
},
data() {
return {
cb:'',
......@@ -129,11 +131,13 @@
typesIndex: 0,
lists: [],
sourceType: 'wine',
checkedArr: []
checkedArr: [],
active: 'agent',
row: {}
}
},
computed: {
...mapState(['sysinfo', 'userInfo']),
...mapState(['sysinfo', 'userInfo','isChildCustomer']),
navHeight() {
return {
'height': `${this.sysinfo.safeArea.top + 44}px`
......@@ -158,20 +162,38 @@
created() {
// this.sourceType = this.$route.query.type
// this.getSalesPlanTypes(true)
console.log(this.isChildCustomer,'isChildCustomer')
},
onLoad(option) {
this.sourceType = option.type
this.active = this.isChildCustomer ? 'agent' : 'query'
this.lists = []
if(this.isWine){
this.getWineList()
this.active == 'query' && this.getWineList()
this.reset()
return
}
this.reset()
this.getSalesPlan()
this.active == 'query' && this.getSalesPlan()
this.active == 'agent' && uni.setNavigationBarTitle({
title: '选择经销商'
})
},
methods: {
changeActive(type, row) {
this.active = type
this.row = row
console.log(this.row,'this.row')
if(this.isWine){
this.getWineList()
return
}
this.getSalesPlan()
// if(type=='query'){
// this.agentInfo = row
// return
// }
},
nextStep(){
if(this.checkedArr.length === 0){
uni.showToast({
......@@ -259,7 +281,7 @@
// ...this.page,
// }
const demandType = this.sourceType ==='common' ? '1' : '2'
const params = `?page=${this.page.page}&pagesize=${this.page.pagesize}&demandType=${demandType}`
const params = `?page=${this.page.page}&pagesize=${this.page.pagesize}&demandType=${demandType}&childLinkCustomer=${this.row?.customerCode || ''}`
uni.showLoading({
title: '加载中'
});
......@@ -296,7 +318,7 @@
},
async getWineList(isRefresh){
const demandType = this.sourceType ==='wine' ? '1' : '2'
const params = `?page=${this.page.page}&pagesize=${this.page.pagesize}&demandType=${demandType}`
const params = `?page=${this.page.page}&pagesize=${this.page.pagesize}&demandType=${demandType}&childLinkCustomer=${this.row?.customerCode || ''}`
uni.showLoading({
title: '加载中'
});
......
pages/purchase/purchase.nvue
View file @ 7a637b55
......@@ -3,14 +3,14 @@
<view class="status_bar" :style="navHeight"></view>
<view class="listview">
<view class="cell-list">
<view class="cell-list-block" @click="goOrder('purchase-list','common')">
<view class="cell-list-block" @click="goOrder('purchase-list','common')" v-if='!isChildCustomer'>
<image class="icon-address" src="@/static/image/order_quota@3x.png" mode="aspectFit"></image>
<view class="cell-list-block__content">
<text class="cell-list-block__title">普通要货</text>
</view>
<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image>
</view>
<view class="cell-list-block" @click="goOrder('purchase-list','wine')">
<view class="cell-list-block" @click="goOrder('purchase-list','wine')" v-if='!isChildCustomer'>
<image class="icon-address" src="@/static/image/order_noquota@3x.png" mode="aspectFit"></image>
<view class="cell-list-block__content">
<text class="cell-list-block__title">以酒促酒要货</text>
......@@ -41,12 +41,13 @@
mapState
} from 'vuex'
export default {
data() {
return {
}
},
onLoad() {
},
computed: {
navHeight() {
......@@ -54,7 +55,7 @@
'height': `${this.sysinfo.safeArea.top + 44}px`
}
},
...mapState(['sysinfo'])
...mapState(['sysinfo','isChildCustomer'])
},
methods: {
goOrder(type,num) {
......
pages/select-agent/select-agent.vue
View file @ 7a637b55
......@@ -7,7 +7,11 @@
<view class="main">
<view class="middle view">
<view class="text-block ">
<text class="middle-date">终端名称</text>
<text class="middle-date">经销商编码</text>
<input class="middle-date-des" type="text" v-model="condition.storeName" placeholder="" />
</view>
<view class="text-block ">
<text class="middle-date">经销商名称</text>
<input class="middle-date-des" type="text" v-model="condition.storeName" placeholder="" />
</view>
</view>
......@@ -23,46 +27,14 @@
<view class="middle view planout-block-item" v-for="(item,index) in lists" :key='index'
@click="handleClick($event,item, index)">
<view class="text-block">
<text class="middle-date middle-date-select">终端名称</text>
<text class="middle-date-des middle-date-des-select">{{item.storeName}}</text>
<text class="middle-date middle-date-select">经销商编码</text>
<text class="middle-date-des middle-date-des-select">{{item.customerCode}}</text>
</view>
<view class="text-block">
<text class="middle-date middle-date-select">终端ID</text>
<text class="middle-date-pro middle-date-des-select">{{item.storeId}}</text>
</view>
<!-- <view class="middle-title">
<text class="middle-title__text flex1">终端名称：</text>
<text class="middle-title__text flex6">{{ item.storeName }}</text>
</view>
<view class="middle-title">
<view style="width: 130px;">
<text class="middle-title__text flex1">联系人：</text>
<text class="middle-title__text flex6">{{ item.consignee }}</text>
</view>
<view>
<text class="middle-title__text flex1">联系电话：</text>
<text class="middle-title__text flex6">{{ item.consigneePhone }}</text>
</view>
</view>
<view class="middle-title justify-space">
<view>
<text class="middle-title__text flex1">省：</text>
<text class="middle-title__text flex6">{{ item.provinceName }}</text>
</view>
<view>
<text class="middle-title__text flex1">市：</text>
<text class="middle-title__text flex6">{{ item.cityName }}</text>
</view>
<view>
<text class="middle-title__text flex1">区：</text>
<text class="middle-title__text flex6">{{ item.districtName }}</text>
<text class="middle-date middle-date-select">经销商名称</text>
<text class="middle-date-pro middle-date-des-select">{{item.customerName}}</text>
</view>
</view>
<view class="middle-title">
<text class="middle-title__text flex1">详细地址：</text>
<text class="middle-title__text flex6">{{ item.address }}</text>
</view> -->
</view>
<view class="loading-more" v-if='lists.length>2'>
<text class="loading-more-text">{{loadingText}}</text>
</view>
......@@ -76,7 +48,7 @@
mapState
} from 'vuex'
import { queryDirectStore } from '@/servers/purchaseList.js'
import { findCustomerByChild } from '@/servers/purchaseList.js'
export default {
data() {
return {
......@@ -96,7 +68,7 @@
}
},
computed: {
...mapState(['sysinfo']),
...mapState(['sysinfo', 'userInfo']),
navHeight() {
return {
'height': `${this.sysinfo.safeArea.top + 44}px`
......@@ -104,7 +76,7 @@
},
scrollHeight() {
return {
'height': `${this.sysinfo.safeArea.height - 44 - 220}px`
'height': `${this.sysinfo.safeArea.height - 44 - 280}px`
}
},
pagination(){
......@@ -133,27 +105,32 @@
},
methods: {
async getProduct(isRefresh) {
const params = { page:this.pageOption, ...this.terminalQureyParams, ...this.condition }
const params = { page:this.pageOption, ...this.terminalQureyParams, ...this.condition,
code: '8100071',}
// code:this.userInfo.code,}
uni.showLoading({
title: '加载中'
});
setTimeout(function() {
uni.hideLoading();
}, 2000);
const res = await queryDirectStore(params)
console.log(this.userInfo.code,'this.userInfo.code')
const res = await findCustomerByChild(params)
uni.hideLoading();
const {
records,
total
} = res.data.data
this.totalCount = total
this.totalPage = Math.ceil(total * 1 / this.pageOption.size * 1)
if (isRefresh) {
this.lists = records
} else {
this.lists = this.lists.concat(records)
}
console.log(res.data)
this.lists = res.data
// const {
// records,
// total
// } = res.data.data
// this.totalCount = total
// this.totalPage = Math.ceil(total * 1 / this.pageOption.size * 1)
// if (isRefresh) {
// this.lists = records
// } else {
// this.lists = this.lists.concat(records)
// }
},
scrolltolower() {
console.log('onReachBottom');
......@@ -184,11 +161,8 @@
this.getProduct(true)
},
handleClick(e, content, index) {
console.log(e, content, index)
uni.$emit('selectTerminal', {
selectTerminal: content
})
uni.navigateBack()
this.$emit('changeActive', 'query', content)
// uni.navigateBack()
}
}
}
......@@ -227,7 +201,7 @@
.middle {
background-color: #fff;
border-radius: 16rpx;
padding: 32rpx;
padding: 16rpx 32rpx;
padding-right: 60rpx;
border-radius: 20rpx;
}
......@@ -309,6 +283,8 @@
.scroll-area {
overflow-y: scroll;
display: flex;
flex-direction: column;
}
.planout-block-lists {
......@@ -351,14 +327,15 @@
display: flex;
justify-content: space-between;
height: 84rpx;
margin-top: 64rpx;
margin-top: 48rpx;
margin-bottom: 48rpx;
padding: 0 24rpx;
}
.planout-block-item {
flex: 1;
margin-bottom: 26rpx;
display: flex;
flex-direction: column;
margin-bottom: 30rpx;
}
.btn {
......
pages/select-terminal/select-terminal.vue
View file @ 7a637b55
......@@ -22,15 +22,15 @@
@scrolltolower='scrolltolower'>
<view class="middle view planout-block-item" v-for="(item,index) in lists" :key='index'
@click="handleClick($event,item, index)">
<view class="text-block">
<!-- <view class="text-block">
<text class="middle-date middle-date-select">终端名称</text>
<text class="middle-date-des middle-date-des-select">{{item.storeName}}</text>
</view>
<view class="text-block">
<text class="middle-date middle-date-select">终端ID</text>
<text class="middle-date-pro middle-date-des-select">{{item.storeId}}</text>
</view>
<!-- <view class="middle-title">
</view> -->
<view class="middle-title">
<text class="middle-title__text flex1">终端名称：</text>
<text class="middle-title__text flex6">{{ item.storeName }}</text>
</view>
......@@ -61,7 +61,7 @@
<view class="middle-title">
<text class="middle-title__text flex1">详细地址：</text>
<text class="middle-title__text flex6">{{ item.address }}</text>
</view> -->
</view>
</view>
<view class="loading-more" v-if='lists.length>2'>
<text class="loading-more-text">{{loadingText}}</text>
......
pages/usercenter/usercenter.nvue
View file @ 7a637b55
......@@ -22,14 +22,14 @@
</view>
</view>
<view class="middle">
<view class="entry-block" @click="goPage('purchase-plan')">
<view class="entry-block" @click="goPage('purchase-plan')" v-if='!isChildCustomer'>
<view class="entry-bill">
<image class="entry-bill-icon" src="@/static/image/usercenter_purchaseplan@3x.png" mode=""></image>
<!-- <text class="entry-bill-dot">25</text> -->
</view>
<text class="entry-bill-text">销售计划</text>
</view>
<view class="entry-block" @click="goPage('my-order')">
<view class="entry-block" @click="goPage('my-order')" v-if='!isChildCustomer'>
<view class="entry-bill">
<image class="entry-bill-icon" src="@/static/image/uc_company@3x.png" mode=""></image>
</view>
......@@ -45,7 +45,7 @@
<text class="entry-bill-text">账票管理</text>
</view>
-->
<view class="entry-block" @click="goPage('ticket-order')">
<view class="entry-block" @click="goPage('ticket-order')" v-if='!isChildCustomer'>
<view class="entry-bill">
<image class="entry-bill-icon entry-bill-icon_billing"
src="@/static/image/usercenter_ticketorder@3x.png" mode=""></image>
......@@ -85,7 +85,7 @@
<text class="dot" v-if="num">{{num}}</text>
<text class="entry-bill-text">市场秩序</text>
</view> -->
<view class="entry-block" @click="goPage('order-trends')">
<view class="entry-block" @click="goPage('order-trends')" v-if='!isChildCustomer'>
<view class="entry-bill">
<image class="entry-bill-icon entry-bill-icon_billing"
src="@/static/image/trends.png" mode="">
......@@ -93,7 +93,7 @@
</view>
<text class="entry-bill-text">订单动态</text>
</view>
<view class="entry-block" @click="goPage('terminal')">
<view class="entry-block" @click="goPage('terminal')" v-if='!isChildCustomer'>
<view class="entry-bill">
<image class="entry-bill-icon entry-bill-icon_billing"
src="@/static/image/terminal.png" mode="">
......@@ -101,7 +101,7 @@
</view>
<text class="entry-bill-text">终端</text>
</view>
<view class="entry-block" @click="goPage('loan-query')">
<view class="entry-block" @click="goPage('loan-query')" v-if='!isChildCustomer'>
<view class="entry-bill">
<image class="entry-bill-icon entry-bill-icon_billing"
src="@/static/image/salesDiscount.png" mode="">
......@@ -110,7 +110,7 @@
<text class="dot" v-if="dhkNum - 0 >0">{{dhkNum}}</text>
<text class="entry-bill-text">销售折扣</text>
</view>
<view class="entry-block" @click="goPage('terminal-list')">
<view class="entry-block" @click="goPage('terminal-list')" v-if='!isChildCustomer'>
<view class="entry-bill">
<image class="entry-bill-icon entry-bill-icon_billing"
src="@/static/image/terminalIn.png" mode="">
......@@ -187,7 +187,7 @@
}
},
computed: {
...mapState(['sysinfo', 'userInfo','userBpData']),
...mapState(['sysinfo', 'userInfo','userBpData','isChildCustomer']),
num() {
return this.agentNum - 0 > 0 ? this.agentNum - 99 > 0 ? '99+' : this.agentNum.toString() : ''
},
......
servers/purchaseList.js
View file @ 7a637b55
......@@ -140,3 +140,23 @@ export async function findGoodsSingleJoinBoxBarcode(params) {
const res = await apiHelper.post('/crm-app/wantGoodsDataQuery/findGoodsSingleJoinBoxBarcode', params, )
return res
}
// 终端直配查询子账号
export async function findCustomerByChild(params) {
const res = await apiHelper.post('/crm-app/wantgoods/findCustomerByChild?childCode='+ params.code)
return res
}
// 终端直配查询子账号要货单
export async function findChildGoodsSingle(params) {
const res = await apiHelper.post('/crm-app/wantgoods/findAppChildGoodsSingle',params)
return res
}
// 判断要货否超月计划数量
export async function exceedMonthPlan(params) {
const res = await apiHelper.post('/crm-app/wantgoods/exceedMonthPlan',params)
return res
}
// 放行数量
export async function queryPledgeQuantity(params) {
const res = await apiHelper.post('/crm-app/wantGoodsDataQuery/anji/queryPledgeQuantity', params, )
return res
}
\ No newline at end of file
store/index.js
View file @ 7a637b55
......@@ -68,7 +68,8 @@ const store = new Vuex.Store({
'ATTACHMENT': [],
'INFO': {},
'baseinfo': {}
}
},
isChildCustomer: false
},
mutations: {
$uStore(state, payload) {
......
unpackage/dist/dev/app-plus/app-service.js
View file @ 7a637b55
This diff is collapsed.
unpackage/dist/dev/app-plus/app-view.js
View file @ 7a637b55
This diff is collapsed.
unpackage/dist/dev/app-plus/manifest.json
View file @ 7a637b55
{"@platforms":["android","iPhone","iPad"],"id":"__UNI__EDB6A1F","name":"五粮液易商","version":{"name":"1.1.42","code":"10142"},"description":"订货系统","launch_path":"","developer":{"name":"","email":"","url":""},"permissions":{"Barcode":{},"Camera":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview","render":"always","uniNView":{"path":"pages/login/login.js"}},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#fff"},"usingComponents":true,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","nvue":{"flex-direction":"row"},"distribute":{"icons":{"android":{"hdpi":"unpackage/res/icons/72x72.png","xhdpi":"unpackage/res/icons/96x96.png","xxhdpi":"unpackage/res/icons/144x144.png","xxxhdpi":"unpackage/res/icons/192x192.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png","proapp@2x":"unpackage/res/icons/167x167.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"}}},"splashscreen":{"iosStyle":"common"},"google":{"permissions":["<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"],"abiFilters":["armeabi-v7a"]},"apple":{"dSYMs":false,"urlschemewhitelist":"uumbs","urltypes":"uusafeportalwly","idfa":false},"plugins":{"ad":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"nativePlugins":{"AndroidLMY-ToastPlus":{"__plugin_info__":{"name":"ToastPlus","description":"原生Toast","platforms":"Android,iOS","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"allowsInlineMediaPlayback":true,"safearea":{"background":"rgba(250,250,250,0.90)","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"3.7.11","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"row"},"nvueLaunchMode":"normal"},"tabBar":{"iconWidth":"19px","spacing":"4px","color":"#999999","selectedColor":"#FF1D32","borderStyle":"rgba(250,250,250,0.90)","backgroundColor":"rgba(250,250,250,0.90)","list":[{"pagePath":"pages/home/home","iconPath":"static/image/home@3x.png","selectedIconPath":"static/image/home_red@3x.png","text":"首页"},{"pagePath":"pages/go-order/go-order","iconPath":"static/image/tab_order@3x.png","selectedIconPath":"static/image/tab_order_red@3x.png","text":"下单"},{"pagePath":"pages/purchase/purchase","iconPath":"static/image/tab_purchase@3x.png","selectedIconPath":"static/image/tab_purchase_red@3x.png","text":"要货"},{"pagePath":"pages/message/message","iconPath":"static/image/tab_message@3x.png","selectedIconPath":"static/image/tab_message_red@3x.png","text":"消息"},{"pagePath":"pages/usercenter/usercenter","iconPath":"static/image/tab_my@3x.png","selectedIconPath":"static/image/tab_my_red@3x.png","text":"我的"}],"height":"50px"}}}
\ No newline at end of file
{"@platforms":["android","iPhone","iPad"],"id":"__UNI__EDB6A1F","name":"五粮液易商","version":{"name":"1.1.38","code":10138},"description":"订货系统","launch_path":"","developer":{"name":"","email":"","url":""},"permissions":{"Barcode":{},"Camera":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview","render":"always","uniNView":{"path":"pages/login/login.js"}},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#fff"},"usingComponents":true,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","nvue":{"flex-direction":"row"},"distribute":{"icons":{"android":{"hdpi":"unpackage/res/icons/72x72.png","xhdpi":"unpackage/res/icons/96x96.png","xxhdpi":"unpackage/res/icons/144x144.png","xxxhdpi":"unpackage/res/icons/192x192.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png","proapp@2x":"unpackage/res/icons/167x167.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"}}},"splashscreen":{"iosStyle":"common"},"google":{"permissions":["<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>","<uses-permission android:name=\"com.samsung.android.providers.context.permission.WRITE_USE_APP_FEATURE_SURVEY\"/>"],"abiFilters":["armeabi-v7a","arm64-v8a","x86"],"targetSdkVersion":""},"apple":{"dSYMs":false,"urlschemewhitelist":"uumbs","urltypes":"uusafeportalwly","idfa":false},"plugins":{"ad":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"nativePlugins":{"AndroidLMY-ToastPlus":{"__plugin_info__":{"name":"ToastPlus","description":"原生Toast","platforms":"Android,iOS","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"allowsInlineMediaPlayback":true,"safearea":{"background":"rgba(250,250,250,0.90)","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"3.99","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"row"},"nvueLaunchMode":"normal"},"tabBar":{"iconWidth":"19px","spacing":"4px","color":"#999999","selectedColor":"#FF1D32","borderStyle":"rgba(250,250,250,0.90)","backgroundColor":"rgba(250,250,250,0.90)","list":[{"pagePath":"pages/home/home","iconPath":"static/image/home@3x.png","selectedIconPath":"static/image/home_red@3x.png","text":"首页"},{"pagePath":"pages/go-order/go-order","iconPath":"static/image/tab_order@3x.png","selectedIconPath":"static/image/tab_order_red@3x.png","text":"下单"},{"pagePath":"pages/purchase/purchase","iconPath":"static/image/tab_purchase@3x.png","selectedIconPath":"static/image/tab_purchase_red@3x.png","text":"要货"},{"pagePath":"pages/usercenter/usercenter","iconPath":"static/image/tab_my@3x.png","selectedIconPath":"static/image/tab_my_red@3x.png","text":"我的"}],"height":"50px"}}}
\ No newline at end of file
unpackage/dist/dev/app-plus/pages/apply-history/apply-history.js
View file @ 7a637b55
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/dev/app-plus/pages/message/message.js
View file @ 7a637b55
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/dev/app-plus/view.css
View file @ 7a637b55
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/dev/app-plus/view.umd.min.js
View file @ 7a637b55
This diff is collapsed.
utils/index.js
View file @ 7a637b55
......@@ -97,6 +97,12 @@ function sapDownloadFile(file, filename) {
return blob
}
// 判断是不是终端子账号
function isChildCustomer(arr) {
return ''
}
export {
deepClone,
deepMerge,
......
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