Commit 29c2edb1 authored by Morson's avatar Morson

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

# Conflicts:
#	src/pages/order/detail.vue
parents 46b7c5ec e59d6a50
(function () { (function () {
let NODE_ENV = 'test'; // dev:开发环境 | test:测试环境 | prod:生产环境 let NODE_ENV = 'test'; // dev:开发环境 | test:测试环境 | prod:生产环境
let ENV_VAR = null; let ENV_VAR = null;
let VERSION_NUMBER = '1.3.9';//版本号 let VERSION_NUMBER = '1.3.9';//版本号
//小程序是否审核通过,参数配置在ucenter库version表,对应版本号的is_audit设置为1,将显示学习视频 //小程序是否审核通过,参数配置在ucenter库version表,对应版本号的is_audit设置为1,将显示学习视频
if (process.env.NODE_ENV === "development") { if (process.env.NODE_ENV === "development") {
if (NODE_ENV === 'dev') { if (NODE_ENV === 'dev') {
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
} else if (NODE_ENV === 'prod') { } else if (NODE_ENV === 'prod') {
ENV_VAR = require('./.env.prod.js'); ENV_VAR = require('./.env.prod.js');
} }
ENV_VAR['bmapAK'] = 'G1wPip2Oj62NnoUctXhiE1faZVHbeo2A';
} else if (process.env.NODE_ENV === "production") { } else if (process.env.NODE_ENV === "production") {
if (NODE_ENV === 'test') { if (NODE_ENV === 'test') {
ENV_VAR = require('./.env.test.js'); ENV_VAR = require('./.env.test.js');
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
process.uniEnv = {}; process.uniEnv = {};
process.uniEnv['node_env'] = NODE_ENV; process.uniEnv['node_env'] = NODE_ENV;
process.uniEnv['version_number'] = VERSION_NUMBER; process.uniEnv['version_number'] = VERSION_NUMBER;
process.uniEnv['bmapAK'] = 'lF1HoyXdiv4uZx6TrGQEZs48F5y8kEHI';
for (let key in ENV_VAR) { for (let key in ENV_VAR) {
process.uniEnv[key] = ENV_VAR[key]; process.uniEnv[key] = ENV_VAR[key];
} }
......
...@@ -111,7 +111,16 @@ ...@@ -111,7 +111,16 @@
orderText() { // 按钮文字 orderText() { // 按钮文字
return this.typeTexts[this.orderType] return this.typeTexts[this.orderType]
}, },
buttonStyle() { // 按钮样式 buttonStyle() { // 按钮样式
/** orderType
0 待接单、
1 待预约、
2 待签到、
3 待完工、
4 审核中、
5 异常单、
6 已完工
*/
switch (this.orderType) { switch (this.orderType) {
case 0: case 0:
if (!this.isCompetition ) { if (!this.isCompetition ) {
...@@ -198,6 +207,12 @@ ...@@ -198,6 +207,12 @@
showDistance() { showDistance() {
return this.orderType == 0 && this.location.length >= 2 && (this.orderData.contactAddressLatitud || this.orderData.contactAddressLongitud) return this.orderType == 0 && this.location.length >= 2 && (this.orderData.contactAddressLatitud || this.orderData.contactAddressLongitud)
}, },
isWaitFinish() {
return this.orderType == 3
},
isException() {
return this.orderType == 5
},
types() { types() {
return { return {
'waitAccept': 0, // 待接单、 'waitAccept': 0, // 待接单、
...@@ -269,10 +284,17 @@ ...@@ -269,10 +284,17 @@
methods: { methods: {
// title:标题,showCountTime:是否显示倒计时。详情页面情况太多,提前传值可以避免页面晃动 // title:标题,showCountTime:是否显示倒计时。详情页面情况太多,提前传值可以避免页面晃动
handleClick() { handleClick() {
// if (this.buttonDisabled) return var func = 'click'
if (this.isWaitFinish || this.isException) { // 不是待完工、不是异常单点按钮算点cell
func = 'action'
}
this.$emit('action', this.orderData, this.type, this.showCountTime ? 'show' : '') this.$emit('action', this.orderData, this.type, this.showCountTime ? 'show' : '')
}, },
handleClickCell() { handleClickCell() {
var func = 'click'
if (this.isException) { // 异常单点cell算点按钮
func = 'action'
}
this.$emit('click', this.orderData, this.type, this.showCountTime ? 'show' : '') this.$emit('click', this.orderData, this.type, this.showCountTime ? 'show' : '')
}, },
handleChange(timestamp) { handleChange(timestamp) {
......
...@@ -114,15 +114,15 @@ ...@@ -114,15 +114,15 @@
}, },
titleColor() { titleColor() {
switch (String(this.info.status)) { switch (String(this.info.status)) {
case '-1': // 审核未通过 case '-2': // 审核未通过
return '#FA5A49' return '#FA5A49'
case '1': // 已取消 case '-1': // 已取消
return '#333333' return '#333333'
default: default:
return '#2272FF' return '#2272FF'
} }
}, },
// 待签收 15 变 已签收 20; 10 待审核 1 变 已取消 -1 // 待签收 15 -> 已签收 20; 待审核 1 -> 已取消 -1
willStatuses() { willStatuses() {
return { return {
'1': '-1', '1': '-1',
......
...@@ -8,7 +8,12 @@ ...@@ -8,7 +8,12 @@
<view>{{remarkText}}</view> <view>{{remarkText}}</view>
</view> </view>
</view> </view>
<view class="count-view">x{{item.quantity||0}}</view> <view class="count-view">
<view v-if="showChecked">
<u-number-box v-model="item.quantity" :min="item.min || 0" :max="item.max || item.quantity" @change="numChange"></u-number-box>
</view>
<text v-else>x{{item.quantity||0}}</text>
</view>
</view> </view>
</template> </template>
...@@ -51,7 +56,11 @@ ...@@ -51,7 +56,11 @@
methods: { methods: {
handleChange() { handleChange() {
this.$emit('change') this.$emit('change')
} },
numChange(event) {
console.log(event.value)
this.$emit('numChange', event.value)
},
} }
} }
</script> </script>
......
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
align-items: center; align-items: center;
} }
.bottom-left { .bottom-left {
margin-left: 30rpx; // margin-left: 30rpx;
.left-list { .left-list {
width: 100%; width: 100%;
&:nth-of-type(1) { &:nth-of-type(1) {
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
} }
.bottom-right { .bottom-right {
width: 360rpx; width: 360rpx;
margin-right: 20rpx; // margin-right: 20rpx;
.btn { .btn {
width: 100%; width: 100%;
padding: 30rpx; padding: 30rpx;
......
...@@ -314,7 +314,7 @@ ...@@ -314,7 +314,7 @@
"path": "warehouse/records", "path": "warehouse/records",
"style": { "style": {
"navigationStyle": "custom", "navigationStyle": "custom",
"navigationBarTitleText": "出入库记录", "navigationBarTitleText": "出库记录",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"disableScroll": true "disableScroll": true
} }
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<template v-else> <template v-else>
<view v-for="(item, index) in orderList" :key="item.orderId"> <view v-for="(item, index) in orderList" :key="item.orderId">
<OrderCell :orderData="item" :type="orderType" :location="dataValue" @click="handleClick" <OrderCell :orderData="item" :type="orderType" :location="dataValue" @click="handleClick"
@action="handleClick"> </OrderCell> @action="handleClickCellButton"> </OrderCell>
</view> </view>
<view class="load-more-view"> <view class="load-more-view">
<u-loadmore v-show="(pageNumber == 1 && loaded) || pageNumber > 2" :status="loadStatus" bgColor="#F4F5F7"></u-loadmore> <u-loadmore v-show="(pageNumber == 1 && loaded) || pageNumber > 2" :status="loadStatus" bgColor="#F4F5F7"></u-loadmore>
...@@ -231,6 +231,9 @@ ...@@ -231,6 +231,9 @@
} }
}); });
}, },
handleClickCellButton(item) {
this.filish(item)
},
handleClick(item, type, showCountTime) { // type:类型,showCountTime:是否显示倒计时。详情页面情况太多,提前传值可以避免页面晃动 handleClick(item, type, showCountTime) { // type:类型,showCountTime:是否显示倒计时。详情页面情况太多,提前传值可以避免页面晃动
if(item.orderStatus===86 || item.orderStatus===88){ if(item.orderStatus===86 || item.orderStatus===88){
this.filish(item) this.filish(item)
......
...@@ -13,26 +13,28 @@ ...@@ -13,26 +13,28 @@
<u-tabs height="66" activeColor="#2272FF" bg-color="none" inactive-color="#999" bar-height="4" <u-tabs height="66" activeColor="#2272FF" bg-color="none" inactive-color="#999" bar-height="4"
bar-width="44" :offset="[0,0]" :list="list" count="total" :current="currentIndex" @change="change" bar-width="44" :offset="[0,0]" :list="list" count="total" :current="currentIndex" @change="change"
:is-scroll="false" font-size="28" bold></u-tabs> :is-scroll="false" font-size="28" bold></u-tabs>
</view> </view>
<scroll-view scroll-y style="height: 100%;width: 100%;" @scrolltolower="reachBottom" scroll-anchoring <view class="tab-view">
refresher-enabled="true" :refresher-triggered="triggered" :refresher-threshold="100" @scroll="scroll" <scroll-view scroll-y style="height: 100%;width: 100%;" @scrolltolower="reachBottom" scroll-anchoring
:scroll-top="scrollTop" refresher-background="#F4F5F7" @refresherpulling="triggered = true" refresher-enabled="true" :refresher-triggered="triggered" :refresher-threshold="100" @scroll="scroll"
@refresherrefresh="onRefresh" @refresherrestore="onRestore" enable-back-to-top> :scroll-top="scrollTop" refresher-background="#F4F5F7" @refresherpulling="triggered = true"
<view class="loading-view" v-if="!loaded"> @refresherrefresh="onRefresh" @refresherrestore="onRestore" enable-back-to-top>
<u-loading mode="flower"></u-loading> <view class="loading-view" v-if="!loaded">
</view> <u-loading mode="flower"></u-loading>
<NoOrder v-else-if="noParts" imageName="wupeijianxinxi.png" text="当前暂无配件信息"
:customStyle="noPartsCustomStyle" />
<template v-else>
<view v-for="(item, index) in partsList" :key="item.id">
<AppliedCell @operate="handleOperate" :info="item" @action="handleClickCell" @express="handleClickExpress"></AppliedCell>
</view>
<view class="load-more-view">
<u-loadmore v-show="(pageNumber == 1 && loaded) || pageNumber > 2" :status="loadStatus"
bgColor="#F4F5F7"></u-loadmore>
</view> </view>
</template> <NoOrder v-else-if="noParts" imageName="wupeijianxinxi.png" text="当前暂无配件信息"
</scroll-view> :customStyle="noPartsCustomStyle" />
<template v-else>
<view v-for="(item, index) in partsList" :key="item.id">
<AppliedCell @operate="handleOperate" :info="item" @action="handleClickCell" @express="handleClickExpress"></AppliedCell>
</view>
<view class="load-more-view">
<u-loadmore v-show="(pageNumber == 1 && loaded) || pageNumber > 2" :status="loadStatus"
bgColor="#F4F5F7"></u-loadmore>
</view>
</template>
</scroll-view>
</view>
<view class="fixed-button"> <view class="fixed-button">
<ApplyButton :type="buttonType" @click="handleClickApply" /> <ApplyButton :type="buttonType" @click="handleClickApply" />
</view> </view>
...@@ -161,7 +163,7 @@ ...@@ -161,7 +163,7 @@
this._freshing = false; this._freshing = false;
if (this.pageNumber == 1) { if (this.pageNumber == 1) {
this.partsList = [] this.partsList = []
} }
let list = res.data || [] let list = res.data || []
this.partsList.push(...list) this.partsList.push(...list)
this.loadStatus = list.length < this.pageSize ? 'nomore' : 'loadmore' this.loadStatus = list.length < this.pageSize ? 'nomore' : 'loadmore'
...@@ -279,9 +281,9 @@ ...@@ -279,9 +281,9 @@
margin-bottom: 30rpx; margin-bottom: 30rpx;
} }
// .tab-view { .tab-view {
// height: 100%; height: 100%;
// overflow: auto; overflow: auto;
.load-more-view { .load-more-view {
margin-bottom: 20rpx; margin-bottom: 20rpx;
...@@ -295,7 +297,7 @@ ...@@ -295,7 +297,7 @@
margin-top: 300rpx; margin-top: 300rpx;
position: absolute; position: absolute;
} }
// } }
.fixed-button { .fixed-button {
position: fixed; position: fixed;
......
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
'orderNumber': '申请单号:', 'orderNumber': '申请单号:',
'createTime': '申请时间:', 'createTime': '申请时间:',
'deliveryTime': '发货时间:', 'deliveryTime': '发货时间:',
'applyRemark': '备注' 'applyRemark': '备注:'
} }
}, },
operateTypes() { operateTypes() {
......
<template> <template>
<view class="ware-wrap"> <view class="ware-wrap">
<u-navbar back-icon-color="#333333" background="#FFFFFF" title="出入库记录" titleColor="#333333" <u-navbar back-icon-color="#333333" background="#FFFFFF" title="出库记录" titleColor="#333333"
:border-bottom="false" title-bold></u-navbar> :border-bottom="false" title-bold></u-navbar>
<!-- <view class="content"> <!-- <view class="content">
<view class="panel"> <view class="panel">
......
...@@ -215,7 +215,7 @@ ...@@ -215,7 +215,7 @@
{ {
label: '配件申请', label: '配件申请',
type: 'image', type: 'image',
image: 'xiancahngpaizhao.png', image: 'peijian.png',
show: this.allowFeedback, show: this.allowFeedback,
disabled: false, disabled: false,
count: 3, count: 3,
......
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