diff --git a/public/static/config.js b/public/static/config.js
index 4268f79..2b30ab3 100644
--- a/public/static/config.js
+++ b/public/static/config.js
@@ -3,7 +3,7 @@
*/
window._CONFIG = {
//接口父路径
- VUE_APP_API_BASE_URL: 'http://store-admin.nhet.cloud:8080/jeecg-boot',
+ VUE_APP_API_BASE_URL: 'http://47.100.35.222:8080/jeecg-boot',
//单点登录地址
VUE_APP_CAS_BASE_URL: '',
//文件预览路径
diff --git a/src/views/erp/OrderList.vue b/src/views/erp/OrderList.vue
index cc92188..afe060c 100644
--- a/src/views/erp/OrderList.vue
+++ b/src/views/erp/OrderList.vue
@@ -24,6 +24,7 @@
批量操作
+
@@ -81,13 +82,21 @@
- 编辑
- 审核
- 派发
-
-
+ 编辑
+ 物料确认
+
+
+ 付款确认
+
+
+ 出货确认
+
+
+
+ 物料打印
- 更多
+
+ 更多
详情
@@ -118,22 +127,28 @@
:label-col="labelCol"
:wrapper-col="wrapperCol"
>
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
-
+
不通过
@@ -170,7 +185,10 @@
state: -1,
row: {}
},
- form: { },
+ form: {
+ imgUrl: '',
+ financeUrl: ''
+ },
rules: {
},
infoModel: {
@@ -188,6 +206,7 @@
deleteBatch: "/erp/order/deleteBatch",
exportXlsUrl: "/erp/order/exportXls",
importExcelUrl: "erp/order/importExcel",
+ uploadUrl: "sys/common/upload",
},
dictOptions:{},
@@ -200,6 +219,9 @@
computed: {
importExcelUrl: function(){
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+ },
+ uploadUrl: function(){
+ return `${window._CONFIG['domianURL']}/${this.url.uploadUrl}`;
}
},
methods: {
@@ -207,11 +229,14 @@
handleOk(type) {
const that = this
const user = that.userInfo()
- if (type === "ok" && that.rowInfo.state === 2 && !that.form.logistics_id) {
- this.$message.warn('请填写物流单号')
+ 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 === "cancel" && [1, 2].includes(that.rowInfo.state) && !that.form.desc) {
+ if (type === "cancel" && [0, 1, 3].includes(that.rowInfo.state) && !that.form.desc) {
this.$message.warn('不通过，请填写备注信息')
return
}
@@ -234,12 +259,19 @@
params.financeTime = time
params.financeId = user.id
params.financeRemark = that.form.desc
- } else if (that.rowInfo.state === 2) {
+ params.financeUrl = that.form.financeUrl
+ } else if (that.rowInfo.state === 3) {
params.dispacher = user.realname
params.dispacherId = user.id
params.logisticsId = that.form.logistics_id
params.dispacherTime = time
+ params.dispacherUrl = that.form.imgUrl
params.dispacherRemark = that.form.desc
+ } else if (that.rowInfo.state === 0) {
+ params.materialRemark = that.form.desc
+ params.materialId = user.id
+ params.materialClerk = user.realname
+ params.materialTime = time
}
params = Object.assign({}, that.rowInfo.row, params)
editOrder(params).then(res => {
@@ -269,7 +301,12 @@
this.infoModel.visible = false
},
handleConfirm(state, row) {
- if (![0, 1].includes(row.state)) {
+ // 打印
+ if (state === 999) {
+ window.open(window._CONFIG['domianURL'] + '/jmreport/shareView/829568033299816448?id=' + row.id)
+ return
+ }
+ if (![6, 0, 2].includes(row.state)) {
this.$message.error('该状态无权限操作')
return
}
@@ -278,13 +315,17 @@
const baseObject = {desc: ''}
const baseObjectRules = { desc: [{ message: '填写备注', trigger: 'blur' }]}
const textOBj = {
- 1: '审核',
- 2: '派发'
+ 0: '物料确认',
+ 1: '财务审核',
+ 3: '出货确认'
}
const obj = {
1: Object.assign({}, baseObject),
- 2: Object.assign({
+ 3: Object.assign({
logistics_id: '',
+ }, baseObject),
+ 0: Object.assign({
+ material_id: '',
}, baseObject)
}
this.form = obj[state]
diff --git a/src/views/erp/const/orderList.js b/src/views/erp/const/orderList.js
index bf65234..2d9b8f4 100644
--- a/src/views/erp/const/orderList.js
+++ b/src/views/erp/const/orderList.js
@@ -10,14 +10,16 @@ export default [
}
},
{
- title:'收件人',
+ title:'订单状态',
align:"center",
- dataIndex: 'recipient'
+ dataIndex: 'state',
+ scopedSlots: { customRender: 'state' }
},
+
{
- title:'手机',
+ title:'订单ID',
align:"center",
- dataIndex: 'mobile'
+ dataIndex: 'id'
},
{
title:'总金额',
@@ -25,53 +27,58 @@ export default [
dataIndex: 'totalAmount'
},
{
- title:'用户id',
+ title:'创建时间',
align:"center",
- dataIndex: 'userId'
+ dataIndex: 'createTime'
},
+
{
- title:'订单状态',
+ title:'物料确认人',
align:"center",
- dataIndex: 'state',
- scopedSlots: { customRender: 'state' }
+ dataIndex: 'materialClerk'
},
{
- title:'下单地址',
+ title:'物料确认时间',
align:"center",
- dataIndex: 'addr'
+ dataIndex: 'materialTime'
+ },
+ {
+ title:'物料确认意见',
+ align:"center",
+ dataIndex: 'materialRemark'
},
{
- title:'审核人',
+ title:'财务确认人',
align:"center",
dataIndex: 'financeReview'
},
{
- title:'审核时间',
+ title:'财务确认时间',
align:"center",
dataIndex: 'financeTime'
},
{
- title:'审核意见',
+ title:'财务确认意见',
align:"center",
dataIndex: 'financeRemark'
},
{
- title:'派单人',
+ title:'出货确认人',
align:"center",
dataIndex: 'dispacher'
},
{
- title:'派发时间',
+ title:'出货确认时间',
align:"center",
dataIndex: 'dispacherTime'
},
+ // {
+ // title:'物流单号',
+ // align:"center",
+ // dataIndex: 'logisticsId'
+ // },
{
- title:'物流单号',
- align:"center",
- dataIndex: 'logisticsId'
- },
- {
- title:'派发意见',
+ title:'出货确认意见',
align:"center",
dataIndex: 'dispacherRemark'
},
@@ -81,6 +88,21 @@ export default [
align:"center",
dataIndex: 'remark'
},
+ {
+ title:'提货点',
+ align:"center",
+ dataIndex: 'recipient'
+ },
+ {
+ title:'提货地址',
+ align:"center",
+ dataIndex: 'addr'
+ },
+ // {
+ // title:'手机',
+ // align:"center",
+ // dataIndex: 'mobile'
+ // },
{
title: '操作',
dataIndex: 'action',
diff --git a/src/views/erp/modules/OrderForm.vue b/src/views/erp/modules/OrderForm.vue
index ffef983..ee67a4f 100644
--- a/src/views/erp/modules/OrderForm.vue
+++ b/src/views/erp/modules/OrderForm.vue
@@ -5,13 +5,13 @@
-
-
+
+
-
-
+
+
@@ -30,38 +30,70 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+