Browse Source

和线上代码同步,本版本不同步给左都辉

master
liutong 1 year ago
parent
commit
ab9144f1ec
  1. BIN
      ci/shenbeitang(2).mobileprovision
  2. BIN
      ci/shenbeitang(2).p12
  3. 7
      common/js/diy.js
  4. 2362
      components/directionGoodsItem.vue
  5. 1640
      components/payment/payment.vue
  6. 30
      config/componentConfig.js
  7. 6
      config/production.js
  8. 6
      manifest.json
  9. 6
      page_goods/components/common-payment/common-payment.vue
  10. 7
      page_goods/components/common-payment/payment.js
  11. 2146
      page_goods/detail/detail.vue
  12. 1646
      page_goods/orderDetail/orderDetail.vue
  13. 3
      page_goods/orderDetail/public/js/orderMethod.js
  14. 3
      page_goods/public/js/orderMethod.js
  15. 3252
      page_salesman_index/Tobe_shipped/Tobe_shipped.vue
  16. 878
      page_salesman_index/index/beconfirmed.vue
  17. 890
      page_salesman_index/index/bereceived.vue
  18. 902
      page_salesman_index/index/close.vue
  19. 1674
      page_salesman_index/index/index.vue
  20. 904
      page_salesman_index/index/received.vue
  21. 1041
      page_salesman_index/index/reviewed.vue
  22. 970
      page_salesman_index/index/shipped.vue
  23. 6
      page_salesman_order/Goods_received/Goods_received.vue
  24. 2226
      page_salesman_order/Goods_received/Goods_received_COPY原版备份.vue
  25. 4704
      page_salesman_order/Order_details/Order_details.vue
  26. 1126
      page_salesman_order/index/index.vue
  27. 977
      page_salesman_order/undgbm/undgbm.vue
  28. 4256
      pages.json
  29. 22
      pages/index/index.vue
  30. 10
      pages/init.vue
  31. 1628
      pages/order/list.vue
  32. 33
      pages_tool/invoice/invoice.vue
  33. 482
      pages_tool/order/refund_goods_select.vue
  34. 214
      pages_tool/order/refund_type_select.vue
  35. 2
      pages_tool/order/sales_return.vue

BIN
ci/shenbeitang(2).mobileprovision

Binary file not shown.

BIN
ci/shenbeitang(2).p12

Binary file not shown.

7
common/js/diy.js

