Browse Source

新增token无感刷新

myd
qb 1 year ago
parent
commit
ce54831b94
  1. 12
      api/user.js
  2. 2
      compoment/BasicContainer/BasicContainer.vue
  3. 4
      config/host.js
  4. 43
      interfaces/pagesHome/SelfPickupDetails.ts
  5. 240
      pages/index/index.vue
  6. 1
      pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue
  7. 9
      pagesHome/pages/CustomerSign/CustomerSign.vue
  8. 1
      pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan.vue
  9. 5
      pagesHome/pages/DownGoods/DownGoods.vue
  10. 210
      pagesHome/pages/LoadingDetails/LoadingDetails.vue
  11. 3
      pagesHome/pages/LoadingScan/LoadingScan.vue
  12. 1
      pagesHome/pages/MergeTrayDetails/MergeTrayDetails.vue
  13. 7
      pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue
  14. 1
      pagesHome/pages/OrderSortingDetailList/OrderSortingDetailList.vue
  15. 3
      pagesHome/pages/PeopleScanUp/PeopleScanUp.vue
  16. 2
      pagesHome/pages/PeopleSortingDetail/PeopleSortingDetail.vue
  17. 1
      pagesHome/pages/PickingScanList/PickingScanList.vue
  18. 9
      pagesHome/pages/SelfPScanList/SelfPScanList.vue
  19. 20
      pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue
  20. 1
      pagesHome/pages/SelfPickupScan/SelfPickupScan.vue
  21. 1
      pagesHome/pages/SetPrice/SetPrice.vue
  22. 175
      pagesHome/pages/SignDetailScan/SignDetailScan.vue
  23. 1
      pagesHome/pages/StockUpListZero/StockUpListZero.vue
  24. 39
      pagesHome/pages/StockUplist/StockUplist.vue
  25. 1
      pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue
  26. 1
      pagesHome/pages/createAddServe/createAddServe.vue
  27. 210
      pagesHome/pages/inventoryDetail/inventoryDetail.vue
  28. 3
      pagesHome/pages/inventoryenter/inventoryenter.vue
  29. 2
      pagesHome/pages/lnventorysortinglist/lnventorysortinglist.vue
  30. 3
      pagesHome/pages/loadingRetention/loadingRetention.vue
  31. 1
      pagesHome/pages/orderDetails/orderDetails.vue
  32. 1
      pagesHome/pages/orderInquiry/orderInquiry.vue
  33. 3
      pagesHome/pages/pickingScan/pickingScan.vue
  34. 10
      pagesHome/pages/scansorting/scansorting.vue
  35. 2
      pagesHome/pages/setbarcode/setbarcode.vue
  36. 7
      pagesHome/pages/signOrderScan/signOrderScan.vue
  37. 1
      pagesHome/pages/signinScan/signinScan.vue
  38. 1
      pagesTask/pages/contracts/contracts.vue
  39. 44
      pagesTask/pages/dynamicCheck/dynamicCheck.vue
  40. 5
      pagesTask/pages/trayCheckDetails/trayCheckDetails.vue
  41. 12
      store/index.js
  42. 1921
      unpackage/dist/dev/app-plus/app-service.js
  43. 4
      unpackage/dist/dev/app-plus/manifest.json
  44. 283
      utils/request.js
  45. 178
      utils/requestA.js

12
api/user.js

@ -302,6 +302,18 @@ export function signforpage(data) {
data data
}); });
} }
/**
* 签收数据
* @param {Object} data
*/
export function signforSignNum(data) {
return request({
url: `logpm-distribution/app/signfor/signNum`,
method: "get",
data
});
}
/** /**
* 客户列表 * 客户列表
* @param {Object} data * @param {Object} data

2
compoment/BasicContainer/BasicContainer.vue

@ -58,7 +58,7 @@
// //
onLoad(() => { onLoad(() => {
// //
uni.startPullDownRefresh() // uni.startPullDownRefresh()
}) })
// //

4
config/host.js

@ -12,9 +12,9 @@
// tjj // tjj
// const devhost = 'http://192.168.10.29:13000/' // const devhost = 'http://192.168.10.29:13000/'
// cyz // cyz
// const devhost = 'http://192.168.10.75:8777/' const devhost = 'http://192.168.10.75:8777/'
// 正式 // 正式
const devhost = 'http://h5uapi.huitongys.com/' // const devhost = 'http://h5uapi.huitongys.com/'
// cg // cg
// const devhost='http://192.168.10.200:8888/' // const devhost='http://192.168.10.200:8888/'
/** /**

43
interfaces/pagesHome/SelfPickupDetails.ts

@ -1,53 +1,56 @@
export interface pagedetailType{ export interface pagedetailType {
/** /**
* */ * */
schanvalue:string; schanvalue : string;
/** /**
* */ * */
typearr:{ typearr : {
value:number; value : number;
label:string; label : string;
}[]; }[];
/** /**
* */ * */
orderStatus:number; orderStatus : number;
orderType:number; orderType : number;
/** /**
* */ * */
// orderSelfNumbering:string; // orderSelfNumbering:string;
/** /**
* */ * */
dataList:any; dataList : any;
/**id /**id
* */ * */
billLadingId:string|number; billLadingId : string | number;
orderCode?:string|number; orderCode ?: string | number;
/** /**
* */ * */
carTypeStr:string; carTypeStr : string;
/** /**
* */ * */
pickUpPlate:string; pickUpPlate : string;
/** /**
* */ * */
consignee:string; consignee : string;
/** /**
* */ * */
orderNum:number|string; orderNum : number | string;
/** /**
* */ * */
planNum:number|string; planNum : number | string;
/** /**
* */ * */
completeNum:number|string; completeNum : number | string;
/** /**
* */ * */
signedNum:number|string; signedNum : number | string;
/** /**
* */ * */
scancode:string; scancode : string;
/** /**
* */ * */
isscan:boolean; isscan : boolean;
orderList : any;
zeroList : any;
stockList : any;
} }

240
pages/index/index.vue

