From 99f6c4f8498f55f4d5855b653d7b77f3beaa21fe Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Mon, 29 Jul 2024 15:25:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=94=80=E5=94=AE=E8=AE=A2?=
=?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/sales/salesOrder.js | 8 +++
src/views/sales/salesOrder/salesOrder.vue | 67 +++++++++++---------
src/views/sales/salesOrder/salesOrderAdd.vue | 32 +++++++++-
3 files changed, 75 insertions(+), 32 deletions(-)
diff --git a/src/api/sales/salesOrder.js b/src/api/sales/salesOrder.js
index be5cd0e..3249837 100644
--- a/src/api/sales/salesOrder.js
+++ b/src/api/sales/salesOrder.js
@@ -40,5 +40,13 @@ export default {
data: data,
headers: { 'Content-Type': 'application/json' }
})
+ },
+ submit: function(data) {
+ return request({
+ url: '/oms/v1/smssalesbill/submit',
+ method: 'post',
+ data: data,
+ headers: { 'Content-Type': 'application/json' }
+ })
}
}
diff --git a/src/views/sales/salesOrder/salesOrder.vue b/src/views/sales/salesOrder/salesOrder.vue
index 2a077e1..546d871 100644
--- a/src/views/sales/salesOrder/salesOrder.vue
+++ b/src/views/sales/salesOrder/salesOrder.vue
@@ -9,16 +9,10 @@
{{ searchxianshitit }}
@@ -148,6 +146,24 @@ export default {
sids: [], // 用于导出的时候保存已选择的SIDs
billType_list: [],
deliveryType_list: [],
+ state_list: [
+ {
+ dictKey: '0',
+ dictValue: '未审核'
+ },
+ {
+ dictKey: '1',
+ dictValue: '已审核'
+ },
+ {
+ dictKey: '2',
+ dictValue: '审核未通过'
+ },
+ {
+ dictKey: '3',
+ dictValue: '审核中'
+ }
+ ],
FormLoading: false,
listLoading: false,
// 翻页
@@ -156,8 +172,6 @@ export default {
size: 5,
total: 0,
params: {
- createByName: '',
- deptName: '',
billNo: '',
startDate: '',
endDate: '',
@@ -167,7 +181,8 @@ export default {
customerName: '',
warehouseName: '',
useOrgSid: '',
- createOrgSid: ''
+ createOrgSid: '',
+ state: ''
}
}
}
@@ -235,7 +250,6 @@ export default {
// 查询列表信息
getList() {
this.listLoading = true
- this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
this.listQuery.params.useOrgSid = window.sessionStorage.getItem('orgSid')
this.listQuery.params.createOrgSid = window.sessionStorage.getItem('orgSid')
req.listPage(this.listQuery).then(response => {
@@ -261,8 +275,6 @@ export default {
size: 5,
total: 0,
params: {
- createByName: '',
- deptName: '',
billNo: '',
startDate: '',
endDate: '',
@@ -272,7 +284,8 @@ export default {
customerName: '',
warehouseName: '',
useOrgSid: '',
- createOrgSid: ''
+ createOrgSid: '',
+ state: ''
}
}
this.getList()
@@ -285,10 +298,6 @@ export default {
this.viewState = 3
this.$refs['divAdd'].showEdit(row)
},
- toInfo(row) {
- this.viewState = 4
- this.$refs['divInfo'].showInfo(row)
- },
// 删除
doDel() {
if (this.sids.length === 0) {
diff --git a/src/views/sales/salesOrder/salesOrderAdd.vue b/src/views/sales/salesOrder/salesOrderAdd.vue
index e773610..72b79fe 100644
--- a/src/views/sales/salesOrder/salesOrderAdd.vue
+++ b/src/views/sales/salesOrder/salesOrderAdd.vue
@@ -5,7 +5,8 @@
{{ viewTitle }}
保存
- 保存并新增
+ 提交
+ 提交并新增
重置
关闭
@@ -946,7 +947,7 @@ export default {
}
})
},
- handleSaveAndAdd() {
+ handleSubmit() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.formobj.amount = this.yhhCompute
@@ -958,7 +959,32 @@ export default {
this.formobj.billTypeKey = '002'
}
this.submitdisabled = true
- req.saveOrUpdate(this.formobj).then((res) => {
+ req.submit(this.formobj).then((res) => {
+ if (res.success) {
+ this.$message({ showClose: true, type: 'success', message: '保存成功' })
+ this.handleReturn('true')
+ } else {
+ this.submitdisabled = false
+ }
+ }).catch(() => {
+ this.submitdisabled = false
+ })
+ }
+ })
+ },
+ handleSubmitAndAdd() {
+ this.$refs['form_obj'].validate((valid) => {
+ if (valid) {
+ this.formobj.amount = this.yhhCompute
+ this.formobj.dueAmount = this.yhhCompute
+ this.formobj.thisDebt = this.bcqkCompute
+ if (this.formobj.billTypeValue === '线下订单') {
+ this.formobj.billTypeKey = '001'
+ } else if (this.formobj.billTypeValue === '预售订单') {
+ this.formobj.billTypeKey = '002'
+ }
+ this.submitdisabled = true
+ req.submit(this.formobj).then((res) => {
if (res.success) {
this.$message({ showClose: true, type: 'success', message: '保存成功' })
this.handlePartReset()