diff --git a/src/views/erp/OrderList.vue b/src/views/erp/OrderList.vue
index afe060c..3a792eb 100644
--- a/src/views/erp/OrderList.vue
+++ b/src/views/erp/OrderList.vue
@@ -141,7 +141,7 @@
-
+
@@ -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
}
diff --git a/src/views/erp/StoreInfoList.vue b/src/views/erp/StoreInfoList.vue
index 9863fe4..29b7812 100644
--- a/src/views/erp/StoreInfoList.vue
+++ b/src/views/erp/StoreInfoList.vue
@@ -182,7 +182,7 @@
{
title:'创建时间',
align:"center",
- dataIndex: 'crateTime'
+ dataIndex: 'createTime'
},
{
title:'创建部门',
diff --git a/src/views/erp/const/orderList.js b/src/views/erp/const/orderList.js
index 2d9b8f4..a8a016b 100644
--- a/src/views/erp/const/orderList.js
+++ b/src/views/erp/const/orderList.js
@@ -9,17 +9,32 @@ export default [
return parseInt(index)+1;
}
},
+ {
+ title:'订单ID',
+ align:"center",
+ dataIndex: 'id'
+ },
{
title:'订单状态',
align:"center",
dataIndex: 'state',
scopedSlots: { customRender: 'state' }
},
+ {
+ title:'提货仓库',
+ align:"center",
+ dataIndex: 'storeName'
+ },
{
- title:'订单ID',
+ title:'下单用户',
align:"center",
- dataIndex: 'id'
+ dataIndex: 'recipient'
+ },
+ {
+ title:'下单电话',
+ align:"center",
+ dataIndex: 'mobile'
},
{
title:'总金额',
@@ -89,14 +104,15 @@ export default [
dataIndex: 'remark'
},
{
- title:'提货点',
+ title:'仓管员',
align:"center",
- dataIndex: 'recipient'
+ dataIndex: 'storeContacts'
},
+
{
title:'提货地址',
align:"center",
- dataIndex: 'addr'
+ dataIndex: 'storeAddr'
},
// {
// title:'手机',
diff --git a/src/views/erp/modules/OrderForm.vue b/src/views/erp/modules/OrderForm.vue
index ee67a4f..1f82110 100644
--- a/src/views/erp/modules/OrderForm.vue
+++ b/src/views/erp/modules/OrderForm.vue
@@ -20,13 +20,33 @@
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -85,17 +105,6 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -149,9 +158,7 @@
// 新增时子表默认添加几行空数据
addDefaultRowNum: 1,
validatorRules: {
- addr: [
- { required: true, message: '请输入地址!'},
- ],
+
},
refKeys: ['orderDetail', ],
tableKeys:['orderDetail', ],
diff --git a/src/views/erp/modules/StoreInfoForm.vue b/src/views/erp/modules/StoreInfoForm.vue
index 0ee1c6c..6dcce31 100644
--- a/src/views/erp/modules/StoreInfoForm.vue
+++ b/src/views/erp/modules/StoreInfoForm.vue
@@ -35,7 +35,7 @@
-
+