product_platform/oms-ui-admin
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

完善销售订单

Browse Source
This commit is contained in:
yunuo970428
2024-07-29 15:25:24 +08:00
parent 75c51b9c0c
commit 99f6c4f849
3 changed files with 75 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/sales/salesOrder.js
View File

@@ -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' }
})
}
}

67
src/views/sales/salesOrder/salesOrder.vue
View File

@@ -9,16 +9,10 @@
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-form-item label="制单部门">
<el-input v-model="listQuery.params.deptName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="制单人">
<el-input v-model="listQuery.params.createByName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="单据编号">
<el-input v-model="listQuery.params.billNo" placeholder="" clearable/>
</el-form-item>
<el-form-item label="制单日期">
<el-form-item label="下单时间">
<el-date-picker v-model="listQuery.params.startDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
<span style="padding: 0 8px">至</span>
<el-date-picker v-model="listQuery.params.endDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
@@ -36,6 +30,11 @@
<el-option v-for="item in deliveryType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
</el-select>
</el-form-item>
<el-form-item label="单据状态">
<el-select class="addinputInfo" v-model="listQuery.params.state" placeholder="请选择" clearable filterable>
<el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
</el-select>
</el-form-item>
<el-form-item label="客户名称">
<el-input v-model="listQuery.params.customerName" placeholder="" clearable/>
</el-form-item>
@@ -61,22 +60,21 @@
<el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center"/>
<el-table-column label="操作" width="180" align="center">
<template slot-scope="scope">
<el-button type="primary" size="small" @click="toEdit(scope.row)">办理</el-button>
<el-button type="primary" size="small" @click="toInfo(scope.row)">查看</el-button>
<el-button type="primary" :disabled="scope.row.data == '已审核' || scope.row.state == '审核中'" size="small" @click="toEdit(scope.row)">办理</el-button>
</template>
</el-table-column>
<el-table-column prop="billNo" label="单据编号" align="center" width="190" />
<el-table-column prop="deptName" label="制单部门" align="center" width="130" />
<el-table-column prop="createByName" label="制单人" align="center" width="120" />
<el-table-column prop="createTime" label="制单日期" align="center" width="120" />
<el-table-column prop="state" label="单据状态" align="center" width="120" />
<el-table-column prop="createTime" label="下单时间" align="center" width="120" />
<el-table-column prop="billTypeValue" label="订单类型" align="center" width="100" />
<el-table-column prop="shopName" label="店铺名称" align="center" min-width="160" />
<el-table-column prop="warehouseName" label="仓库" align="center" min-width="160" />
<el-table-column prop="deliveryTypeValue" label="配送方式" align="center" width="100" />
<el-table-column prop="customerName" label="客户名称" align="center" min-width="130" />
<el-table-column prop="thisPay" label="实付" align="center" width="100" />
<el-table-column prop="discountAmount" label="优惠" align="center" width="100" />
<el-table-column prop="dueAmount" label="应收" align="center" width="100" />
<el-table-column prop="freight" label="运费" align="center" width="100" />
<el-table-column prop="deliveryTypeValue" label="配送方式" align="center" width="120" />
<el-table-column prop="customerName" label="客户名称" align="center" width="130" />
<el-table-column prop="logisticsName" label="快递公司" align="center" width="120" />
<el-table-column prop="shipperName" label="收货人" align="center" width="100" />
<el-table-column prop="shipperMob" label="手机号" align="center" width="110" />
<el-table-column prop="deliveryAddress" label="详细地址" align="center" width="150" />
<el-table-column prop="salesName" label="业务员" align="center" width="100" />
</el-table>
</div>
@@ -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) {

32
src/views/sales/salesOrder/salesOrderAdd.vue
View File

@@ -5,7 +5,8 @@
<div>{{ viewTitle }}</div>
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="handleSave()">保存</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="handleSaveAndAdd()">保存并新增</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="handleSubmit()">提交</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="handleSubmitAndAdd()">提交并新增</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="handleReset()">重置</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
@@ -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()