@ -42,126 +42,126 @@
import { inject, reactive, toRefs, watchEffect, ref } from "vue"; import { inject, reactive, toRefs, watchEffect, ref } from "vue";
import utils from '../../utils/utils'; import utils from '../../utils/utils';
const tip = ref(null) const tip = ref(null)
let details = reactive<listtype>({ tablist: [] }); // let details = reactive<listtype>({ tablist: [] });
// let details = reactive<listtype>({ let details = reactive<listtype>({
// tablist: [ tablist: [
// { {
// type: 1, type: 1,
// name: '', name: '工作台',
// minilist: [ minilist: [
// { {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '', name: '订单查询',
// router: '/pagesHome/pages/orderInquiry/orderInquiry', router: '/pagesHome/pages/orderInquiry/orderInquiry',
// }, },
// ] ]
// }, },
// { {
// type: 1, type: 1,
// name: '', name: '库内',
// minilist: [ minilist: [
// { {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '', name: '分拣打托',
// router: '/pagesHome/pages/scansorting/scansorting', router: '/pagesHome/pages/scansorting/scansorting',
// }, },
// // { // {
// // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// // name: '', // name: '',
// // router: '/pagesHome/pages/ordersorting/ordersorting', // router: '/pagesHome/pages/ordersorting/ordersorting',
// // }, // },
// // { // {
// // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// // name: '', // name: '',
// // router: '/pagesHome/pages/lnventorysorting/lnventorysorting', // router: '/pagesHome/pages/lnventorysorting/lnventorysorting',
// // }, // },
// { {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '', name: '扫码上架',
// router: '/pagesHome/pages/ScanUpType/ScanUpType', router: '/pagesHome/pages/ScanUpType/ScanUpType',
// }, },
// { {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '', name: '手动上架',
// router: '/pagesHome/pages/PeopleScanUpType/PeopleScanUpType', router: '/pagesHome/pages/PeopleScanUpType/PeopleScanUpType',
// }, },
// { {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '', name: '移库',
// router: '/pagesHome/pages/RelocationType/RelocationType', router: '/pagesHome/pages/RelocationType/RelocationType',
// }, },
// { {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '', name: '滞留',
// router: '/pagesHome/pages/Retention/Retention', router: '/pagesHome/pages/Retention/Retention',
// }, },
// { {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '', name: '合托',
// router: '/pagesHome/pages/MergeTray/MergeTray', router: '/pagesHome/pages/MergeTray/MergeTray',
// }, },
// { {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '', name: '下架',
// router: '/pagesHome/pages/DownGoodsType/DownGoodsType', router: '/pagesHome/pages/DownGoodsType/DownGoodsType',
// }, },
// { {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '', name: '空置托盘',
// router: '/pagesHome/pages/RemoveTray/RemoveTray', router: '/pagesHome/pages/RemoveTray/RemoveTray',
// }, },
// { {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '', name: '复核',
// router: '/pagesHome/pages/Check/Check', router: '/pagesHome/pages/Check/Check',
// }, },
// ] ]
// }, },
// { {
// type: 1, type: 1,
// name: '', name: '出库',
// minilist: [ minilist: [
// { {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '', name: '拣货扫描',
// router: '/pagesHome/pages/pickingScan/pickingScan', router: '/pagesHome/pages/pickingScan/pickingScan',
// }, },
// { {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '', name: '自提扫描',
// router: '/pagesHome/pages/SelfPickupScan/SelfPickupScan', router: '/pagesHome/pages/SelfPickupScan/SelfPickupScan',
// }, },
// ] ]
// }, },
// { {
// type: 1, type: 1,
// name: '', name: '配送',
// minilist: [ minilist: [
// { {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '', name: '装车扫描',
// router: '/pagesHome/pages/LoadingScan/LoadingScan', router: '/pagesHome/pages/LoadingScan/LoadingScan',
// }, },
// { {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '', name: '签收扫描',
// router: '/pagesHome/pages/signinScan/signinScan', router: '/pagesHome/pages/signinScan/signinScan',
// }, },
// ] ]
// }, },
// { {
// type: 1, type: 1,
// name: '线', name: '离线上传',
// minilist: [ minilist: [
// { {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png', icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '线', name: '离线上传',
// router: '/pagesHome/pages/OfflineUpload/OfflineUpload', router: '/pagesHome/pages/OfflineUpload/OfflineUpload',
// }, },
// ] ]
// }, },
// ] ]
// }) })
function gopathpage(path : string) { function gopathpage(path : string) {
uni.navigateTo({ uni.navigateTo({

1
pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue

@ -256,6 +256,7 @@
// //
let response = null let response = null
response = await deliveryorder(data) response = await deliveryorder(data)
if (response.code !== 200) return
details.zero.data = [] details.zero.data = []
details.order.data = [] details.order.data = []
if (response.data) { if (response.data) {

9
pagesHome/pages/CustomerSign/CustomerSign.vue

@ -93,7 +93,8 @@
signforUpdatePicture, signforUpdatePicture,
signforpositioning, signforpositioning,
signforoneclick, signforoneclick,
dictbizdictionary dictbizdictionary,
signforSignNum
} from '@/api/user.js' } from '@/api/user.js'
import { import {
onLoad, onLoad,
@ -206,6 +207,7 @@
id: details.id id: details.id
} }
let response = await signforcustom(data) let response = await signforcustom(data)
if (response.code !== 200) return
const _arr = response.data.records const _arr = response.data.records
// //
const _fastArr = [] const _fastArr = []
@ -230,6 +232,7 @@
let data = { let data = {
reservationId: item.id, reservationId: item.id,
} }
//
let res = await signforprices(data) let res = await signforprices(data)
console.log('res>>>>>', res) console.log('res>>>>>', res)
let imglis = [], rearks = '' let imglis = [], rearks = ''
@ -253,6 +256,10 @@
} }
} }
//
const response = await signforSignNum({ ...data, id: details.id, })
console.log('response :>> ', response);
console.log('tiplists :>> ', tiplists.value); console.log('tiplists :>> ', tiplists.value);
tiplists.value.setdetails({ tiplists.value.setdetails({

1
pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan.vue

@ -216,6 +216,7 @@
id: details.id id: details.id
} }
let response = await deliverycustom(data) let response = await deliverycustom(data)
if (response.code !== 200) return
console.log('response', response) console.log('response', response)
details.datalist = response.data.records details.datalist = response.data.records
} }

5
pagesHome/pages/DownGoods/DownGoods.vue

@ -324,8 +324,8 @@
} }
}) })
onShow(async () => { onShow(() => {
await initmarke() initmarke()
// app // app
// #ifdef APP // #ifdef APP
uni.$on('scancodedate', function (code) { uni.$on('scancodedate', function (code) {
@ -370,6 +370,7 @@
warehouseCode: 'LQ' warehouseCode: 'LQ'
} }
let res = await warehouseTrayTypefindAllMarket(data) let res = await warehouseTrayTypefindAllMarket(data)
if (res.code !== 200) return
console.log(res.data); console.log(res.data);
details.Marketlist = res.data details.Marketlist = res.data
} }

210
pagesHome/pages/LoadingDetails/LoadingDetails.vue

@ -1,9 +1,7 @@
<template> <template>
<!-- <u-navbar title="配车明细列表" placeholder border=true :autoBack="true" leftIconSize='35'></u-navbar> --> <!-- <u-navbar title="配车明细列表" placeholder border=true :autoBack="true" leftIconSize='35'></u-navbar> -->
<u-navbar title="配车明细列表" <u-navbar title="配车明细列表" bgColor='#D3832A' leftIconColor='#ffffff' titleStyle='color:#ffffff' placeholder
bgColor='#D3832A' leftIconColor='#ffffff' :autoBack="true" leftIconSize='35'></u-navbar>
titleStyle='color:#ffffff' placeholder
:autoBack="true" leftIconSize='35'></u-navbar>
<view class="headtop"> <view class="headtop">
<view> <view>
<view>配车类型{{items?.vehicleStatus_name}}</view> <view>配车类型{{items?.vehicleStatus_name}}</view>
@ -15,7 +13,7 @@
</view> </view>
<view class="tabmabx"> <view class="tabmabx">
<view> <view>
<uni-table :loading='false' emptyText="暂无更多数据" > <uni-table :loading='false' emptyText="暂无更多数据">
<uni-tr> <uni-tr>
<uni-th width="50" align="center"></uni-th> <uni-th width="50" align="center"></uni-th>
<uni-th width="70" align="center">配送客户数</uni-th> <uni-th width="70" align="center">配送客户数</uni-th>
@ -34,10 +32,11 @@
<view class="scinp"> <view class="scinp">
<view>扫描状态</view> <view>扫描状态</view>
<view> <view>
<cusSelects @change='checktype' :data='typearr' :value="schanvalue" placeholder='全部' :arrLeft='5' size='145' :clearable='true'></cusSelects> <cusSelects @change='checktype' :data='typearr' :value="schanvalue" placeholder='全部' :arrLeft='5' size='145'
:clearable='true'></cusSelects>
</view> </view>
<view class="inputs"> <view class="inputs">
<input placeholder="请输入查询的订单号" v-model="orderCode"/> <input placeholder="请输入查询的订单号" v-model="orderCode" />
</view> </view>
<view @click="initpage" class="btscan">查询</view> <view @click="initpage" class="btscan">查询</view>
</view> </view>
@ -57,7 +56,9 @@
<view>包条码{{item.orderPackageCode}}</view> <view>包条码{{item.orderPackageCode}}</view>
</view> </view>
<view> <view>
<view>是否扫描{{item.scanStatus==1?'未扫描':item.scanStatus==''?'未扫描':item.scanStatus==4?'未扫描':(!item.scanStatus)?'未扫描':'扫描'}}</view> <view>
是否扫描{{item.scanStatus==1?'未扫描':item.scanStatus==''?'未扫描':item.scanStatus==4?'未扫描':(!item.scanStatus)?'未扫描':'扫描'}}
</view>
<!-- <view>异常{{item.StockNot}}</view> --> <!-- <view>异常{{item.StockNot}}</view> -->
</view> </view>
</view> </view>
@ -72,13 +73,15 @@
</view> </view>
<view> <view>
<view>单位{{item.logpmUnit}}</view> <view>单位{{item.logpmUnit}}</view>
<view>扫描{{item.scanStatus==1?'未扫描':item.scanStatus==''?'未扫描':item.scanStatus==4?'未扫描':(!item.scanStatus)?'未扫描':'扫描'}}</view> <view>
扫描{{item.scanStatus==1?'未扫描':item.scanStatus==''?'未扫描':item.scanStatus==4?'未扫描':(!item.scanStatus)?'未扫描':'扫描'}}
</view>
<!-- <view>规格{{item.specification}}</view> --> <!-- <view>规格{{item.specification}}</view> -->
</view> </view>
</view> </view>
</view> </view>
</scroll-view> </scroll-view>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
@ -94,92 +97,94 @@
} from '@dcloudio/uni-app' } from '@dcloudio/uni-app'
import cusSelects from '@/compoment/cus-selects-fan/cus-selects-fan.vue' import cusSelects from '@/compoment/cus-selects-fan/cus-selects-fan.vue'
import { reactive, toRefs } from "vue"; import { reactive, toRefs } from "vue";
let details=reactive({ let details = reactive({
schanvalue:'', schanvalue: '',
typearr:[ typearr: [
{ {
value:2, value: 2,
label:'已扫' label: '已扫'
}, },
{ {
value:1, value: 1,
label:'未扫' label: '未扫'
}, },
], ],
dataList:[], dataList: [],
id:'', id: '',
items:null as any, items: null as any,
current:1, current: 1,
size:10, size: 10,
orderStatus:1, orderStatus: 1,
scanStatus:'' as string|number, scanStatus: '' as string | number,
orderCode:'' orderCode: ''
}) })
onLoad((op)=>{ onLoad((op) => {
details.items=JSON.parse(op.item) details.items = JSON.parse(op.item)
details.id=JSON.parse(op.item).id details.id = JSON.parse(op.item).id
}) })
onShow(()=>{ onShow(() => {
init() init()
}) })
function init(){ function init() {
details.current=1 details.current = 1
initpage() initpage()
} }
async function initpage(){ async function initpage() {
details.dataList=[] details.dataList = []
let data={ let data = {
current:details.current, current: details.current,
size:details.size, size: details.size,
id:details.id, id: details.id,
scanStatus:details.scanStatus, scanStatus: details.scanStatus,
orderCode:details.orderCode orderCode: details.orderCode
} }
let response=null let response = null
if(details.orderStatus==1){ if (details.orderStatus == 1) {
response=await deliverywrap(data) response = await deliverywrap(data)
}else if(details.orderStatus==2){ } else if (details.orderStatus == 2) {
response=await deliverywrapIn(data) response = await deliverywrapIn(data)
} }
details.dataList=response.data.records if (response.code !== 200) return
details.dataList = response.data.records
} }
function goorderdetail(item){ function goorderdetail(item) {
uni.navigateTo({ uni.navigateTo({
url:'/pagesHome/pages/orderDetails/orderDetails?orderCode='+item.orderCode url: '/pagesHome/pages/orderDetails/orderDetails?orderCode=' + item.orderCode
}) })
} }
function setorderStatus(state:number){ function setorderStatus(state : number) {
details.orderStatus=state details.orderStatus = state
init() init()
} }
/** /**
* */ * */
function scandata(){ function scandata() {
} }
function checktype(e){ function checktype(e) {
if(e==''){ if (e == '') {
details.schanvalue='' details.schanvalue = ''
details.scanStatus='' details.scanStatus = ''
} }
details.typearr.map(item=>{ details.typearr.map(item => {
if(item.value==e){ if (item.value == e) {
details.schanvalue=item.label details.schanvalue = item.label
details.scanStatus=item.value details.scanStatus = item.value
console.log(details.schanvalue) console.log(details.schanvalue)
} }
}) })
} }
const { orderCode,orderStatus,schanvalue,typearr,dataList,items }=toRefs(details) const { orderCode, orderStatus, schanvalue, typearr, dataList, items } = toRefs(details)
</script> </script>
<style lang="scss"> <style lang="scss">
.tabtip{ .tabtip {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
>view{
>view {
width: 50%; width: 50%;
display: flex; display: flex;
align-items: center; align-items: center;
@ -188,7 +193,8 @@
font-size: 32upx; font-size: 32upx;
font-weight: 400; font-weight: 400;
color: #90A0AF; color: #90A0AF;
>view{
>view {
height: 80upx; height: 80upx;
border-bottom: 8upx solid #ffffff; border-bottom: 8upx solid #ffffff;
display: flex; display: flex;
@ -196,13 +202,15 @@
justify-content: center; justify-content: center;
} }
} }
.xz{
.xz {
color: #D3832A; color: #D3832A;
border-bottom: 8upx solid #D3832A; border-bottom: 8upx solid #D3832A;
// border-radius: 5upx; // border-radius: 5upx;
} }
} }
.scrollv{
.scrollv {
width: 686upx; width: 686upx;
height: 41vh; height: 41vh;
// padding: 10upx; // padding: 10upx;
@ -212,12 +220,14 @@
margin-top: 20upx; margin-top: 20upx;
padding: 20upx; padding: 20upx;
box-sizing: border-box; box-sizing: border-box;
.mabxs{
.mabxs {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
padding-top: 5upx; padding-top: 5upx;
.ite{
.ite {
width: 96%; width: 96%;
// width: 100%; // width: 100%;
display: flex; display: flex;
@ -229,7 +239,8 @@
box-shadow: 0upx 2upx 10upx 0upx #e2e2e3; box-shadow: 0upx 2upx 10upx 0upx #e2e2e3;
margin-bottom: 20upx; margin-bottom: 20upx;
padding-bottom: 10upx; padding-bottom: 10upx;
>view{
>view {
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
justify-content: space-between; justify-content: space-between;
@ -237,10 +248,12 @@
margin-bottom: 20upx; margin-bottom: 20upx;
word-wrap: break-word; word-wrap: break-word;
word-break: break-all; word-break: break-all;
&:nth-last-child(1){
&:nth-last-child(1) {
margin-bottom: none !important; margin-bottom: none !important;
} }
>view{
>view {
width: 50%; width: 50%;
// flex: 1; // flex: 1;
font-size: 28upx; font-size: 28upx;
@ -252,55 +265,63 @@
} }
} }
} }
.tabmabx{
.tabmabx {
width: 100%; width: 100%;
padding:0 32upx; padding: 0 32upx;
box-sizing: border-box; box-sizing: border-box;
background-color: #ffffff; background-color: #ffffff;
padding-bottom: 20upx; padding-bottom: 20upx;
.uni-table-th{
.uni-table-th {
background-color: #F8FBFF; background-color: #F8FBFF;
font-size: 28upx; font-size: 28upx;
font-weight: 400; font-weight: 400;
color: #092C4D; color: #092C4D;
} }
.jhjs{
.jhjs {}
}
.uni-table-tr:nth-last-child(2)>.uni-table-td{ .uni-table-tr:nth-last-child(2)>.uni-table-td {
font-size: 36upx; font-size: 36upx;
font-weight: 400; font-weight: 400;
color: #092C4D; color: #092C4D;
&:nth-of-type(1){
&:nth-of-type(1) {
font-size: 28upx !important; font-size: 28upx !important;
font-weight: 400; font-weight: 400;
color: #092C4D !important; color: #092C4D !important;
} }
} }
.uni-table-tr:nth-last-child(1)>.uni-table-td{
.uni-table-tr:nth-last-child(1)>.uni-table-td {
border-bottom: none !important; border-bottom: none !important;
font-size: 36upx; font-size: 36upx;
font-weight: 400; font-weight: 400;
color: #0086F1; color: #0086F1;
&:nth-of-type(1){
&:nth-of-type(1) {
font-size: 28upx !important; font-size: 28upx !important;
font-weight: 400; font-weight: 400;
color: #092C4D !important; color: #092C4D !important;
} }
} }
>view{
>view {
border-radius: 8upx; border-radius: 8upx;
border: 1upx solid #EEEEEE; border: 1upx solid #EEEEEE;
padding-bottom: -2upx; padding-bottom: -2upx;
} }
} }
.headtop{
.headtop {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
padding: 34upx 32upx; padding: 34upx 32upx;
box-sizing: border-box; box-sizing: border-box;
background-color: #ffffff; background-color: #ffffff;
>view{
>view {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
@ -308,26 +329,31 @@
font-weight: 400; font-weight: 400;
color: #092C4D; color: #092C4D;
margin-bottom: 24upx; margin-bottom: 24upx;
&:nth-of-type(2){
&:nth-of-type(2) {
margin-bottom: 0; margin-bottom: 0;
} }
>view{
>view {
flex: 1; flex: 1;
} }
} }
} }
.scinp{
.scinp {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
padding: 12upx 32upx; padding: 12upx 32upx;
box-sizing: border-box; box-sizing: border-box;
background-color: #ffffff; background-color: #ffffff;
>view:nth-of-type(1){
>view:nth-of-type(1) {
font-size: 28upx; font-size: 28upx;
font-weight: 400; font-weight: 400;
color: #092C4D; color: #092C4D;
} }
.inputs { .inputs {
width: 276upx; width: 276upx;
height: 64upx; height: 64upx;
@ -340,13 +366,15 @@
font-size: 24upx; font-size: 24upx;
font-weight: 400; font-weight: 400;
color: #AFB4BA; color: #AFB4BA;
>input{
>input {
flex: 1; flex: 1;
font-size: 24upx; font-size: 24upx;
color: #092C4D; color: #092C4D;
} }
} }
.btscan{
.btscan {
width: 128upx; width: 128upx;
height: 64upx; height: 64upx;
background: #D3832A; background: #D3832A;
@ -359,4 +387,4 @@
color: #FFFFFF; color: #FFFFFF;
} }
} }
</style> </style>

3
pagesHome/pages/LoadingScan/LoadingScan.vue

@ -194,6 +194,7 @@
deliveryId: item.id deliveryId: item.id
} }
let res = await deliveryvehicle(data) let res = await deliveryvehicle(data)
if (res.code !== 200) return
if (res.data.length == 1) { if (res.data.length == 1) {
let data = { let data = {
deliveryId: item.id, deliveryId: item.id,
@ -300,6 +301,7 @@
} }
let response = await deliverypage(data) let response = await deliverypage(data)
console.log(response); console.log(response);
if (response.code !== 200) return
if (details.current == 1) { if (details.current == 1) {
details.recordsList = response.data.records details.recordsList = response.data.records
} else { } else {
@ -441,6 +443,7 @@
deliveryId: item.id deliveryId: item.id
} }
let res = await deliveryvehicle(data) let res = await deliveryvehicle(data)
if (res.code !== 200) return
console.log(res); console.log(res);
if (res.data.length == 1) { if (res.data.length == 1) {
uni.setStorageSync('checkvehicle', res.data[0]) uni.setStorageSync('checkvehicle', res.data[0])

1
pagesHome/pages/MergeTrayDetails/MergeTrayDetails.vue

@ -162,6 +162,7 @@
trayCode: trayCode.value trayCode: trayCode.value
} }
let res = await warehouseTrayTypescanTargetTrayCode(data) let res = await warehouseTrayTypescanTargetTrayCode(data)
if (res.code !== 200) return
resdata.value = res.data resdata.value = res.data
} }
</script> </script>

7
pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue

@ -463,6 +463,7 @@
orderCode: item.dataCode, orderCode: item.dataCode,
} }
let res = await warehouseTrayTypedeleteOrderCode(data) let res = await warehouseTrayTypedeleteOrderCode(data)
if (res.code !== 200) return
console.log('res :>> ', res); console.log('res :>> ', res);
initlist() initlist()
tip.value.setisshow(false) tip.value.setisshow(false)
@ -739,6 +740,7 @@
} }
let response = await warehouseTrayTypegetZeroOrderByWaybillCode(data) let response = await warehouseTrayTypegetZeroOrderByWaybillCode(data)
if (response.code !== 200) return
console.log(response); console.log(response);
details.codelist = response.data details.codelist = response.data
details.codelist.map(item => { details.codelist.map(item => {
@ -816,6 +818,7 @@
materialCode: details.stock.materialCode materialCode: details.stock.materialCode
} }
let res = await warehouseTrayTypeselectStockByMaterialCodeAndMarketId(data) let res = await warehouseTrayTypeselectStockByMaterialCodeAndMarketId(data)
if (res.code !== 200) return
// 0 // 0
details.stock.searchStockList = res.data.filter(val => val.quantityStock !== 0) details.stock.searchStockList = res.data.filter(val => val.quantityStock !== 0)
} }
@ -899,7 +902,9 @@
_arr.forEach((value, index) => { _arr.forEach((value, index) => {
_position += 30 _position += 30
// //
orderListText += `T 55 0 10 ${_position} ${value.dataCode}\r\n` if (value.isFleeing) orderListText += `T 55 0 10 ${_position} ${'(窜)' + value.dataCode}\r\n`
else orderListText += `T 55 0 10 ${_position} ${value.dataCode}\r\n`
// orderListText += `T 55 0 10 ${_position} ${value.dataCode}\r\n`
// //
orderListText += `T 55 0 300 ${_position} ${value.orderTotalNum}\r\n` orderListText += `T 55 0 300 ${_position} ${value.orderTotalNum}\r\n`
// //

1
pagesHome/pages/OrderSortingDetailList/OrderSortingDetailList.vue

@ -212,6 +212,7 @@
trayCode: details.trayCode, trayCode: details.trayCode,
} }
let response = await warehouseTrayTypeorderDetail(data) let response = await warehouseTrayTypeorderDetail(data)
if (response.code !== 200) return
details.list = response.data.parcelList details.list = response.data.parcelList
details.detaobj = response.data details.detaobj = response.data
let set = new Set() let set = new Set()

3
pagesHome/pages/PeopleScanUp/PeopleScanUp.vue

@ -468,6 +468,7 @@
warehouseCode: 'LQ' warehouseCode: 'LQ'
} }
let res = await warehouseTrayTypefindAllMarket(data) let res = await warehouseTrayTypefindAllMarket(data)
if (res.code !== 200) return
console.log(res.data); console.log(res.data);
details.Marketlist = res.data details.Marketlist = res.data
} }
@ -488,7 +489,7 @@
} }
response = await warehouseUpdownTypegetStockByParam(data) response = await warehouseUpdownTypegetStockByParam(data)
} }
if (response.code !== 200) return
console.log(response); console.log(response);
details.codelist = response.data details.codelist = response.data
details.codelist.map(item => { details.codelist.map(item => {

2
pagesHome/pages/PeopleSortingDetail/PeopleSortingDetail.vue

@ -226,6 +226,7 @@
trayCode: details.trayCode trayCode: details.trayCode
} }
let response = await warehouseTrayTypezeroScanTrayCode(data) let response = await warehouseTrayTypezeroScanTrayCode(data)
if (response.code !== 200) return
details.warehouseTray = response.data.data details.warehouseTray = response.data.data
if (response?.data?.data?.list) { if (response?.data?.data?.list) {
details.datalist = response?.data?.data?.list details.datalist = response?.data?.data?.list
@ -245,6 +246,7 @@
} }
let response = await warehouseTrayTypegetZeroOrderByWaybillCode(data) let response = await warehouseTrayTypegetZeroOrderByWaybillCode(data)
console.log(response); console.log(response);
if (response.code !== 200) return
details.codelist = response.data details.codelist = response.data
details.codelist.map(item => { details.codelist.map(item => {
item['number'] = 0 item['number'] = 0

1
pagesHome/pages/PickingScanList/PickingScanList.vue

@ -166,6 +166,7 @@
stockupId: details.id stockupId: details.id
} }
let response = await distributionStockuppageListClient(data) let response = await distributionStockuppageListClient(data)
if (response.code !== 200) return
details.datalist = response.data.orderList details.datalist = response.data.orderList
details.items = response.data details.items = response.data
} }

9
pagesHome/pages/SelfPScanList/SelfPScanList.vue

@ -213,6 +213,7 @@
orderCode: details.orderCode orderCode: details.orderCode
} }
let response = await billLadingorderList(data) let response = await billLadingorderList(data)
if (response.code !== 200) return
details.datalist = response.data.list details.datalist = response.data.list
details.orderNum = response.data.orderNum details.orderNum = response.data.orderNum
details.completeNum = response.data.completeNum details.completeNum = response.data.completeNum
@ -226,15 +227,19 @@
size: 10 size: 10
} }
let response = await billLadinggetInventory(date) let response = await billLadinggetInventory(date)
details.datalist.map(item => { if (res.code !== 200) return
details.datalist = response.data.records
details.datalist.every(item => {
if (item.esauInventoryNum == -1) { if (item.esauInventoryNum == -1) {
uni.showToast({ uni.showToast({
title: '物品备货未完成,请前往备货', title: '物品备货未完成,请前往备货',
icon: 'none' icon: 'none'
}) })
return false
} }
return true
}) })
details.datalist = response.data.records
// details.orderNum=response.data.orderNum // details.orderNum=response.data.orderNum
// details.completeNum=response.data.completeNum // details.completeNum=response.data.completeNum
// details.planNum=response.data.planNum // details.planNum=response.data.planNum