@ -264,14 +264,12 @@ export default {
is_default: this.isDefault is_default: this.isDefault
}, },
success: res => { success: res => {
// console.log(JSON.parse(res.data.value));
// console.log(JSON.parse(res.data.value),`diy`);
if (res.code != 0 || !res.data) { if (res.code != 0 || !res.data) {
if (this.$refs.loadingCover) this.$refs.loadingCover.hide(); if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
this.diyData = {}; this.diyData = {};
return; return;
} }
let diyDatavalue = res.data; let diyDatavalue = res.data;
// console.log(JSON.parse(diyDatavalue.value)) // console.log(JSON.parse(diyDatavalue.value))
//处理后台组件input输入单引号问题 -- 英文状态下 //处理后台组件input输入单引号问题 -- 英文状态下
@ -279,7 +277,6 @@ export default {
if (diyDatavalue.value) { if (diyDatavalue.value) {
// uni.setStorageSync(this.name, diyDatavalue.value); // uni.setStorageSync(this.name, diyDatavalue.value);
this.diyData = JSON.parse(diyDatavalue.value); this.diyData = JSON.parse(diyDatavalue.value);
console.log(this.diyData);
this.diyData.compExtend = diyDatavalue.comp_extend; // 自定义扩展组件 this.diyData.compExtend = diyDatavalue.comp_extend; // 自定义扩展组件
this.$langConfig.title(this.diyData.global.title); this.$langConfig.title(this.diyData.global.title);
this.mpCollect = this.diyData.global.mpCollect; this.mpCollect = this.diyData.global.mpCollect;
@ -392,7 +389,7 @@ export default {
this.getDiyInfo(); this.getDiyInfo();
this.$refs.diyGroup.$refs.ManyGoodsList[0].$refs.diyGoodsList.getGoodsList(); this.$refs.diyGroup.$refs.ManyGoodsList[0].$refs.diyGoodsList.getGoodsList();
}) })
this.$refs.uniPopupWindow.open(); // this.$refs.uniPopupWindow.open();
} }
}, },
onReachBottom() { onReachBottom() {

2362
components/directionGoodsItem.vue

File diff suppressed because it is too large

1640
components/payment/payment.vue

File diff suppressed because it is too large

30
config/componentConfig.js

@ -36,12 +36,18 @@ export default {
teamId = updateConfig.teamId teamId = updateConfig.teamId
baseURL = updateConfig.ipConfig baseURL = updateConfig.ipConfig
} }
console.log(`${baseURL}/api/app/checkupdate/${teamId}/${platform}/${bundleID}/${version.versionCode}`, // console.log(111, `${baseURL}/api/app/checkupdate/${teamId}/${platform}/${bundleID}/${version.versionCode}`,
'################################'); // '################################');
const res = await requestGet( // const res = await requestGet(
`${baseURL}/api/app/checkupdate/${teamId}/${platform}/${bundleID}/${version.versionCode}`).then( // `${baseURL}/api/app/checkupdate/${teamId}/${platform}/${bundleID}/${version.versionCode}`).then(
res => res.data) // res => res.data)
console.log(res);
const res = await requestGet(`https://cbtadmin.jtyqt.com/api/config/checkupdate`).then(
res => {
console.log('====>', res);
return res.data
})
const returnRes = { const returnRes = {
versionCode: '', // int 版本号 versionCode: '', // int 版本号
versionName: '', // String 版本名称 versionName: '', // String 版本名称
@ -49,11 +55,10 @@ export default {
updateType: '', // String forcibly = 强制更新, solicit = 弹窗确认更新, silent = 静默更新 updateType: '', // String forcibly = 强制更新, solicit = 弹窗确认更新, silent = 静默更新
downloadUrl: '' // String 版本下载链接(IOS安装包更新请放跳转store应用商店链接,安卓apk和wgt文件放文件下载链接) downloadUrl: '' // String 版本下载链接(IOS安装包更新请放跳转store应用商店链接,安卓apk和wgt文件放文件下载链接)
}; };
if (Number(res.data.versionCode) <= version.versionCode) {
if (!res || !res.success) {
// 不提示 // 不提示
if (!isPrompt) return if (!isPrompt) return
if(isCustom) { if (isCustom) {
return; return;
} }
// 提示 // 提示
@ -70,17 +75,16 @@ export default {
normal: 'solicit', normal: 'solicit',
silent: 'silent' silent: 'silent'
} }
const versionData = res.data.version // const versionData = res.data.version
const versionData = res.data
// versionData.updateMode = 'force'
returnRes.versionCode = Number(versionData.versionCode) returnRes.versionCode = Number(versionData.versionCode)
returnRes.versionName = versionData.versionStr returnRes.versionName = versionData.versionStr
returnRes.versionInfo = versionData.changelog || '' returnRes.versionInfo = versionData.changelog || ''
returnRes.updateType = updateMode2Type[versionData.updateMode] ? updateMode2Type[versionData returnRes.updateType = updateMode2Type[versionData.updateMode] ? updateMode2Type[versionData
.updateMode] : 'solicit' .updateMode] : 'solicit'
returnRes.downloadUrl = versionData.installUrl returnRes.downloadUrl = versionData.installUrl
console.log(returnRes);
console.log(returnRes, 'returnRes');
// 兼容之前的版本 // 兼容之前的版本
return callback && callback(returnRes); return callback && callback(returnRes);

6
config/production.js

@ -4,13 +4,11 @@
// api请求地址 // api请求地址
// export const baseUrl = 'https://cbtadmin.jtyqt.com' // export const baseUrl = 'https://cbtadmin.jtyqt.com'
// export const baseUrl = 'https://yaochangtest.first.xinzhidi.cn'//测试地址1 export const baseUrl = 'https://cbtadmin.jtyqt.com'
export const baseUrl = 'http://devzhiyao.zeyan.wang'//测试地址2
// 图片域名 // 图片域名
// export const imgDomain='https://cbtadmin.jtyqt.com' // export const imgDomain='https://cbtadmin.jtyqt.com'
// export const imgDomain = 'https://yaochangtest.first.xinzhidi.cn'//测试地址1 export const imgDomain = 'https://cbtadmin.jtyqt.com'
export const imgDomain = 'http://devzhiyao.zeyan.wang'//测试地址2
// 极光推送 // 极光推送
export const PUSHCONFIG = { export const PUSHCONFIG = {

6
manifest.json

@ -1,9 +1,9 @@
{ {
"name" : "齐采药", "name" : "齐采药",
"appid" : "__UNI__9C80A8A", "appid" : "__UNI__9009737",
"description" : "", "description" : "",
"versionName" : "1.000.188", "versionName" : "1.000.1243",
"versionCode" : 10001234, "versionCode" : 10001243,
"transformPx" : false, "transformPx" : false,
"app-plus" : { "app-plus" : {
"compatible" : { "compatible" : {

6
page_goods/components/common-payment/common-payment.vue

@ -412,7 +412,7 @@
<u-switch v-model="is_invoice" :activeValue="1" activeColor="var(--base-color)" <u-switch v-model="is_invoice" :activeValue="1" activeColor="var(--base-color)"
:inactiveValue="0" @change="change"></u-switch> :inactiveValue="0" @change="change"></u-switch>
</view> </view>
<!-- <view class="site-wrap buy-one-bytheway"> <view class="site-wrap buy-one-bytheway" v-if="buyOneGoodsData">
<view class="headerline"> <view class="headerline">
<view class="title">顺手买一件</view> <view class="title">顺手买一件</view>
<view @click="handleChangeBuyOne" class="change"> <view @click="handleChangeBuyOne" class="change">
@ -422,7 +422,7 @@
</view> </view>
<view class="goodsContent"> <view class="goodsContent">
<view class="image"> <view class="image">
<img :src="buyOneGoodsData.goods_image.split(',')[0]" mode="aspectFill" /> <img :src="buyOneGoodsData && buyOneGoodsData.goods_image.split(',')[0]" mode="aspectFill" />
</view> </view>
<view class="right"> <view class="right">
<view class="contnent"> <view class="contnent">
@ -441,7 +441,7 @@
</view> </view>
</view> </view>
</view> </view>
</view> --> </view>
<!-- <view v-if="false" class="site-wrap buyer-message df aic jcsb" @click="btn"> <!-- <view v-if="false" class="site-wrap buyer-message df aic jcsb" @click="btn">
<div class="tit">发票</div> <div class="tit">发票</div>
<image class="imgar" :src="$util.img('/upload/weapp/user/arrow-right.png')" mode=""></image> <image class="imgar" :src="$util.img('/upload/weapp/user/arrow-right.png')" mode=""></image>

7
page_goods/components/common-payment/payment.js

@ -193,6 +193,13 @@ export default {
} }
}, },
handleChangeBuyOne() { handleChangeBuyOne() {
if(this.buyOnetotal === 1) {
uni.showToast({
title: '没有更多了~',
icon: 'none'
})
return;
}
this.buyOnePageNum += 1; this.buyOnePageNum += 1;
this.getBuyOneInfo(); this.getBuyOneInfo();
this.isCheckedBuyOne = [] this.isCheckedBuyOne = []

2146
page_goods/detail/detail.vue

File diff suppressed because it is too large

1646
page_goods/orderDetail/orderDetail.vue

File diff suppressed because it is too large

3
page_goods/orderDetail/public/js/orderMethod.js

@ -10,8 +10,7 @@ export default {
} else { } else {
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
// content: '商家已将支付金额调整为' + orderData.pay_money + '元,是否继续支付?', content: '商家已将支付金额调整为' + orderData.pay_money + '元,是否继续支付?',
content: `商家已将支付金额调整为${orderData.pay_money}元,还需支付${orderData.pay.pay_money}元,是否继续支付?`,
success: res => { success: res => {
if (res.confirm) { if (res.confirm) {
this.pay(); this.pay();

3
page_goods/public/js/orderMethod.js

@ -10,7 +10,8 @@ export default {
} else { } else {
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
content: '商家已将支付金额调整为' + orderData.pay_money + '元,是否继续支付?', // content: '商家已将支付金额调整为' + orderData.pay_money + '元,是否继续支付?',
content: `商家已将支付金额调整为${orderData.pay_money}元,还需支付${orderData.pay.pay_money}元,是否继续支付?`,
success: res => { success: res => {
if (res.confirm) { if (res.confirm) {
this.pay(); this.pay();

3252
page_salesman_index/Tobe_shipped/Tobe_shipped.vue

File diff suppressed because it is too large

878
page_salesman_index/index/beconfirmed.vue

@ -1,453 +1,453 @@
<template> <template>
<view class="box"> <view class="box">
<view class="list list-mt" v-for="(item,index) in listsui.length>0?listsui:list" :key="index" <view class="list list-mt" v-for="(item,index) in listsui.length>0?listsui:list" :key="index"
@click="btn(item.order_id,item.member_id)"> @click="btn(item.order_id,item.member_id)">
<view v-if="item.sales_money>0" class="list-Openonbehalf"> <view v-if="item.sales_money>0" class="list-Openonbehalf">
特批价|代开 特批价|代开
</view> </view>
<view v-if="item.is_first_order" class="list-Openonbehalftwo"> <view v-if="item.is_first_order" class="list-Openonbehalftwo">
首单 首单
</view> </view>
<view class="list-data df jcsb"> <view class="list-data df jcsb">
<div>订单编号:&emsp;{{item.order_no}}</div> <div>订单编号:&emsp;{{item.order_no}}</div>
<div>{{item.order_status_name}}</div> <div>{{item.order_status_name}}</div>
<!-- <div style="color:#FF1449 ;" v-if="item.status==0">待审核</div> <!-- <div style="color:#FF1449 ;" v-if="item.status==0">待审核</div>
<div style="color:#FF7D02 ;" v-if="item.status==1">待出库</div> <div style="color:#FF7D02 ;" v-if="item.status==1">待出库</div>
<div style="color:#FF7D02 ;" v-if="item.status==2">待出库(部分)</div> <div style="color:#FF7D02 ;" v-if="item.status==2">待出库(部分)</div>
<div style="color:#00C594 ;" v-if="item.status==3">待发货</div> <div style="color:#00C594 ;" v-if="item.status==3">待发货</div>
<div style="color:#00BEF9 ;" v-if="item.status==4">已收货</div> <div style="color:#00BEF9 ;" v-if="item.status==4">已收货</div>
<div style="color:#999999 ;" v-if="item.status==5">已取消</div> --> <div style="color:#999999 ;" v-if="item.status==5">已取消</div> -->
</view> </view>
<div class="list-Splitline"></div> <div class="list-Splitline"></div>
<div class="list-hospital">客户名称<span>{{item.nickname}}</span> <div class="list-hospital">客户名称<span>{{item.nickname}}</span>
<span v-if="item.order_type==1">普通订单</span> <span v-if="item.order_type==1">普通订单</span>
<span v-if="item.order_type==2">门店订单</span> <span v-if="item.order_type==2">门店订单</span>
<span v-if="item.order_type==3">本地配送订单</span> <span v-if="item.order_type==3">本地配送订单</span>
<span v-if="item.order_type==4">虚拟订单</span> <span v-if="item.order_type==4">虚拟订单</span>
<span v-if="item.order_type==5">代客下单</span> <span v-if="item.order_type==5">代客下单</span>
</div> </div>
<view class="list-time"> <view class="list-time">
下单时间<span>{{item.create_time | time}}</span><span>{{item.time}}</span> 下单时间<span>{{item.create_time | time}}</span><span>{{item.time}}</span>
</view> </view>
<view class="list-time"> <view class="list-time">
支付状态<span>{{item.pay_status_name}}</span> 支付状态<span>{{item.pay_status_name}}</span>
<span v-if="item.pay.pay_money > 0">剩余未支付金额{{item.pay.pay_money}}</span> <span v-if="item.pay.pay_money > 0">剩余未支付金额{{item.pay.pay_money}}</span>
</view> </view>
<view class="list-money"> <view class="list-money">
合计{{item.goods_num}}件商品 合计{{item.goods_num}}件商品
<span v-if="item.sales_money>0">订单金额{{item.sales_money}}</span> <span v-if="item.sales_money>0">订单金额{{item.sales_money}}</span>
<span v-else>订单金额{{item.order_money}}</span> <span v-else>订单金额{{item.order_money}}</span>
<span v-if="item.wait_status==1">(待确认)</span> <span v-if="item.wait_status==1">(待确认)</span>
<span v-if="item.wait_status==2">(已收款)</span> <span v-if="item.wait_status==2">(已收款)</span>
</view> </view>
<view class="list-btn df jcf"> <view class="list-btn df jcf">
<div class="df aic jcsa one" v-if="item.sales_balance==1" <div class="df aic jcsa one" v-if="item.sales_balance==1"
@click.stop="increased(item,item.order_id,item.member_id)">新增收款</div> @click.stop="increased(item,item.order_id,item.member_id)">新增收款</div>
<div class="df aic jcsa two" v-if="item.sales_balance==1" <div class="df aic jcsa two" v-if="item.sales_balance==1"
@click.stop="affirm(item.order_id,item.member_id)">确认收款</div> @click.stop="affirm(item.order_id,item.member_id)">确认收款</div>
<div class="df aic jcsa sui" @click.stop="more(item)">再次订购</div> <div class="df aic jcsa sui" @click.stop="more(item)">再次订购</div>
</view> </view>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
const timesfm = require('@/common/js/map/message.js') const timesfm = require('@/common/js/map/message.js')
import eventBus from '@/common/js/bus.js' import eventBus from '@/common/js/bus.js'
export default { export default {
data() { data() {
return { return {
list: [], list: [],
page: 1, page: 1,
listsui: [], listsui: [],
dataList: [] dataList: []
} }
}, },
created() { created() {
this.$api.sendRequest({ this.$api.sendRequest({
url: '/api/salasmanorder/lists', url: '/api/salasmanorder/lists',
data: { data: {
order_status: 'all', order_status: 'all',
wait_status: '1' wait_status: '1'
}, },
success: res => { success: res => {
console.log(res, '待确认收款'); console.log(res, '待确认收款');
this.list = res.data.list this.list = res.data.list
} }
}) })
}, },
methods: { methods: {
getwrong(order_status, member_id, is_today, sales_status, searchText, start_time, end_time) { getwrong(order_status, member_id, is_today, sales_status, searchText, start_time, end_time) {
console.log(order_status, member_id, is_today, sales_status, searchText, start_time, end_time); console.log(order_status, member_id, is_today, sales_status, searchText, start_time, end_time);
let obj = { let obj = {
order_status, order_status,
member_id, member_id,
is_today, is_today,
sales_status, sales_status,
searchText, searchText,
start_time, start_time,
end_time end_time
} }
obj.order_status = 'all' obj.order_status = 'all'
obj.wait_status = '1' obj.wait_status = '1'
if (searchText) { if (searchText) {
delete obj.sales_status delete obj.sales_status
} }
if (is_today) { if (is_today) {
delete obj.sales_status delete obj.sales_status
} }
if (!sales_status) { if (!sales_status) {
delete obj.sales_status delete obj.sales_status
} }
this.$api.sendRequest({ this.$api.sendRequest({
url: '/api/salasmanorder/lists', url: '/api/salasmanorder/lists',
data: obj, data: obj,
success: res => { success: res => {
this.list = res.data.list this.list = res.data.list
} }
}) })
}, },
getwrongtllisttwo() { getwrongtllisttwo() {
this.$api.sendRequest({ this.$api.sendRequest({
url: '/api/salasmanorder/lists', url: '/api/salasmanorder/lists',
data: { data: {
order_status: 'all', order_status: 'all',
wait_status: '1' wait_status: '1'
// sales_status:false, // sales_status:false,
// wait_status:1 // wait_status:1
}, },
success: res => { success: res => {
console.log(res, '待确认收款'); console.log(res, '待确认收款');
this.list = res.data.list this.list = res.data.list
uni.stopPullDownRefresh() uni.stopPullDownRefresh()
} }
}) })
}, },
getwrongtllistsui() { getwrongtllistsui() {
this.page += 1 this.page += 1
this.$api.sendRequest({ this.$api.sendRequest({
url: '/api/salasmanorder/lists', url: '/api/salasmanorder/lists',
data: { data: {
order_status: 'all', order_status: 'all',
wait_status: '1', wait_status: '1',
page: this.page page: this.page
}, },
success: res => { success: res => {
this.list = [...this.list, ...res.data.list] this.list = [...this.list, ...res.data.list]
console.log(this.list, '待确认收款'); console.log(this.list, '待确认收款');
uni.stopPullDownRefresh() uni.stopPullDownRefresh()
} }
}) })
}, },
queryList(pageNo, pageSize) { queryList(pageNo, pageSize) {
console.log(pageNo, pageSize); console.log(pageNo, pageSize);
// this.page+=10 // this.page+=10
// this.$api.sendRequest({ // this.$api.sendRequest({
// url:'/api/salasmanorder/lists', // url:'/api/salasmanorder/lists',
// data:{ // data:{
// order_status:'waitrate', // order_status:'waitrate',
// page:this.page // page:this.page
// }, // },
// success:res=>{ // success:res=>{
// console.log(res,''); // console.log(res,'');
// this.list=res.data.list // this.list=res.data.list
// } // }
// }) // })
this.$refs.paging.complete(this.list) this.$refs.paging.complete(this.list)
// this.$refs.paging.complete(false); // this.$refs.paging.complete(false);
}, },
btn(order, member) { btn(order, member) {
let _this = this let _this = this
setTimeout(() => { setTimeout(() => {
eventBus.$emit('urlone', 5) eventBus.$emit('urlone', 5)
}, 500) }, 500)
console.log(order, member); console.log(order, member);
uni.navigateTo({ uni.navigateTo({
// url:this.list[this.current.URL] // url:this.list[this.current.URL]
url: `../../page_salesman_order/Goods_received/Goods_received?or=${order}&me=${member}`, url: `../../page_salesman_order/Goods_received/Goods_received?or=${order}&me=${member}`,
fail: function(res) { fail: function(res) {
console.log(res); console.log(res);
} }
}) })
}, },
increased(item, order, member) { increased(item, order, member) {
// event.stopPropagation(); // event.stopPropagation();
// console.log(item); // console.log(item);
setTimeout(() => { setTimeout(() => {
uni.$emit('Collection', item) uni.$emit('Collection', item)
}, 500) }, 500)
uni.navigateTo({ uni.navigateTo({
url: `/page_salesman_order/Customer_payment/Customer_payment?id=${order}&di=${member}` url: `/page_salesman_order/Customer_payment/Customer_payment?id=${order}&di=${member}`
}) })
}, },
affirm(order_id, member_id) { affirm(order_id, member_id) {
let _this = this let _this = this
// event.stopPropagation(); // event.stopPropagation();
console.log(order_id, member_id); console.log(order_id, member_id);
this.$api.sendRequest({ this.$api.sendRequest({
url: '/api/salasmanorder/detail', url: '/api/salasmanorder/detail',
data: { data: {
order_id: order_id, order_id: order_id,
member_id: member_id member_id: member_id
}, },
success: res => { success: res => {
this.data = res.data this.data = res.data
console.log(res.data, '订单详情'); console.log(res.data, '订单详情');
// setTimeout(()=>{ // setTimeout(()=>{
// uni.$emit('CommodityList',res.data.order_goods) // uni.$emit('CommodityList',res.data.order_goods)
// },500) // },500)
// uni.navigateTo({ // uni.navigateTo({
// // url:this.list[this.current.URL] // // url:this.list[this.current.URL]
// url:`/page_salesman_index/Commodity_list/Commodity_list` // url:`/page_salesman_index/Commodity_list/Commodity_list`
// }) // })
uni.navigateTo({ uni.navigateTo({
// url:this.list[this.current.URL] // url:this.list[this.current.URL]
url: `../Collection_record/Collection_record?id=${res.data.member_id}&di=${res.data.order_id}` url: `../Collection_record/Collection_record?id=${res.data.member_id}&di=${res.data.order_id}`
}) })
} }
}) })
}, },
more(item) { more(item) {
// event.stopPropagation(); // event.stopPropagation();
console.log(item); console.log(item);
setTimeout(() => { setTimeout(() => {
uni.$emit('zaicidinggou', { uni.$emit('zaicidinggou', {
one: item.order_goods, one: item.order_goods,
two: 1 two: 1
}) })
}, 500) }, 500)
uni.navigateTo({ uni.navigateTo({
url: `/page_salesman_index/Select_item/Select_item?st=${item.member_id}&di=${item.store_id}` url: `/page_salesman_index/Select_item/Select_item?st=${item.member_id}&di=${item.store_id}`
}) })
} }
}, },
filters: { filters: {
time(num) { time(num) {
return timesfm(num * 1000) return timesfm(num * 1000)
} }
} }
} }
</script> </script>
<style lang="scss"> <style lang="scss">
.box .list:nth-child(1) { .box .list:nth-child(1) {
margin: 34rpx 24rpx 0 24rpx !important; margin: 34rpx 24rpx 0 24rpx !important;
// margin: 0 !important; // margin: 0 !important;
} }
.box { .box {
margin-top: -28rpx !important; margin-top: -28rpx !important;
} }
.list { .list {
margin: 42rpx 24rpx 0 24rpx; margin: 42rpx 24rpx 0 24rpx;
width: 702rpx; width: 702rpx;
//height: 424rpx; height: 480rpx;
background: #FFFFFF; background: #FFFFFF;
border-radius: 24rpx; border-radius: 24rpx;
// padding: 32rpx; // padding: 32rpx;
box-sizing: border-box; box-sizing: border-box;
padding: 24rpx; padding: 24rpx;
position: relative; position: relative;
.list-Openonbehalf { .list-Openonbehalf {
text-align: center; text-align: center;
background: #00C594; background: #00C594;
border-radius: 30rpx; border-radius: 30rpx;
position: absolute; position: absolute;
top: -10rpx; top: -10rpx;
left: 0; left: 0;
width: 142rpx; width: 142rpx;
height: 34rpx; height: 34rpx;
font-size: 24rpx; font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #FFFFFF; color: #FFFFFF;
line-height: 34rpx; line-height: 34rpx;
} }
.list-Openonbehalftwo { .list-Openonbehalftwo {
text-align: center; text-align: center;
background: #ff5500; background: #ff5500;
border-radius: 30rpx; border-radius: 30rpx;
position: absolute; position: absolute;
top: -10rpx; top: -10rpx;
left: 140rpx; left: 140rpx;
width: 100rpx; width: 100rpx;
height: 34rpx; height: 34rpx;
font-size: 24rpx; font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #FFFFFF; color: #FFFFFF;
line-height: 34rpx; line-height: 34rpx;
} }
.list-data {} .list-data {}
.list-data div:nth-child(1) { .list-data div:nth-child(1) {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #222222; color: #222222;
line-height: 40rpx; line-height: 40rpx;
} }
.list-data div:nth-child(2) { .list-data div:nth-child(2) {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
line-height: 40rpx; line-height: 40rpx;
} }
.list-Splitline { .list-Splitline {
width: 638rpx; width: 638rpx;
height: 2rpx; height: 2rpx;
background: #F2F2F2; background: #F2F2F2;
border-radius: 16rpx; border-radius: 16rpx;
margin-top: 28rpx; margin-top: 28rpx;
} }
.list-hospital { .list-hospital {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #999999; color: #999999;
line-height: 40rpx; line-height: 40rpx;
margin-top: 30rpx; margin-top: 30rpx;
} }
.list-hospital span:nth-child(1) { .list-hospital span:nth-child(1) {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #222222; color: #222222;
line-height: 40rpx; line-height: 40rpx;
margin-left: 42rpx; margin-left: 42rpx;
margin-right: 16rpx; margin-right: 16rpx;
} }
.list-hospital span:nth-child(2) { .list-hospital span:nth-child(2) {
width: 92rpx; width: 92rpx;
height: 36rpx; height: 36rpx;
font-size: 20rpx; font-size: 20rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #FF7D02; color: #FF7D02;
line-height: 28rpx; line-height: 28rpx;
background-color: rgb(255, 240, 226); background-color: rgb(255, 240, 226);
} }
.list-time { .list-time {
margin-top: 24rpx; margin-top: 24rpx;
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #999999; color: #999999;
line-height: 40rpx; line-height: 40rpx;
} }
.list-time span:nth-child(1) { .list-time span:nth-child(1) {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #222222; color: #222222;
line-height: 40rpx; line-height: 40rpx;
margin-right: 10rpx; margin-right: 10rpx;
margin-left: 42rpx; margin-left: 42rpx;
} }
.list-time span:nth-child(2) { .list-time span:nth-child(2) {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #222222; color: #222222;
line-height: 40rpx; line-height: 40rpx;
} }
.list-money { .list-money {
margin-top: 24rpx; margin-top: 24rpx;
font-size: 24rpx; font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #999999; color: #999999;
line-height: 34rpx; line-height: 34rpx;
} }
.list-money span:nth-child(1) { .list-money span:nth-child(1) {
color: rgb(58, 58, 58); color: rgb(58, 58, 58);
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-size: 28rpx; font-size: 28rpx;
} }
.list-money span:nth-child(2) { .list-money span:nth-child(2) {
color: rgb(58, 58, 58); color: rgb(58, 58, 58);
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-size: 28rpx; font-size: 28rpx;
} }
.list-btn { .list-btn {
margin-top: 32rpx; margin-top: 32rpx;
.one { .one {
width: 176rpx; width: 176rpx;
height: 60rpx; height: 60rpx;
border-radius: 30rpx; border-radius: 30rpx;
border: 2rpx solid #E8E8E8; border: 2rpx solid #E8E8E8;
margin-left: 94rpx; margin-left: 94rpx;
font-size: 24rpx; font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #333333; color: #333333;
line-height: 34rpx; line-height: 34rpx;
} }
.two { .two {
width: 176rpx; width: 176rpx;
height: 60rpx; height: 60rpx;
border-radius: 30rpx; border-radius: 30rpx;
border: 2rpx solid #E8E8E8; border: 2rpx solid #E8E8E8;
margin-left: 24rpx; margin-left: 24rpx;
font-size: 24rpx; font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #333333; color: #333333;
line-height: 34rpx; line-height: 34rpx;
} }
.sui { .sui {
width: 176rpx; width: 176rpx;
height: 60rpx; height: 60rpx;
background: #21BBF3; background: #21BBF3;
border-radius: 30rpx; border-radius: 30rpx;
margin-left: 24rpx; margin-left: 24rpx;
font-size: 24rpx; font-size: 24rpx;
font-family: PingFangSC-Medium, PingFang SC; font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #FFFFFF; color: #FFFFFF;
line-height: 34rpx; line-height: 34rpx;
} }
} }
} }
.list-mt { .list-mt {
margin-top: 28rpx; margin-top: 28rpx;
} }
</style> </style>

890
page_salesman_index/index/bereceived.vue

@ -1,455 +1,455 @@
<template> <template>
<view class="box"> <view class="box">
<view class="list list-mt" v-for="(item,index) in listsui.length>0?listsui:list" :key="index" <view class="list list-mt" v-for="(item,index) in listsui.length>0?listsui:list" :key="index"
@click="btn(item.order_id,item.member_id)"> @click="btn(item.order_id,item.member_id)">
<view v-if="item.sales_money>0" class="list-Openonbehalf"> <view v-if="item.sales_money>0" class="list-Openonbehalf">
特批价|代开 特批价|代开
</view> </view>
<view v-if="item.is_first_order" class="list-Openonbehalftwo"> <view v-if="item.is_first_order" class="list-Openonbehalftwo">
首单 首单
</view> </view>
<view class="list-data df jcsb"> <view class="list-data df jcsb">
<div>订单编号:&emsp;{{item.order_no}}</div> <div>订单编号:&emsp;{{item.order_no}}</div>
<div>{{item.order_status_name}}</div> <div>{{item.order_status_name}}</div>
<!-- <div style="color:#FF1449 ;" v-if="item.status==0">待审核</div> <!-- <div style="color:#FF1449 ;" v-if="item.status==0">待审核</div>
<div style="color:#FF7D02 ;" v-if="item.status==1">待出库</div> <div style="color:#FF7D02 ;" v-if="item.status==1">待出库</div>
<div style="color:#FF7D02 ;" v-if="item.status==2">待出库(部分)</div> <div style="color:#FF7D02 ;" v-if="item.status==2">待出库(部分)</div>
<div style="color:#00C594 ;" v-if="item.status==3">待发货</div> <div style="color:#00C594 ;" v-if="item.status==3">待发货</div>
<div style="color:#00BEF9 ;" v-if="item.status==4">已收货</div> <div style="color:#00BEF9 ;" v-if="item.status==4">已收货</div>
<div style="color:#999999 ;" v-if="item.status==5">已取消</div> --> <div style="color:#999999 ;" v-if="item.status==5">已取消</div> -->
</view> </view>
<div class="list-Splitline"></div> <div class="list-Splitline"></div>
<div class="list-hospital">客户名称<span>{{item.nickname}}</span> <div class="list-hospital">客户名称<span>{{item.nickname}}</span>
<span v-if="item.order_type==1">普通订单</span> <span v-if="item.order_type==1">普通订单</span>
<span v-if="item.order_type==2">门店订单</span> <span v-if="item.order_type==2">门店订单</span>
<span v-if="item.order_type==3">本地配送订单</span> <span v-if="item.order_type==3">本地配送订单</span>
<span v-if="item.order_type==4">虚拟订单</span> <span v-if="item.order_type==4">虚拟订单</span>
<span v-if="item.order_type==5">代客下单</span> <span v-if="item.order_type==5">代客下单</span>
</div> </div>
<view class="list-time"> <view class="list-time">
下单时间<span>{{item.create_time | time}}</span><span>{{item.time}}</span> 下单时间<span>{{item.create_time | time}}</span><span>{{item.time}}</span>
</view> </view>
<view class="list-money"> <view class="list-money">
合计{{item.goods_num}}件商品 合计{{item.goods_num}}件商品
<span v-if="item.sales_money>0">订单金额{{item.sales_money}}</span> <span v-if="item.sales_money>0">订单金额{{item.sales_money}}</span>
<span v-else>订单金额{{item.order_money}}</span> <span v-else>订单金额{{item.order_money}}</span>
<span v-if="item.wait_status==1">(待确认)</span> <span v-if="item.wait_status==1">(待确认)</span>
<span v-if="item.wait_status==2">(已收款)</span> <span v-if="item.wait_status==2">(已收款)</span>
</view> </view>
<view class="list-btn df jcf"> <view class="list-btn df jcf">
<div class="df aic jcsa one" v-if="item.sales_balance==1" <div class="df aic jcsa one" v-if="item.sales_balance==1"
@click.stop="increased(item,item.order_id,item.member_id)">新增收款</div> @click.stop="increased(item,item.order_id,item.member_id)">新增收款</div>
<div class="df aic jcsa two" v-if="item.sales_balance==1 " <div class="df aic jcsa two" v-if="item.sales_balance==1 "
@click.stop="affirm(item.order_id,item.member_id)">确认收款</div> @click.stop="affirm(item.order_id,item.member_id)">确认收款</div>
<div class="df aic jcsa sui" @click.stop="more(item)">再次订购</div> <div class="df aic jcsa sui" @click.stop="more(item)">再次订购</div>
</view> </view>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
const timesfm = require('@/common/js/map/message.js') const timesfm = require('@/common/js/map/message.js')
import eventBus from '@/common/js/bus.js' import eventBus from '@/common/js/bus.js'
export default { export default {
data() { data() {
return { return {
show1: false, show1: false,
indexa: 0, indexa: 0,
columns: [], columns: [],
value: '', value: '',
listsui: [], listsui: [],
show: false, show: false,
list: [], list: [],
page: 1, page: 1,
dataList: [] dataList: []
}; };
}, },
created() { created() {
this.$api.sendRequest({ this.$api.sendRequest({
url: '/api/salasmanorder/lists', url: '/api/salasmanorder/lists',
data: { data: {
order_status: 'waitconfirm' order_status: 'waitconfirm'
}, },
success: res => { success: res => {
console.log(res, '待收货'); console.log(res, '待收货');
this.list = res.data.list this.list = res.data.list
} }
}) })
}, },
methods: { methods: {
getwrong(order_status, member_id, is_today, sales_status, searchText,start_time, getwrong(order_status, member_id, is_today, sales_status, searchText,start_time,
end_time) { end_time) {
console.log(order_status, member_id, is_today, sales_status, searchText, start_time, end_time); console.log(order_status, member_id, is_today, sales_status, searchText, start_time, end_time);
let obj = { let obj = {
order_status, order_status,
member_id, member_id,
is_today, is_today,
sales_status, sales_status,
searchText, searchText,
start_time, start_time,
end_time end_time
} }
obj.order_status = 'waitconfirm' obj.order_status = 'waitconfirm'
if (searchText) { if (searchText) {
delete obj.sales_status delete obj.sales_status
} }
if (is_today) { if (is_today) {
delete obj.sales_status delete obj.sales_status
} }
if (!sales_status) { if (!sales_status) {
delete obj.sales_status delete obj.sales_status
} }
this.$api.sendRequest({ this.$api.sendRequest({
url: '/api/salasmanorder/lists', url: '/api/salasmanorder/lists',
data: obj, data: obj,
success: res => { success: res => {
this.list = res.data.list this.list = res.data.list
} }
}) })
}, },
getwrongtllisttwo() { getwrongtllisttwo() {
this.$api.sendRequest({ this.$api.sendRequest({
url: '/api/salasmanorder/lists', url: '/api/salasmanorder/lists',
data: { data: {
order_status: 'waitconfirm', order_status: 'waitconfirm',
// sales_status:false, // sales_status:false,
// wait_status:1 // wait_status:1
}, },
success: res => { success: res => {
console.log(res, '待收货'); console.log(res, '待收货');
this.list = res.data.list this.list = res.data.list
uni.stopPullDownRefresh() uni.stopPullDownRefresh()
} }
}) })
}, },
getwrongtllistsui() { getwrongtllistsui() {
this.page += 1 this.page += 1
this.$api.sendRequest({ this.$api.sendRequest({
url: '/api/salasmanorder/lists', url: '/api/salasmanorder/lists',
data: { data: {
order_status: 'waitconfirm', order_status: 'waitconfirm',
page: this.page page: this.page
}, },
success: res => { success: res => {
this.list = [...this.list, ...res.data.list] this.list = [...this.list, ...res.data.list]
console.log(this.list, '待收货'); console.log(this.list, '待收货');
uni.stopPullDownRefresh() uni.stopPullDownRefresh()
} }
}) })
}, },
queryList(pageNo, pageSize) { queryList(pageNo, pageSize) {
// this.page+=10 // this.page+=10
// this.$api.sendRequest({ // this.$api.sendRequest({
// url:'/api/salasmanorder/lists', // url:'/api/salasmanorder/lists',
// data:{ // data:{
// order_status:'waitconfirm', // order_status:'waitconfirm',
// page:this.page // page:this.page
// }, // },
// success:res=>{ // success:res=>{
// console.log(res,''); // console.log(res,'');
// // this.list=res.data.list // // this.list=res.data.list
// this.list=res.data.list // this.list=res.data.list
// } // }
// }) // })
this.$refs.paging.complete(this.list); this.$refs.paging.complete(this.list);
}, },
statusbtn(item) { statusbtn(item) {
// this.show=true // this.show=true
console.log('item', item); console.log('item', item);
}, },
change(e) { change(e) {
console.log('change', e); console.log('change', e);
}, },
btn(order, member) { btn(order, member) {
// order id member id // order id member id
let _this = this let _this = this
setTimeout(() => { setTimeout(() => {
eventBus.$emit('urlone', 3) eventBus.$emit('urlone', 3)
}, 500) }, 500)
console.log(order, member); console.log(order, member);
uni.navigateTo({ uni.navigateTo({
url: `../Order_details/Order_details?or=${order}&me=${member}` url: `../Order_details/Order_details?or=${order}&me=${member}`
}) })
}, },
click(index) { click(index) {
console.log(index.index, 'index'); console.log(index.index, 'index');
this.indexa = index.index this.indexa = index.index
}, },
increased(item, order, member) { increased(item, order, member) {
// event.stopPropagation(); // event.stopPropagation();
// console.log(item); // console.log(item);
setTimeout(() => { setTimeout(() => {
uni.$emit('Collection', item) uni.$emit('Collection', item)
}, 500) }, 500)
uni.navigateTo({ uni.navigateTo({
url: `/page_salesman_order/Customer_payment/Customer_payment?id=${order}&di=${member}` url: `/page_salesman_order/Customer_payment/Customer_payment?id=${order}&di=${member}`
}) })
}, },
affirm(order_id, member_id) { affirm(order_id, member_id) {
let _this = this let _this = this
// event.stopPropagation(); // event.stopPropagation();
console.log(order_id, member_id); console.log(order_id, member_id);
this.$api.sendRequest({ this.$api.sendRequest({
url: '/api/salasmanorder/detail', url: '/api/salasmanorder/detail',
data: { data: {
order_id: order_id, order_id: order_id,
member_id: member_id member_id: member_id
}, },
success: res => { success: res => {
this.data = res.data this.data = res.data
console.log(res.data, '订单详情'); console.log(res.data, '订单详情');
// setTimeout(()=>{ // setTimeout(()=>{
// uni.$emit('CommodityList',res.data.order_goods) // uni.$emit('CommodityList',res.data.order_goods)
// },500) // },500)
// uni.navigateTo({ // uni.navigateTo({
// // url:this.list[this.current.URL] // // url:this.list[this.current.URL]
// url:`/page_salesman_index/Commodity_list/Commodity_list` // url:`/page_salesman_index/Commodity_list/Commodity_list`
// }) // })
uni.navigateTo({ uni.navigateTo({
// url:this.list[this.current.URL] // url:this.list[this.current.URL]
url: `../Collection_record/Collection_record?id=${res.data.member_id}&di=${res.data.order_id}` url: `../Collection_record/Collection_record?id=${res.data.member_id}&di=${res.data.order_id}`
}) })
} }
}) })
}, },
more(item) { more(item) {
// event.stopPropagation(); // event.stopPropagation();
console.log(item); console.log(item);
setTimeout(() => { setTimeout(() => {
uni.$emit('zaicidinggou', { uni.$emit('zaicidinggou', {
one: item.order_goods, one: item.order_goods,
two: 1 two: 1
}) })
}, 500) }, 500)
uni.navigateTo({ uni.navigateTo({
url: `/page_salesman_index/Select_item/Select_item?st=${item.member_id}&di=${item.store_id}` url: `/page_salesman_index/Select_item/Select_item?st=${item.member_id}&di=${item.store_id}`
}) })
} }
}, },
filters: { filters: {
time(num) { time(num) {
return timesfm(num * 1000) return timesfm(num * 1000)
} }
} }
} }
</script> </script>
<style lang="scss"> <style lang="scss">
.box { .box {
margin-top: -28rpx; margin-top: -28rpx;
} }
.box .list:nth-child(1) { .box .list:nth-child(1) {
margin: 34rpx 24rpx 0 24rpx !important; margin: 34rpx 24rpx 0 24rpx !important;
// margin: 0 !important; // margin: 0 !important;
} }
.list { .list {
margin: 42rpx 24rpx 0 24rpx; margin: 42rpx 24rpx 0 24rpx;
width: 702rpx; width: 702rpx;
//height: 424rpx; //height: 424rpx;
background: #FFFFFF; background: #FFFFFF;
border-radius: 24rpx; border-radius: 24rpx;
// padding: 32rpx; // padding: 32rpx;
box-sizing: border-box; box-sizing: border-box;
padding: 24rpx; padding: 24rpx;
position: relative; position: relative;
.list-Openonbehalf { .list-Openonbehalf {
text-align: center; text-align: center;
background: #00C594; background: #00C594;
border-radius: 30rpx; border-radius: 30rpx;
position: absolute; position: absolute;
top: -10rpx; top: -10rpx;
left: 0; left: 0;
width: 142rpx; width: 142rpx;
height: 34rpx; height: 34rpx;
font-size: 24rpx; font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #FFFFFF; color: #FFFFFF;
line-height: 34rpx; line-height: 34rpx;
} }
.list-Openonbehalftwo { .list-Openonbehalftwo {
text-align: center; text-align: center;
background: #ff5500; background: #ff5500;
border-radius: 30rpx; border-radius: 30rpx;
position: absolute; position: absolute;
top: -10rpx; top: -10rpx;
left: 140rpx; left: 140rpx;
width: 100rpx; width: 100rpx;
height: 34rpx; height: 34rpx;
font-size: 24rpx; font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #FFFFFF; color: #FFFFFF;
line-height: 34rpx; line-height: 34rpx;
} }
.list-data {} .list-data {}
.list-data div:nth-child(1) { .list-data div:nth-child(1) {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #222222; color: #222222;
line-height: 40rpx; line-height: 40rpx;
} }
.list-data div:nth-child(2) { .list-data div:nth-child(2) {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
line-height: 40rpx; line-height: 40rpx;
} }
.list-Splitline { .list-Splitline {
width: 638rpx; width: 638rpx;
height: 2rpx; height: 2rpx;
background: #F2F2F2; background: #F2F2F2;
border-radius: 16rpx; border-radius: 16rpx;
margin-top: 28rpx; margin-top: 28rpx;
} }
.list-hospital { .list-hospital {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #999999; color: #999999;
line-height: 40rpx; line-height: 40rpx;
margin-top: 30rpx; margin-top: 30rpx;
} }
.list-hospital span:nth-child(1) { .list-hospital span:nth-child(1) {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #222222; color: #222222;
line-height: 40rpx; line-height: 40rpx;
margin-left: 42rpx; margin-left: 42rpx;
margin-right: 16rpx; margin-right: 16rpx;
} }
.list-hospital span:nth-child(2) { .list-hospital span:nth-child(2) {
width: 92rpx; width: 92rpx;
height: 36rpx; height: 36rpx;
font-size: 20rpx; font-size: 20rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #FF7D02; color: #FF7D02;
line-height: 28rpx; line-height: 28rpx;
background-color: rgb(255, 240, 226); background-color: rgb(255, 240, 226);
} }
.list-time { .list-time {
margin-top: 24rpx; margin-top: 24rpx;
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #999999; color: #999999;
line-height: 40rpx; line-height: 40rpx;
} }
.list-time span:nth-child(1) { .list-time span:nth-child(1) {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #222222; color: #222222;
line-height: 40rpx; line-height: 40rpx;
margin-right: 10rpx; margin-right: 10rpx;
margin-left: 42rpx; margin-left: 42rpx;
} }
.list-time span:nth-child(2) { .list-time span:nth-child(2) {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #222222; color: #222222;
line-height: 40rpx; line-height: 40rpx;
} }
.list-money { .list-money {
margin-top: 24rpx; margin-top: 24rpx;
font-size: 24rpx; font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #999999; color: #999999;
line-height: 34rpx; line-height: 34rpx;
} }
.list-money span:nth-child(1) { .list-money span:nth-child(1) {
color: rgb(58, 58, 58); color: rgb(58, 58, 58);
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-size: 28rpx; font-size: 28rpx;
} }
.list-money span:nth-child(2) { .list-money span:nth-child(2) {
color: rgb(58, 58, 58); color: rgb(58, 58, 58);
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-size: 28rpx; font-size: 28rpx;
} }
.list-btn { .list-btn {
margin-top: 32rpx; margin-top: 32rpx;
.one { .one {
width: 176rpx; width: 176rpx;
height: 60rpx; height: 60rpx;
border-radius: 30rpx; border-radius: 30rpx;
border: 2rpx solid #E8E8E8; border: 2rpx solid #E8E8E8;
margin-left: 94rpx; margin-left: 94rpx;
font-size: 24rpx; font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #333333; color: #333333;
line-height: 34rpx; line-height: 34rpx;
} }
.two { .two {
width: 176rpx; width: 176rpx;
height: 60rpx; height: 60rpx;
border-radius: 30rpx; border-radius: 30rpx;
border: 2rpx solid #E8E8E8; border: 2rpx solid #E8E8E8;
margin-left: 24rpx; margin-left: 24rpx;
font-size: 24rpx; font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #333333; color: #333333;
line-height: 34rpx; line-height: 34rpx;
} }
.sui { .sui {
width: 176rpx; width: 176rpx;
height: 60rpx; height: 60rpx;
background: #21BBF3; background: #21BBF3;
border-radius: 30rpx; border-radius: 30rpx;
margin-left: 24rpx; margin-left: 24rpx;
font-size: 24rpx; font-size: 24rpx;
font-family: PingFangSC-Medium, PingFang SC; font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #FFFFFF; color: #FFFFFF;
line-height: 34rpx; line-height: 34rpx;
} }
} }
} }
.list-mt { .list-mt {
// margin-top: 28rpx; // margin-top: 28rpx;
} }
</style> </style>

902
page_salesman_index/index/close.vue

@ -1,461 +1,461 @@
<template> <template>
<view class="box"> <view class="box">
<view class="list list-mt" v-for="(item,index) in listsui.length>0?listsui:list" :key="index" <view class="list list-mt" v-for="(item,index) in listsui.length>0?listsui:list" :key="index"
@click="btn(item.order_id,item.member_id)"> @click="btn(item.order_id,item.member_id)">
<view v-if="item.sales_money>0" class="list-Openonbehalf"> <view v-if="item.sales_money>0" class="list-Openonbehalf">
特批价|代开 特批价|代开
</view> </view>
<view v-if="item.is_first_order" class="list-Openonbehalftwo"> <view v-if="item.is_first_order" class="list-Openonbehalftwo">
首单 首单
</view> </view>
<view class="list-data df jcsb"> <view class="list-data df jcsb">
<div>订单编号:&emsp;{{item.order_no}}</div> <div>订单编号:&emsp;{{item.order_no}}</div>
<div>{{item.order_status_name}}</div> <div>{{item.order_status_name}}</div>
<!-- <div style="color:#FF1449 ;" v-if="item.status==0">待审核</div> <!-- <div style="color:#FF1449 ;" v-if="item.status==0">待审核</div>
<div style="color:#FF7D02 ;" v-if="item.status==1">待出库</div> <div style="color:#FF7D02 ;" v-if="item.status==1">待出库</div>
<div style="color:#FF7D02 ;" v-if="item.status==2">待出库(部分)</div> <div style="color:#FF7D02 ;" v-if="item.status==2">待出库(部分)</div>
<div style="color:#00C594 ;" v-if="item.status==3">待发货</div> <div style="color:#00C594 ;" v-if="item.status==3">待发货</div>
<div style="color:#00BEF9 ;" v-if="item.status==4">已收货</div> <div style="color:#00BEF9 ;" v-if="item.status==4">已收货</div>
<div style="color:#999999 ;" v-if="item.status==5">已取消</div> --> <div style="color:#999999 ;" v-if="item.status==5">已取消</div> -->
</view> </view>
<div class="list-Splitline"></div> <div class="list-Splitline"></div>
<div class="list-hospital">客户名称<span>{{item.nickname}}</span> <div class="list-hospital">客户名称<span>{{item.nickname}}</span>
<span v-if="item.order_type==1">普通订单</span> <span v-if="item.order_type==1">普通订单</span>
<span v-if="item.order_type==2">门店订单</span> <span v-if="item.order_type==2">门店订单</span>
<span v-if="item.order_type==3">本地配送订单</span> <span v-if="item.order_type==3">本地配送订单</span>
<span v-if="item.order_type==4">虚拟订单</span> <span v-if="item.order_type==4">虚拟订单</span>
<span v-if="item.order_type==5">代客下单</span> <span v-if="item.order_type==5">代客下单</span>
</div> </div>
<view class="list-time"> <view class="list-time">
下单时间<span>{{item.create_time | time}}</span><span>{{item.time}}</span> 下单时间<span>{{item.create_time | time}}</span><span>{{item.time}}</span>
</view> </view>
<view class="list-money"> <view class="list-money">
合计{{item.goods_num}}件商品 合计{{item.goods_num}}件商品
<span v-if="item.sales_money>0">订单金额{{item.sales_money}}</span> <span v-if="item.sales_money>0">订单金额{{item.sales_money}}</span>
<span v-else>订单金额{{item.order_money}}</span> <span v-else>订单金额{{item.order_money}}</span>
<span v-if="item.wait_status==1">(待确认)</span> <span v-if="item.wait_status==1">(待确认)</span>
<span v-if="item.wait_status==2">(已收款)</span> <span v-if="item.wait_status==2">(已收款)</span>
</view> </view>
<view class="list-btn df jcf"> <view class="list-btn df jcf">
<div class="df aic jcsa one" v-if="item.sales_balance==1" <div class="df aic jcsa one" v-if="item.sales_balance==1"
@click.stop="increased(item,item.order_id,item.member_id)">新增收款</div> @click.stop="increased(item,item.order_id,item.member_id)">新增收款</div>
<div class="df aic jcsa two" v-if="item.sales_balance==1" <div class="df aic jcsa two" v-if="item.sales_balance==1"
@click.stop="affirm(item.order_id,item.member_id)">确认收款</div> @click.stop="affirm(item.order_id,item.member_id)">确认收款</div>
<div class="df aic jcsa sui" @click.stop="more(item)">再次订购</div> <div class="df aic jcsa sui" @click.stop="more(item)">再次订购</div>
</view> </view>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
const timesfm = require('@/common/js/map/message.js') const timesfm = require('@/common/js/map/message.js')
import eventBus from '@/common/js/bus.js' import eventBus from '@/common/js/bus.js'
export default { export default {
data() { data() {
return { return {
list: [], list: [],
page: 1, page: 1,
listsui: [], listsui: [],
dataList: [] dataList: []
} }
}, },
created() { created() {
this.$api.sendRequest({ this.$api.sendRequest({
url: '/api/salasmanorder/lists', url: '/api/salasmanorder/lists',
data: { data: {
order_status: 'close' order_status: 'close'
}, },
success: res => { success: res => {
this.list = res.data.list this.list = res.data.list
} }
}) })
}, },
methods: { methods: {
getwrong(order_status, member_id, is_today, sales_status, searchText,start_time,end_time) { getwrong(order_status, member_id, is_today, sales_status, searchText,start_time,end_time) {
console.log(order_status, member_id, is_today, sales_status, searchText,start_time,end_time); console.log(order_status, member_id, is_today, sales_status, searchText,start_time,end_time);
let obj = { let obj = {
order_status, order_status,
member_id, member_id,
is_today, is_today,
sales_status, sales_status,
searchText,start_time,end_time searchText,start_time,end_time
} }
obj.order_status = 'close' obj.order_status = 'close'
if (searchText) { if (searchText) {
delete obj.sales_status delete obj.sales_status
} }
if(is_today){ if(is_today){
delete obj.sales_status delete obj.sales_status
} }
if (!sales_status) { if (!sales_status) {
delete obj.sales_status delete obj.sales_status
} }
this.$api.sendRequest({ this.$api.sendRequest({
url: '/api/salasmanorder/lists', url: '/api/salasmanorder/lists',
data: obj, data: obj,
success: res => { success: res => {
this.list = res.data.list this.list = res.data.list
} }
}) })
}, },
// getwrong(order_status, member_id, is_today, sales_status, searchText, one){ // getwrong(order_status, member_id, is_today, sales_status, searchText, one){
// let obj = { // let obj = {
// order_status, // order_status,
// member_id, // member_id,
// is_today, // is_today,
// sales_status, // sales_status,
// searchText // searchText
// } // }
// obj.order_status='all' // obj.order_status='all'
// if (searchText) { // if (searchText) {
// delete obj.sales_status // delete obj.sales_status
// } // }
// this.$api.sendRequest({ // this.$api.sendRequest({
// url: '/api/salasmanorder/lists', // url: '/api/salasmanorder/lists',
// data: obj, // data: obj,
// success: res => { // success: res => {
// this.listsui = res.data.list // this.listsui = res.data.list
// } // }
// }) // })
// }, // },
getwrongtllisttwo() { getwrongtllisttwo() {
this.$api.sendRequest({ this.$api.sendRequest({
url: '/api/salasmanorder/lists', url: '/api/salasmanorder/lists',
data: { data: {
order_status: 'close', order_status: 'close',
// sales_status:false, // sales_status:false,
// wait_status:1 // wait_status:1
}, },
success: res => { success: res => {
console.log(res, '已收货'); console.log(res, '已收货');
this.list = res.data.list this.list = res.data.list
uni.stopPullDownRefresh() uni.stopPullDownRefresh()
} }
}) })
}, },
getwrongtllistsui() { getwrongtllistsui() {
this.page += 1 this.page += 1
this.$api.sendRequest({ this.$api.sendRequest({
url: '/api/salasmanorder/lists', url: '/api/salasmanorder/lists',
data: { data: {
order_status: 'close', order_status: 'close',
page: this.page page: this.page
}, },
success: res => { success: res => {
this.list = [...this.list, ...res.data.list] this.list = [...this.list, ...res.data.list]
console.log(this.list, '已收货'); console.log(this.list, '已收货');
uni.stopPullDownRefresh() uni.stopPullDownRefresh()
} }
}) })
}, },
queryList(pageNo, pageSize) { queryList(pageNo, pageSize) {
console.log(pageNo, pageSize); console.log(pageNo, pageSize);
// this.page+=10 // this.page+=10
// this.$api.sendRequest({ // this.$api.sendRequest({
// url:'/api/salasmanorder/lists', // url:'/api/salasmanorder/lists',
// data:{ // data:{
// order_status:'close', // order_status:'close',
// page:this.page // page:this.page
// }, // },
// success:res=>{ // success:res=>{
// console.log(res,''); // console.log(res,'');
// this.list=res.data.list // this.list=res.data.list
// } // }
// }) // })
this.$refs.paging.complete(this.list) this.$refs.paging.complete(this.list)
// this.$refs.paging.complete(false); // this.$refs.paging.complete(false);
}, },
btn(order, member) { btn(order, member) {
console.log(order, member); console.log(order, member);
let _this = this let _this = this
setTimeout(() => { setTimeout(() => {
eventBus.$emit('urlone', 6) eventBus.$emit('urlone', 6)
}, 500) }, 500)
uni.navigateTo({ uni.navigateTo({
// url:this.list[this.current.URL] // url:this.list[this.current.URL]
url: `../../page_salesman_order/Goods_received/Goods_received?or=${order}&me=${member}`, url: `../../page_salesman_order/Goods_received/Goods_received?or=${order}&me=${member}`,
fail: function(res) { fail: function(res) {
console.log(res); console.log(res);
} }
}) })
}, },
increased(item, order, member) { increased(item, order, member) {
// event.stopPropagation(); // event.stopPropagation();
// console.log(item); // console.log(item);
setTimeout(() => { setTimeout(() => {
uni.$emit('Collection', item) uni.$emit('Collection', item)
}, 500) }, 500)
uni.navigateTo({ uni.navigateTo({
url: `/page_salesman_order/Customer_payment/Customer_payment?id=${order}&di=${member}` url: `/page_salesman_order/Customer_payment/Customer_payment?id=${order}&di=${member}`
}) })
}, },
affirm(order_id, member_id) { affirm(order_id, member_id) {
let _this = this let _this = this
// event.stopPropagation(); // event.stopPropagation();
console.log(order_id, member_id); console.log(order_id, member_id);
this.$api.sendRequest({ this.$api.sendRequest({
url: '/api/salasmanorder/detail', url: '/api/salasmanorder/detail',
data: { data: {
order_id: order_id, order_id: order_id,
member_id: member_id member_id: member_id
}, },
success: res => { success: res => {
this.data = res.data this.data = res.data
console.log(res.data, '订单详情'); console.log(res.data, '订单详情');
// setTimeout(()=>{ // setTimeout(()=>{
// uni.$emit('CommodityList',res.data.order_goods) // uni.$emit('CommodityList',res.data.order_goods)
// },500) // },500)
// uni.navigateTo({ // uni.navigateTo({
// // url:this.list[this.current.URL] // // url:this.list[this.current.URL]
// url:`/page_salesman_index/Commodity_list/Commodity_list` // url:`/page_salesman_index/Commodity_list/Commodity_list`
// }) // })
uni.navigateTo({ uni.navigateTo({
// url:this.list[this.current.URL] // url:this.list[this.current.URL]
url: `../Collection_record/Collection_record?id=${res.data.member_id}&di=${res.data.order_id}` url: `../Collection_record/Collection_record?id=${res.data.member_id}&di=${res.data.order_id}`
}) })
} }
}) })
}, },
more(item) { more(item) {
event.stopPropagation(); event.stopPropagation();
setTimeout(() => { setTimeout(() => {
uni.$emit('zaicidinggou', { uni.$emit('zaicidinggou', {
one: item.order_goods, one: item.order_goods,
two: 1 two: 1
}) })
}, 500) }, 500)
uni.navigateTo({ uni.navigateTo({
url: `/page_salesman_index/Select_item/Select_item?st=${item.member_id}&di=${item.store_id}` url: `/page_salesman_index/Select_item/Select_item?st=${item.member_id}&di=${item.store_id}`
}) })
} }
}, },
filters: { filters: {
time(num) { time(num) {
return timesfm(num * 1000) return timesfm(num * 1000)
} }
} }
} }
</script> </script>
<style lang="scss"> <style lang="scss">
.box .list:nth-child(1) { .box .list:nth-child(1) {
margin: 34rpx 24rpx 0 24rpx !important; margin: 34rpx 24rpx 0 24rpx !important;
// margin: 0 !important; // margin: 0 !important;
} }
.box { .box {
margin-top: -28rpx !important; margin-top: -28rpx !important;
} }
.list { .list {
margin: 42rpx 24rpx 0 24rpx; margin: 42rpx 24rpx 0 24rpx;
width: 702rpx; width: 702rpx;
height: 424rpx; height: 424rpx;
background: #FFFFFF; background: #FFFFFF;
border-radius: 24rpx; border-radius: 24rpx;
// padding: 32rpx; // padding: 32rpx;
box-sizing: border-box; box-sizing: border-box;
padding: 24rpx; padding: 24rpx;
position: relative; position: relative;
.list-Openonbehalf { .list-Openonbehalf {
text-align: center; text-align: center;
background: #00C594; background: #00C594;
border-radius: 30rpx; border-radius: 30rpx;
position: absolute; position: absolute;
top: -10rpx; top: -10rpx;
left: 0; left: 0;
width: 142rpx; width: 142rpx;
height: 34rpx; height: 34rpx;
font-size: 24rpx; font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #FFFFFF; color: #FFFFFF;
line-height: 34rpx; line-height: 34rpx;
} }
.list-Openonbehalftwo { .list-Openonbehalftwo {
text-align: center; text-align: center;
background: #ff5500; background: #ff5500;
border-radius: 30rpx; border-radius: 30rpx;
position: absolute; position: absolute;
top: -10rpx; top: -10rpx;
left: 140rpx; left: 140rpx;
width: 100rpx; width: 100rpx;
height: 34rpx; height: 34rpx;
font-size: 24rpx; font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #FFFFFF; color: #FFFFFF;
line-height: 34rpx; line-height: 34rpx;
} }
.list-data {} .list-data {}
.list-data div:nth-child(1) { .list-data div:nth-child(1) {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #222222; color: #222222;
line-height: 40rpx; line-height: 40rpx;
} }
.list-data div:nth-child(2) { .list-data div:nth-child(2) {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
line-height: 40rpx; line-height: 40rpx;
} }
.list-Splitline { .list-Splitline {
width: 638rpx; width: 638rpx;
height: 2rpx; height: 2rpx;
background: #F2F2F2; background: #F2F2F2;
border-radius: 16rpx; border-radius: 16rpx;
margin-top: 28rpx; margin-top: 28rpx;
} }
.list-hospital { .list-hospital {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #999999; color: #999999;
line-height: 40rpx; line-height: 40rpx;
margin-top: 30rpx; margin-top: 30rpx;
} }
.list-hospital span:nth-child(1) { .list-hospital span:nth-child(1) {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #222222; color: #222222;
line-height: 40rpx; line-height: 40rpx;
margin-left: 42rpx; margin-left: 42rpx;
margin-right: 16rpx; margin-right: 16rpx;
} }
.list-hospital span:nth-child(2) { .list-hospital span:nth-child(2) {
width: 92rpx; width: 92rpx;
height: 36rpx; height: 36rpx;
font-size: 20rpx; font-size: 20rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #FF7D02; color: #FF7D02;
line-height: 28rpx; line-height: 28rpx;
background-color: rgb(255, 240, 226); background-color: rgb(255, 240, 226);
} }
.list-time { .list-time {
margin-top: 24rpx; margin-top: 24rpx;
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #999999; color: #999999;
line-height: 40rpx; line-height: 40rpx;
} }
.list-time span:nth-child(1) { .list-time span:nth-child(1) {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #222222; color: #222222;
line-height: 40rpx; line-height: 40rpx;
margin-right: 10rpx; margin-right: 10rpx;
margin-left: 42rpx; margin-left: 42rpx;
} }
.list-time span:nth-child(2) { .list-time span:nth-child(2) {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #222222; color: #222222;
line-height: 40rpx; line-height: 40rpx;
} }
.list-money { .list-money {
margin-top: 24rpx; margin-top: 24rpx;
font-size: 24rpx; font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #999999; color: #999999;
line-height: 34rpx; line-height: 34rpx;
} }
.list-money span:nth-child(1) { .list-money span:nth-child(1) {
color: rgb(58, 58, 58); color: rgb(58, 58, 58);
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-size: 28rpx; font-size: 28rpx;
} }
.list-money span:nth-child(2) { .list-money span:nth-child(2) {
color: rgb(58, 58, 58); color: rgb(58, 58, 58);
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-size: 28rpx; font-size: 28rpx;
} }
.list-btn { .list-btn {
margin-top: 32rpx; margin-top: 32rpx;
.one { .one {
width: 176rpx; width: 176rpx;
height: 60rpx; height: 60rpx;
border-radius: 30rpx; border-radius: 30rpx;
border: 2rpx solid #E8E8E8; border: 2rpx solid #E8E8E8;
margin-left: 94rpx; margin-left: 94rpx;
font-size: 24rpx; font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #333333; color: #333333;
line-height: 34rpx; line-height: 34rpx;
} }
.two { .two {
width: 176rpx; width: 176rpx;
height: 60rpx; height: 60rpx;
border-radius: 30rpx; border-radius: 30rpx;
border: 2rpx solid #E8E8E8; border: 2rpx solid #E8E8E8;
margin-left: 24rpx; margin-left: 24rpx;
font-size: 24rpx; font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #333333; color: #333333;
line-height: 34rpx; line-height: 34rpx;
} }
.sui { .sui {
width: 176rpx; width: 176rpx;
height: 60rpx; height: 60rpx;
background: #21BBF3; background: #21BBF3;
border-radius: 30rpx; border-radius: 30rpx;
margin-left: 24rpx; margin-left: 24rpx;
font-size: 24rpx; font-size: 24rpx;
font-family: PingFangSC-Medium, PingFang SC; font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #FFFFFF; color: #FFFFFF;
line-height: 34rpx; line-height: 34rpx;
} }
} }
} }
.list-mt { .list-mt {
margin-top: 28rpx; margin-top: 28rpx;
} }
</style> </style>

1674
page_salesman_index/index/index.vue

File diff suppressed because it is too large

904
page_salesman_index/index/received.vue

@ -1,462 +1,462 @@
<template> <template>
<view class="box"> <view class="box">
<view class="list list-mt" v-for="(item,index) in listsui.length>0?listsui:list" :key="index" <view class="list list-mt" v-for="(item,index) in listsui.length>0?listsui:list" :key="index"
@click="btn(item.order_id,item.member_id)"> @click="btn(item.order_id,item.member_id)">
<view v-if="item.sales_money>0" class="list-Openonbehalf"> <view v-if="item.sales_money>0" class="list-Openonbehalf">
特批价|代开 特批价|代开
</view> </view>
<view v-if="item.is_first_order" class="list-Openonbehalftwo"> <view v-if="item.is_first_order" class="list-Openonbehalftwo">
首单 首单
</view> </view>
<view class="list-data df jcsb"> <view class="list-data df jcsb">
<div>订单编号:&emsp;{{item.order_no}}</div> <div>订单编号:&emsp;{{item.order_no}}</div>
<div>{{item.order_status_name}}</div> <div>{{item.order_status_name}}</div>
<!-- <div style="color:#FF1449 ;" v-if="item.status==0">待审核</div> <!-- <div style="color:#FF1449 ;" v-if="item.status==0">待审核</div>
<div style="color:#FF7D02 ;" v-if="item.status==1">待出库</div> <div style="color:#FF7D02 ;" v-if="item.status==1">待出库</div>
<div style="color:#FF7D02 ;" v-if="item.status==2">待出库(部分)</div> <div style="color:#FF7D02 ;" v-if="item.status==2">待出库(部分)</div>
<div style="color:#00C594 ;" v-if="item.status==3">待发货</div> <div style="color:#00C594 ;" v-if="item.status==3">待发货</div>
<div style="color:#00BEF9 ;" v-if="item.status==4">已收货</div> <div style="color:#00BEF9 ;" v-if="item.status==4">已收货</div>
<div style="color:#999999 ;" v-if="item.status==5">已取消</div> --> <div style="color:#999999 ;" v-if="item.status==5">已取消</div> -->
</view> </view>
<div class="list-Splitline"></div> <div class="list-Splitline"></div>
<div class="list-hospital">客户名称<span>{{item.nickname}}</span> <div class="list-hospital">客户名称<span>{{item.nickname}}</span>
<span v-if="item.order_type==1">普通订单</span> <span v-if="item.order_type==1">普通订单</span>
<span v-if="item.order_type==2">门店订单</span> <span v-if="item.order_type==2">门店订单</span>
<span v-if="item.order_type==3">本地配送订单</span> <span v-if="item.order_type==3">本地配送订单</span>
<span v-if="item.order_type==4">虚拟订单</span> <span v-if="item.order_type==4">虚拟订单</span>
<span v-if="item.order_type==5">代客下单</span> <span v-if="item.order_type==5">代客下单</span>
</div> </div>
<view class="list-time"> <view class="list-time">
下单时间<span>{{item.create_time | time}}</span><span>{{item.time}}</span> 下单时间<span>{{item.create_time | time}}</span><span>{{item.time}}</span>
</view> </view>
<view class="list-money"> <view class="list-money">
合计{{item.goods_num}}件商品 合计{{item.goods_num}}件商品
<span v-if="item.sales_money>0">订单金额{{item.sales_money}}</span> <span v-if="item.sales_money>0">订单金额{{item.sales_money}}</span>
<span v-else>订单金额{{item.order_money}}</span> <span v-else>订单金额{{item.order_money}}</span>
<span v-if="item.wait_status==1">(待确认)</span> <span v-if="item.wait_status==1">(待确认)</span>
<span v-if="item.wait_status==2">(已收款)</span> <span v-if="item.wait_status==2">(已收款)</span>
</view> </view>
<view class="list-btn df jcf"> <view class="list-btn df jcf">
<div class="df aic jcsa one" v-if="item.sales_balance==1" <div class="df aic jcsa one" v-if="item.sales_balance==1"
@click.stop="increased(item,item.order_id,item.member_id)">新增收款</div> @click.stop="increased(item,item.order_id,item.member_id)">新增收款</div>
<div class="df aic jcsa two" v-if="item.sales_balance==1" <div class="df aic jcsa two" v-if="item.sales_balance==1"
@click.stop="affirm(item.order_id,item.member_id)">确认收款</div> @click.stop="affirm(item.order_id,item.member_id)">确认收款</div>
<div class="df aic jcsa sui" @click.stop="more(item)">再次订购</div> <div class="df aic jcsa sui" @click.stop="more(item)">再次订购</div>
</view> </view>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
const timesfm = require('@/common/js/map/message.js') const timesfm = require('@/common/js/map/message.js')
import eventBus from '@/common/js/bus.js' import eventBus from '@/common/js/bus.js'
export default { export default {
data() { data() {
return { return {
list: [], list: [],
page: 1, page: 1,
listsui: [], listsui: [],
dataList: [] dataList: []
} }
}, },
created() { created() {
this.$api.sendRequest({ this.$api.sendRequest({
url: '/api/salasmanorder/lists', url: '/api/salasmanorder/lists',
data: { data: {
order_status: 'waitrate' order_status: 'waitrate'
}, },
success: res => { success: res => {
console.log(res, '已收货'); console.log(res, '已收货');
this.list = res.data.list this.list = res.data.list
} }
}) })
}, },
methods: { methods: {
getwrong(order_status, member_id, is_today, sales_status, searchText,start_time,end_time) { getwrong(order_status, member_id, is_today, sales_status, searchText,start_time,end_time) {
console.log(order_status, member_id, is_today, sales_status, searchText,start_time,end_time); console.log(order_status, member_id, is_today, sales_status, searchText,start_time,end_time);
let obj = { let obj = {
order_status, order_status,
member_id, member_id,
is_today, is_today,
sales_status, sales_status,
searchText,start_time,end_time searchText,start_time,end_time
} }
obj.order_status = 'waitrate' obj.order_status = 'waitrate'
if (searchText) { if (searchText) {
delete obj.sales_status delete obj.sales_status
} }
if(is_today){ if(is_today){
delete obj.sales_status delete obj.sales_status
} }
if (!sales_status) { if (!sales_status) {
delete obj.sales_status delete obj.sales_status
} }
this.$api.sendRequest({ this.$api.sendRequest({
url: '/api/salasmanorder/lists', url: '/api/salasmanorder/lists',
data: obj, data: obj,
success: res => { success: res => {
this.list = res.data.list this.list = res.data.list
} }
}) })
}, },
// getwrong(order_status, member_id, is_today, sales_status, searchText, one){ // getwrong(order_status, member_id, is_today, sales_status, searchText, one){
// let obj = { // let obj = {
// order_status, // order_status,
// member_id, // member_id,
// is_today, // is_today,
// sales_status, // sales_status,
// searchText // searchText
// } // }
// obj.order_status='all' // obj.order_status='all'
// if (searchText) { // if (searchText) {
// delete obj.sales_status // delete obj.sales_status
// } // }
// this.$api.sendRequest({ // this.$api.sendRequest({
// url: '/api/salasmanorder/lists', // url: '/api/salasmanorder/lists',
// data: obj, // data: obj,
// success: res => { // success: res => {
// this.listsui = res.data.list // this.listsui = res.data.list
// } // }
// }) // })
// }, // },
getwrongtllisttwo() { getwrongtllisttwo() {
this.$api.sendRequest({ this.$api.sendRequest({
url: '/api/salasmanorder/lists', url: '/api/salasmanorder/lists',
data: { data: {
order_status: 'waitrate', order_status: 'waitrate',
// sales_status:false, // sales_status:false,
// wait_status:1 // wait_status:1
}, },
success: res => { success: res => {
console.log(res, '已收货'); console.log(res, '已收货');
this.list = res.data.list this.list = res.data.list
uni.stopPullDownRefresh() uni.stopPullDownRefresh()
} }
}) })
}, },
getwrongtllistsui() { getwrongtllistsui() {
this.page += 1 this.page += 1
this.$api.sendRequest({ this.$api.sendRequest({
url: '/api/salasmanorder/lists', url: '/api/salasmanorder/lists',
data: { data: {
order_status: 'waitrate', order_status: 'waitrate',
page: this.page page: this.page
}, },
success: res => { success: res => {
this.list = [...this.list, ...res.data.list] this.list = [...this.list, ...res.data.list]
console.log(this.list, '已收货'); console.log(this.list, '已收货');
uni.stopPullDownRefresh() uni.stopPullDownRefresh()
} }
}) })
}, },
queryList(pageNo, pageSize) { queryList(pageNo, pageSize) {
console.log(pageNo, pageSize); console.log(pageNo, pageSize);
// this.page+=10 // this.page+=10
// this.$api.sendRequest({ // this.$api.sendRequest({
// url:'/api/salasmanorder/lists', // url:'/api/salasmanorder/lists',
// data:{ // data:{
// order_status:'waitrate', // order_status:'waitrate',
// page:this.page // page:this.page
// }, // },
// success:res=>{ // success:res=>{
// console.log(res,''); // console.log(res,'');
// this.list=res.data.list // this.list=res.data.list
// } // }
// }) // })
this.$refs.paging.complete(this.list) this.$refs.paging.complete(this.list)
// this.$refs.paging.complete(false); // this.$refs.paging.complete(false);
}, },
btn(order, member) { btn(order, member) {
console.log(order, member); console.log(order, member);
let _this = this let _this = this
setTimeout(() => { setTimeout(() => {
eventBus.$emit('urlone', 4) eventBus.$emit('urlone', 4)
}, 500) }, 500)
uni.navigateTo({ uni.navigateTo({
// url:this.list[this.current.URL] // url:this.list[this.current.URL]
url: `../../page_salesman_order/Goods_received/Goods_received?or=${order}&me=${member}`, url: `../../page_salesman_order/Goods_received/Goods_received?or=${order}&me=${member}`,
fail: function(res) { fail: function(res) {
console.log(res); console.log(res);
} }
}) })
}, },
increased(item, order, member) { increased(item, order, member) {
// event.stopPropagation(); // event.stopPropagation();
// console.log(item); // console.log(item);
setTimeout(() => { setTimeout(() => {
uni.$emit('Collection', item) uni.$emit('Collection', item)
}, 500) }, 500)
uni.navigateTo({ uni.navigateTo({
url: `/page_salesman_order/Customer_payment/Customer_payment?id=${order}&di=${member}` url: `/page_salesman_order/Customer_payment/Customer_payment?id=${order}&di=${member}`
}) })
}, },
affirm(order_id, member_id) { affirm(order_id, member_id) {
let _this = this let _this = this
// event.stopPropagation(); // event.stopPropagation();
console.log(order_id, member_id); console.log(order_id, member_id);
this.$api.sendRequest({ this.$api.sendRequest({
url: '/api/salasmanorder/detail', url: '/api/salasmanorder/detail',
data: { data: {
order_id: order_id, order_id: order_id,
member_id: member_id member_id: member_id
}, },
success: res => { success: res => {
this.data = res.data this.data = res.data
console.log(res.data, '订单详情'); console.log(res.data, '订单详情');
// setTimeout(()=>{ // setTimeout(()=>{
// uni.$emit('CommodityList',res.data.order_goods) // uni.$emit('CommodityList',res.data.order_goods)
// },500) // },500)
// uni.navigateTo({ // uni.navigateTo({
// // url:this.list[this.current.URL] // // url:this.list[this.current.URL]
// url:`/page_salesman_index/Commodity_list/Commodity_list` // url:`/page_salesman_index/Commodity_list/Commodity_list`
// }) // })
uni.navigateTo({ uni.navigateTo({
// url:this.list[this.current.URL] // url:this.list[this.current.URL]
url: `../Collection_record/Collection_record?id=${res.data.member_id}&di=${res.data.order_id}` url: `../Collection_record/Collection_record?id=${res.data.member_id}&di=${res.data.order_id}`
}) })
} }
}) })
}, },
more(item) { more(item) {
// event.stopPropagation(); // event.stopPropagation();
setTimeout(() => { setTimeout(() => {
uni.$emit('zaicidinggou', { uni.$emit('zaicidinggou', {
one: item.order_goods, one: item.order_goods,
two: 1 two: 1
}) })
}, 500) }, 500)
uni.navigateTo({ uni.navigateTo({
url: `/page_salesman_index/Select_item/Select_item?st=${item.member_id}&di=${item.store_id}` url: `/page_salesman_index/Select_item/Select_item?st=${item.member_id}&di=${item.store_id}`
}) })
} }
}, },
filters: { filters: {
time(num) { time(num) {
return timesfm(num * 1000) return timesfm(num * 1000)
} }
} }
} }
</script> </script>
<style lang="scss"> <style lang="scss">
.box .list:nth-child(1) { .box .list:nth-child(1) {
margin: 34rpx 24rpx 0 24rpx !important; margin: 34rpx 24rpx 0 24rpx !important;
// margin: 0 !important; // margin: 0 !important;
} }
.box { .box {
margin-top: -28rpx !important; margin-top: -28rpx !important;
} }
.list { .list {
margin: 42rpx 24rpx 0 24rpx; margin: 42rpx 24rpx 0 24rpx;
width: 702rpx; width: 702rpx;
//height: 424rpx; //height: 424rpx;
background: #FFFFFF; background: #FFFFFF;
border-radius: 24rpx; border-radius: 24rpx;
// padding: 32rpx; // padding: 32rpx;
box-sizing: border-box; box-sizing: border-box;
padding: 24rpx; padding: 24rpx;
position: relative; position: relative;
.list-Openonbehalf { .list-Openonbehalf {
text-align: center; text-align: center;
background: #00C594; background: #00C594;
border-radius: 30rpx; border-radius: 30rpx;
position: absolute; position: absolute;
top: -10rpx; top: -10rpx;
left: 0; left: 0;
width: 142rpx; width: 142rpx;
height: 34rpx; height: 34rpx;
font-size: 24rpx; font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #FFFFFF; color: #FFFFFF;
line-height: 34rpx; line-height: 34rpx;
} }
.list-Openonbehalftwo { .list-Openonbehalftwo {
text-align: center; text-align: center;
background: #ff5500; background: #ff5500;
border-radius: 30rpx; border-radius: 30rpx;
position: absolute; position: absolute;
top: -10rpx; top: -10rpx;
left: 140rpx; left: 140rpx;
width: 100rpx; width: 100rpx;
height: 34rpx; height: 34rpx;
font-size: 24rpx; font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #FFFFFF; color: #FFFFFF;
line-height: 34rpx; line-height: 34rpx;
} }
.list-data {} .list-data {}
.list-data div:nth-child(1) { .list-data div:nth-child(1) {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #222222; color: #222222;
line-height: 40rpx; line-height: 40rpx;
} }
.list-data div:nth-child(2) { .list-data div:nth-child(2) {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
line-height: 40rpx; line-height: 40rpx;
} }
.list-Splitline { .list-Splitline {
width: 638rpx; width: 638rpx;
height: 2rpx; height: 2rpx;
background: #F2F2F2; background: #F2F2F2;
border-radius: 16rpx; border-radius: 16rpx;
margin-top: 28rpx; margin-top: 28rpx;
} }
.list-hospital { .list-hospital {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #999999; color: #999999;
line-height: 40rpx; line-height: 40rpx;
margin-top: 30rpx; margin-top: 30rpx;
} }
.list-hospital span:nth-child(1) { .list-hospital span:nth-child(1) {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #222222; color: #222222;
line-height: 40rpx; line-height: 40rpx;
margin-left: 42rpx; margin-left: 42rpx;
margin-right: 16rpx; margin-right: 16rpx;
} }
.list-hospital span:nth-child(2) { .list-hospital span:nth-child(2) {
width: 92rpx; width: 92rpx;
height: 36rpx; height: 36rpx;
font-size: 20rpx; font-size: 20rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #FF7D02; color: #FF7D02;
line-height: 28rpx; line-height: 28rpx;
background-color: rgb(255, 240, 226); background-color: rgb(255, 240, 226);
} }
.list-time { .list-time {
margin-top: 24rpx; margin-top: 24rpx;
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #999999; color: #999999;
line-height: 40rpx; line-height: 40rpx;
} }
.list-time span:nth-child(1) { .list-time span:nth-child(1) {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #222222; color: #222222;
line-height: 40rpx; line-height: 40rpx;
margin-right: 10rpx; margin-right: 10rpx;
margin-left: 42rpx; margin-left: 42rpx;
} }
.list-time span:nth-child(2) { .list-time span:nth-child(2) {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #222222; color: #222222;
line-height: 40rpx; line-height: 40rpx;
} }
.list-money { .list-money {
margin-top: 24rpx; margin-top: 24rpx;
font-size: 24rpx; font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #999999; color: #999999;
line-height: 34rpx; line-height: 34rpx;
} }
.list-money span:nth-child(1) { .list-money span:nth-child(1) {
color: rgb(58, 58, 58); color: rgb(58, 58, 58);
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-size: 28rpx; font-size: 28rpx;
} }
.list-money span:nth-child(2) { .list-money span:nth-child(2) {
color: rgb(58, 58, 58); color: rgb(58, 58, 58);
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-size: 28rpx; font-size: 28rpx;
} }
.list-btn { .list-btn {
margin-top: 32rpx; margin-top: 32rpx;
.one { .one {
width: 176rpx; width: 176rpx;
height: 60rpx; height: 60rpx;
border-radius: 30rpx; border-radius: 30rpx;
border: 2rpx solid #E8E8E8; border: 2rpx solid #E8E8E8;
margin-left: 94rpx; margin-left: 94rpx;
font-size: 24rpx; font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #333333; color: #333333;
line-height: 34rpx; line-height: 34rpx;
} }
.two { .two {
width: 176rpx; width: 176rpx;
height: 60rpx; height: 60rpx;
border-radius: 30rpx; border-radius: 30rpx;
border: 2rpx solid #E8E8E8; border: 2rpx solid #E8E8E8;
margin-left: 24rpx; margin-left: 24rpx;
font-size: 24rpx; font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #333333; color: #333333;
line-height: 34rpx; line-height: 34rpx;
} }
.sui { .sui {
width: 176rpx; width: 176rpx;
height: 60rpx; height: 60rpx;
background: #21BBF3; background: #21BBF3;
border-radius: 30rpx; border-radius: 30rpx;
margin-left: 24rpx; margin-left: 24rpx;
font-size: 24rpx; font-size: 24rpx;
font-family: PingFangSC-Medium, PingFang SC; font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #FFFFFF; color: #FFFFFF;
line-height: 34rpx; line-height: 34rpx;
} }
} }
} }
.list-mt { .list-mt {
margin-top: 28rpx; margin-top: 28rpx;
} }
</style> </style>

1041
page_salesman_index/index/reviewed.vue

File diff suppressed because it is too large

970
page_salesman_index/index/shipped.vue

@ -1,498 +1,498 @@
<template> <template>
<view class="box"> <view class="box">
<view class="list list-mt" v-for="(item,index) in listsui.length>0?listsui:list" :key="index" <view class="list list-mt" v-for="(item,index) in listsui.length>0?listsui:list" :key="index"
@click="btn(item.order_id,item.member_id)"> @click="btn(item.order_id,item.member_id)">
<view v-if="item.sales_money>0" class="list-Openonbehalf"> <view v-if="item.sales_money>0" class="list-Openonbehalf">
特批价|代开 特批价|代开
</view> </view>
<view v-if="item.is_first_order" class="list-Openonbehalftwo"> <view v-if="item.is_first_order" class="list-Openonbehalftwo">
首单 首单
</view> </view>
<view class="list-data df jcsb"> <view class="list-data df jcsb">
<div>订单编号:&emsp;{{item.order_no}}</div> <div>订单编号:&emsp;{{item.order_no}}</div>
<div>{{item.order_status_name}}</div> <div>{{item.order_status_name}}</div>
<!-- <div style="color:#FF1449 ;" v-if="item.status==0">待审核</div> <!-- <div style="color:#FF1449 ;" v-if="item.status==0">待审核</div>
<div style="color:#FF7D02 ;" v-if="item.status==1">待出库</div> <div style="color:#FF7D02 ;" v-if="item.status==1">待出库</div>
<div style="color:#FF7D02 ;" v-if="item.status==2">待出库(部分)</div> <div style="color:#FF7D02 ;" v-if="item.status==2">待出库(部分)</div>
<div style="color:#00C594 ;" v-if="item.status==3">待发货</div> <div style="color:#00C594 ;" v-if="item.status==3">待发货</div>
<div style="color:#00BEF9 ;" v-if="item.status==4">已收货</div> <div style="color:#00BEF9 ;" v-if="item.status==4">已收货</div>
<div style="color:#999999 ;" v-if="item.status==5">已取消</div> --> <div style="color:#999999 ;" v-if="item.status==5">已取消</div> -->
</view> </view>
<div class="list-Splitline"></div> <div class="list-Splitline"></div>
<div class="list-hospital">客户名称<span>{{item.nickname}}</span> <div class="list-hospital">客户名称<span>{{item.nickname}}</span>
<span v-if="item.order_type==1">普通订单</span> <span v-if="item.order_type==1">普通订单</span>
<span v-if="item.order_type==2">门店订单</span> <span v-if="item.order_type==2">门店订单</span>
<span v-if="item.order_type==3">本地配送订单</span> <span v-if="item.order_type==3">本地配送订单</span>
<span v-if="item.order_type==4">虚拟订单</span> <span v-if="item.order_type==4">虚拟订单</span>
<span v-if="item.order_type==5">代客下单</span> <span v-if="item.order_type==5">代客下单</span>
</div> </div>
<view class="list-time"> <view class="list-time">
下单时间<span>{{item.create_time | time}}</span><span>{{item.time}}</span> 下单时间<span>{{item.create_time | time}}</span><span>{{item.time}}</span>
</view> </view>
<view class="list-money"> <view class="list-money">
合计{{item.goods_num}}件商品 合计{{item.goods_num}}件商品
<span v-if="item.sales_money>0">订单金额{{item.sales_money}}</span> <span v-if="item.sales_money>0">订单金额{{item.sales_money}}</span>
<span v-else>订单金额{{item.order_money}}</span> <span v-else>订单金额{{item.order_money}}</span>
<span v-if="item.wait_status==1">(待确认)</span> <span v-if="item.wait_status==1">(待确认)</span>
<span v-if="item.wait_status==2">(已收款)</span> <span v-if="item.wait_status==2">(已收款)</span>
</view> </view>
<view class="list-btn df jcf"> <view class="list-btn df jcf">
<div class="df aic jcsa listone" v-if="item.sales_balance==1 && item.sales_status==1" <div class="df aic jcsa listone" v-if="item.sales_balance==1 && item.sales_status==1"
@click.stop="increased(item,item.order_id,item.member_id)">新增收款</div> @click.stop="increased(item,item.order_id,item.member_id)">新增收款</div>
<div class="df aic jcsa listtwo" v-if="item.sales_balance==1 && item.sales_status==1" <div class="df aic jcsa listtwo" v-if="item.sales_balance==1 && item.sales_status==1"
@click.stop="affirm(item.order_id,item.member_id)">确认收款</div> @click.stop="affirm(item.order_id,item.member_id)">确认收款</div>
<!--订单处于待审核状态展示取消审核按钮-暂时注释--> <!--订单处于待审核状态展示取消审核按钮-暂时注释-->
<!-- <div class="df aic jcsa listsui" v-if="item.sales_status != 0" @click.stop="cancelAudit(item.order_id,item.member_id)">取消审核</div>--> <!-- <div class="df aic jcsa listsui" v-if="item.sales_status != 0" @click.stop="cancelAudit(item.order_id,item.member_id)">取消审核</div>-->
<div class="df aic jcsa listsui" @click.stop="more(item)">再次订购</div> <div class="df aic jcsa listsui" @click.stop="more(item)">再次订购</div>
</view> </view>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
const timesfm = require('@/common/js/map/message.js') const timesfm = require('@/common/js/map/message.js')
import eventBus from '@/common/js/bus.js' import eventBus from '@/common/js/bus.js'
export default { export default {
data() { data() {
return { return {
list: [], list: [],
page: 1, page: 1,
listsui: [], listsui: [],
dataList: [{ dataList: [{
sex: '202209012-0001', sex: '202209012-0001',
status: 1, status: 1,
household: '好大夫诊所', household: '好大夫诊所',
type: 0, type: 0,
date: '2021-09-12', date: '2021-09-12',
time: '18:20:21', time: '18:20:21',
statusdata: '¥1000', statusdata: '¥1000',
Received: 2, Received: 2,
box: 0 box: 0
}, },
{ {
sex: '202209012-0001', sex: '202209012-0001',
status: 3, status: 3,
household: '好大夫诊所', household: '好大夫诊所',
type: 0, type: 0,
date: '2021-09-12', date: '2021-09-12',
time: '18:20:21', time: '18:20:21',
statusdata: '¥1000', statusdata: '¥1000',
Received: 2, Received: 2,
box: 0 box: 0
}, },
] ]
} }
}, },
created() { created() {
this.$api.sendRequest({ this.$api.sendRequest({
url: '/api/salasmanorder/lists', url: '/api/salasmanorder/lists',
data: { data: {
order_status: 'waitsend' order_status: 'waitsend'
},
success: res => {
console.log(res, '待发货');
this.list = res.data.list
}
})
},
methods: {
getwrong(order_status, member_id, is_today, sales_status, searchText, start_time, end_time) {
console.log(order_status, member_id, is_today, sales_status, searchText, start_time, end_time);
let obj = {
order_status,
member_id,
is_today,
sales_status,
searchText,
start_time,
end_time
}
obj.order_status = 'waitsend'
if (searchText) {
delete obj.sales_status
}
if (is_today) {
delete obj.sales_status
}
if (!sales_status) {
delete obj.sales_status
}
this.$api.sendRequest({
url: '/api/salasmanorder/lists',
data: obj,
success: res => {
this.listsui = res.data.list
}
})
},
getwrongtllisttwo() {
this.$api.sendRequest({
url: '/api/salasmanorder/lists',
data: {
order_status: 'waitsend'
},
success: res => {
console.log(res, '待发货');
this.list = res.data.list
uni.stopPullDownRefresh()
}
})
},
getwrongtllistsui() {
this.page += 1
this.$api.sendRequest({
url: '/api/salasmanorder/lists',
data: {
order_status: 'waitsend',
page: this.page
},
success: res => {
this.list = [...this.list, ...res.data.list]
console.log(this.list, '待发货');
uni.stopPullDownRefresh()
}
})
},
queryList(pageNo, pageSize) {
// this.page+=1
// this.$api.sendRequest({
// url:'/api/salasmanorder/lists',
// data:{
// order_status:'waitsend',
// page:this.page
// },
// success:res=>{
// console.log(res,'');
// this.list.push(res.data.list)
// }
// })
// console.log(pageNo, pageSize);
// this.$refs.paging.complete(this.list)
// this.$refs.paging.complete(false);
},
btn(order, member) {
let _this = this
setTimeout(() => {
eventBus.$emit('urlone', 2)
}, 500)
uni.navigateTo({
// url:this.list[this.current.URL]
url: `/page_salesman_index/Tobe_shipped/Tobe_shipped?or=${order}&me=${member}`,
fail: function(res) {
console.log(res);
}
})
},
increased(item, order, member) {
// event.stopPropagation();
// console.log(item);
setTimeout(() => {
uni.$emit('Collection', item)
}, 500)
uni.navigateTo({
url: `/page_salesman_order/Customer_payment/Customer_payment?id=${order}&di=${member}`
})
},
affirm(order_id, member_id) {
let _this = this
// event.stopPropagation();
console.log(order_id, member_id);
this.$api.sendRequest({
url: '/api/salasmanorder/detail',
data: {
order_id: order_id,
member_id: member_id
},
success: res => {
this.data = res.data
console.log(res.data, '订单详情');
// setTimeout(()=>{
// uni.$emit('CommodityList',res.data.order_goods)
// },500)
// uni.navigateTo({
// // url:this.list[this.current.URL]
// url:`/page_salesman_index/Commodity_list/Commodity_list`
// })
uni.navigateTo({
// url:this.list[this.current.URL]
url: `../Collection_record/Collection_record?id=${res.data.member_id}&di=${res.data.order_id}`
})
}
})
},
more(item) {
// event.stopPropagation();
console.log(item);
setTimeout(() => {
uni.$emit('zaicidinggou', {
one: item.order_goods,
two: 1
})
}, 500)
uni.navigateTo({
url: `/page_salesman_index/Select_item/Select_item?st=${item.member_id}&di=${item.store_id}`
})
},
//(=>)
cancelAudit(order_id,member_id){
console.log(order_id,'取消审核')
//
this.$api.sendRequest({
//url: `/api/salasmanorder/doExamineOrder`,//
url: `/api/salasmanorder/editSalesStatus`,//(2024-11-28 11:30)
data: {
order_id: order_id,
member_id: member_id,
sales_status: 0,//0=
// remark:''
},
success: res => {
//
this.$api.sendRequest({
url: '/api/salasmanorder/lists',
data: {
order_status: 'waitsend'
},
success: res => {
console.log(res, '待发货');
this.list = res.data.list
}
})
this.$util.showToast({
title: '操作成功'
});
}
})
}, },
}, success: res => {
filters: { console.log(res, '待发货');
time(num) { this.list = res.data.list
return timesfm(num * 1000) }
})
} },
} methods: {
} getwrong(order_status, member_id, is_today, sales_status, searchText, start_time, end_time) {
console.log(order_status, member_id, is_today, sales_status, searchText, start_time, end_time);
let obj = {
order_status,
member_id,
is_today,
sales_status,
searchText,
start_time,
end_time
}
obj.order_status = 'waitsend'
if (searchText) {
delete obj.sales_status
}
if (is_today) {
delete obj.sales_status
}
if (!sales_status) {
delete obj.sales_status
}
this.$api.sendRequest({
url: '/api/salasmanorder/lists',
data: obj,
success: res => {
this.listsui = res.data.list
}
})
},
getwrongtllisttwo() {
this.$api.sendRequest({
url: '/api/salasmanorder/lists',
data: {
order_status: 'waitsend'
},
success: res => {
console.log(res, '待发货');
this.list = res.data.list
uni.stopPullDownRefresh()
}
})
},
getwrongtllistsui() {
this.page += 1
this.$api.sendRequest({
url: '/api/salasmanorder/lists',
data: {
order_status: 'waitsend',
page: this.page
},
success: res => {
this.list = [...this.list, ...res.data.list]
console.log(this.list, '待发货');
uni.stopPullDownRefresh()
}
})
},
queryList(pageNo, pageSize) {
// this.page+=1
// this.$api.sendRequest({
// url:'/api/salasmanorder/lists',
// data:{
// order_status:'waitsend',
// page:this.page
// },
// success:res=>{
// console.log(res,'');
// this.list.push(res.data.list)
// }
// })
// console.log(pageNo, pageSize);
// this.$refs.paging.complete(this.list)
// this.$refs.paging.complete(false);
},
btn(order, member) {
let _this = this
setTimeout(() => {
eventBus.$emit('urlone', 2)
}, 500)
uni.navigateTo({
// url:this.list[this.current.URL]
url: `/page_salesman_index/Tobe_shipped/Tobe_shipped?or=${order}&me=${member}`,
fail: function(res) {
console.log(res);
}
})
},
increased(item, order, member) {
// event.stopPropagation();
// console.log(item);
setTimeout(() => {
uni.$emit('Collection', item)
}, 500)
uni.navigateTo({
url: `/page_salesman_order/Customer_payment/Customer_payment?id=${order}&di=${member}`
})
},
affirm(order_id, member_id) {
let _this = this
// event.stopPropagation();
console.log(order_id, member_id);
this.$api.sendRequest({
url: '/api/salasmanorder/detail',
data: {
order_id: order_id,
member_id: member_id
},
success: res => {
this.data = res.data
console.log(res.data, '订单详情');
// setTimeout(()=>{
// uni.$emit('CommodityList',res.data.order_goods)
// },500)
// uni.navigateTo({
// // url:this.list[this.current.URL]
// url:`/page_salesman_index/Commodity_list/Commodity_list`
// })
uni.navigateTo({
// url:this.list[this.current.URL]
url: `../Collection_record/Collection_record?id=${res.data.member_id}&di=${res.data.order_id}`
})
}
})
},
more(item) {
// event.stopPropagation();
console.log(item);
setTimeout(() => {
uni.$emit('zaicidinggou', {
one: item.order_goods,
two: 1
})
}, 500)
uni.navigateTo({
url: `/page_salesman_index/Select_item/Select_item?st=${item.member_id}&di=${item.store_id}`
})
},
//(=>)
cancelAudit(order_id,member_id){
console.log(order_id,'取消审核')
//
this.$api.sendRequest({
//url: `/api/salasmanorder/doExamineOrder`,//
url: `/api/salasmanorder/editSalesStatus`,//(2024-11-28 11:30)
data: {
order_id: order_id,
member_id: member_id,
sales_status: 0,//0=
// remark:''
},
success: res => {
//
this.$api.sendRequest({
url: '/api/salasmanorder/lists',
data: {
order_status: 'waitsend'
},
success: res => {
console.log(res, '待发货');
this.list = res.data.list
}
})
this.$util.showToast({
title: '操作成功'
});
}
})
},
},
filters: {
time(num) {
return timesfm(num * 1000)
}
}
}
</script> </script>
<style lang="scss"> <style lang="scss">
.box .list:nth-child(1) { .box .list:nth-child(1) {
margin: 34rpx 24rpx 0 24rpx !important; margin: 34rpx 24rpx 0 24rpx !important;
// margin: 0 !important; // margin: 0 !important;
} }
.box { .box {
margin-top: -28rpx !important; margin-top: -28rpx !important;
} }
.list { .list {
margin: 42rpx 24rpx 0 24rpx; margin: 42rpx 24rpx 0 24rpx;
width: 702rpx; width: 702rpx;
//height: 424rpx; //height: 424rpx;
background: #FFFFFF; background: #FFFFFF;
border-radius: 24rpx; border-radius: 24rpx;
// padding: 32rpx; // padding: 32rpx;
box-sizing: border-box; box-sizing: border-box;
padding: 24rpx; padding: 24rpx;
position: relative; position: relative;
.list-Openonbehalf { .list-Openonbehalf {
text-align: center; text-align: center;
background: #00C594; background: #00C594;
border-radius: 30rpx; border-radius: 30rpx;
position: absolute; position: absolute;
top: -10rpx; top: -10rpx;
left: 0; left: 0;
width: 142rpx; width: 142rpx;
height: 34rpx; height: 34rpx;
font-size: 24rpx; font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #FFFFFF; color: #FFFFFF;
line-height: 34rpx; line-height: 34rpx;
} }
.list-Openonbehalftwo { .list-Openonbehalftwo {
text-align: center; text-align: center;
background: #ff5500; background: #ff5500;
border-radius: 30rpx; border-radius: 30rpx;
position: absolute; position: absolute;
top: -10rpx; top: -10rpx;
left: 140rpx; left: 140rpx;
width: 100rpx; width: 100rpx;
height: 34rpx; height: 34rpx;
font-size: 24rpx; font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #FFFFFF; color: #FFFFFF;
line-height: 34rpx; line-height: 34rpx;
} }
.list-data {} .list-data {}
.list-data div:nth-child(1) { .list-data div:nth-child(1) {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #222222; color: #222222;
line-height: 40rpx; line-height: 40rpx;
} }
.list-data div:nth-child(2) { .list-data div:nth-child(2) {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
line-height: 40rpx; line-height: 40rpx;
} }
.list-Splitline { .list-Splitline {
width: 638rpx; width: 638rpx;
height: 2rpx; height: 2rpx;
background: #F2F2F2; background: #F2F2F2;
border-radius: 16rpx; border-radius: 16rpx;
margin-top: 28rpx; margin-top: 28rpx;
} }
.list-hospital { .list-hospital {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #999999; color: #999999;
line-height: 40rpx; line-height: 40rpx;
margin-top: 30rpx; margin-top: 30rpx;
} }
.list-hospital span:nth-child(1) { .list-hospital span:nth-child(1) {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #222222; color: #222222;
line-height: 40rpx; line-height: 40rpx;
margin-left: 42rpx; margin-left: 42rpx;
margin-right: 16rpx; margin-right: 16rpx;
} }
.list-hospital span:nth-child(2) { .list-hospital span:nth-child(2) {
width: 92rpx; width: 92rpx;
height: 36rpx; height: 36rpx;
font-size: 20rpx; font-size: 20rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #FF7D02; color: #FF7D02;
line-height: 28rpx; line-height: 28rpx;
background-color: rgb(255, 240, 226); background-color: rgb(255, 240, 226);
} }
.list-time { .list-time {
margin-top: 24rpx; margin-top: 24rpx;
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #999999; color: #999999;
line-height: 40rpx; line-height: 40rpx;
} }
.list-time span:nth-child(1) { .list-time span:nth-child(1) {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #222222; color: #222222;
line-height: 40rpx; line-height: 40rpx;
margin-right: 10rpx; margin-right: 10rpx;
margin-left: 42rpx; margin-left: 42rpx;
} }
.list-time span:nth-child(2) { .list-time span:nth-child(2) {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #222222; color: #222222;
line-height: 40rpx; line-height: 40rpx;
} }
.list-money { .list-money {
margin-top: 24rpx; margin-top: 24rpx;
font-size: 24rpx; font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #999999; color: #999999;
line-height: 34rpx; line-height: 34rpx;
} }
.list-money span:nth-child(1) { .list-money span:nth-child(1) {
color: rgb(58, 58, 58); color: rgb(58, 58, 58);
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-size: 28rpx; font-size: 28rpx;
} }
.list-money span:nth-child(2) { .list-money span:nth-child(2) {
color: rgb(58, 58, 58); color: rgb(58, 58, 58);
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-size: 28rpx; font-size: 28rpx;
} }
.list-btn { .list-btn {
margin-top: 32rpx; margin-top: 32rpx;
.listone { .listone {
width: 176rpx; width: 176rpx;
height: 60rpx; height: 60rpx;
border-radius: 30rpx; border-radius: 30rpx;
border: 2rpx solid #E8E8E8; border: 2rpx solid #E8E8E8;
margin-left: 94rpx; margin-left: 94rpx;
font-size: 24rpx; font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #333333; color: #333333;
line-height: 34rpx; line-height: 34rpx;
} }
.listtwo { .listtwo {
width: 176rpx; width: 176rpx;
height: 60rpx; height: 60rpx;
border-radius: 30rpx; border-radius: 30rpx;
border: 2rpx solid #E8E8E8; border: 2rpx solid #E8E8E8;
margin-left: 24rpx; margin-left: 24rpx;
font-size: 24rpx; font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #333333; color: #333333;
line-height: 34rpx; line-height: 34rpx;
} }
.listsui { .listsui {
width: 176rpx; width: 176rpx;
height: 60rpx; height: 60rpx;
background: #21BBF3; background: #21BBF3;
border-radius: 30rpx; border-radius: 30rpx;
margin-left: 24rpx; margin-left: 24rpx;
font-size: 24rpx; font-size: 24rpx;
font-family: PingFangSC-Medium, PingFang SC; font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #FFFFFF; color: #FFFFFF;
line-height: 34rpx; line-height: 34rpx;
} }
} }
} }
.list-mt { .list-mt {
margin-top: 28rpx; margin-top: 28rpx;
} }
</style> </style>

6
page_salesman_order/Goods_received/Goods_received.vue

@ -251,10 +251,10 @@
@click="ConfirmCharge">确认收货</div> @click="ConfirmCharge">确认收货</div>
<div class="df aic jcsa listtwo" v-if="data.order_status_name=='待支付'" @click="payment">去支付</div> <div class="df aic jcsa listtwo" v-if="data.order_status_name=='待支付'" @click="payment">去支付</div>
<div class="df aic jcsa listtwo" v-if="data.order_status==1" @click="show3=true">确认发货</div> <div class="df aic jcsa listtwo" v-if="data.order_status==1" @click="show3=true">确认发货</div>
<!-- 暂时注释审核功能--> <!-- 暂时注释审核功能-->
<!-- <div class="df aic jcsa listtwo" v-if="data.sales_status == 0" @click="show9=true">去审核</div>--> <!-- <div class="df aic jcsa listtwo" v-if="data.sales_status == 0" @click="show9=true">去审核</div>-->
<!--订单状态order_status在[0待支付,1待发货,20待审核] && sales_status=0时才展示取消审核--> <!--订单状态order_status在[0待支付,1待发货,20待审核] && sales_status=0时才展示取消审核-->
<!-- <div class="df aic jcsa listtwo" v-if="data.sales_status != 0 && [0,1,20].includes(data.order_status)" @click="cancelAudit(data.order_id)">取消审核</div>--> <!-- <div class="df aic jcsa listtwo" v-if="data.sales_status != 0 && [0,1,20].includes(data.order_status)" @click="cancelAudit(data.order_id)">取消审核</div>-->
</view> </view>
<u-overlay :show="show9"> <u-overlay :show="show9">
<view class="head-one"> <view class="head-one">

2226
page_salesman_order/Goods_received/Goods_received_COPY原版备份.vue

File diff suppressed because it is too large

4704
page_salesman_order/Order_details/Order_details.vue

File diff suppressed because it is too large

1126
page_salesman_order/index/index.vue

File diff suppressed because it is too large

977
page_salesman_order/undgbm/undgbm.vue

@ -1,500 +1,501 @@
<template> <template>
<view class="box"> <view class="box">
<view class="list list-mt" v-for="(item,index) in zuanti?listsui:list" :key="index" <view class="list list-mt" v-for="(item,index) in zuanti?listsui:list" :key="index"
@click="btn(item.order_id,item.member_id)"> @click="btn(item.order_id,item.member_id)">
<view v-if="item.sales_money>0" class="list-Openonbehalf"> <view v-if="item.sales_money>0" class="list-Openonbehalf">
特批价|代开 特批价|代开
</view> </view>
<view v-if="item.is_first_order" class="list-Openonbehalftwo"> <view v-if="item.is_first_order" class="list-Openonbehalftwo">
首单 首单
</view> </view>
<view class="list-data df jcsb"> <view class="list-data df jcsb">
<div>订单编号:&emsp;{{item.order_no}}</div> <div>订单编号:&emsp;{{item.order_no}}</div>
{{item.order_status_name}} {{item.order_status_name}}
</view> </view>
<div class="list-Splitline"></div> <div class="list-Splitline"></div>
<div class="list-hospital">客户名称<span>{{item.nickname}}</span> <div class="list-hospital">客户名称<span>{{item.nickname}}</span>
<span v-if="item.order_type==1">普通订单</span> <span v-if="item.order_type==1">普通订单</span>
<span v-if="item.order_type==2">门店订单</span> <span v-if="item.order_type==2">门店订单</span>
<span v-if="item.order_type==3">本地配送订单</span> <span v-if="item.order_type==3">本地配送订单</span>
<span v-if="item.order_type==4">虚拟订单</span> <span v-if="item.order_type==4">虚拟订单</span>
<span v-if="item.order_type==5">代客下单</span> <span v-if="item.order_type==5">代客下单</span>
</div> </div>
<view class="list-time"> <view class="list-time">
下单时间<span>{{item.create_time | time}}</span><span>{{item.time}}</span> 下单时间<span>{{item.create_time | time}}</span><span>{{item.time}}</span>
</view> </view>
<view class="list-time"> <view class="list-time">
支付状态<span>{{item.pay_status_name}}</span> 支付状态<span>{{item.pay_status_name}}</span>
<span v-if="item.pay.pay_money > 0">剩余未支付金额{{item.pay.pay_money}}</span> <span v-if="item.pay.pay_money > 0">剩余未支付金额{{item.pay.pay_money}}</span>
</view>
<view class="list-money">
合计{{item.goods_num}}件商品
<span v-if="item.sales_money>0">订单金额{{item.sales_money}}</span>
<span v-else>订单金额{{item.order_money}}</span>
<span v-if="item.wait_status==1">(待收款)</span>
<span v-if="item.wait_status==2">(已收款)</span>
</view> </view>
<view class="list-money"> <view class="list-btn df jcf">
合计{{item.goods_num}}件商品 <div class="df aic jcsa listone" v-if="item.sales_balance==1 "
<span v-if="item.sales_money>0">订单金额{{item.sales_money}}</span> @click.stop="increased(item,item.order_id,item.member_id,item.sales_balance,item.sales_status)">新增收款
<span v-else>订单金额{{item.order_money}}</span> </div>
<span v-if="item.wait_status==1">(待收款)</span>
<span v-if="item.wait_status==2">(已收款)</span> <div class="df aic jcsa listtwo" v-if="item.sales_balance==1 "
</view> @click.stop="affirm(item.order_id,item.member_id,item.sales_balance,item.sales_status)">确认收款</div>
<view class="list-btn df jcf"> <div class="df aic jcsa listsui" @click.stop="more(item)">再次订购</div>
<div class="df aic jcsa listone" v-if="item.sales_balance==1 " </view>
@click.stop="increased(item,item.order_id,item.member_id,item.sales_balance,item.sales_status)">新增收款 </view>
</div>
</view>
<div class="df aic jcsa listtwo" v-if="item.sales_balance==1 "
@click.stop="affirm(item.order_id,item.member_id,item.sales_balance,item.sales_status)">确认收款</div>
<div class="df aic jcsa listsui" @click.stop="more(item)">再次订购</div>
</view>
</view>
</view>
</template> </template>
<script> <script>
const timesfm = require('@/common/js/map/message.js') const timesfm = require('@/common/js/map/message.js')
import eventBus from '@/common/js/bus.js' import eventBus from '@/common/js/bus.js'
export default { export default {
data() { data() {
return { return {
show1: false, show1: false,
indexa: 0, indexa: 0,
columns: [ columns: [
['中国', '美国', '日本'] ['中国', '美国', '日本']
], ],
value: '', value: '',
listsui: [], listsui: [],
show: false, show: false,
page: 1, page: 1,
list: [],// list: [],//
// url:'/page_salesman_order/index/index?index=${index=0}', // url:'/page_salesman_order/index/index?index=${index=0}',
dataList: [], dataList: [],
zuanti: false zuanti: false
}; };
}, },
created() { created() {
this.getwrongtllist() this.getwrongtllist()
console.log(this.zuanti); console.log(this.zuanti);
}, },
methods: { methods: {
// queryList(pageNo, pageSize) { // queryList(pageNo, pageSize) {
// this.page += 10 // this.page += 10
// this.$api.sendRequest({ // this.$api.sendRequest({
// url: '/api/salasmanorder/lists', // url: '/api/salasmanorder/lists',
// data: { // data: {
// page_size: this.page // page_size: this.page
// }, // },
// success: res => { // success: res => {
// console.log(res, ''); // console.log(res, '');
// this.list = res.data.list // this.list = res.data.list
// } // }
// }) // })
// this.$refs.paging.reload(); // this.$refs.paging.reload();
// this.$refs.loadingCover.hide(); // this.$refs.loadingCover.hide();
// this.$refs.paging.complete(this.list); // this.$refs.paging.complete(this.list);
// }, // },
getwrong(order_status, member_id, is_today, sales_status, searchText, one, start_time, getwrong(order_status, member_id, is_today, sales_status, searchText, one, start_time,
end_time) { end_time) {
let obj = { let obj = {
order_status, order_status,
member_id, member_id,
is_today, is_today,
sales_status, sales_status,
searchText, searchText,
start_time, start_time,
end_time end_time
} }
if (searchText) { if (searchText) {
delete obj.sales_status delete obj.sales_status
} }
if (is_today) { if (is_today) {
delete obj.sales_status delete obj.sales_status
} }
if (!sales_status) { if (!sales_status) {
delete obj.sales_status delete obj.sales_status
} }
console.log(one, '开关123'); console.log(one, '开关123');
this.zuanti = one this.zuanti = one
this.$api.sendRequest({ this.$api.sendRequest({
url: '/api/salasmanorder/lists', url: '/api/salasmanorder/lists',
data: obj, data: obj,
success: res => { success: res => {
this.listsui = res.data.list this.listsui = res.data.list
} }
}) })
}, },
statusbtn(item) { statusbtn(item) {
// this.show=true // this.show=true
console.log('item', item); console.log('item', item);
}, },
getwrongtllist() { getwrongtllist() {
this.$api.sendRequest({ this.$api.sendRequest({
url: '/api/salasmanorder/lists', url: '/api/salasmanorder/lists',
data: {}, data: {},
success: res => { success: res => {
console.log(res, '全部'); console.log(res, '全部');
this.list = res.data.list this.list = res.data.list
} }
}) })
}, },
getwrongtllisttwo() { getwrongtllisttwo() {
this.$api.sendRequest({ this.$api.sendRequest({
url: '/api/salasmanorder/lists', url: '/api/salasmanorder/lists',
data: {}, data: {},
success: res => { success: res => {
console.log(res, '全部'); console.log(res, '全部');
this.list = res.data.list this.list = res.data.list
uni.stopPullDownRefresh() uni.stopPullDownRefresh()
} }
}) })
}, },
getwrongtllistsui() { getwrongtllistsui() {
this.page += 1 this.page += 1
this.$api.sendRequest({ this.$api.sendRequest({
url: '/api/salasmanorder/lists', url: '/api/salasmanorder/lists',
data: { data: {
page: this.page page: this.page
}, },
success: res => { success: res => {
this.list = [...this.list, ...res.data.list] this.list = [...this.list, ...res.data.list]
console.log(this.list, '全部'); console.log(this.list, '全部');
uni.stopPullDownRefresh() uni.stopPullDownRefresh()
} }
}) })
}, },
change(e) { change(e) {
console.log('change', e); console.log('change', e);
}, },
btn(order, member) { btn(order, member) {
// order id member id // order id member id
// console.log(this.url,'1'); // console.log(this.url,'1');
let _this = this let _this = this
setTimeout(() => { setTimeout(() => {
eventBus.$emit('urlone', 0) eventBus.$emit('urlone', 0)
}, 500) }, 500)
uni.navigateTo({ uni.navigateTo({
url: `../Order_details/Order_details?or=${order}&me=${member}` url: `../Order_details/Order_details?or=${order}&me=${member}`
}) })
}, },
click(index) { click(index) {
console.log(index.index, 'index'); console.log(index.index, 'index');
this.indexa = index.index this.indexa = index.index
}, },
increased(item, order, member, sales_balance, sales_status) { increased(item, order, member, sales_balance, sales_status) {
// event.stopPropagation(); // event.stopPropagation();
// console.log(item); // console.log(item);
let _this = this let _this = this
if (sales_balance == 0) { if (sales_balance == 0) {
this.$util.showToast({ this.$util.showToast({
title: '无收款记录' title: '无收款记录'
}); });
return return
} }
if (sales_status == 0) { if (sales_status == 0) {
this.$util.showToast({ this.$util.showToast({
title: '未审核' title: '未审核'
}); });
return return
} }
if (sales_status == 2) { if (sales_status == 2) {
this.$util.showToast({ this.$util.showToast({
title: '已驳回' title: '已驳回'
}); });
return return
} }
setTimeout(() => { setTimeout(() => {
uni.$emit('Collection', item) uni.$emit('Collection', item)
}, 500) }, 500)
uni.navigateTo({ uni.navigateTo({
url: `/page_salesman_order/Customer_payment/Customer_payment?id=${order}&di=${member}` url: `/page_salesman_order/Customer_payment/Customer_payment?id=${order}&di=${member}`
}) })
}, },
affirm(order_id, member_id, sales_balance, sales_status) { affirm(order_id, member_id, sales_balance, sales_status) {
let _this = this let _this = this
if (sales_balance == 0) { if (sales_balance == 0) {
this.$util.showToast({ this.$util.showToast({
title: '无收款记录' title: '无收款记录'
}); });
return return
} }
if (sales_status == 0) { if (sales_status == 0) {
this.$util.showToast({ this.$util.showToast({
title: '未审核' title: '未审核'
}); });
return return
} }
if (sales_status == 2) { if (sales_status == 2) {
this.$util.showToast({ this.$util.showToast({
title: '已驳回' title: '已驳回'
}); });
return return
} }
// event.stopPropagation(); // event.stopPropagation();
console.log(order_id, member_id); console.log(order_id, member_id);
this.$api.sendRequest({ this.$api.sendRequest({
url: '/api/salasmanorder/detail', url: '/api/salasmanorder/detail',
data: { data: {
order_id: order_id, order_id: order_id,
member_id: member_id member_id: member_id
}, },
success: res => { success: res => {
this.data = res.data this.data = res.data
console.log(res.data, '订单详情'); console.log(res.data, '订单详情');
// setTimeout(()=>{ // setTimeout(()=>{
// uni.$emit('CommodityList',res.data.order_goods) // uni.$emit('CommodityList',res.data.order_goods)
// },500) // },500)
// uni.navigateTo({ // uni.navigateTo({
// // url:this.list[this.current.URL] // // url:this.list[this.current.URL]
// url:`/page_salesman_index/Commodity_list/Commodity_list` // url:`/page_salesman_index/Commodity_list/Commodity_list`
// }) // })
uni.navigateTo({ uni.navigateTo({
// url:this.list[this.current.URL] // url:this.list[this.current.URL]
url: `../Collection_record/Collection_record?id=${res.data.member_id}&di=${res.data.order_id}` url: `../Collection_record/Collection_record?id=${res.data.member_id}&di=${res.data.order_id}`
}) })
} }
}) })
// this.$util.showToast({ // this.$util.showToast({
// title: '' // title: ''
// }); // });
}, },
more(item) { more(item) {
// event.stopPropagation(); // event.stopPropagation();
console.log(item); console.log(item);
// setTimeout(() => { // setTimeout(() => {
// uni.$emit('zaicidinggou', item.order_goods) // uni.$emit('zaicidinggou', item.order_goods)
// }, 500) // }, 500)
// uni.navigateTo({ // uni.navigateTo({
// url: `/page_salesman_index/affirm_order/affirm_order?id=${item.member_id}&shop=${item.store_id}` // url: `/page_salesman_index/affirm_order/affirm_order?id=${item.member_id}&shop=${item.store_id}`
// }) // })
setTimeout(() => { setTimeout(() => {
uni.$emit('zaicidinggou', { uni.$emit('zaicidinggou', {
one: item.order_goods, one: item.order_goods,
two: 1 two: 1
}) })
}, 500) }, 500)
uni.navigateTo({ uni.navigateTo({
url: `/page_salesman_index/Select_item/Select_item?st=${item.member_id}&di=${item.store_id}` url: `/page_salesman_index/Select_item/Select_item?st=${item.member_id}&di=${item.store_id}`
}) })
} }
}, },
filters: { filters: {
time(num) { time(num) {
return timesfm(num * 1000) return timesfm(num * 1000)
} }
}, },
} }
</script> </script>
<style lang="scss"> <style lang="scss">
.box { .box {
margin-top: -28rpx; margin-top: -28rpx;
} }
.box .list:nth-child(1) { .box .list:nth-child(1) {
margin: 34rpx 24rpx 0 24rpx !important; margin: 34rpx 24rpx 0 24rpx !important;
// margin: 0 !important; // margin: 0 !important;
} }
.list { .list {
margin: 42rpx 24rpx 0 24rpx; margin: 42rpx 24rpx 0 24rpx;
width: 702rpx; width: 702rpx;
//height: 424rpx; height: 480rpx;
background: #FFFFFF; background: #FFFFFF;
border-radius: 24rpx; border-radius: 24rpx;
// padding: 32rpx; // padding: 32rpx;
box-sizing: border-box; box-sizing: border-box;
padding: 24rpx; padding: 24rpx;
position: relative; position: relative;
.list-Openonbehalf { .list-Openonbehalf {
text-align: center; text-align: center;
background: #00C594; background: #00C594;
border-radius: 30rpx; border-radius: 30rpx;
position: absolute; position: absolute;
top: -10rpx; top: -10rpx;
left: 0; left: 0;
width: 142rpx; width: 142rpx;
height: 34rpx; height: 34rpx;
font-size: 24rpx; font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #FFFFFF; color: #FFFFFF;
line-height: 34rpx; line-height: 34rpx;
} }
.list-Openonbehalftwo { .list-Openonbehalftwo {
text-align: center; text-align: center;
background: #ff5500; background: #ff5500;
border-radius: 30rpx; border-radius: 30rpx;
position: absolute; position: absolute;
top: -10rpx; top: -10rpx;
left: 140rpx; left: 140rpx;
width: 100rpx; width: 100rpx;
height: 34rpx; height: 34rpx;
font-size: 24rpx; font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #FFFFFF; color: #FFFFFF;
line-height: 34rpx; line-height: 34rpx;
} }
.list-data {} .list-data {}
.list-data div:nth-child(1) { .list-data div:nth-child(1) {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #222222; color: #222222;
line-height: 40rpx; line-height: 40rpx;
} }
.list-data div:nth-child(2) { .list-data div:nth-child(2) {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
line-height: 40rpx; line-height: 40rpx;
} }
.list-Splitline { .list-Splitline {
width: 638rpx; width: 638rpx;
height: 2rpx; height: 2rpx;
background: #F2F2F2; background: #F2F2F2;
border-radius: 16rpx; border-radius: 16rpx;
margin-top: 28rpx; margin-top: 28rpx;
} }
.list-hospital { .list-hospital {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #999999; color: #999999;
line-height: 40rpx; line-height: 40rpx;
margin-top: 30rpx; margin-top: 30rpx;
} }
.list-hospital span:nth-child(1) { .list-hospital span:nth-child(1) {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #222222; color: #222222;
line-height: 40rpx; line-height: 40rpx;
margin-left: 42rpx; margin-left: 42rpx;
margin-right: 16rpx; margin-right: 16rpx;
} }
.list-hospital span:nth-child(2) { .list-hospital span:nth-child(2) {
width: 92rpx; width: 92rpx;
height: 36rpx; height: 36rpx;
font-size: 20rpx; font-size: 20rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #FF7D02; color: #FF7D02;
line-height: 28rpx; line-height: 28rpx;
background-color: rgb(255, 240, 226); background-color: rgb(255, 240, 226);
} }
.list-time { .list-time {
margin-top: 24rpx; margin-top: 24rpx;
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #999999; color: #999999;
line-height: 40rpx; line-height: 40rpx;
} }
.list-time span:nth-child(1) { .list-time span:nth-child(1) {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #222222; color: #222222;
line-height: 40rpx; line-height: 40rpx;
margin-right: 10rpx; margin-right: 10rpx;
margin-left: 42rpx; margin-left: 42rpx;
} }
.list-time span:nth-child(2) { .list-time span:nth-child(2) {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #222222; color: #222222;
line-height: 40rpx; line-height: 40rpx;
} }
.list-money { .list-money {
margin-top: 24rpx; margin-top: 24rpx;
font-size: 24rpx; font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #999999; color: #999999;
line-height: 34rpx; line-height: 34rpx;
} }
.list-money span:nth-child(1) { .list-money span:nth-child(1) {
color: rgb(58, 58, 58); color: rgb(58, 58, 58);
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-size: 28rpx; font-size: 28rpx;
} }
.list-money span:nth-child(2) { .list-money span:nth-child(2) {
color: rgb(58, 58, 58); color: rgb(58, 58, 58);
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-size: 28rpx; font-size: 28rpx;
} }
.list-btn { .list-btn {
margin-top: 32rpx; margin-top: 32rpx;
// height: 500rpx !important;
.listone {
width: 176rpx; .listone {
height: 60rpx; width: 176rpx;
border-radius: 30rpx; height: 60rpx;
border: 2rpx solid #E8E8E8; border-radius: 30rpx;
margin-left: 94rpx; border: 2rpx solid #E8E8E8;
font-size: 24rpx; margin-left: 94rpx;
font-family: PingFangSC-Regular, PingFang SC; font-size: 24rpx;
font-weight: 400; font-family: PingFangSC-Regular, PingFang SC;
color: #333333; font-weight: 400;
line-height: 34rpx; color: #333333;
} line-height: 34rpx;
}
.listtwo {
width: 176rpx; .listtwo {
height: 60rpx; width: 176rpx;
border-radius: 30rpx; height: 60rpx;
border: 2rpx solid #E8E8E8; border-radius: 30rpx;
margin-left: 24rpx; border: 2rpx solid #E8E8E8;
font-size: 24rpx; margin-left: 24rpx;
font-family: PingFangSC-Regular, PingFang SC; font-size: 24rpx;
font-weight: 400; font-family: PingFangSC-Regular, PingFang SC;
color: #333333; font-weight: 400;
line-height: 34rpx; color: #333333;
} line-height: 34rpx;
}
.listsui {
width: 176rpx; .listsui {
height: 60rpx; width: 176rpx;
background: #21BBF3; height: 60rpx;
border-radius: 30rpx; background: #21BBF3;
margin-left: 24rpx; border-radius: 30rpx;
margin-left: 24rpx;
font-size: 24rpx;
font-family: PingFangSC-Medium, PingFang SC; font-size: 24rpx;
font-weight: 500; font-family: PingFangSC-Medium, PingFang SC;
color: #FFFFFF; font-weight: 500;
line-height: 34rpx; color: #FFFFFF;
} line-height: 34rpx;
} }
}
}
}
.list-mt {
// margin-top: 28rpx; .list-mt {
} // margin-top: 28rpx;
}
</style> </style>

4256
pages.json

File diff suppressed because it is too large

22
pages/index/index.vue

@ -1,6 +1,7 @@
<template> <template>
<page-meta :page-style="themeColor"></page-meta> <page-meta :page-style="themeColor"></page-meta>
<view :style="{ backgroundColor: bgColor, minHeight: 'calc(100vh )' }" class="page-img"> <view :style="{ backgroundColor: bgColor, minHeight: 'calc(100vh )' }" class="page-img">
<!-- 自定义组件 --> <!-- 自定义组件 -->
@ -91,6 +92,9 @@
import diyJs from '@/common/js/diy.js'; import diyJs from '@/common/js/diy.js';
import indexJs from './public/js/index.js'; import indexJs from './public/js/index.js';
import APPUpdate from '@/config/appUpdate.js'; import APPUpdate from '@/config/appUpdate.js';
import {
getCurrentNo
} from '@/config/appUpdate.js'
export default { export default {
components: { components: {
uniPopup uniPopup
@ -108,7 +112,8 @@
}, },
site_tel: '', site_tel: '',
diyGlobalData: {}, diyGlobalData: {},
floatData: {} floatData: {},
}; };
}, },
onLoad() { onLoad() {
@ -123,15 +128,28 @@
// true false // true false
APPUpdate(true, true); APPUpdate(true, true);
// #endif // #endif
}, },
onHide() { onHide() {
uni.$emit('videoStop') uni.$emit('videoStop')
}, },
onShow() { onShow() {
// uni.$emit('videoStart') // uni.$emit('videoStart')
this.getSystem()
}, },
methods: { methods: {
getSystem() {
//#ifdef APP-PLUS
getCurrentNo(({
versionCode,
versionName
}) => {
console.log('========versionCode', versionName);
console.log('========versionCode', versionCode);
})
//#endif
},
goRouter(data) { goRouter(data) {
uni.navigateTo({ uni.navigateTo({
url: data.link.wap_url url: data.link.wap_url

10
pages/init.vue

@ -5,7 +5,7 @@
<image :src="item.adv_image" mode="aspectFill" class="cover" @click="goPage(item)"></image> <image :src="item.adv_image" mode="aspectFill" class="cover" @click="goPage(item)"></image>
</swiper-item> </swiper-item>
</swiper> </swiper>
<view class="init-skip" @click="handleJump">跳过{{ time }}s</view> <view class="init-skip" @click="handleJump" v-if="showgg">跳过{{ time }}s</view>
</div> </div>
</template> </template>
<script> <script>
@ -13,6 +13,7 @@
name: "init", name: "init",
data() { data() {
return { return {
showgg:false,
info: {}, info: {},
dataList: [], dataList: [],
current: 0, current: 0,
@ -22,7 +23,7 @@
}, },
onLoad(e) { onLoad(e) {
this.getComAdvertising() this.getComAdvertising()
this.handleJump() // this.handleJump()
this.timer = setInterval(() => { this.timer = setInterval(() => {
if (this.time > 0) { if (this.time > 0) {
this.time-- this.time--
@ -61,8 +62,9 @@
url: '/api/adv/appstartadvlist', url: '/api/adv/appstartadvlist',
data: {}, data: {},
success: res => { success: res => {
console.log(res, 'res') if (res.code==0&&res.data.data.length!=0) {
if (!res.code) { console.log('-------------广告',res.data.data)
this.showgg = true
this.dataList = res.data.data this.dataList = res.data.data
} else { } else {
this.handleJump() this.handleJump()

1628
pages/order/list.vue

File diff suppressed because it is too large

33
pages_tool/invoice/invoice.vue

@ -37,6 +37,9 @@
<view class="" v-if="orderItem.invoice_status==0&&orderItem.is_invoice==1"> <view class="" v-if="orderItem.invoice_status==0&&orderItem.is_invoice==1">
待审核 待审核
</view> </view>
<view class="apply-ticket" v-if="orderItem.is_invoice === 0" @click="handleApplyTicket(orderItem)">
申请开票
</view>
<view class="" v-else-if="orderItem.invoice_status==1&&orderItem.is_invoice==1"> <view class="" v-else-if="orderItem.invoice_status==1&&orderItem.is_invoice==1">
已开票 已开票
</view> </view>
@ -127,13 +130,18 @@
name: '待开票', name: '待开票',
} }
], ],
curTab: 1 curTab: 1,
applyTicketOrderId: 0 // id
} }
}, },
onShow() { onShow() {
if (this.$refs.mescroll) this.$refs.mescroll.refresh(); if (this.$refs.mescroll) this.$refs.mescroll.refresh();
}, },
methods: { methods: {
handleApplyTicket(item) {
this.applyTicketOrderId = item.order_id;
this.show = true;
},
handleChangeTab(id) { handleChangeTab(id) {
// tab // tab
if(this.curTab === id){ if(this.curTab === id){
@ -156,7 +164,8 @@
page_size: mescroll.size, page_size: mescroll.size,
order_status: "all", order_status: "all",
invoice_status: this.curTab, invoice_status: this.curTab,
invoice: 1 // invoice: 1
invoice: 3 //
}, },
success: res => { success: res => {
let newArr = []; let newArr = [];
@ -191,16 +200,17 @@
this.dataList[index].changer = !this.dataList[index].changer; this.dataList[index].changer = !this.dataList[index].changer;
}, },
confirmDoInvoice() { confirmDoInvoice() {
let arr = [] // let arr = []
this.dataList.forEach(item => { // this.dataList.forEach(item => {
if (item.changer) { // if (item.changer) {
arr.push(item.order_id) // arr.push(item.order_id)
} // }
}) // })
this.$api.sendRequest({ this.$api.sendRequest({
url: "/api/order/doInvoice", url: "/api/order/doInvoice",
data: { data: {
order_id: arr[0] // order_id: arr[0]
order_id: this.applyTicketOrderId
}, },
success: res => { success: res => {
this.$util.showToast({ this.$util.showToast({
@ -221,7 +231,7 @@
}) })
this.selectCurrentPage = !this.selectCurrentPage this.selectCurrentPage = !this.selectCurrentPage
}, },
invoiceShow() { invoiceShow(orderItem) {
let arr = [] let arr = []
this.dataList.forEach(item => { this.dataList.forEach(item => {
if (item.changer) { if (item.changer) {
@ -736,7 +746,8 @@
} }
} }
.topBtn { .topBtn,
.apply-ticket{
background-color: #21BBF3; background-color: #21BBF3;
color: #fff; color: #fff;
padding: 5rpx 20rpx; padding: 5rpx 20rpx;

482
pages_tool/order/refund_goods_select.vue

@ -1,250 +1,250 @@
<template> <template>
<page-meta :page-style="themeColor"></page-meta> <page-meta :page-style="themeColor"></page-meta>
<view class="goods-select"> <view class="goods-select">
<view class="top"> <view class="top">
<text class="color-base-text">{{refund_data.length}}</text>件商品 <text class="color-base-text">{{refund_data.length}}</text>件商品
</view> </view>
<view class="body"> <view class="body">
<view class="item" v-for="(item,index) in refund_data" :key="index"> <view class="item" v-for="(item,index) in refund_data" :key="index">
<view @click="single(index)" v-if="promotion_type != 'bundling'"> <view @click="single(index)" v-if="promotion_type != 'bundling'">
<text v-if="item.judge" class="iconfont icon-yuan_checked color-base-text"></text> <text v-if="item.judge" class="iconfont icon-yuan_checked color-base-text"></text>
<text v-else class="iconfont icon-yuan_checkbox"></text> <text v-else class="iconfont icon-yuan_checkbox"></text>
</view> </view>
<image :src="$util.img(item.sku_image)" @error="error(index)"></image> <image :src="$util.img(item.sku_image)" @error="error(index)"></image>
<view class="title"> <view class="title">
<text>{{item.sku_name}}</text> <text>{{item.sku_name}}</text>
</view> </view>
</view> </view>
</view> </view>
<view class="bottom-all"> <view class="bottom-all">
<view @click="all" v-if="promotion_type != 'bundling'"> <view @click="all" v-if="promotion_type != 'bundling'">
<text v-if=" judge" class="iconfont icon-yuan_checked color-base-text"></text> <text v-if=" judge" class="iconfont icon-yuan_checked color-base-text"></text>
<text v-else class="iconfont icon-yuan_checkbox"></text> <text v-else class="iconfont icon-yuan_checkbox"></text>
<text style="margin-left: 10rpx;">全选</text> <text style="margin-left: 10rpx;">全选</text>
</view> </view>
<view class="" v-else> <view class="" v-else>
</view> </view>
<view v-if="nexthover" class="next" @click="next">下一步</view> <view v-if="nexthover" class="next" @click="next">下一步</view>
<view v-else class="next nexthover">请选择商品</view> <view v-else class="next nexthover">请选择商品</view>
</view> </view>
<!-- <loading-cover ref="loadingCover"></loading-cover> --> <!-- <loading-cover ref="loadingCover"></loading-cover> -->
</view> </view>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
refund_type: 1, refund_type: 1,
refund_data: [], refund_data: [],
judge: false, judge: false,
order_goods_id: [], order_goods_id: [],
nexthover: true, nexthover: true,
promotion_type: "", promotion_type: "",
} }
}, },
onLoad(option) { onLoad(option) {
if (option.promotion_type) { if (option.promotion_type) {
this.promotion_type = option.promotion_type this.promotion_type = option.promotion_type
} }
if (option.refund_type) { if (option.refund_type) {
this.refund_type = option.refund_type; this.refund_type = option.refund_type;
this.getGoodsInfo() this.getGoodsInfo()
} else { } else {
uni.showToast({ uni.showToast({
title: '未查找到订单信息', title: '未查找到订单信息',
icon: 'none' icon: 'none'
}) })
setTimeout(() => { setTimeout(() => {
this.$util.redirectTo('/pages/order/list'); this.$util.redirectTo('/pages/order/list');
}, 1000) }, 1000)
} }
}, },
methods: { methods: {
/** /**
* 处理商品选中数据 * 处理商品选中数据
*/ */
getGoodsInfo() { getGoodsInfo() {
uni.getStorage({ uni.getStorage({
key: 'refund_goods_data', key: 'refund_goods_data',
success: res => { success: res => {
let refund_data = JSON.parse(res.data); let refund_data = JSON.parse(res.data);
this.refund_data = []; this.refund_data = [];
refund_data.forEach(item => { refund_data.forEach(item => {
if (item.refund_status == 0) { if (item.refund_status == 0) {
item.judge = false; item.judge = false;
this.refund_data.push(item); this.refund_data.push(item);
} }
}) })
}
})
},
/**
*单选事件
*/
single(key) {
this.refund_data[key].judge = !this.refund_data[key].judge;
let allJudge = true;
this.refund_data.forEach((item) => {
if (!item.judge) {
allJudge = false;
}
})
this.judge = allJudge;
this.getOrderIdInfo();
this.$forceUpdate()
},
/**
* 全选选择
*/
all() {
this.judge = !this.judge;
this.refund_data.map(item => {
item.judge = this.judge;
return item;
})
this.getOrderIdInfo();
this.$forceUpdate()
},
/**
* 获取选择的order_goods_id
*/
getOrderIdInfo() {
this.order_goods_id = [];
this.refund_data.forEach(item => {
if (item.judge) {
this.order_goods_id.push(item.order_goods_id)
}
})
if (this.order_goods_id.length == 0) {
this.nexthover = false;
} else {
this.nexthover = true;
}
this.$forceUpdate();
},
/**
* 跳转退款界面
*/
next() {
if (this.order_goods_id.length == 0) {
this.getOrderIdInfo();
}
if (this.refund_type == '4') {
//退=4
this.$util.redirectTo('/pages_tool/order/sales_return', {
order_goods_id: this.order_goods_id.join(),
refund_type: this.refund_type
});
}else{
this.$util.redirectTo('/pages_tool/order/refund_batch', {
order_goods_id: this.order_goods_id.join(),
refund_type: this.refund_type
});
} }
}, })
/** },
* 默认图片处理 /**
*/ *单选事件
error(index) { */
this.refund_data[index].sku_image = this.$util.getDefaultImage().goods single(key) {
this.$forceUpdate(); this.refund_data[key].judge = !this.refund_data[key].judge;
} let allJudge = true;
}
} this.refund_data.forEach((item) => {
if (!item.judge) {
allJudge = false;
}
})
this.judge = allJudge;
this.getOrderIdInfo();
this.$forceUpdate()
},
/**
* 全选选择
*/
all() {
this.judge = !this.judge;
this.refund_data.map(item => {
item.judge = this.judge;
return item;
})
this.getOrderIdInfo();
this.$forceUpdate()
},
/**
* 获取选择的order_goods_id
*/
getOrderIdInfo() {
this.order_goods_id = [];
this.refund_data.forEach(item => {
if (item.judge) {
this.order_goods_id.push(item.order_goods_id)
}
})
if (this.order_goods_id.length == 0) {
this.nexthover = false;
} else {
this.nexthover = true;
}
this.$forceUpdate();
},
/**
* 跳转退款界面
*/
next() {
if (this.order_goods_id.length == 0) {
this.getOrderIdInfo();
}
if (this.refund_type == '4') {
//退=4
this.$util.redirectTo('/pages_tool/order/sales_return', {
order_goods_id: this.order_goods_id.join(),
refund_type: this.refund_type
});
}else{
this.$util.redirectTo('/pages_tool/order/refund_batch', {
order_goods_id: this.order_goods_id.join(),
refund_type: this.refund_type
});
}
},
/**
* 默认图片处理
*/
error(index) {
this.refund_data[index].sku_image = this.$util.getDefaultImage().goods
this.$forceUpdate();
}
}
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.goods-select { .goods-select {
margin-top: 30rpx; margin-top: 30rpx;
.top { .top {
padding: 20rpx 30rpx; padding: 20rpx 30rpx;
box-sizing: border-box; box-sizing: border-box;
font-size: 28rpx; font-size: 28rpx;
background: #FFFFFF; background: #FFFFFF;
text { text {
font-size: 30rpx; font-size: 30rpx;
margin: 0 10rpx; margin: 0 10rpx;
font-weight: bold; font-weight: bold;
} }
} }
.iconfont { .iconfont {
font-size: 40rpx; font-size: 40rpx;
} }
.body { .body {
margin: 30rpx; margin: 30rpx;
border-radius: 10rpx; border-radius: 10rpx;
background: #FFFFFF; background: #FFFFFF;
padding: 30rpx 0 0; padding: 30rpx 0 0;
.item { .item {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
padding: 0 30rpx 30rpx; padding: 0 30rpx 30rpx;
image { image {
width: 180rpx; width: 180rpx;
height: 180rpx; height: 180rpx;
border-radius: 10rpx; border-radius: 10rpx;
} }
.title { .title {
width: 368rpx; width: 368rpx;
height: 180rpx; height: 180rpx;
font-size: 28rpx; font-size: 28rpx;
text { text {
text-overflow: -o-ellipsis-lastline; text-overflow: -o-ellipsis-lastline;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
display: -webkit-box; display: -webkit-box;
-webkit-line-clamp: 3; -webkit-line-clamp: 3;
line-clamp: 3; line-clamp: 3;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
} }
} }
} }
} }
.bottom-all { .bottom-all {
padding-left: 30rpx; padding-left: 30rpx;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
background: #FFFFFF; background: #FFFFFF;
position: fixed; position: fixed;
left: 0; left: 0;
bottom: 0; bottom: 0;
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
.next { .next {
padding: 16rpx 80rpx; padding: 16rpx 80rpx;
color: #FFFFFF; color: #FFFFFF;
background: #ff4544; background: #ff4544;
} }
.nexthover { .nexthover {
background: #e7dcdc !important; background: #e7dcdc !important;
} }
} }
} }
</style> </style>

214
pages_tool/order/refund_type_select.vue

@ -1,23 +1,23 @@
<template> <template>
<page-meta :page-style="themeColor"></page-meta> <page-meta :page-style="themeColor"></page-meta>
<view style="margin-top: 30rpx;"> <view style="margin-top: 30rpx;">
<view> <view>
<view class="refund-option"> <view class="refund-option">
<view class="option-item" @click="selectRefundType(1)"> <view class="option-item" @click="selectRefundType(1)">
<view> <view>
<text>退款无需退货</text> <text>退款无需退货</text>
<text class="font-size-goods-tag color-tip">没收到货或与卖家协商同意无需退货只退款</text> <text class="font-size-goods-tag color-tip">没收到货或与卖家协商同意无需退货只退款</text>
</view> </view>
<text class="iconfont icon-right"></text> <text class="iconfont icon-right"></text>
</view> </view>
<view class="option-item" @click="selectRefundType(2)" v-if="refund_data.order_status == 3"> <view class="option-item" @click="selectRefundType(2)" v-if="refund_data.order_status == 3">
<view> <view>
<text>退货退款</text> <text>退货退款</text>
<text class="font-size-goods-tag color-tip">已收到货需退还收到的货物</text> <text class="font-size-goods-tag color-tip">已收到货需退还收到的货物</text>
</view> </view>
<text class="iconfont icon-right"></text> <text class="iconfont icon-right"></text>
</view> </view>
<view class="option-item" @click="selectRefundType(4)"> <view class="option-item" @click="selectRefundType(4)">
<view> <view>
@ -27,108 +27,108 @@
<text class="iconfont icon-right"></text> <text class="iconfont icon-right"></text>
</view> </view>
</view> </view>
<loading-cover ref="loadingCover"></loading-cover> <loading-cover ref="loadingCover"></loading-cover>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
import uniPopup from '@/components/uni-popup/uni-popup.vue'; import uniPopup from '@/components/uni-popup/uni-popup.vue';
export default { export default {
components: { components: {
uniPopup uniPopup
}, },
data() { data() {
return { return {
order_id: '', order_id: '',
isIphoneX: false, isIphoneX: false,
refund_data: {}, refund_data: {},
}; };
}, },
onLoad(option) { onLoad(option) {
if (option.order_id) this.order_id = option.order_id; if (option.order_id) this.order_id = option.order_id;
}, },
onShow() { onShow() {
this.isIphoneX = this.$util.uniappIsIPhoneX(); this.isIphoneX = this.$util.uniappIsIPhoneX();
if (uni.getStorageSync('token')) { if (uni.getStorageSync('token')) {
this.getRefundData(); this.getRefundData();
} else { } else {
this.$util.redirectTo('/pages_tool/login/login', { this.$util.redirectTo('/pages_tool/login/login', {
back: '/pages_tool/order/refund?order_goods_id=' + this back: '/pages_tool/order/refund?order_goods_id=' + this
.order_goods_id .order_goods_id
}); });
} }
}, },
methods: { methods: {
/** /**
* 选择退款方式 * 选择退款方式
* @param {Object} type * @param {Object} type
*/ */
selectRefundType(type) { selectRefundType(type) {
this.$util.redirectTo('/pages_tool/order/refund_goods_select', { this.$util.redirectTo('/pages_tool/order/refund_goods_select', {
refund_type: type, refund_type: type,
promotion_type: this.refund_data.promotion_type, promotion_type: this.refund_data.promotion_type,
}); });
}, },
/** /**
* 获取退款订单数据 * 获取退款订单数据
*/ */
getRefundData() { getRefundData() {
this.$api.sendRequest({ this.$api.sendRequest({
url: '/api/order/detail', url: '/api/order/detail',
data: { data: {
order_id: this.order_id order_id: this.order_id
}, },
success: res => { success: res => {
if (res.code >= 0) { if (res.code >= 0) {
this.refund_data = res.data; this.refund_data = res.data;
uni.setStorage({ uni.setStorage({
key: 'refund_goods_data', key: 'refund_goods_data',
data: JSON.stringify(res.data.order_goods), data: JSON.stringify(res.data.order_goods),
success: res => {} success: res => {}
}) })
if (this.$refs.loadingCover) this.$refs.loadingCover.hide(); if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
} else { } else {
this.$util.showToast({ title: '未获取到该订单项退款信息' }); this.$util.showToast({ title: '未获取到该订单项退款信息' });
setTimeout(() => { setTimeout(() => {
this.$util.redirectTo('/pages/order/list'); this.$util.redirectTo('/pages/order/list');
}, 1000); }, 1000);
} }
}, },
fail: res => { fail: res => {
if (this.$refs.loadingCover) this.$refs.loadingCover.hide(); if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
} }
}); });
}, },
} }
}; };
</script> </script>
<style lang="scss"> <style lang="scss">
@import './public/css/refund.scss'; @import './public/css/refund.scss';
</style> </style>
<style scoped> <style scoped>
/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box { /deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
background: none; background: none;
max-height: unset !important; max-height: unset !important;
overflow-y: hidden !important; overflow-y: hidden !important;
} }
/deep/ .uni-popup__wrapper { /deep/ .uni-popup__wrapper {
border-radius: 20rpx 20rpx 0 0; border-radius: 20rpx 20rpx 0 0;
} }
/deep/ .uni-popup { /deep/ .uni-popup {
z-index: 8; z-index: 8;
} }
.sub-btn { .sub-btn {
padding-top: 20rpx; padding-top: 20rpx;
background-color: #FFFFFF; background-color: #FFFFFF;
} }
</style> </style>

2
pages_tool/order/sales_return.vue

@ -1,5 +1,5 @@
<template> <template>
<!--仅退货申请--> <!--仅退货申请-->
<page-meta :page-style="themeColor"></page-meta> <page-meta :page-style="themeColor"></page-meta>
<view > <view >
<view> <view>

Loading…
Cancel
Save