Commit 3bcfb5c5 authored by Damon's avatar Damon

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

parents 1f8f83d7 00deb534
;(function() { ;(function() {
let NODE_ENV = 'prod' // dev:开发环境 | test:测试环境 | prod:生产环境 let NODE_ENV = 'test' // dev:开发环境 | test:测试环境 | prod:生产环境
let ENV_VAR = null let ENV_VAR = null
let VERSION_NUMBER = '1.3.19' //版本号 let VERSION_NUMBER = '1.4.0' //版本号
//小程序是否审核通过,参数配置在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') {
......
...@@ -196,7 +196,8 @@ let orderApiFun = function(vm){ ...@@ -196,7 +196,8 @@ let orderApiFun = function(vm){
let receiveParts = async (partOrderId) => await vm.$u.put(prefix + 'parts/' + vm.vuex_token + '/orders/' + partOrderId +'/receive',{}, formType); let receiveParts = async (partOrderId) => await vm.$u.put(prefix + 'parts/' + vm.vuex_token + '/orders/' + partOrderId +'/receive',{}, formType);
// 配件申请单-取消申请 // 配件申请单-取消申请
let cancelParts = async (partOrderId) => await vm.$u.put(prefix + 'parts/' + vm.vuex_token + '/orders/'+ partOrderId +'/cancel',{}, formType); let cancelParts = async (partOrderId) => await vm.$u.put(prefix + 'parts/' + vm.vuex_token + '/orders/'+ partOrderId +'/cancel',{}, formType);
// 点击了异常单去处理
let workerDealWithError = async (params = {}, orderId) => await vm.$u.get( prefix + vm.vuex_token + '/order/' + orderId + '/workerDealWithError', params)
const orderApi = { const orderApi = {
listByRecommendOrder, listByRecommendOrder,
listOrderCount, listOrderCount,
...@@ -247,7 +248,8 @@ let orderApiFun = function(vm){ ...@@ -247,7 +248,8 @@ let orderApiFun = function(vm){
getLogistics, getLogistics,
getOrderPartsSum, getOrderPartsSum,
receiveParts, receiveParts,
cancelParts cancelParts,
workerDealWithError
} }
return orderApi return orderApi
} }
......
...@@ -2,28 +2,28 @@ ...@@ -2,28 +2,28 @@
export default { export default {
data() { data() {
return { return {
dataValue: '' dataValue: '',
} }
}, },
watch: { watch: {
value: function(val) { value: function(val) {
this.dataValue = val this.dataValue = val
} },
}, },
props: { props: {
value: { value: {
type: [String, Number], type: [String, Number],
default: '' default: '',
}, },
/** 索引值 用于更新数据 */ /** 索引值 用于更新数据 */
itemIndex:Number, itemIndex: Number,
groupIndex:Number, groupIndex: Number,
/** 包含数据源 */ /** 包含数据源 */
item: Object, item: Object,
disabled: { disabled: {
type: Boolean, type: Boolean,
default: false default: false,
} },
}, },
mounted() { mounted() {
...@@ -34,13 +34,19 @@ export default { ...@@ -34,13 +34,19 @@ export default {
methods: { methods: {
// 输入的值 // 输入的值
valueChange(val) { valueChange(val) {
if (this.type == 'digit') {
// 防止粘贴非数字
val = val.replace(/[^\d.]/gi, '')
this.$nextTick(() => {
this.dataValue = val
})
}
const data = { const data = {
groupIndex: this.groupIndex,// 左侧菜单下标 groupIndex: this.groupIndex, // 左侧菜单下标
itemIndex:this.itemIndex,//右侧某一项下标 itemIndex: this.itemIndex, //右侧某一项下标
value: val value: val,
} }
this.$emit('value-change', data) this.$emit('value-change', data)
} },
} },
} }
...@@ -300,7 +300,10 @@ export default { ...@@ -300,7 +300,10 @@ export default {
} }
}) })
}, },
handleClickCellButton(item) { handleClickCellButton(item, type) {
if (type == 'exception') {
this.$u.api.workerDealWithError(item.orderId).then(() => {})
}
// 去完工 // 去完工
uni.navigateTo({ uni.navigateTo({
url: url:
......
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