20
pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue

@ -158,6 +158,9 @@
signedNum: '', signedNum: '',
scancode: '', scancode: '',
isscan: false, isscan: false,
zeroList: [],
orderList: [],
stockList: []
}) })
const tiplists = ref(null) const tiplists = ref(null)
onLoad((op) => { onLoad((op) => {
@ -171,6 +174,7 @@
sacn() sacn()
} }
}) })
details.dataList = details.orderList
initpage() initpage()
}) })
function goorderdetail(item) { function goorderdetail(item) {
@ -296,6 +300,7 @@
} }
async function initpage() { async function initpage() {
details.dataList = []
console.log('获取数据') console.log('获取数据')
if (details.orderType == 1) { if (details.orderType == 1) {
let data = { let data = {
@ -304,7 +309,8 @@
orderCode: details.orderCode orderCode: details.orderCode
} }
let response = await billLadingdetailList(data) let response = await billLadingdetailList(data)
details.dataList = response.data.list if (response.code !== 200) return
details.orderList = response.data.list
details.consignee = response.data.consignee details.consignee = response.data.consignee
details.pickUpPlate = response.data.pickUpPlate details.pickUpPlate = response.data.pickUpPlate
details.carTypeStr = response.data.carTypeStr details.carTypeStr = response.data.carTypeStr
@ -321,7 +327,8 @@
size: 10 size: 10
} }
let response = await billLadinggetInventoryNum(data) let response = await billLadinggetInventoryNum(data)
details.dataList = response.data.records if (response.code !== 200) return
details.zeroList = response.data.records
} }
else if (details.orderType == 3) { else if (details.orderType == 3) {
let data = { let data = {
@ -329,15 +336,16 @@
} }
const response = await billLadingzeroBillData(data) const response = await billLadingzeroBillData(data)
console.log('response :>> ', response); console.log('response :>> ', response);
const { code } = response if (response.code !== 200) return
if (code === 200) { details.stockList = response.data || []
details.dataList = response.data || []
}
} }
} }
function setorderStatus(state : number) { function setorderStatus(state : number) {
details.orderType = state details.orderType = state
initpage() initpage()
if (state === 1) details.dataList = details.orderList
else if (state === 2) details.dataList = details.zeroList
else if (state === 3) details.dataList = details.stockList
} }
function checktype(e) { function checktype(e) {
if (e == '') { if (e == '') {

1
pagesHome/pages/SelfPickupScan/SelfPickupScan.vue

@ -145,6 +145,7 @@
pickUpTimeEnd: date.value[1], pickUpTimeEnd: date.value[1],
} }
let response = await billLadingpageList(data) let response = await billLadingpageList(data)
if (response.code !== 200) return
// details.recordsList=response.data.records // details.recordsList=response.data.records
if (details.current == 1) { if (details.current == 1) {
details.recordsList = response.data.records details.recordsList = response.data.records

1
pagesHome/pages/SetPrice/SetPrice.vue

@ -133,6 +133,7 @@
reservationId: details.items.id reservationId: details.items.id
} }
let res = await addvalueaddvalueInfo(data) let res = await addvalueaddvalueInfo(data)
if (res.code !== 200) return
details.priceList = res.data details.priceList = res.data
} }
function goValueaddedServicePage(item : any) { function goValueaddedServicePage(item : any) {

175
pagesHome/pages/SignDetailScan/SignDetailScan.vue

@ -1,9 +1,7 @@
<template> <template>
<!-- <u-navbar title="签收明细扫描" placeholder border=true :autoBack="true" leftIconSize='35'></u-navbar> --> <!-- <u-navbar title="签收明细扫描" placeholder border=true :autoBack="true" leftIconSize='35'></u-navbar> -->
<u-navbar title="签收明细扫描" <u-navbar title="签收明细扫描" bgColor='#D3832A' leftIconColor='#ffffff' titleStyle='color:#ffffff' placeholder
bgColor='#D3832A' leftIconColor='#ffffff' :autoBack="true" leftIconSize='35'></u-navbar>
titleStyle='color:#ffffff' placeholder
:autoBack="true" leftIconSize='35'></u-navbar>
<view class="headtop"> <view class="headtop">
<view> <view>
<view>配车类型{{items.type_name}}</view> <view>配车类型{{items.type_name}}</view>
@ -35,8 +33,8 @@
<view class="left"> <view class="left">
<view class="titl">齐套状态</view> <view class="titl">齐套状态</view>
<view> <view>
<cusSelects @change='checktype(1,$event)' :data='signforStatearr' :value="signforStatevalue" placeholder='全部' :arrLeft='5' size='145' <cusSelects @change='checktype(1,$event)' :data='signforStatearr' :value="signforStatevalue"
:clearable='true'></cusSelects> placeholder='全部' :arrLeft='5' size='145' :clearable='true'></cusSelects>
</view> </view>
</view> </view>
<!-- <view class="titl">包件类型</view> <!-- <view class="titl">包件类型</view>
@ -89,7 +87,7 @@
<view class="toplft"> <view class="toplft">
SKU{{item.sku}} SKU{{item.sku}}
</view> </view>
</view> </view>
<view class="boxcontt"> <view class="boxcontt">
<view> <view>
@ -118,7 +116,7 @@
onHide, onHide,
onUnload onUnload
} from '@dcloudio/uni-app' } from '@dcloudio/uni-app'
import { reactive, toRefs,ref } from "vue"; import { reactive, toRefs, ref } from "vue";
let details = reactive({ let details = reactive({
orderCodevalue: '', orderCodevalue: '',
signforStatevalue: '', signforStatevalue: '',
@ -150,60 +148,62 @@
label: '未扫' label: '未扫'
} }
], ],
items:{} as any, items: {} as any,
id:'', id: '',
datalist:[], datalist: [],
orderStatus:1, orderStatus: 1,
signforState:'' as string|number, signforState: '' as string | number,
}) })
onLoad((op)=>{ onLoad((op) => {
details.items=JSON.parse(op.item) details.items = JSON.parse(op.item)
details.id=JSON.parse(op.item).id details.id = JSON.parse(op.item).id
initpage() initpage()
}) })
function goorderdetail(item){ function goorderdetail(item) {
uni.navigateTo({ uni.navigateTo({
url:'/pagesHome/pages/orderDetails/orderDetails?orderCode='+item.orderCode url: '/pagesHome/pages/orderDetails/orderDetails?orderCode=' + item.orderCode
}) })
} }
function setorderStatus(state:number){ function setorderStatus(state : number) {
details.orderStatus=state details.orderStatus = state
initpage() initpage()
} }
async function initpage(){ async function initpage() {
details.datalist=[] details.datalist = []
let data={ let data = {
id:details.id, id: details.id,
signforState:details.signforState signforState: details.signforState
} }
if(details.orderStatus==1){ if (details.orderStatus == 1) {
let res=await signforwrap(data) let res = await signforwrap(data)
if (res.code !== 200) return
console.log(res); console.log(res);
details.datalist=res.data.records details.datalist = res.data.records
}else if(details.orderStatus==2){ } else if (details.orderStatus == 2) {
let res=await signforwrapIn(data) let res = await signforwrapIn(data)
if (res.code !== 200) return
console.log(res); console.log(res);
details.datalist=res.data.records details.datalist = res.data.records
} }
} }
function checktype(type,e) { function checktype(type, e) {
console.log(type,e); console.log(type, e);
if(type==1){ if (type == 1) {
if(e==''){ if (e == '') {
details.signforStatevalue='' details.signforStatevalue = ''
details.signforState='' details.signforState = ''
} }
details.signforStatearr.map(item=>{ details.signforStatearr.map(item => {
if(item.value==e){ if (item.value == e) {
details.signforStatevalue=item.label details.signforStatevalue = item.label
details.signforState=item.value details.signforState = item.value
console.log(details.signforStatevalue) console.log(details.signforStatevalue)
} }
}) })
initpage() initpage()
}else if(type==2){ } else if (type == 2) {
// if(e==''){ // if(e==''){
// details.schanvalue='' // details.schanvalue=''
// } // }
@ -216,15 +216,16 @@
// }) // })
} }
} }
const { orderStatus,signforStatearr,signforStatevalue,items,datalist } = toRefs(details) const { orderStatus, signforStatearr, signforStatevalue, items, datalist } = toRefs(details)
</script> </script>
<style lang="scss"> <style lang="scss">
.tabtip{ .tabtip {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
>view{
>view {
width: 50%; width: 50%;
display: flex; display: flex;
align-items: center; align-items: center;
@ -233,7 +234,8 @@
font-size: 32upx; font-size: 32upx;
font-weight: 400; font-weight: 400;
color: #90A0AF; color: #90A0AF;
>view{
>view {
height: 80upx; height: 80upx;
border-bottom: 8upx solid #ffffff; border-bottom: 8upx solid #ffffff;
display: flex; display: flex;
@ -241,21 +243,25 @@
justify-content: center; justify-content: center;
} }
} }
.xz{
.xz {
color: #D3832A; color: #D3832A;
border-bottom: 8upx solid #D3832A; border-bottom: 8upx solid #D3832A;
// border-radius: 5upx; // border-radius: 5upx;
} }
} }
.scbx{
.scbx {
width: 100%; width: 100%;
height: 45vh; height: 45vh;
padding-top: 20upx; padding-top: 20upx;
.mabox{
.mabox {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
>.item{
>.item {
width: 686upx; width: 686upx;
// height: 378upx; // height: 378upx;
background: #FFFFFF; background: #FFFFFF;
@ -268,10 +274,12 @@
border-bottom: 1upx solid #ebebeb; border-bottom: 1upx solid #ebebeb;
margin-bottom: 20upx; margin-bottom: 20upx;
padding-bottom: 10upx; padding-bottom: 10upx;
&:nth-last-child(1){
&:nth-last-child(1) {
margin-bottom: 5upx; margin-bottom: 5upx;
} }
.toptitl{
.toptitl {
width: 100%; width: 100%;
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
@ -279,14 +287,16 @@
border-bottom: 2upx solid #EEEEEE; border-bottom: 2upx solid #EEEEEE;
padding: 34upx 24upx; padding: 34upx 24upx;
box-sizing: border-box; box-sizing: border-box;
.toplft{
.toplft {
font-size: 32upx; font-size: 32upx;
font-weight: 400; font-weight: 400;
color: #092C4D; color: #092C4D;
word-wrap: break-word; word-wrap: break-word;
word-break: break-all; word-break: break-all;
} }
.tis{
.tis {
width: 180upx; width: 180upx;
font-size: 32upx; font-size: 32upx;
font-weight: 400; font-weight: 400;
@ -294,11 +304,13 @@
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
} }
.bf{
.bf {
color: #D3832A; color: #D3832A;
} }
} }
.boxcontt{
.boxcontt {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
@ -306,43 +318,51 @@
padding: 32upx 24upx; padding: 32upx 24upx;
box-sizing: border-box; box-sizing: border-box;
font-size: 28upx; font-size: 28upx;
>view{ >view {
width: 100%; width: 100%;
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
justify-content: space-between; justify-content: space-between;
&:nth-of-type(1){
&:nth-of-type(1) {
margin-bottom: 20upx; margin-bottom: 20upx;
} }
>view{
>view {
width: 50%; width: 50%;
} }
} }
.scanstatesucc{
.scanstatesucc {
color: #3AD8BC; color: #3AD8BC;
} }
.scanstateerr{
.scanstateerr {
color: #F8544B; color: #F8544B;
} }
} }
.buttts{
height:100upx; .buttts {
height: 100upx;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-around; justify-content: space-around;
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
border-top: 2upx solid #EEEEEE; border-top: 2upx solid #EEEEEE;
.antu{
.antu {
border: 2upx solid #0086F1; border: 2upx solid #0086F1;
color: #0086F1; color: #0086F1;
} }
.anj{
.anj {
border: 2upx solid #D3832A; border: 2upx solid #D3832A;
color: #D3832A; color: #D3832A;
} }
>view{
>view {
width: 204upx; width: 204upx;
height: 64upx; height: 64upx;
background: #FFFFFF; background: #FFFFFF;
@ -352,12 +372,13 @@
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
} }
} }
} }
} }
.scinp { .scinp {
display: flex; display: flex;
align-items: center; align-items: center;
@ -366,17 +387,18 @@
box-sizing: border-box; box-sizing: border-box;
background-color: #ffffff; background-color: #ffffff;
>.left{ >.left {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
>.titl { >.titl {
font-size: 28upx; font-size: 28upx;
font-weight: 400; font-weight: 400;
color: #092C4D; color: #092C4D;
margin-right: 30upx; margin-right: 30upx;
} }
.inputs { .inputs {
width: 276upx; width: 276upx;
height: 64upx; height: 64upx;
@ -389,7 +411,8 @@
font-size: 24upx; font-size: 24upx;
font-weight: 400; font-weight: 400;
color: #AFB4BA; color: #AFB4BA;
>input{
>input {
flex: 1; flex: 1;
font-size: 24upx; font-size: 24upx;
color: #092C4D; color: #092C4D;

1
pagesHome/pages/StockUpListZero/StockUpListZero.vue

@ -191,6 +191,7 @@
typeService: details.typeService typeService: details.typeService
} }
let response = await distributionStockuporderInfo(data) let response = await distributionStockuporderInfo(data)
if (response.code !== 200) return
console.log(response); console.log(response);
details.dataList = response.data.packageList details.dataList = response.data.packageList
details.customer = response.data.customer details.customer = response.data.customer

39
pagesHome/pages/StockUplist/StockUplist.vue

@ -225,6 +225,7 @@
} }
details.orderList = [] details.orderList = []
let response = await distributionStockuporderList(data) let response = await distributionStockuporderList(data)
if (response !== 200) return
console.log('response :>> ', response); console.log('response :>> ', response);
console.log('details.orderStatus :>> ', details.orderStatus); console.log('details.orderStatus :>> ', details.orderStatus);
details.user.consignee = response.data?.consignee details.user.consignee = response.data?.consignee
@ -281,6 +282,7 @@
deliveryDetailsId: item.deliveryDetailsId deliveryDetailsId: item.deliveryDetailsId
} }
let res = await distributionStockuplocationSelection(data) let res = await distributionStockuplocationSelection(data)
if (res.code !== 200) return
let list = [] let list = []
res.data.map(item => { res.data.map(item => {
list.push(item.positionCode + ' (' + item.num + '件)') list.push(item.positionCode + ' (' + item.num + '件)')
@ -341,6 +343,7 @@
reservationId: details.reservationId, reservationId: details.reservationId,
} }
let res = await distributionStockupscanningCode(data) let res = await distributionStockupscanningCode(data)
if (res.code !== 200) return
if (res.audio) utils.ttsspke(res.audio) if (res.audio) utils.ttsspke(res.audio)
initpage() initpage()
details.isscan = false details.isscan = false
@ -364,25 +367,25 @@
stockArticleId: item.stockArticleId stockArticleId: item.stockArticleId
} }
const res = await postZeroStockUpData(data) const res = await postZeroStockUpData(data)
let inpList = []
const { code } = res const { code } = res
if (code === 200) { let inpList = []
console.log('res.data :>> ', res.data); if (code !== 200) return
inpList = res.data.map(val => { console.log('res.data :>> ', res.data);
return { inpList = res.data.map(val => {
id: val.id, return {
title: val.categoryName, id: val.id,
value: val.realityQuantity, title: val.categoryName,
maxNum: val.quantity, value: val.realityQuantity,
minNum: val.realityQuantity || 0, maxNum: val.quantity,
type: 'Number', minNum: val.realityQuantity || 0,
disabled: item.completeStact, type: 'Number',
allocationId: item.allocationId, disabled: item.completeStact,
orderCode: item.orderCode, allocationId: item.allocationId,
stockArticleId: val.stockArticleId orderCode: item.orderCode,
} stockArticleId: val.stockArticleId
}) }
} })
// //
if (item.completeStact) { if (item.completeStact) {

1
pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue

@ -303,6 +303,7 @@
typeService: details.typeService typeService: details.typeService
} }
let response = await distributionStockuporderInfo(data) let response = await distributionStockuporderInfo(data)
if (response.code !== 200) return
console.log(response); console.log(response);
details.dataList = response.data.packageList details.dataList = response.data.packageList
details.customer = response.data.customer details.customer = response.data.customer

1
pagesHome/pages/createAddServe/createAddServe.vue

@ -207,6 +207,7 @@
let res = await addvalueeditAddvalueInfo(data) let res = await addvalueeditAddvalueInfo(data)
console.log(res); console.log(res);
console.log('details.allpack :>> ', details.allpack); console.log('details.allpack :>> ', details.allpack);
if (res.code !== 200) return
if (res.data.addvalueDetailId) { if (res.data.addvalueDetailId) {
details.addvalueDetailId = res.data.addvalueDetailId details.addvalueDetailId = res.data.addvalueDetailId
} }

210
pagesHome/pages/inventoryDetail/inventoryDetail.vue

@ -1,14 +1,7 @@
<template> <template>
<!-- <u-navbar title="扫描" placeholder border=true :autoBack="true" leftIconSize='35'></u-navbar> --> <!-- <u-navbar title="扫描" placeholder border=true :autoBack="true" leftIconSize='35'></u-navbar> -->
<u-navbar <u-navbar title="扫描" placeholder :autoBack="true" leftIconSize='35' bgColor='#d3832a' leftIconColor='#ffffff'
title="扫描" titleStyle='color:#ffffff'></u-navbar>
placeholder
:autoBack="true"
leftIconSize='35'
bgColor='#d3832a'
leftIconColor='#ffffff'
titleStyle='color:#ffffff'
></u-navbar>
<image mode="widthFix" class="bgimg" src="/pagesHome/static/bgby.png"></image> <image mode="widthFix" class="bgimg" src="/pagesHome/static/bgby.png"></image>
<view class="mabxtop"> <view class="mabxtop">
<view> <view>
@ -79,78 +72,79 @@
onUnload onUnload
} from '@dcloudio/uni-app' } from '@dcloudio/uni-app'
import { reactive, toRefs } from "vue"; import { reactive, toRefs } from "vue";
let details=reactive({ let details = reactive({
datelist:[], datelist: [],
trayCode:'', trayCode: '',
trayType:'', trayType: '',
trayName:'', trayName: '',
Inventorydetail:{ Inventorydetail: {
trayCode:'', trayCode: '',
trayNum:'', trayNum: '',
trayTypeName:'', trayTypeName: '',
marketName:'', marketName: '',
name:'', name: '',
}, },
scancode:'', scancode: '',
}) })
onLoad((op)=>{ onLoad((op) => {
details.trayCode=op.trayCode details.trayCode = op.trayCode
details.trayType=op.trayType details.trayType = op.trayType
if(!op.trayType){ if (!op.trayType) {
uni.showToast({ uni.showToast({
title:'获取打托方式出错', title: '获取打托方式出错',
icon:'none' icon: 'none'
}) })
} }
let trayCodeTypearr=uni.getStorageSync('trayCodeType') let trayCodeTypearr = uni.getStorageSync('trayCodeType')
trayCodeTypearr.map(item=>{ trayCodeTypearr.map(item => {
if(item.dictKey==details.trayType){ if (item.dictKey == details.trayType) {
details.trayName=item.dictValue details.trayName = item.dictValue
} }
}) })
}) })
onShow(()=>{ onShow(() => {
uni.$on('scancodedate', function(code) { uni.$on('scancodedate', function (code) {
if (code) { if (code) {
console.log(code); console.log(code);
details.scancode=code details.scancode = code
scandata() scandata()
} }
}) })
initpage() initpage()
}) })
onHide(()=>{ onHide(() => {
uni.$off('scancodedate') uni.$off('scancodedate')
}) })
async function initpage(){ async function initpage() {
let data={ let data = {
trayCode:details.trayCode trayCode: details.trayCode
} }
let res=await warehouseTrayTypestockScanTrayCode(data) let res = await warehouseTrayTypestockScanTrayCode(data)
details.Inventorydetail=res.data.data if (res.code !== 200) return
details.datelist=res.data.data.list details.Inventorydetail = res.data.data
details.datelist = res.data.data.list
} }
async function scandata(){ async function scandata() {
let data={ let data = {
trayType:details.trayType, trayType: details.trayType,
trayCode:details.trayCode, trayCode: details.trayCode,
orderPackageCode:details.scancode, orderPackageCode: details.scancode,
} }
let res=await warehouseTrayTypescanStockOrderPackageCode(data) let res = await warehouseTrayTypescanStockOrderPackageCode(data)
} }
function godetailslist(item){ function godetailslist(item) {
return return
// uni.navigateTo({ // uni.navigateTo({
// url:'/pagesHome/pages/inventoryDetailList/inventoryDetailList' // url:'/pagesHome/pages/inventoryDetailList/inventoryDetailList'
// }) // })
} }
const { trayName,Inventorydetail,datelist,trayCode,trayType }=toRefs(details) const { trayName, Inventorydetail, datelist, trayCode, trayType } = toRefs(details)
</script> </script>
<style lang="scss"> <style lang="scss">
.mabxtop{ .mabxtop {
position: relative; position: relative;
width: 684upx; width: 684upx;
// height: 348upx; // height: 348upx;
@ -164,27 +158,31 @@
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
>view{
>view {
width: 100%; width: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
margin-bottom: 70upx; margin-bottom: 70upx;
&:nth-last-child(1){ &:nth-last-child(1) {
margin-bottom: 0; margin-bottom: 0;
} }
>view{
>view {
width: 50%; width: 50%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: flex-start; align-items: flex-start;
>view:nth-of-type(1){
>view:nth-of-type(1) {
font-size: 32upx; font-size: 32upx;
font-weight: 400; font-weight: 400;
color: #020B18; color: #020B18;
} }
>view:nth-of-type(2){
>view:nth-of-type(2) {
font-size: 28upx; font-size: 28upx;
font-weight: 400; font-weight: 400;
color: #90A0AF; color: #90A0AF;
@ -192,23 +190,27 @@
} }
} }
} }
.bgimg{
.bgimg {
position: absolute; position: absolute;
left: 0; left: 0;
top: 0; top: 0;
width: 100%; width: 100%;
} }
.scvmabx{
.scvmabx {
width: 100%; width: 100%;
height: 63vh; height: 63vh;
margin-top: 20upx; margin-top: 20upx;
.maxboxs{
.maxboxs {
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
>.items{
>.items {
width: 690upx; width: 690upx;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@ -218,11 +220,12 @@
background-color: #ffffff; background-color: #ffffff;
border-radius: 10upx; border-radius: 10upx;
margin-bottom: 30upx; margin-bottom: 30upx;
&:nth-last-child(1){ &:nth-last-child(1) {
margin-bottom: 20upx; margin-bottom: 20upx;
} }
.tophd{
.tophd {
width: 100%; width: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
@ -230,68 +233,82 @@
padding: 15upx 25upx; padding: 15upx 25upx;
box-sizing: border-box; box-sizing: border-box;
border-bottom: 4upx solid #EEEEEE; border-bottom: 4upx solid #EEEEEE;
>image{
>image {
width: 48upx; width: 48upx;
height: 48upx; height: 48upx;
margin-right: 10upx; margin-right: 10upx;
} }
>view{
>view {
font-size: 32upx; font-size: 32upx;
color: #020B18; color: #020B18;
font-weight: 400; font-weight: 400;
} }
} }
.numbxvie{
.numbxvie {
width: 100%; width: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-around; justify-content: space-around;
padding: 15upx 25upx; padding: 15upx 25upx;
box-sizing: border-box; box-sizing: border-box;
.zhon{
.zhon {
color: #D3832A; color: #D3832A;
} }
.yish{
.yish {
color: #1197EB; color: #1197EB;
} }
.weish{
.weish {
color: #020B18; color: #020B18;
} }
>view{
>view {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
>view:nth-of-type(1){
>view:nth-of-type(1) {
font-size: 36upx; font-size: 36upx;
margin-bottom: 12upx; margin-bottom: 12upx;
} }
>view:nth-of-type(2){
>view:nth-of-type(2) {
font-size: 28upx; font-size: 28upx;
} }
} }
} }
.type1{
.type1 {
width: 100%; width: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
margin-bottom: 20upx; margin-bottom: 20upx;
>view{
>view {
display: flex; display: flex;
align-items: center; align-items: center;
font-size: 28upx; font-size: 28upx;
>view:nth-of-type(1){
>view:nth-of-type(1) {
color: #90A0AF; color: #90A0AF;
} }
>view:nth-of-type(2){
>view:nth-of-type(2) {
color: #092C4D; color: #092C4D;
} }
} }
} }
} }
} }
} }
.headtop { .headtop {
display: flex; display: flex;
align-items: center; align-items: center;
@ -300,20 +317,22 @@
background-color: #FFFFFF; background-color: #FFFFFF;
padding: 20upx 30upx; padding: 20upx 30upx;
box-sizing: border-box; box-sizing: border-box;
>view:nth-of-type(1) { >view:nth-of-type(1) {
width: 540upx; width: 540upx;
border: 1upx solid #00000020; border: 1upx solid #00000020;
padding: 10upx 20upx; padding: 10upx 20upx;
box-sizing: border-box; box-sizing: border-box;
// flex: 1; // flex: 1;
// margin-right: 50upx; // margin-right: 50upx;
// border-radius: 10upx; // border-radius: 10upx;
>input{ >input {
flex: 1; flex: 1;
font-size: 28upx; font-size: 28upx;
} }
} }
>view:nth-of-type(2) { >view:nth-of-type(2) {
width: 128upx; width: 128upx;
height: 64upx; height: 64upx;
@ -327,7 +346,8 @@
color: #FFFFFF; color: #FFFFFF;
} }
} }
.hedtopt{
.hedtopt {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
@ -335,8 +355,8 @@
background-color: #ffffff; background-color: #ffffff;
padding: 36upx 32upx; padding: 36upx 32upx;
box-sizing: border-box; box-sizing: border-box;
.typto{ .typto {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
@ -345,24 +365,28 @@
font-weight: 400; font-weight: 400;
color: #092C4D; color: #092C4D;
margin-bottom: 20upx; margin-bottom: 20upx;
>view{
>view {
display: flex; display: flex;
align-items: center; align-items: center;
>view:nth-of-type(1){
>view:nth-of-type(1) {
color: #90A0AF; color: #90A0AF;
} }
>view:nth-of-type(2){
>view:nth-of-type(2) {
color: #092C4D; color: #092C4D;
} }
} }
&:nth-last-child(1){ &:nth-last-child(1) {
margin-bottom: 0; margin-bottom: 0;
} }
>view{
>view {
flex: 1; flex: 1;
} }
} }
} }
</style> </style>

3
pagesHome/pages/inventoryenter/inventoryenter.vue

@ -260,6 +260,7 @@
} }
let res = await warehouseTrayTypefindAllMarket(data) let res = await warehouseTrayTypefindAllMarket(data)
console.log("Marketlist", res.data); console.log("Marketlist", res.data);
if (res.code !== 200) return
details.Marketlist = res.data details.Marketlist = res.data
let market = details.Marketlist.find((item) => { let market = details.Marketlist.find((item) => {
return item.marketId === details.marketId return item.marketId === details.marketId
@ -272,6 +273,7 @@
trayCode: details.trayCode trayCode: details.trayCode
} }
let res = await warehouseTrayTypestockNoDataScanTrayCode(data) let res = await warehouseTrayTypestockNoDataScanTrayCode(data)
if (res.code !== 200) return
console.log("res.data >>>>>>>>>", res.data); console.log("res.data >>>>>>>>>", res.data);
details.marketId = res.data.data.marketId details.marketId = res.data.data.marketId
console.log("details.marketId", details.marketId) console.log("details.marketId", details.marketId)
@ -294,6 +296,7 @@
materialCode: details.materialCode materialCode: details.materialCode
} }
let res = await warehouseTrayTypeselectStockByMaterialCodeAndMarketId(data) let res = await warehouseTrayTypeselectStockByMaterialCodeAndMarketId(data)
if (res.code !== 200) return
details.scanlist = res.data details.scanlist = res.data
} }
async function confirmlur() { async function confirmlur() {

2
pagesHome/pages/lnventorysortinglist/lnventorysortinglist.vue

@ -185,7 +185,7 @@
details.pageType = 1 details.pageType = 1
}) })
onShow(() => { onShow(() => {
// initpage() initpage()
uni.$on('scancodedate', function (code) { uni.$on('scancodedate', function (code) {
if (code) { if (code) {
console.log(code); console.log(code);

3
pagesHome/pages/loadingRetention/loadingRetention.vue

@ -1,6 +1,6 @@
<template> <template>
<!-- <u-navbar title="配送客户扫描" placeholder border=true :autoBack="true" leftIconSize='35'></u-navbar> --> <!-- <u-navbar title="配送客户扫描" placeholder border=true :autoBack="true" leftIconSize='35'></u-navbar> -->
<u-navbar title="配送客户扫描" bgColor='#D3832A' leftIconColor='#ffffff' titleStyle='color:#ffffff' placeholder <u-navbar title="装车滞留" bgColor='#D3832A' leftIconColor='#ffffff' titleStyle='color:#ffffff' placeholder
:autoBack="true" leftIconSize='35'></u-navbar> :autoBack="true" leftIconSize='35'></u-navbar>
<view class="hedtopt"> <view class="hedtopt">
<view class="typto"> <view class="typto">
@ -155,6 +155,7 @@
id: details.id id: details.id
} }
let response = await deliverycustom(data) let response = await deliverycustom(data)
if (response.code !== 200) return
details.renderList = response.data.records details.renderList = response.data.records
} }

1
pagesHome/pages/orderDetails/orderDetails.vue

@ -166,6 +166,7 @@
orderCode: details.orderCode, orderCode: details.orderCode,
} }
let response = await warehouseUpdownTypeorderUpshelfDetail(data) let response = await warehouseUpdownTypeorderUpshelfDetail(data)
if (response.code !== 200) return
if (!response.data) { if (!response.data) {
uni.showToast({ uni.showToast({
title: response.msg, title: response.msg,

1
pagesHome/pages/orderInquiry/orderInquiry.vue

@ -320,6 +320,7 @@
}) })
const res = await BatchPrintPackages(ids) const res = await BatchPrintPackages(ids)
const { code, data } = res const { code, data } = res
if (code !== 200) return
console.log('res :>> ', res); console.log('res :>> ', res);
tiplists.value.setdetails({ tiplists.value.setdetails({
title: '请选择需要打印的包条码', title: '请选择需要打印的包条码',

3
pagesHome/pages/pickingScan/pickingScan.vue

@ -172,7 +172,8 @@
// await distributionStockuppageList(data) // await distributionStockuppageList(data)
// } // }
let response = await distributionStockuppageList(data) let response = await distributionStockuppageList(data)
if (details.currentPage == 1) { if (response.code !== 200) return
if (details.currentPage == 1 && response.data) {
details.dataList = response.data.records details.dataList = response.data.records
} else { } else {
if (response.data.records.lngth == 0) { if (response.data.records.lngth == 0) {

10
pagesHome/pages/scansorting/scansorting.vue

@ -171,7 +171,7 @@
// //
antiShake = null antiShake = null
// , // ,
if (res.data.records.length < details.pageSize) { if (res.data && res.data.records.length < details.pageSize) {
uni.showToast({ uni.showToast({
title: '已经到底了', title: '已经到底了',
icon: 'success' icon: 'success'
@ -206,6 +206,7 @@
}) })
onShow(() => { onShow(() => {
// init() // init()
initpage()
uni.$on('scancodedate', function (code) { uni.$on('scancodedate', function (code) {
console.log('code :>> ', code); console.log('code :>> ', code);
if (code) { if (code) {
@ -228,6 +229,7 @@
trayCode: details.scancode trayCode: details.scancode
} }
let res = await warehouseTrayTypeorderScanTrayCode(data) let res = await warehouseTrayTypeorderScanTrayCode(data)
if (res.code !== 200) return
console.log('res', res); console.log('res', res);
if (Number(res.data.isHasData) === 0) { if (Number(res.data.isHasData) === 0) {
@ -249,13 +251,11 @@
createDateEnd: date.value[1] || '', createDateEnd: date.value[1] || '',
} }
const res = await warehouseTrayTypeorderPageList(submitData) const res = await warehouseTrayTypeorderPageList(submitData)
if (res.code !== 200) return
console.log('res :>> ', res);
const { code, data } = res const { code, data } = res
if (data.pages <= details.pageNum) option.isEnd = true
if (code === 200 && data) details.datalist = [...details.datalist, ...data.records] if (code === 200 && data) details.datalist = [...details.datalist, ...data.records]
if (data && data.pages <= details.pageNum) option.isEnd = true
console.log('details.datalist :>> ', details.datalist); console.log('details.datalist :>> ', details.datalist);
// if ()
return res return res
} catch (err) { } catch (err) {
//TODO handle the exception //TODO handle the exception

2
pagesHome/pages/setbarcode/setbarcode.vue

@ -145,6 +145,7 @@
status: details.completeStact ? 1 : 0 status: details.completeStact ? 1 : 0
} }
let response = await distributionStockuporderInfo(data) let response = await distributionStockuporderInfo(data)
if (response !== 200) return
details.codelist = response.data.stockList details.codelist = response.data.stockList
details.customer = response.data.customer details.customer = response.data.customer
details.deliveryAddress = response.data.deliveryAddress details.deliveryAddress = response.data.deliveryAddress
@ -187,6 +188,7 @@
status: details.completeStact ? 1 : 0 status: details.completeStact ? 1 : 0
} }
let response = await distributionStockupstockupStockListPackageCode(data) let response = await distributionStockupstockupStockListPackageCode(data)
if (response.code !== 200) return
console.log(response); console.log(response);
details.printlist = response.data details.printlist = response.data
let checklist = [] let checklist = []

7
pagesHome/pages/signOrderScan/signOrderScan.vue

@ -238,6 +238,7 @@
// //
let response = null let response = null
response = await signfororder(data) response = await signfororder(data)
if (response.code !== 200) return
details.zeroArr = [] details.zeroArr = []
details.orderArr = [] details.orderArr = []
response.data.records.forEach(val => { response.data.records.forEach(val => {
@ -247,6 +248,7 @@
}) })
// //
let response1 = await signforinventory(data) let response1 = await signforinventory(data)
if (response1.code !== 200) return
if (response1.data) details.stockArr = response1.data.records || [] if (response1.data) details.stockArr = response1.data.records || []
console.log('response :>> ', response); console.log('response :>> ', response);
@ -308,6 +310,7 @@
reservationId: details.id reservationId: details.id
} }
let response = await signforsignforcontinue(data) let response = await signforsignforcontinue(data)
if (response.code !== 200) return
console.log(response); console.log(response);
uni.showToast({ uni.showToast({
title: response.msg, title: response.msg,
@ -344,6 +347,7 @@
} }
let response = await signforsignforcontinue(data) let response = await signforsignforcontinue(data)
console.log(response); console.log(response);
if (response.code !== 200) return
uni.showToast({ uni.showToast({
title: response.msg, title: response.msg,
icon: 'none' icon: 'none'
@ -422,6 +426,7 @@
// //
if (details.orderStatus == 1 || details.orderStatus === 2) { if (details.orderStatus == 1 || details.orderStatus === 2) {
response = await signfororder(data) response = await signfororder(data)
if (response.code !== 200) return
details.zeroArr = [] details.zeroArr = []
details.orderArr = [] details.orderArr = []
response.data.records.forEach(val => { response.data.records.forEach(val => {
@ -433,6 +438,7 @@
// //
else if (details.orderStatus == 3) { else if (details.orderStatus == 3) {
response = await signforinventory(data) response = await signforinventory(data)
if (response.code !== 200) return
details.stockArr = response.data.records || [] details.stockArr = response.data.records || []
} }
// //
@ -518,6 +524,7 @@
}) })
const res = await signforZeroSignfor(data) const res = await signforZeroSignfor(data)
if (res.code !== 200) return
if (res.audio) { if (res.audio) {
// #ifdef APP // #ifdef APP
utils.ttsspke(res.audio) utils.ttsspke(res.audio)

1
pagesHome/pages/signinScan/signinScan.vue

@ -186,6 +186,7 @@
type: details.checkstate type: details.checkstate
} }
let response = await signforpage(data) let response = await signforpage(data)
if (response !== 200) return
if (details.current == 1) { if (details.current == 1) {
details.datalist = response.data.records details.datalist = response.data.records
} else { } else {

1
pagesTask/pages/contracts/contracts.vue

@ -481,6 +481,7 @@
pcontractQuestDetailList(FormData).then(res => { pcontractQuestDetailList(FormData).then(res => {
console.log(res); console.log(res);
if (res.code !== 200) return
// //
if (res.data.isInventory == 1) { if (res.data.isInventory == 1) {
stock.isInventory = res.data.isInventory stock.isInventory = res.data.isInventory

44
pagesTask/pages/dynamicCheck/dynamicCheck.vue

@ -1,5 +1,5 @@
<template> <template>
<BasicContainer :option="option"> <BasicContainer ref="basicContainer" :option="option">
<template #body v-if="renderList.length !== 0"> <template #body v-if="renderList.length !== 0">
<view class="taskList" v-for="item in renderList" :key="item.id"> <view class="taskList" v-for="item in renderList" :key="item.id">
<view class="taskData"> <view class="taskData">
@ -38,7 +38,7 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { reactive, toRefs } from 'vue'; import { reactive, toRefs, ref, onMounted } from 'vue';
import { import {
onLoad, onLoad,
onShow, onShow,
@ -76,6 +76,8 @@
isEnd: false, isEnd: false,
}) })
const basicContainer = ref(null)
const option = reactive({ const option = reactive({
title: '任务列表', title: '任务列表',
pullDownRefreshInitPage: async () => { pullDownRefreshInitPage: async () => {
@ -102,36 +104,6 @@
// uni.startPullDownRefresh() // uni.startPullDownRefresh()
}) })
// //
// let antiShake : any = null
// //
// onReachBottom(() => {
// // ,
// if (isEnd) {
// return uni.showToast({
// title: '',
// icon: 'success'
// })
// }
// if (antiShake) {
// uni.hideLoading()
// //
// clearTimeout(antiShake)
// return antiShake = null
// }
// uni.showLoading({
// mask: true,
// title: ''
// })
// antiShake = setTimeout(async () => {
// // +1
// details.page.current += 1
// //
// await initPage()
// uni.hideLoading()
// }, 500)
// })
// //
onPullDownRefresh(async () => { onPullDownRefresh(async () => {
// //
@ -151,6 +123,14 @@
// } // }
}) })
// onShow(() => {
// initPage()
// })
onMounted(() => {
basicContainer.value.startPullDownRefresh()
})
const goCheckList = (pageType : number | string, item : any) => { const goCheckList = (pageType : number | string, item : any) => {
// //
const { startTime, endTime } = item const { startTime, endTime } = item

5
pagesTask/pages/trayCheckDetails/trayCheckDetails.vue

@ -218,7 +218,7 @@
onLoad, onLoad,
onHide, onHide,
} from '@dcloudio/uni-app' } from '@dcloudio/uni-app'
import { ref, reactive, toRefs, watch } from "vue"; import { ref, reactive, toRefs, onMounted } from "vue";
import { import {
getWarehousetrayListInfo, getWarehousetrayListInfo,
@ -321,6 +321,9 @@
} }
}) })
if (details.holdBackFirstPost) return if (details.holdBackFirstPost) return
})
onMounted(() => {
basicContainer.value.startPullDownRefresh() basicContainer.value.startPullDownRefresh()
}) })

12
store/index.js

@ -5,9 +5,10 @@ import {
export default createStore({ export default createStore({
state: { state: {
islogin: true, islogin: true,
access_token:'', access_token: '',
refresh_token:'', refresh_token: '',
userinfo:{} userinfo: {},
repetitionCode: 4000
}, },
mutations: { mutations: {
updateislog(state, islogin) { updateislog(state, islogin) {
@ -24,11 +25,10 @@ export default createStore({
} }
}, },
actions: { actions: {
huoqubeijin(context){ huoqubeijin(context) {
// context.commit('') // context.commit('')
} }
}, },
getters: { getters: {},
},
modules: {} modules: {}
}); });

1921
unpackage/dist/dev/app-plus/app-service.js vendored

File diff suppressed because it is too large Load Diff

4
unpackage/dist/dev/app-plus/manifest.json vendored

@ -7,8 +7,8 @@
"id": "__UNI__EB22F37", "id": "__UNI__EB22F37",
"name": "货无忧", "name": "货无忧",
"version": { "version": {
"name": "1.0.18", "name": "1.0.19",
"code": 1018 "code": 1019
}, },
"description": "", "description": "",
"developer": { "developer": {

283
utils/request.js

@ -9,25 +9,58 @@ import base64 from '@/utils/base64.js';
import { import {
hexMD5 hexMD5
} from '@/utils/md5.js' } from '@/utils/md5.js'
// import {
// useUserStore
// } from "@/store/uaeUserStore";
// import { /**
// storeToRefs * 刷新token
// } from 'pinia'; */
const HandleRefreshToken = (header, urlhd, refresh_token, user) => {
// const userStore = useUserStore() _isRefreshToken._isRefreshToken = new Promise((resolve, reject) => {
console.log('user :>> ', user);
// const { const data = {
// HANDLE_ACCTOKEN, "grant_type": 'refresh_token',
// HANDLE_ISLOGIN, 'scope': 'all',
// HANDLE_REFTOKEN, "refresh_token": user.refresh_token,
// HANDLE_USERINFO 'tenantId': user.tenant_id
// } = userStore }
header['Content-Type'] = 'application/x-www-form-urlencoded'
header['Tenant-Id'] = user.tenant_id
uni.request({
url: urlhd + `blade-auth/oauth/token`,
data,
method: 'post',
header
}).then((res) => {
console.log('请求res :>> ', res);
// 请求成功
if (res.statusCode === 200) {
const userinfo = res.data
uni.setStorageSync('access_token', userinfo.access_token)
uni.setStorageSync('refresh_token', userinfo.refresh_token)
uni.setStorageSync('userinfo', userinfo)
resolve(res)
} else {
reject(null)
}
const service = (params) => { }).catch((err) => {
// 刷新token失败, 退出登录
uni.reLaunch({
url: '/pages/login/login'
})
uni.removeStorage({
key: 'access_token'
})
functions.error('请登录')
reject(err)
})
})
return _isRefreshToken._isRefreshToken
}
/**
* 请求函数
*/
const HandleRequest = (params, key) => {
return new Promise(async (relove, reject) => { return new Promise(async (relove, reject) => {
let refresh_token = uni.getStorageSync('refresh_token') let refresh_token = uni.getStorageSync('refresh_token')
let token = uni.getStorageSync('access_token') let token = uni.getStorageSync('access_token')
@ -47,10 +80,12 @@ const service = (params) => {
header.Authorization = `Basic ${base64.encode(APPKEY)}` header.Authorization = `Basic ${base64.encode(APPKEY)}`
// return // return
console.log('params :1111>> ', params);
if (params.url.indexOf('blade-auth/oauth/token') != -1) { if (params.url.indexOf('blade-auth/oauth/token') != -1) {
header['Content-Type'] = 'application/x-www-form-urlencoded' header['Content-Type'] = 'application/x-www-form-urlencoded'
header['Tenant-Id'] = params.data.tenantId header['Tenant-Id'] = params.data.tenantId
params.data.password = hexMD5(params.data.password) // 登录请求时, 加密密码
if (params.data.password) params.data.password = hexMD5(params.data.password)
} }
// uni.showLoading({ // uni.showLoading({
// title:'请求中', // title:'请求中',
@ -71,102 +106,162 @@ const service = (params) => {
// #endif // #endif
} }
function req() { let submitData = {
let submitData = { url: urlhd + params.url,
url: urlhd + params.url, data: params.data,
data: params.data, method: params.method,
method: params.method, header
header }
} // 当程序在app上运行时, 带上版本号
// 当程序在app上运行时, 带上版本号 // #ifdef APP
// #ifdef APP submitData = {
submitData = { url: urlhd + params.url,
url: urlhd + params.url, data: {
data: { ...params.data,
...params.data, version
version },
}, method: params.method,
method: params.method, // dataType: "json",
// dataType: "json", header
header }
} // #endif
// #endif
const request = uni.request(submitData)
console.log('request :>> ', request);
request.then(res => {
// console.log(res);
console.log('登录res :>> ', res);
uni.hideLoading()
if (res.statusCode == 200) {
let data = res.data;
// #ifdef APP
utils.ttsspke(data.audio || '')
// #endif
if (data.code != 200 && data?.msg) {
uni.showToast({
title: data?.msg || '',
icon: 'none'
})
} else if (data.audio) {
uni.showToast({
title: data.msg,
icon: 'none'
})
}
// 请求成功, 删除请求记录
delete requestObj[key]
uni.request(submitData).then(res => { switch (data.code) {
// console.log(res); case 200:
uni.hideLoading() relove(data);
if (res.statusCode == 200) { break;
case 203:
relove(data);
break;
default:
relove(data);
break;
}
let data = res.data; } else {
if (res.statusCode == 400) {
delete requestObj[key]
relove({});
return
} else if (res.statusCode == 500) {
delete requestObj[key]
functions.error('接口出错,请联系后端开发人员')
// #ifdef APP // #ifdef APP
utils.ttsspke(data.audio || '') utils.ttsspke('接口出错,请联系后端开发人员')
// #endif // #endif
if (data.code != 200 && data?.msg) { return
uni.showToast({ } else if (res.statusCode == 401) {
title: data?.msg || '', // 登录失败时
icon: 'none' if (!refresh_token) {
}) return uni.showToast({
} else if (data.audio) { title: "登录失败",
uni.showToast({
title: data.msg,
icon: 'none' icon: 'none'
}) })
} }
switch (data.code) { // 当token在刷新时, 等待
case 200: if (_isRefreshToken._isRefreshToken) {
relove(data); _isRefreshToken._isRefreshToken.then(() => {
break; // 递归重新请求
case 203: HandleRequest(requestObj[key], key).then((res) => {
relove(data); relove(res)
break; })
default:
relove(data);
break;
}
} else {
if (res.statusCode == 400) {
relove({});
return
} else if (res.statusCode == 500) {
functions.error('接口出错,请联系后端开发人员')
// #ifdef APP
utils.ttsspke('接口出错,请联系后端开发人员')
// #endif
return
} else if (res.statusCode == 401) {
// 没有权限, 返回login页面
uni.reLaunch({
url: '/pages/login/login'
}) })
uni.removeStorage({ } else {
key: 'access_token' console.log('header :>> ', header);
// 发起刷新请求
const refreshFn = HandleRefreshToken(header, urlhd, refresh_token, user)
refreshFn.then(res => {
// 递归重新请求
HandleRequest(requestObj[key], key).then((res) => {
relove(res)
})
}).finally(() => {
// 关闭刷新token状态
_isRefreshToken._isRefreshToken = null
}) })
functions.error('请登录')
return
} }
} else {
delete requestObj[key]
functions.error('连接服务器失败') functions.error('连接服务器失败')
// #ifdef APP // #ifdef APP
utils.ttsspke('连接服务器失败') utils.ttsspke('连接服务器失败')
// #endif // #endif
} }
}).catch(err => { }
console.log(err); }).catch(err => {
// uni.reLaunch({ console.log(err);
// url: '/pages/index/index' // uni.reLaunch({
// }) // url: '/pages/index/index'
functions.error('请检查是否连接到无线网络') // })
// #ifdef APP delete requestObj[key]
utils.ttsspke('请检查是否连接到无线网络') functions.error('请检查是否连接到无线网络')
// #endif // #ifdef APP
uni.hideLoading() utils.ttsspke('请检查是否连接到无线网络')
}) // #endif
} uni.hideLoading()
req() }).finally()
}) })
}
/**
* 存储请求
*/
const requestObj = {}
/**
* 是否正在进行刷新token
*/
let _isRefreshToken = {
_isRefreshToken: null
}
const service = async (params) => {
console.log('params :>> ', params);
const _key = params.url + JSON.stringify(params.data)
// 防止重复请求
if (requestObj[_key]) return new Promise(resolve => resolve({
code: 4000
}))
// 记录请求参数
requestObj[_key] = params
// 如果正在刷新token则不请求, 等token刷新成功后再请求
console.log('_isRefreshToken :>> ', _isRefreshToken);
if (_isRefreshToken._isRefreshToken) {
await _isRefreshToken._isRefreshToken
console.log('213123 :>> ', 213123);
return HandleRequest(params, _key)
} else return HandleRequest(params, _key)
} }
export default service; export default service;

178
utils/requestA.js

@ -0,0 +1,178 @@
import store from "@/store/index.js";
import utils from '@/utils/utils.js'
import functions from '@/utils/functions.js'
import {
host,
APPKEY
} from "@/config/host";
import base64 from '@/utils/base64.js';
import {
hexMD5
} from '@/utils/md5.js'
// import {
// useUserStore
// } from "@/store/uaeUserStore";
// import {
// storeToRefs
// } from 'pinia';
// const userStore = useUserStore()
// const {
// HANDLE_ACCTOKEN,
// HANDLE_ISLOGIN,
// HANDLE_REFTOKEN,
// HANDLE_USERINFO
// } = userStore
const service = (params) => {
return new Promise(async (relove, reject) => {
let refresh_token = uni.getStorageSync('refresh_token')
let token = uni.getStorageSync('access_token')
let user = uni.getStorageSync('userinfo')
let header = {};
if (user && token && refresh_token) {
store.commit('updateislog', true)
store.commit('updaterftk', refresh_token)
store.commit('updatetk', token)
store.commit('updatauser', user)
header['Blade-Auth'] = `bearer ${store.state.access_token}`
} else {
if (!token && params.url.indexOf('oauth/token') == -1) {
}
}
header.Authorization = `Basic ${base64.encode(APPKEY)}`
// return
if (params.url.indexOf('blade-auth/oauth/token') != -1) {
header['Content-Type'] = 'application/x-www-form-urlencoded'
header['Tenant-Id'] = params.data.tenantId
// 登录请求时, 加密密码
if (params.data.password) params.data.password = hexMD5(params.data.password)
}
// uni.showLoading({
// title:'请求中',
// mask:true
// })
let urlhd = ''
if (uni.getStorageSync('setip')) {
urlhd = uni.getStorageSync('setip')
} else {
urlhd = host
}
let version = ''
if (!version) {
// #ifdef APP
version = await utils.getversion()
version = version.version
// #endif
}
function req() {
let submitData = {
url: urlhd + params.url,
data: params.data,
method: params.method,
header
}
// 当程序在app上运行时, 带上版本号
// #ifdef APP
submitData = {
url: urlhd + params.url,
data: {
...params.data,
version
},
method: params.method,
// dataType: "json",
header
}
// #endif
const request = uni.request(submitData)
console.log('request :>> ', request);
request.then(res => {
// console.log(res);
console.log('登录res :>> ', res);
uni.hideLoading()
if (res.statusCode == 200) {
let data = res.data;
// #ifdef APP
utils.ttsspke(data.audio || '')
// #endif
if (data.code != 200 && data?.msg) {
uni.showToast({
title: data?.msg || '',
icon: 'none'
})
} else if (data.audio) {
uni.showToast({
title: data.msg,
icon: 'none'
})
}
switch (data.code) {
case 200:
relove(data);
break;
case 203:
relove(data);
break;
default:
relove(data);
break;
}
} else {
if (res.statusCode == 400) {
relove({});
return
} else if (res.statusCode == 500) {
functions.error('接口出错,请联系后端开发人员')
// #ifdef APP
utils.ttsspke('接口出错,请联系后端开发人员')
// #endif
return
} else if (res.statusCode == 401) {
// 没有权限, 返回login页面
uni.reLaunch({
url: '/pages/login/login'
})
uni.removeStorage({
key: 'access_token'
})
functions.error('请登录')
return
}
functions.error('连接服务器失败')
// #ifdef APP
utils.ttsspke('连接服务器失败')
// #endif
}
}).catch(err => {
console.log(err);
// uni.reLaunch({
// url: '/pages/index/index'
// })
functions.error('请检查是否连接到无线网络')
// #ifdef APP
utils.ttsspke('请检查是否连接到无线网络')
// #endif
uni.hideLoading()
})
}
req()
})
}
export default service;
Loading…
Cancel
Save