|
|
|
|
@ -141,7 +141,7 @@
|
|
|
|
|
<j-image-upload v-model="form.imgUrl" ></j-image-upload>
|
|
|
|
|
</a-form-model-item>
|
|
|
|
|
<a-form-model-item label="上传文件" prop="url" v-if='rowInfo.state === 1'>
|
|
|
|
|
<j-image-upload v-model="form.financeUrl" ></j-image-upload>
|
|
|
|
|
<j-image-upload v-model="form.imgUrl" ></j-image-upload>
|
|
|
|
|
</a-form-model-item>
|
|
|
|
|
<a-form-model-item :label="'意见'" prop="desc">
|
|
|
|
|
<a-input v-model="form.desc" type="textarea" />
|
|
|
|
|
@ -186,8 +186,7 @@
|
|
|
|
|
row: {}
|
|
|
|
|
},
|
|
|
|
|
form: {
|
|
|
|
|
imgUrl: '',
|
|
|
|
|
financeUrl: ''
|
|
|
|
|
imgUrl: ''
|
|
|
|
|
},
|
|
|
|
|
rules: {
|
|
|
|
|
},
|
|
|
|
|
@ -229,12 +228,13 @@
|
|
|
|
|
handleOk(type) {
|
|
|
|
|
const that = this
|
|
|
|
|
const user = that.userInfo()
|
|
|
|
|
console.log('that.rowInfo.state', that.rowInfo.state)
|
|
|
|
|
// 0 确认操作, 1 确认付款操作, 3，完结操作
|
|
|
|
|
// return
|
|
|
|
|
if (type === "ok" && that.rowInfo.state === 3 && !that.form.imgUrl) {
|
|
|
|
|
this.$message.warn('请上传确认文件')
|
|
|
|
|
return
|
|
|
|
|
if (type === "ok") {
|
|
|
|
|
if ([1, 3].includes(that.rowInfo.state) && !that.form.imgUrl) {
|
|
|
|
|
this.$message.warn('请上传确认文件')
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (type === "cancel" && [0, 1, 3].includes(that.rowInfo.state) && !that.form.desc) {
|
|
|
|
|
this.$message.warn('不通过，请填写备注信息')
|
|
|
|
|
@ -242,7 +242,6 @@
|
|
|
|
|
}
|
|
|
|
|
this.$refs.ruleForm.validate(valid => {
|
|
|
|
|
if (valid) {
|
|
|
|
|
|
|
|
|
|
this.$confirm({
|
|
|
|
|
title: "确认操作",
|
|
|
|
|
content: "是否确认此操作?",
|
|
|
|
|
@ -259,7 +258,7 @@
|
|
|
|
|
params.financeTime = time
|
|
|
|
|
params.financeId = user.id
|
|
|
|
|
params.financeRemark = that.form.desc
|
|
|
|
|
params.financeUrl = that.form.financeUrl
|
|
|
|
|
params.financeUrl = that.form.imgUrl
|
|
|
|
|
} else if (that.rowInfo.state === 3) {
|
|
|
|
|
params.dispacher = user.realname
|
|
|
|
|
params.dispacherId = user.id
|
|
|
|
|
@ -277,6 +276,7 @@
|
|
|
|
|
editOrder(params).then(res => {
|
|
|
|
|
that.infoModel.confirmLoading = false
|
|
|
|
|
that.infoModel.visible = false
|
|
|
|
|
that.form.imgUrl = ''
|
|
|
|
|
if (res.result) {
|
|
|
|
|
that.$message.success('操作成功');
|
|
|
|
|
that.loadData(1);
|
|
|
|
|
@ -284,6 +284,7 @@
|
|
|
|
|
that.$message.warn(res.message);
|
|
|
|
|
}
|
|
|
|
|
}).catch(() => {
|
|
|
|
|
that.form.imgUrl = ''
|
|
|
|
|
that.infoModel.confirmLoading = false
|
|
|
|
|
that.infoModel.visible = false
|
|
|
|
|
})
|
|
|
|
|
@ -355,7 +356,7 @@
|
|
|
|
|
fieldList.push({type:'string',value:'financeRemark',text:'审核意见',dictCode:''})
|
|
|
|
|
fieldList.push({type:'string',value:'dispacher',text:'派单人',dictCode:''})
|
|
|
|
|
fieldList.push({type:'datetime',value:'dispacherTime',text:'派发时间'})
|
|
|
|
|
fieldList.push({type:'int',value:'state',text:'状态,0:待付款 默认，1：待发货，2：已发货，3：完结，4：退换货',dictCode:'orderState'})
|
|
|
|
|
fieldList.push({type:'int',value:'state',text:'状态',dictCode:'orderState'})
|
|
|
|
|
fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''})
|
|
|
|
|
this.superFieldList = fieldList
|
|
|
|
|
}
|
|
|
|
|
|
huyuanxiang
2 years ago