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
});
}
/**
* 签收数据
* @param {Object} data
*/
export function signforSignNum(data) {
return request({
url: `logpm-distribution/app/signfor/signNum`,
method: "get",
data
});
}
/**
* 客户列表
* @param {Object} data

2
compoment/BasicContainer/BasicContainer.vue

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

4
config/host.js

@ -12,9 +12,9 @@
// tjj
// const devhost = 'http://192.168.10.29:13000/'
// 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
// 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:{
value:number;
label:string;
typearr : {
value : number;
label : string;
}[];
/**
* */
orderStatus:number;
orderType:number;
orderStatus : number;
orderType : number;
/**
* */
// orderSelfNumbering:string;
/**
* */
dataList:any;
dataList : any;
/**id
* */
billLadingId:string|number;
orderCode?:string|number;
billLadingId : 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 utils from '../../utils/utils';
const tip = ref(null)
let details = reactive<listtype>({ tablist: [] });
// let details = reactive<listtype>({
// tablist: [
// {
// type: 1,
// name: '',
// minilist: [
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '',
// router: '/pagesHome/pages/orderInquiry/orderInquiry',
// },
// ]
// },
// {
// type: 1,
// name: '',
// minilist: [
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '',
// router: '/pagesHome/pages/scansorting/scansorting',
// },
// // {
// // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// // name: '',
// // router: '/pagesHome/pages/ordersorting/ordersorting',
// // },
// // {
// // icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// // name: '',
// // router: '/pagesHome/pages/lnventorysorting/lnventorysorting',
// // },
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '',
// router: '/pagesHome/pages/ScanUpType/ScanUpType',
// },
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '',
// router: '/pagesHome/pages/PeopleScanUpType/PeopleScanUpType',
// },
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '',
// router: '/pagesHome/pages/RelocationType/RelocationType',
// },
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '',
// router: '/pagesHome/pages/Retention/Retention',
// },
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '',
// router: '/pagesHome/pages/MergeTray/MergeTray',
// },
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '',
// router: '/pagesHome/pages/DownGoodsType/DownGoodsType',
// },
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '',
// router: '/pagesHome/pages/RemoveTray/RemoveTray',
// },
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '',
// router: '/pagesHome/pages/Check/Check',
// },
// ]
// },
// {
// type: 1,
// name: '',
// minilist: [
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '',
// router: '/pagesHome/pages/pickingScan/pickingScan',
// },
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '',
// router: '/pagesHome/pages/SelfPickupScan/SelfPickupScan',
// },
// ]
// },
// {
// type: 1,
// name: '',
// minilist: [
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '',
// router: '/pagesHome/pages/LoadingScan/LoadingScan',
// },
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '',
// router: '/pagesHome/pages/signinScan/signinScan',
// },
// ]
// },
// {
// type: 1,
// name: '线',
// minilist: [
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '线',
// router: '/pagesHome/pages/OfflineUpload/OfflineUpload',
// },
// ]
// },
// ]
// })
// let details = reactive<listtype>({ tablist: [] });
let details = reactive<listtype>({
tablist: [
{
type: 1,
name: '工作台',
minilist: [
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
name: '订单查询',
router: '/pagesHome/pages/orderInquiry/orderInquiry',
},
]
},
{
type: 1,
name: '库内',
minilist: [
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
name: '分拣打托',
router: '/pagesHome/pages/scansorting/scansorting',
},
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '',
// router: '/pagesHome/pages/ordersorting/ordersorting',
// },
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '',
// router: '/pagesHome/pages/lnventorysorting/lnventorysorting',
// },
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
name: '扫码上架',
router: '/pagesHome/pages/ScanUpType/ScanUpType',
},
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
name: '手动上架',
router: '/pagesHome/pages/PeopleScanUpType/PeopleScanUpType',
},
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
name: '移库',
router: '/pagesHome/pages/RelocationType/RelocationType',
},
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
name: '滞留',
router: '/pagesHome/pages/Retention/Retention',
},
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
name: '合托',
router: '/pagesHome/pages/MergeTray/MergeTray',
},
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
name: '下架',
router: '/pagesHome/pages/DownGoodsType/DownGoodsType',
},
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
name: '空置托盘',
router: '/pagesHome/pages/RemoveTray/RemoveTray',
},
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
name: '复核',
router: '/pagesHome/pages/Check/Check',
},
]
},
{
type: 1,
name: '出库',
minilist: [
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
name: '拣货扫描',
router: '/pagesHome/pages/pickingScan/pickingScan',
},
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
name: '自提扫描',
router: '/pagesHome/pages/SelfPickupScan/SelfPickupScan',
},
]
},
{
type: 1,
name: '配送',
minilist: [
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
name: '装车扫描',
router: '/pagesHome/pages/LoadingScan/LoadingScan',
},
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
name: '签收扫描',
router: '/pagesHome/pages/signinScan/signinScan',
},
]
},
{
type: 1,
name: '离线上传',
minilist: [
{
icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
name: '离线上传',
router: '/pagesHome/pages/OfflineUpload/OfflineUpload',
},
]
},
]
})
function gopathpage(path : string) {
uni.navigateTo({

1
pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue

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

9
pagesHome/pages/CustomerSign/CustomerSign.vue

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

1
pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan.vue

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

5
pagesHome/pages/DownGoods/DownGoods.vue

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

210
pagesHome/pages/LoadingDetails/LoadingDetails.vue

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

3
pagesHome/pages/LoadingScan/LoadingScan.vue

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

1
pagesHome/pages/MergeTrayDetails/MergeTrayDetails.vue

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

7
pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue

@ -463,6 +463,7 @@
orderCode: item.dataCode,
}
let res = await warehouseTrayTypedeleteOrderCode(data)
if (res.code !== 200) return
console.log('res :>> ', res);
initlist()
tip.value.setisshow(false)
@ -739,6 +740,7 @@
}
let response = await warehouseTrayTypegetZeroOrderByWaybillCode(data)
if (response.code !== 200) return
console.log(response);
details.codelist = response.data
details.codelist.map(item => {
@ -816,6 +818,7 @@
materialCode: details.stock.materialCode
}
let res = await warehouseTrayTypeselectStockByMaterialCodeAndMarketId(data)
if (res.code !== 200) return
// 0
details.stock.searchStockList = res.data.filter(val => val.quantityStock !== 0)
}
@ -899,7 +902,9 @@
_arr.forEach((value, index) => {
_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`
//

1
pagesHome/pages/OrderSortingDetailList/OrderSortingDetailList.vue

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

3
pagesHome/pages/PeopleScanUp/PeopleScanUp.vue

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

2
pagesHome/pages/PeopleSortingDetail/PeopleSortingDetail.vue

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

1
pagesHome/pages/PickingScanList/PickingScanList.vue

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

9
pagesHome/pages/SelfPScanList/SelfPScanList.vue

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

20
pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue

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

1
pagesHome/pages/SelfPickupScan/SelfPickupScan.vue

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

1
pagesHome/pages/SetPrice/SetPrice.vue

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

175
pagesHome/pages/SignDetailScan/SignDetailScan.vue

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

1
pagesHome/pages/StockUpListZero/StockUpListZero.vue

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

39
pagesHome/pages/StockUplist/StockUplist.vue

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

1
pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue

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

1
pagesHome/pages/createAddServe/createAddServe.vue

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

210
pagesHome/pages/inventoryDetail/inventoryDetail.vue

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

3
pagesHome/pages/inventoryenter/inventoryenter.vue

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

2
pagesHome/pages/lnventorysortinglist/lnventorysortinglist.vue

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

3
pagesHome/pages/loadingRetention/loadingRetention.vue

@ -1,6 +1,6 @@
<template>
<!-- <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>
<view class="hedtopt">
<view class="typto">
@ -155,6 +155,7 @@
id: details.id
}
let response = await deliverycustom(data)
if (response.code !== 200) return
details.renderList = response.data.records
}

1
pagesHome/pages/orderDetails/orderDetails.vue

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

1
pagesHome/pages/orderInquiry/orderInquiry.vue

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

3
pagesHome/pages/pickingScan/pickingScan.vue

@ -172,7 +172,8 @@
// 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
} else {
if (response.data.records.lngth == 0) {

10
pagesHome/pages/scansorting/scansorting.vue

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

2
pagesHome/pages/setbarcode/setbarcode.vue

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

7
pagesHome/pages/signOrderScan/signOrderScan.vue

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

1
pagesHome/pages/signinScan/signinScan.vue

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

1
pagesTask/pages/contracts/contracts.vue

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

44
pagesTask/pages/dynamicCheck/dynamicCheck.vue

@ -1,5 +1,5 @@
<template>
<BasicContainer :option="option">
<BasicContainer ref="basicContainer" :option="option">
<template #body v-if="renderList.length !== 0">
<view class="taskList" v-for="item in renderList" :key="item.id">
<view class="taskData">
@ -38,7 +38,7 @@
</template>
<script setup lang="ts">
import { reactive, toRefs } from 'vue';
import { reactive, toRefs, ref, onMounted } from 'vue';
import {
onLoad,
onShow,
@ -76,6 +76,8 @@
isEnd: false,
})
const basicContainer = ref(null)
const option = reactive({
title: '任务列表',
pullDownRefreshInitPage: async () => {
@ -102,36 +104,6 @@
// 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 () => {
//
@ -151,6 +123,14 @@
// }
})
// onShow(() => {
// initPage()
// })
onMounted(() => {
basicContainer.value.startPullDownRefresh()
})
const goCheckList = (pageType : number | string, item : any) => {
//
const { startTime, endTime } = item

5
pagesTask/pages/trayCheckDetails/trayCheckDetails.vue

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

12
store/index.js

@ -5,9 +5,10 @@ import {
export default createStore({
state: {
islogin: true,
access_token:'',
refresh_token:'',
userinfo:{}
access_token: '',
refresh_token: '',
userinfo: {},
repetitionCode: 4000
},
mutations: {
updateislog(state, islogin) {
@ -24,11 +25,10 @@ export default createStore({
}
},
actions: {
huoqubeijin(context){
huoqubeijin(context) {
// context.commit('')
}
},
getters: {
},
getters: {},
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",
"name": "货无忧",
"version": {
"name": "1.0.18",
"code": 1018
"name": "1.0.19",
"code": 1019
},
"description": "",
"developer": {

283
utils/request.js

@ -9,25 +9,58 @@ 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
/**
* 刷新token
*/
const HandleRefreshToken = (header, urlhd, refresh_token, user) => {
_isRefreshToken._isRefreshToken = new Promise((resolve, reject) => {
console.log('user :>> ', user);
const data = {
"grant_type": 'refresh_token',
'scope': 'all',
"refresh_token": user.refresh_token,
'tenantId': user.tenant_id
}
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) => {
let refresh_token = uni.getStorageSync('refresh_token')
let token = uni.getStorageSync('access_token')
@ -47,10 +80,12 @@ const service = (params) => {
header.Authorization = `Basic ${base64.encode(APPKEY)}`
// return
console.log('params :1111>> ', params);
if (params.url.indexOf('blade-auth/oauth/token') != -1) {
header['Content-Type'] = 'application/x-www-form-urlencoded'
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({
// title:'请求中',
@ -71,102 +106,162 @@ const service = (params) => {
// #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
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'
})
}
// 请求成功, 删除请求记录
delete requestObj[key]
uni.request(submitData).then(res => {
// console.log(res);
uni.hideLoading()
if (res.statusCode == 200) {
switch (data.code) {
case 200:
relove(data);
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
utils.ttsspke(data.audio || '')
utils.ttsspke('接口出错,请联系后端开发人员')
// #endif
if (data.code != 200 && data?.msg) {
uni.showToast({
title: data?.msg || '',
icon: 'none'
})
} else if (data.audio) {
uni.showToast({
title: data.msg,
return
} else if (res.statusCode == 401) {
// 登录失败时
if (!refresh_token) {
return uni.showToast({
title: "登录失败",
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'
// 当token在刷新时, 等待
if (_isRefreshToken._isRefreshToken) {
_isRefreshToken._isRefreshToken.then(() => {
// 递归重新请求
HandleRequest(requestObj[key], key).then((res) => {
relove(res)
})
})
uni.removeStorage({
key: 'access_token'
} else {
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('连接服务器失败')
// #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()
}
}).catch(err => {
console.log(err);
// uni.reLaunch({
// url: '/pages/index/index'
// })
delete requestObj[key]
functions.error('请检查是否连接到无线网络')
// #ifdef APP
utils.ttsspke('请检查是否连接到无线网络')
// #endif
uni.hideLoading()
}).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;

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