Skip to content

S
self-support
Commit af178223 authored by Damon's avatar Damon
Browse files
Options

Merge branch 'dev' of https://git.banshouhui.com/lijundan/self-support into dev

parents 49da1533 2e13902c
Show whitespace changes
Inline Side-by-side
Showing with 593 additions and 99 deletions
src/common/api/order.js
View file @ af178223
......@@ -188,6 +188,8 @@ let orderApiFun = function(vm){
let returnedParts = async (params = {}) => await vm.$u.get(prefix + 'parts/' + vm.vuex_token + '/return', params);
// 备件仓列表
let reserveList = async (params = {}) => await vm.$u.get(prefix + 'parts/' + vm.vuex_token + '/items/reserve', params);
// 配件物流
let getLogistics = async (orderId) => await vm.$u.get(prefix + 'parts/' + vm.vuex_token+ '/orders/'+ orderId +'/express',{}, formType);
const orderApi = {
listByRecommendOrder,
......@@ -235,7 +237,8 @@ let orderApiFun = function(vm){
completeNextStep,
applyList,
returnedParts,
reserveList
reserveList,
getLogistics
}
return orderApi
}
......
src/components/order/noOrder.vue
View file @ af178223
......@@ -12,22 +12,18 @@
type: String,
default: 'background-color: #FFFFFF'
},
type: { // 图片
imageName: { // 图片
type: String,
default: 'white',
default: 'wudingdan.png'
},
text: { // 提示文字
type: String,
default: '当前暂无订单'
}
},
computed: {
wudingdanImage() {
var name = 'wudingdan.png'
switch(this.type) {
case 'black':
name = "zwdd.png"
break
default:
break
}
return process.uniEnv.qn_base_url + name
return process.uniEnv.qn_base_url + this.imageName
}
}
}
......
src/components/parts/appliedPartsCell.vue
View file @ af178223
<template>
<!-- 已申请配件cell -->
<view class="applied-cell">
<view class="applied-cell" @click="handleClick">
<view class="title-view">
<view v-for="(item, key) in labels" :key="key">
<text>{{item}}:</text>
<text>{{info[key]}}</text>
<text class="title-text" :style="{'color': titleColor}">{{title}}</text>
<view>
<text>工单编号：</text>
<text>{{info.orderNumber}}</text>
</view>
</view>
<view class="line-view"></view>
<view class="list-content">
<view v-for="(item, index) in info.items" :key="index">
<!-- <PartsCell @operate="handleOperate" :info="item"></PartsCell> -->
<view class="image-list">
<image class="image-view" v-for="(item, index) in images" :key="index" :src="item"></image>
<view class="info-view" v-if="info.items.length == 1">
<view class="name-text">{{info.items[0].name}}</view>
<view>{{info.categoryName + '-' + info.brandName}}</view>
</view>
</view>
<view class="count-view">共{{info.items.length}}种</view>
</view>
<view class="bottom-view">
<view class="total-view">
<text>合计：</text>
<text class="amount-view">{{total}}</text>
<text>件</text>
</view>
<u-button v-if="buttonText" :custom-style="customStyle" shape="circle" @click.stop="handleOperate" type="primary">{{buttonText}}</u-button>
</view>
</view>
</template>
......@@ -23,7 +37,7 @@
type: Object,
default() {
return {
status: 0, // -1 已驳回，-1 已取消，0 新申请，1 待审核，10 待发货，11 配货中，12 采购中，15 已发货，20 已签收，21 待返件，22 返件中，90 已转备件，100 已完成
status: 0, // 待签收 15；待发货 10；待审核 1；已取消 -1；已驳回 -2；已签收 20
}
}
}
......@@ -35,7 +49,12 @@
},
computed: {
texts() {
return {}
return {
'1': '取消申请',
'10': '',
'15': '签收',
'20': '',
}
},
buttonText() {
return this.texts[this.info.status]
......@@ -46,14 +65,62 @@
'width': '100%',
}
},
labels() {
// 待签收 15；待发货 10；待审核 1；已取消 -1；已驳回 -2；已签收 20
title() {
return this.titles[String(this.info.status)]
},
titles() {
return {
'1': '待审核',
'10': '待发货',
'15': '代签收',
'20': '已签收',
'-1': '审核未通过',
'1': '已取消'
}
},
titleColor() {
switch (String(this.info.status)) {
case '-1': // 审核未通过
return '#FA5A49'
case '1': // 已取消
return '#666666'
default:
return '#2272FF'
}
},
total() { // 合计
var i = 0
for (var item of this.info.items) {
i += item.quantity
}
return i
},
images() {
var array = []
for (var item of this.info.items) {
if (item.images) {
array.push(process.uniEnv.systemUrl.apiUrl + item.images.split(',').shift())
} else {
array.push(this.placeholderImage)
}
}
return array
},
placeholderImage() {
return process.uniEnv.qn_base_url + 'logo.png'
},
customStyle() {
return {
'id': '申请单号',
'statusText': '状态'
'height': '80rpx',
'width': '200rpx',
}
}
},
methods: {
handleClick() {
this.$emit('action', this.info)
},
handleOperate() {
this.$emit('operate', this.info)
}
......@@ -63,12 +130,75 @@
<style lang="scss" scoped>
.applied-cell {
padding: 30rpx;
background-color: #FFFFFF;
border-radius: 12rpx;
margin-bottom: 20rpx;
.title-view{
display: flex;
align-items: center;
justify-content: space-between;
font-size: 26rpx;
color: #333333;
.title-text {
font-size: 36rpx;
font-weight: bold;
}
}
.line-view {
background-color: #F4F5F7;
height: 2rpx;
width: 100%;
margin-top: 20rpx;
}
.list-content {
display: flex;
width: 100%;
margin-top: 40rpx;
margin-bottom: 40rpx;
.image-list {
overflow-x: auto;
display: flex;
width: 100%;
border-right: 2rpx solid #F4F5F7;
margin-right: 30rpx;
.image-view {
width: 120rpx;
height: 120rpx;
margin-right: 20rpx;
flex-shrink: 0;
}
.info-view {
font-size: 24rpx;
color: #333333;
.name-text {
font-size: 32rpx;
font-weight: bold;
color: #333333;
margin-bottom: 30rpx;
}
}
}
.count-view {
width: 30rpx;
text-align: center;
font-size: 26rpx;
color: #666666;
}
}
.bottom-view {
display: flex;
justify-content: space-between;
align-items: center;
.total-view {
font-size: 32rpx;
font-weight: bold;
color: #333333;
.amount-view {
color: #2272FF;
padding-right: 10rpx;
}
}
}
}
......
src/pages.json
View file @ af178223
......@@ -270,6 +270,15 @@
"enablePullDownRefresh": false
}
},
{
"path": "warehouse/partsDetail",
"style": {
"navigationStyle": "custom",
"navigationBarTitleText": "", // 配件详情
"enablePullDownRefresh": false,
"disableScroll": true
}
},
{
"path": "superLogin/index",
"style": {
......
src/pages/index/order.vue
View file @ af178223
......@@ -23,7 +23,10 @@
refresher-enabled="true" :refresher-triggered="triggered" :refresher-threshold="100" :scroll-top="scrollTop"
refresher-background="#F4F5F7" @refresherpulling="triggered = true" @refresherrefresh="onRefresh"
@refresherrestore="onRestore" @scroll="scroll" enable-back-to-top>
<NoOrder v-if="noMore" type="black" :customStyle="noOrderCustomStyle" />
<view class="loading-view" v-if="!loaded">
<u-loading mode="flower"></u-loading>
</view>
<NoOrder v-else-if="noMore" imageName="zwdd.png" :customStyle="noOrderCustomStyle" />
<template v-else>
<view v-for="(item, index) in orderList" :key="item.orderId">
<OrderCell :orderData="item" :type="orderType" :location="dataValue" @click="handleClick"
......@@ -298,6 +301,14 @@
.load-more-view {
margin-bottom: 20rpx;
}
.loading-view {
width: 100%;
display: flex;
align-items: center;
justify-content: center;
margin-top: 300rpx;
position: absolute;
}
}
.tools-box {
......
src/pages/mine/warehouse/index.vue
View file @ af178223
......@@ -11,26 +11,28 @@
</view>
<u-button class="right-btn" @click="handleClickRecords" :custom-style="buttonStyle" type="primary"
shape="circle">操作记录</u-button>
</view>
<view class="search-btn" @click="handleClickSearch">
<image class="search-image" mode="widthFix" :src="sousuoImage"></image>
<text class="search-btn-text">搜索</text>
</view>
</view>
<view class="u-tabs-box">
<u-tabs height="66" activeColor="#2272FF" bg-color="none" inactive-color="#999" bar-height="4"
bar-width="44" :offset="[0,0]" :list="list[curNow]" count="total" :current="current[curNow]"
@change="change" :is-scroll="false" font-size="28" bold></u-tabs>
</view>
<view class="tab-view">
<scroll-view scroll-y style="height: 100%;width: 100%;" @scrolltolower="reachBottom" scroll-anchoring
refresher-enabled="true" :refresher-triggered="triggered" :refresher-threshold="100"
:scroll-top="scrollTop" refresher-background="#F4F5F7" @refresherpulling="triggered = true"
@refresherrefresh="onRefresh" @refresherrestore="onRestore" enable-back-to-top>
<NoOrder v-if="noParts" type="black" :customStyle="noPartsCustomStyle" />
<view class="loading-view" v-if="!loaded">
<u-loading mode="flower"></u-loading>
</view>
<NoOrder v-else-if="noParts" imageName="zwdd.png" text="当前暂无配件信息" :customStyle="noPartsCustomStyle" />
<template v-else>
<view v-for="(item, index) in partsList" :key="item.id">
<AppliedCell @operate="handleOperate" :info="item"></AppliedCell>
<AppliedCell @operate="handleOperate" :info="item" @action="handleClickCell"></AppliedCell>
</view>
<view class="load-more-view">
<u-loadmore v-show="(pageNumber == 1 && loaded) || pageNumber > 2" :status="loadStatus"
......@@ -78,33 +80,30 @@
};
},
computed: {
// 待签收 15；待发货 10；待审核 1；已驳回 -2；已签收 20;已取消 -1；
// 不传值 全部；待签收 15；待发货 10；待审核 1；已驳回 -2；已签收 20;已取消 -1；
list() {
return [
[{
'name': '代签收',
'status': 15
},
{
'name': '代发货',
'status': 10
'name': '全部',
'status': null
},
{
'name': '代审核',
'status': 1
},
{
'name': '已驳回',
'status': -2
'name': '代发货',
'status': 10
},
{
'name': '已签收',
'status': 20
'name': '代签收',
'status': 15
},
{
'name': '已取消',
'status': -1
},
'name': '已签收',
'status': 20
}
],
[{
'name': '备件仓',
......@@ -182,8 +181,9 @@
var param = {
'pageSize': 20,
'pageNumbr': 1,
'status': status, //不传值 全部；待签收 15；待发货 10；待审核 1；已取消 -1；已驳回 -2；已签收 20
// 'workOrderId': ''
}
if (status != null) {
param.status = status //不传值 全部；待签收 15；待发货 10；待审核 1；已取消 -1；已驳回 -2；已签收 20
}
this.$u.api.applyList(param).then((res) => {
if (res.code == 200) {
......@@ -193,19 +193,20 @@
if (this.pageNumber == 1) {
this.partsList = []
}
if (res.data.list) {
this.partsList.push(...res.data.list)
this.loadStatus = res.data.list.length < this.pageSize ? 'nomore' : 'loadmore'
res.data = [{"id":9406509.806407556,"type":86614521.01432693,"orderNumber":"RQ9543573175802","uid":67994626.298127,"workerId":69452943.60857615,"siteId":270403.14672003686,"status":15,"totalPriceApply":96899360.2165232,"totalPriceOuter":35919580.812509984,"totalPriceWarranty":-83602139.37454514,"totalPriceActual":-71939604.96854639,"warehouseId":61923414.728333235,"applyRemark":"tempor esse adipisicing nulla","deliverRemark":"enim","createTime":"cupidatat in Excepteur esse anim","updateTime":"dolore cillum","items":[{"id":88259111.29600757,"orderId":48226509.228051245,"name":"空开盒","partId":-52087023.09823719,"status":15,"quantity":2,"priceApply":-74553732.16561832,"priceActual":-52938715.5216837,"returnType":71273082.1392237,"useCount":68961949.10468733,"createTime":"ut minim laboris ex ea","updateTime":"culpa ea nulla adipisicing","returnId":-73960153.99926767, "images": "/rest/file/image/parts/invoice_1591333116039992.jpg,/rest/file/image/parts/invoice_1591333116048870.jpg"},{"id":-3524944.017209992,"orderId":34533058.60869488,"name":"电缆","partId":78320657.17744848,"status":15,"quantity":6,"priceApply":72739542.49244872,"priceActual":5169889.19776167,"returnType":-92361482.60375243,"useCount":59522052.97427672,"createTime":"ut velit adipisicing incididunt","updateTime":"pariatur sed proident","returnId":-96764909.17950238,"images": "/rest/file/image/parts/invoice_1591333116039992.jpg,/rest/file/image/parts/invoice_1591333116048870.jpg"}],"images":"/rest/file/image/parts/invoice_1591333116039992.jpg,/rest/file/image/parts/invoice_1591333116048870.jpg","statusText":"待审核","workOrderId":-12573027.93228963,"workOrderNumber":"OR20150327000003","measures":"est","express":{"orderId":1804452.0561671257,"status":-1,"name":"机顶盒","phoneNumber":"minim Ut nisi","areaCode":42437809.509774685,"address":"magna","createTime":"mollit tempor cillum","deliveryTime":"consequat et labore dolore","updateTime":"nostrud","remark":"eiusmod mollit ea aute","com":"sint nisi anim elit dolor","number":"consectetur ex"},"productModel":"incididunt magna velit Excepteur laboris","productBarcode":"esse","supplierId":53499096.003008485,"brandName":"长虹（CHANGHONG）","productId":-68709997.40881962,"categoryName":"电冰箱"},{"id":21491164.69065389,"type":-99940494.04686938,"orderNumber":"RE9878766666","uid":-86210053.82862727,"workerId":47505594.97869697,"siteId":-3766937.9397049993,"status":-1,"totalPriceApply":78049843.31156719,"totalPriceOuter":-97305746.39303829,"totalPriceWarranty":-93872258.5442259,"totalPriceActual":54629844.58685568,"warehouseId":72893467.15425757,"applyRemark":"ullamco cillum commodo tempor","deliverRemark":"labore dolor Ut ex id","createTime":"laborum enim minim sint","updateTime":"tempor pariatur","items":[{"id":22876807.093349114,"orderId":-73328349.75448325,"name":"proident culpa","partId":-57956331.85626335,"status":-61540349.085944615,"quantity":88196350.70342317,"priceApply":-49775657.860448994,"priceActual":-25006069.17107247,"returnType":84771113.8737934,"useCount":86264998.81449816,"createTime":"pariatur commodo esse nisi Ut","updateTime":"officia laboris cupidatat","returnId":73065823.78881967},{"id":-51040560.904031195,"orderId":-28945683.292889908,"name":"cupidatat veniam reprehenderit velit ea","partId":38434800.50565642,"status":43614158.136024624,"quantity":9111630.336844191,"priceApply":38764169.330946624,"priceActual":-1931327.0985768437,"returnType":-93067293.47853354,"useCount":90333545.98417392,"createTime":"nisi","updateTime":"cillum dolore sint","returnId":91168418.0917764},{"id":45557257.39867419,"orderId":1407586.8636095077,"name":"ad labore tempor","partId":-99019059.82541245,"status":8199757.844844416,"quantity":49577898.758369386,"priceApply":78393740.80746442,"priceActual":-19161016.249845147,"returnType":-99616253.70173919,"useCount":-91155682.11473106,"createTime":"quis id sunt magna proident","updateTime":"consequat irure","returnId":69728822.52361763},{"id":52490483.55701485,"orderId":22205466.1845994,"name":"minim","partId":99353322.81353238,"status":74090404.86914167,"quantity":92588636.85998356,"priceApply":21638286.200525463,"priceActual":42168758.11864549,"returnType":2228380.1288566887,"useCount":-56271233.94790425,"createTime":"ullamco","updateTime":"sit Duis id proident","returnId":-48202137.79856801},{"id":-17082858.02511455,"orderId":-74415557.20143555,"name":"eu mollit","partId":-29774044.667875186,"status":73843352.9406685,"quantity":-12878510.704664588,"priceApply":47246503.69669163,"priceActual":-50399277.40573487,"returnType":80989912.69142082,"useCount":26525737.12704797,"createTime":"id","updateTime":"Duis","returnId":18003864.839698642}],"images":"/rest/file/image/parts/invoice_1591333116039992.jpg,/rest/file/image/parts/invoice_1591333116048870.jpg","statusText":"待审核","productId":23292895.61379446,"categoryName":"电冰箱","productModel":"pariatur est laborum Lorem velit","supplierId":5143732.578579828,"workOrderId":75720200.59443054,"measures":"pariatur nisi","productBarcode":"fugiat","brandName":"长虹（CHANGHONG）","workOrderNumber":"OR20150327000003","express":{"orderId":-45628847.934746996,"status":84421057.49708548,"name":"anim","phoneNumber":"laborum anim elit et ex","areaCode":-8920144.598569289,"address":"ut fugiat consequat pariatur incididunt","createTime":"incididunt in","deliveryTime":"enim consequat do incididunt adipisicing","updateTime":"voluptate magna Ut elit sint","number":"Excepteur sunt pariatur velit est","com":"ea sint irure eiusmod","remark":"aliqua quis tempor"}},{"id":78424322.41282636,"type":33783320.35653822,"orderNumber":"esse do amet nulla","uid":96825133.44702333,"workerId":-20514660.459787086,"siteId":-96725068.14741592,"status":1,"totalPriceApply":12907471.845122173,"totalPriceOuter":83153762.12794018,"totalPriceWarranty":-45816944.25450489,"totalPriceActual":46263733.25401527,"warehouseId":-80245498.07111172,"applyRemark":"irure laborum","deliverRemark":"non in nulla eiusmod consectetur","createTime":"enim laboris","updateTime":"non Excepteur incididunt magna aliquip","items":[{"id":43122261.98756099,"orderId":89891559.09495953,"name":"aute tempor sed","partId":-33112044.289685547,"status":-90355790.51323123,"quantity":99573793.60419351,"priceApply":-1347292.11380589,"priceActual":60305230.40028921,"returnType":-34640097.10314855,"useCount":79567567.223061,"createTime":"cillum eu deserunt","updateTime":"exercitation nisi in","returnId":-31561799.157562435}],"images":"/rest/file/image/parts/invoice_1591333116039992.jpg,/rest/file/image/parts/invoice_1591333116048870.jpg","statusText":"待审核","workOrderNumber":"OR20150327000003","express":{"orderId":-77965448.40290305,"status":-48505936.17972718,"name":"qui Duis","phoneNumber":"anim occaecat sit commodo","areaCode":-32566304.761578918,"address":"proident Excepteur","createTime":"non laboris dolor et","deliveryTime":"dolore veniam Duis","updateTime":"nulla esse","number":"sint ut et esse","com":"irure laboris","remark":"dolor Lorem laboris dolor"},"productBarcode":"cillum nulla Ut ipsum","productId":-47980724.91529095,"measures":"exercitation","brandName":"长虹（CHANGHONG）","supplierId":-21118419.445017934,"productModel":"incididunt irure","workOrderId":23532670.725171506,"categoryName":"电冰箱"},{"id":-27016749.524627715,"type":98311830.96038702,"orderNumber":"Excepteur exercitation voluptate","uid":-23955900.388702527,"workerId":12348320.263107345,"siteId":85445481.861619,"status":-85639031.40044658,"totalPriceApply":59578811.39297968,"totalPriceOuter":63020136.54167214,"totalPriceWarranty":43624244.99155545,"totalPriceActual":66909001.40717006,"warehouseId":61666308.50697875,"applyRemark":"reprehenderit dolor consectetur","deliverRemark":"voluptate aute elit Excepteur","createTime":"dolore veniam Duis","updateTime":"labore proident ut deserunt irure","items":[{"id":29537776.228774786,"orderId":67503467.09976402,"name":"minim nulla nisi ex eu","partId":-21949243.355626136,"status":93701973.31152403,"quantity":-5584003.629620329,"priceApply":7135128.281559229,"priceActual":85248204.81612098,"returnType":12998787.696959198,"useCount":-68055928.52868809,"createTime":"laboris voluptate in consequat dolor","updateTime":"culpa in","returnId":-20348547.63497989},{"id":39742322.49149105,"orderId":96562506.70698965,"name":"dolore eiusmod occaecat","partId":-26810768.572022334,"status":2796631.830863744,"quantity":-26922446.21481517,"priceApply":-55179205.75027007,"priceActual":5697379.518900096,"returnType":53261341.24092224,"useCount":74342986.36835992,"createTime":"ipsum laborum","updateTime":"dolore","returnId":-21860322.65894431},{"id":-17470619.832603917,"orderId":48112878.69515741,"name":"commodo","partId":27845586.202810198,"status":83884256.5329633,"quantity":69335236.06709576,"priceApply":-84246321.52978861,"priceActual":28965031.536926314,"returnType":-550131.0979412645,"useCount":99968478.51870897,"createTime":"pariatur qui cillum Duis","updateTime":"proident aliqua sunt","returnId":14952441.495038033},{"id":34995646.945470065,"orderId":-39293942.692088366,"name":"sunt","partId":57973905.82733452,"status":66859878.30531177,"quantity":-72406647.4199554,"priceApply":-10822358.045907527,"priceActual":26050607.973160654,"returnType":45059697.69330442,"useCount":41999647.11947328,"createTime":"proident in mollit in","updateTime":"reprehenderit magna amet","returnId":-86293781.49458757},{"id":96571724.33663553,"orderId":-16255981.89165847,"name":"minim ipsum ullamco culpa","partId":33297414.986852616,"status":35470971.70208612,"quantity":-47109346.81945864,"priceApply":-72173057.59690742,"priceActual":-94334669.98701036,"returnType":-47114863.55247505,"useCount":92358631.7287406,"createTime":"consectetur reprehenderit minim Excepteur","updateTime":"ut aute anim sed","returnId":92143490.11591995}],"images":"/rest/file/image/parts/invoice_1591333116039992.jpg,/rest/file/image/parts/invoice_1591333116048870.jpg","statusText":"待审核","productBarcode":"laborum cillum adipisicing ad velit","categoryName":"电冰箱","workOrderId":12532424.255793735,"workOrderNumber":"OR20150327000003","brandName":"长虹（CHANGHONG）","express":{"orderId":-47061242.5943119,"status":-71113301.69277315,"name":"sit in","phoneNumber":"voluptate dolor commodo","areaCode":3163523.565223247,"address":"sed consectetur aliqua","createTime":"occaecat fugiat in mollit","deliveryTime":"consectetur anim","updateTime":"velit non enim ut","com":"qui sint cillum","remark":"sed nostrud cillum","number":"veniam nulla"},"supplierId":659667.8267708272,"productId":87457975.53702831,"productModel":"ex","measures":"do in non"},{"id":79910321.25893903,"type":-92755715.85938272,"orderNumber":"dolore","uid":32045129.492245644,"workerId":-87225497.55755508,"siteId":929206.9191809446,"status":-49628754.46400306,"totalPriceApply":-86759265.47973964,"totalPriceOuter":77774648.6038025,"totalPriceWarranty":-43192184.70357793,"totalPriceActual":63259397.26451972,"warehouseId":-51540398.5483279,"applyRemark":"ut","deliverRemark":"est labore dolor","createTime":"consectetur","updateTime":"ut velit tempor irure mollit","items":[{"id":-59145028.86317692,"orderId":-11320686.899104223,"name":"enim","partId":49736274.59968069,"status":95250295.35558042,"quantity":-81208607.06551526,"priceApply":-8044619.175376594,"priceActual":-48277760.54597996,"returnType":64159297.29585245,"useCount":84371931.03454325,"createTime":"esse ea dolor anim nulla","updateTime":"laborum reprehenderit sit veniam","returnId":24299761.634605184}],"images":"/rest/file/image/parts/invoice_1591333116039992.jpg,/rest/file/image/parts/invoice_1591333116048870.jpg","statusText":"待审核","productModel":"ut sint dolor reprehenderit eu","brandName":"长虹（CHANGHONG）","productBarcode":"reprehenderit laboris Lorem tempor","measures":"irure elit pariatur","supplierId":-36938327.731029876,"workOrderId":78526155.84958395,"express":{"orderId":-49350095.5799381,"status":29255996.85214384,"name":"irure labore","phoneNumber":"dolor mollit pariatur consectetur","areaCode":43876681.307484895,"address":"ipsum enim dolor nostrud proident","createTime":"in pariatur eiusmod","deliveryTime":"ea","updateTime":"aute","remark":"ut id magna","number":"eu Ut","com":"dolor culpa non Ut"},"productId":-58537035.058075525,"workOrderNumber":"OR20150327000003","categoryName":"电冰箱"}]
if (res.data) {
this.partsList.push(...res.data)
this.loadStatus = res.data.length < this.pageSize ? 'nomore' : 'loadmore'
}
} else {
console.log(res.message, "获取订单数量失败！");
console.log(res.message)
}
this.loaded = true
});
},
getReturnedParts(status) { // 返件列表
getReturnedParts(status) { // 返件列表
this.pageNumber += 1
this.loaded = false
var param = {
......@@ -222,12 +223,12 @@ getReturnedParts(status) { // 返件列表
if (this.pageNumber == 1) {
this.partsList = []
}
if (res.data.list) {
this.partsList.push(...res.data.list)
this.loadStatus = res.data.list.length < this.pageSize ? 'nomore' : 'loadmore'
if (res.data) {
this.partsList.push(...res.data)
this.loadStatus = res.data.length < this.pageSize ? 'nomore' : 'loadmore'
}
} else {
console.log(res.message, "获取订单数量失败！");
console.log(res.message)
}
this.loaded = true
});
......@@ -236,20 +237,15 @@ getReturnedParts(status) { // 返件列表
getReserveList() { // 备件列表
this.pageNumber += 1
this.loaded = false
this.$u.api.reserveList(param).then((res) => {
this.$u.api.reserveList().then((res) => {
if (res.code == 200) {
if (res.data.type != this.partsType) return
this.triggered = false;
this._freshing = false;
if (this.pageNumber == 1) {
this.partsList = []
}
if (res.data.list) {
this.partsList.push(...res.data.list)
this.loadStatus = res.data.list.length < this.pageSize ? 'nomore' : 'loadmore'
}
this.triggered = false
this._freshing = false
this.partsList = res.data || []
this.loadStatus = 'nomore'
} else {
console.log(res.message, "获取订单数量失败！");
console.log(res.message);
}
this.loaded = true
});
......@@ -258,6 +254,16 @@ getReturnedParts(status) { // 返件列表
// 调接口
// 刷新页面
},
handleClickCell(info) {
var pages = getCurrentPages();
if (pages.length >= 1) {
var page = pages[pages.length - 1];
page.info = info
}
uni.navigateTo({
url: 'pages/mine/warehouse/partsDetail'
})
},
handleClickRecords() {
uni.navigateTo({
url: 'pages/mine/warehouse/records'
......@@ -298,7 +304,6 @@ getReturnedParts(status) { // 返件列表
}
},
reachBottom(e) {
if (this.isReserve) this.loadStatus = 'nomore' // 已入库的备件仓没有分页
if (this.loadStatus != 'loadmore') return
this.loadStatus == 'loading'
this.loadPartsList()
......@@ -316,30 +321,6 @@ getReturnedParts(status) { // 返件列表
height: 100vh;
display: flex;
flex-direction: column;
.u-tabs-box {
margin-bottom: 30rpx;
}
.tab-view {
height: 100%;
overflow: auto;
.load-more-view {
margin-bottom: 20rpx;
}
}
.tools-box {
display: flex;
flex-direction: row;
justify-content: space-between;
padding-bottom: 20rpx;
.search-sub {
height: 72rpx;
width: 320rpx;
}
.search-btn {
height: 72rpx;
width: 220rpx;
......@@ -363,6 +344,36 @@ getReturnedParts(status) { // 返件列表
font-size: 26rpx;
}
}
.u-tabs-box {
margin-bottom: 30rpx;
}
.tab-view {
height: 100%;
overflow: auto;
.load-more-view {
margin-bottom: 20rpx;
}
.loading-view {
width: 100%;
display: flex;
align-items: center;
justify-content: center;
margin-top: 300rpx;
position: absolute;
}
}
.tools-box {
display: flex;
flex-direction: row;
justify-content: space-between;
padding-bottom: 20rpx;
.search-sub {
height: 72rpx;
width: 320rpx;
}
}
.bottom-view {
display: flex;
......
src/pages/mine/warehouse/partsDetail.vue 0 → 100644
View file @ af178223
<template>
<view class="parts-detail">
<u-navbar back-icon-color="#333333" background="#F4F5F7" titleColor="#333333" :border-bottom="false" title-bold>
</u-navbar>
<view class="title-text" :style="{'color': titleColor}">{{title}}</view>
<view class="content-view">
<view class="title-view">
<view>
<text>工单编号：</text>
<text>{{info.orderNumber}}</text>
</view>
</view>
<view class="line-view"></view>
<view class="list-content">
<view class="list-item" v-for="(item, index) in info.items" :key="index">
<view class="left-view">
<image class="image-view" :src="imageUrl(item)"></image>
<view class="info-view">
<view class="name-text">{{item.name}}</view>
<view>{{noteText}}</view>
</view>
</view>
<view class="count-view">x{{item.quantity}}</view>
</view>
</view>
<view class="line-view"></view>
<view class="detail-info-view">
<view v-for="(value, key) in detailKey" :key="key" class="info-item">
<text>{{ value }}:</text>
<text>{{ detail[key] }}</text>
</view>
</view>
<view class="logistics-view"></view>
</view>
<view class="bottom-view">
<view class="total-view">
<text>合计：</text>
<text class="amount-view">{{total}}</text>
<text>件</text>
</view>
<u-button v-if="buttonText" :custom-style="customStyle" shape="circle" @click="handleClick" type="primary">
{{buttonText}}
</u-button>
</view>
</view>
</template>
<script>
export default {
data() {
return {
info: {items:[], express: []},
logisticsRecords: [], // 物流
};
},
computed: {
texts() {
return {
'1': '取消申请',
'10': '',
'15': '签收',
'20': '',
}
},
buttonText() {
return this.texts[this.info.status]
},
buttonStyle() {
return {
'height': '104rpx',
'width': '100%',
}
},
// 待签收 15；待发货 10；待审核 1；已取消 -1；已驳回 -2；已签收 20
title() {
return this.titles[String(this.info.status)]
},
titles() {
return {
'1': '待审核',
'10': '待发货',
'15': '代签收',
'20': '已签收',
'-1': '审核未通过',
'1': '已取消'
}
},
titleColor() {
switch (String(this.info.status)) {
case '-1': // 审核未通过
return '#FA5A49'
case '1': // 已取消
return '#666666'
default:
return '#2272FF'
}
},
total() { // 合计
var i = 0
for (var item of this.info.items) {
i += item.quantity
}
return i
},
placeholderImage() {
return process.uniEnv.qn_base_url + 'logo.png'
},
customStyle() {
return {
'height': '80rpx',
'width': '200rpx',
}
},
noteText() {
return this.info.categoryName + '-' + this.info.brandName
},
detail() { // 详情
return {
'orderNumber': this.info.orderNumber,
'createTime': this.info.createTime,
'name': this.info.express.com,
'number': this.info.express.number
}
},
detailKey() { // 详情
return {
'orderNumber': '申请单号',
'createTime': '申请时间',
'name': '物流公司',
'number': '物流单号'
}
}
},
onLoad() {
getApp().trackPage('仓库配件详情')
var pages = getCurrentPages();
if (pages.length >= 2) {
var page = pages[pages.length - 2];
this.info = page.info
}
this.getLogistics()
},
methods: {
getLogistics() {
this.$u.api.getLogistics(this.info.id).then((res) => {
res = {
"code": 200,
"message": "",
"data": {
"orderId": 1883,
"status": 15,
"com": "sf",
"number": "SF1314164238675",
"name": "周明杨",
"phoneNumber": "17630408443",
"areaCode": 0,
"province": "44",
"city": "4401",
"district": "440106",
"street": "440106001",
"address": "广东省 广州市 天河区 长兴街道 芩村北街四巷16号菜鸟驿站",
"fullAddress": null,
"remark": "",
"createTime": 1624104976000,
"deliveryTime": 1624256100000,
"receiveTime": null,
"updateTime": 1624256100000,
"expressInfo": {
"state": "1",
"state_name": "transporting",
"state_orig": "0",
"records": [{
"datetime": "2021-06-22 04:09:08",
"context": "[杭州市]快件在【杭州萧山铁路站点】完成分拣,准备发往 【广州棠溪铁路站点】"
}, {
"datetime": "2021-06-22 04:09:08",
"context": "[杭州市]快件到达 【杭州萧山铁路站点】"
}, {
"datetime": "2021-06-21 23:46:32",
"context": "[金华市]快件已发车"
}, {
"datetime": "2021-06-21 23:46:26",
"context": "[金华市]快件在【金华金东中转场】完成分拣,准备发往 【杭州萧山铁路站点】"
}, {
"datetime": "2021-06-21 19:33:17",
"context": "[金华市]快件到达 【金华金东中转场】"
}, {
"datetime": "2021-06-21 18:41:02",
"context": "[金华市]快件已发车"
}, {
"datetime": "2021-06-21 18:40:53",
"context": "[金华市]快件在【金华永康滨江速运营业点】完成分拣,准备发往 【金华金东中转场】"
}, {
"datetime": "2021-06-21 17:17:54",
"context": "[金华市]顺丰速运 已收取快件"
}]
}
}
}
if (res.code == 200) {
if (res.data && res.data.records) {
this.logisticsRecords = res.data.records
}
} else {
console.log(res.message)
}
});
},
handleClick() {
},
imageUrl(item) {
return item.images ? item.images.split(',').shift() : this.placeholderImage
},
}
};
</script>
<style lang="scss" scoped>
.parts-detail {
background-color: #FFFFFF;
border-radius: 12rpx;
margin-bottom: 20rpx;
background-color: #F4F5F7;
height: 100vh;
display: flex;
flex-direction: column;
.title-text {
font-size: 48rpx;
font-weight: bold;
padding: 0 30rpx 30rpx 30rpx;
;
}
.content-view {
margin: 0 30rpx 30rpx 30rpx;
padding: 30rpx;
background-color: #FFFFFF;
border-radius: 12rpx;
height: 100%;
overflow: auto;
.title-view {
display: flex;
align-items: center;
justify-content: space-between;
font-size: 26rpx;
color: #333333;
}
.line-view {
background-color: #F4F5F7;
height: 2rpx;
width: 100%;
margin-top: 20rpx;
}
.list-content {
margin-top: 40rpx;
margin-bottom: 40rpx;
.list-item {
display: flex;
width: 100%;
margin-right: 30rpx;
justify-content: space-between;
align-items: flex-end;
margin-bottom: 40rpx;
.left-view {
display: flex;
align-items: center;
.image-view {
width: 120rpx;
height: 120rpx;
margin-right: 20rpx;
flex-shrink: 0;
}
.info-view {
font-size: 24rpx;
color: #333333;
.name-text {
font-size: 32rpx;
font-weight: bold;
color: #333333;
margin-bottom: 30rpx;
}
}
}
.count-view {
font-size: 28rpx;
color: #333333;
}
}
}
.detail-info-view {
padding: 30rpx 0;
.info-item {
margin-bottom: 20rpx;
color: #333333;
font-size: 26rpx;
}
}
.ogistics-view {}
}
.bottom-view {
display: flex;
justify-content: space-between;
align-items: center;
margin: 10rpx 30rpx 44rpx 30rpx;
.total-view {
font-size: 32rpx;
font-weight: bold;
color: #333333;
.amount-view {
color: #2272FF;
}
}
}
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment