huyuanxiang
/
nherp_vue2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[fix]页面优化-订单管理仓库信息

Browse Source
develop
huyuanxiang 2 years ago
parent e25c3a2f66
commit 0900e1c3b2
5 changed files with 59 additions and 35 deletions
Show Stats Download Patch File Download Diff File

21
src/views/erp/OrderList.vue
Unescape View File

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

2
src/views/erp/StoreInfoList.vue
Unescape View File

@ -182,7 +182,7 @@
{ {
title:'创建时间', title:'创建时间',
align:"center", align:"center",
dataIndex: 'crateTime' dataIndex: 'createTime'
}, },
{ {
title:'创建部门', title:'创建部门',

26
src/views/erp/const/orderList.js
Unescape View File

@ -9,17 +9,32 @@ export default [
return parseInt(index)+1; return parseInt(index)+1;
} }
}, },
{
title:'订单ID',
align:"center",
dataIndex: 'id'
},
{ {
title:'订单状态', title:'订单状态',
align:"center", align:"center",
dataIndex: 'state', dataIndex: 'state',
scopedSlots: { customRender: 'state' } scopedSlots: { customRender: 'state' }
}, },
{
title:'提货仓库',
align:"center",
dataIndex: 'storeName'
},
{ {
title:'订单ID', title:'下单用户',
align:"center", align:"center",
dataIndex: 'id' dataIndex: 'recipient'
},
{
title:'下单电话',
align:"center",
dataIndex: 'mobile'
}, },
{ {
title:'总金额', title:'总金额',
@ -89,14 +104,15 @@ export default [
dataIndex: 'remark' dataIndex: 'remark'
}, },
{ {
title:'提货点', title:'仓管员',
align:"center", align:"center",
dataIndex: 'recipient' dataIndex: 'storeContacts'
}, },
{ {
title:'提货地址', title:'提货地址',
align:"center", align:"center",
dataIndex: 'addr' dataIndex: 'storeAddr'
}, },
// { // {
// title:'手机', // title:'手机',

43
src/views/erp/modules/OrderForm.vue
Unescape View File

@ -20,13 +20,33 @@
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24" > <a-col :span="24" >
<a-form-model-item label="用户id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId"> <a-form-model-item label="下单用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
<a-input v-model="model.userId" placeholder="请输入用户id" ></a-input> <a-input v-model="model.recipient" placeholder="请输入用户id" ></a-input>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24" > <a-col :span="24" >
<a-form-model-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="addr"> <a-form-model-item label="下单电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
<a-input v-model="model.addr" placeholder="请输入地址" ></a-input> <a-input v-model="model.mobile" placeholder="请输入用户id" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24" >
<a-form-model-item label="仓管员" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="addr">
<a-input v-model="model.storeContacts" placeholder="请输入仓管员" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24" >
<a-form-model-item label="仓管电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="addr">
<a-input v-model="model.storePhone" placeholder="请输入仓管电话" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24" >
<a-form-model-item label="提货仓库" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="addr">
<a-input v-model="model.storeName" placeholder="请输入提货仓库" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24" >
<a-form-model-item label="提货仓库地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="addr">
<a-input v-model="model.storeAddr" placeholder="请提货仓库地址" ></a-input>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24" > <a-col :span="24" >
@ -85,17 +105,6 @@
<j-image-upload isMultiple v-model="model.dispacherUrl" ></j-image-upload> <j-image-upload isMultiple v-model="model.dispacherUrl" ></j-image-upload>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24" >
<a-form-model-item label="收件人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="recipient">
<a-input v-model="model.recipient" placeholder="请输入收件人" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24" >
<a-form-model-item label="手机" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="mobile">
<a-input v-model="model.mobile" placeholder="请输入手机" ></a-input>
</a-form-model-item>
</a-col>
</a-row> </a-row>
</a-form-model> </a-form-model>
</j-form-container> </j-form-container>
@ -149,9 +158,7 @@
// 新增时子表默认添加几行空数据 // 新增时子表默认添加几行空数据
addDefaultRowNum: 1, addDefaultRowNum: 1,
validatorRules: { validatorRules: {
addr: [
{ required: true, message: '请输入地址!'},
],
}, },
refKeys: ['orderDetail', ], refKeys: ['orderDetail', ],
tableKeys:['orderDetail', ], tableKeys:['orderDetail', ],

2
src/views/erp/modules/StoreInfoForm.vue
Unescape View File

@ -35,7 +35,7 @@
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-model-item label="创建时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="crateTime"> <a-form-model-item label="创建时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="crateTime">
<j-date placeholder="请选择创建时间" v-model="model.crateTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" /> <j-date placeholder="请选择创建时间" v-model="model.createTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">

Write Preview
Loading…
Cancel
Save