Commit 10aa7ea4 authored by Damon's avatar Damon

chore: merge

parents 7ac8bea9 5d5b861c
...@@ -11,6 +11,6 @@ const UNI_APP = { ...@@ -11,6 +11,6 @@ const UNI_APP = {
qn_base_url: 'https://qn-static.banshouhui.com/self-support/', qn_base_url: 'https://qn-static.banshouhui.com/self-support/',
qn_asset_url: 'http://deudn.c.pp.cc/', qn_asset_url: 'http://deudn.c.pp.cc/',
argoDebugMode: 1, argoDebugMode: 1,
version: 'v1.5.0' version: 'v1.5.01'
} }
module.exports = UNI_APP; module.exports = UNI_APP;
;(function() { ;(function() {
let NODE_ENV = 'test' // dev:开发环境 | test:测试环境 | prod:生产环境 let NODE_ENV = 'prod' // dev:开发环境 | test:测试环境 | prod:生产环境
let ENV_VAR = null let ENV_VAR = null
let VERSION_NUMBER = '1.5.0' //版本号 let VERSION_NUMBER = '1.5.01' //版本号
//小程序是否审核通过,参数配置在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') {
......
...@@ -10,7 +10,7 @@ const UNI_APP = { ...@@ -10,7 +10,7 @@ const UNI_APP = {
qn_base_url: 'https://qn-static.banshouhui.com/self-support/', qn_base_url: 'https://qn-static.banshouhui.com/self-support/',
qn_asset_url: 'https://qn-static.banshouhui.com', qn_asset_url: 'https://qn-static.banshouhui.com',
argoDebugMode: 0, argoDebugMode: 0,
version: 'v1.5.0' version: 'v1.5.01'
} }
module.exports = UNI_APP; module.exports = UNI_APP;
...@@ -11,6 +11,6 @@ const UNI_APP = { ...@@ -11,6 +11,6 @@ const UNI_APP = {
qn_base_url: 'https://qn-static.banshouhui.com/self-support/', qn_base_url: 'https://qn-static.banshouhui.com/self-support/',
qn_asset_url: 'https://qn-static.banshouhui.com', qn_asset_url: 'https://qn-static.banshouhui.com',
argoDebugMode: 1, argoDebugMode: 1,
version: 'v1.5.0' version: 'v1.5.01'
} }
module.exports = UNI_APP; module.exports = UNI_APP;
...@@ -336,7 +336,9 @@ export default { ...@@ -336,7 +336,9 @@ export default {
} }
}, },
auditResults() { auditResults() {
let partAuditResults = this.orderData.partAuditResults !== null && Object.keys(this.orderData.partAuditResults).length > 0 ? ['orderSpareParts'] : [] let partAuditResults = Object.keys(this.orderData.partAuditResults || {}).length > 0
? ['orderSpareParts']
: []
let auditResults = this.orderData.auditResults let auditResults = this.orderData.auditResults
? Object.keys(this.orderData.auditResults) ? Object.keys(this.orderData.auditResults)
: [] : []
...@@ -430,6 +432,7 @@ export default { ...@@ -430,6 +432,7 @@ export default {
if ([3, 4, 5, 6].indexOf(this.orderType) != -1) { if ([3, 4, 5, 6].indexOf(this.orderType) != -1) {
func = 'action' func = 'action'
} }
this.orderData.auditResults = this.auditResults
this.$emit( this.$emit(
func, func,
this.orderData, this.orderData,
...@@ -450,6 +453,7 @@ export default { ...@@ -450,6 +453,7 @@ export default {
// 异常单点cell算点按钮 // 异常单点cell算点按钮
func = 'action' func = 'action'
} }
this.orderData.auditResults = this.auditResults
this.$emit( this.$emit(
func, func,
this.orderData, this.orderData,
......
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
}, },
{ {
pathName: 'warehouse/spare', pathName: 'warehouse/spare',
title: '物料库', title: '备件库',
value: '', value: '',
icon: process.uniEnv.qn_base_url + 'wodebeijian.png', icon: process.uniEnv.qn_base_url + 'wodebeijian.png',
imageStyle: 'width:60rpx;height:54rpx' imageStyle: 'width:60rpx;height:54rpx'
......
...@@ -416,7 +416,7 @@ export default { ...@@ -416,7 +416,7 @@ export default {
} }
}) })
}, },
handleClickCellButton(item, type, showCountTime, auditResults) { handleClickCellButton(item, type) {
if (!this.loaded) return if (!this.loaded) return
uni.navigateTo({ uni.navigateTo({
url: url:
...@@ -437,7 +437,7 @@ export default { ...@@ -437,7 +437,7 @@ export default {
'&brandId=' + '&brandId=' +
item.lianbaoBrandId + item.lianbaoBrandId +
'&auditResults=' + '&auditResults=' +
(auditResults ? auditResults.join() : '') + (item.auditResults ? item.auditResults.join() : '') +
'&orderNumber=' + '&orderNumber=' +
item.orderNumber, item.orderNumber,
}) })
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<view class="message">当前无可用物料</view> <view class="message">当前无可用物料</view>
</view> </view>
<view class="bar" v-if="lists.length > 0"> <view class="bar">
<submit-bar <submit-bar
:partNum="partNum" :partNum="partNum"
:num="num" :num="num"
......
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