yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修复测试文档中有关销售管理——虚拟订车单的问题

master
yunuo970428 3 years ago
parent
2409325eac
commit
b67cebb3fc
3 changed files with 216 additions and 108 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 73
      anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingdanguanli.vue
  2. 193
      anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjinAdd.vue
  3. 58
      anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjininfo.vue

73
anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingdanguanli.vue
View File

@ -4,11 +4,11 @@
<div class="tab-header webtop">
<div>销售虚拟订单管理</div>
<div>
<el-button type="primary" size="small" @click="handleGenerate()">生成销售订单</el-button>
<!-- <el-button type="primary" size="small" @click="handleGenerate()">生成销售订单</el-button>-->
<el-button type="primary" size="small" @click="handleCreate()">新增</el-button>
<el-button type="primary" size="small" @click="handleUpdate()">编辑</el-button>
<el-button type="danger" size="small" @click="handleDelete()">删除</el-button>
<el-button type="primary" size="small">打印</el-button>
<!-- <el-button type="primary" size="small">打印</el-button>-->
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
<el-dialog
@ -21,7 +21,7 @@
</div>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="handleConfirm()">确 定</el-button>
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button @click="dialogVisible = false">退 出</el-button>
</span>
</el-dialog>
</div>
@ -73,20 +73,16 @@
</div>
<div class="listtop">
<div class="tit">销售虚拟订车单列表</div>
<pageye v-show="total > 0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size"
class="pagination" @pagination="getList"/>
<pageye v-show="total > 0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
<div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%"
@selection-change="handleSelectionChange">
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column width="50px" type="selection" align="center"/>
<el-table-column width="80px" label="编号" type="index" :index="indexMethod" align="center"/>
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column width="150px" label="操作" align="center">
<template slot-scope="scope">
<div class="searchbtns">
<el-button size="small" type="primary"
:disabled="scope.row.nodeState == '' ? false:scope.row.nodeState == '发起订单'?false : true"
@click="changeNodeState(scope.row)">办理
<el-button size="small" type="primary" :disabled="scope.row.nodeState == '' ? false:scope.row.nodeState == '发起订单'?false : true" @click="changeNodeState(scope.row)">办理
</el-button>
<el-button size="small" type="primary" @click="handleCheck(scope.row)">查看</el-button>
</div>
@ -97,7 +93,7 @@
<span>{{ scope.row.nodeState }}</span>
</template>
</el-table-column>
<el-table-column label="虚拟订单类型" align="center">
<el-table-column label="单据类型" align="center">
<template slot-scope="scope">
<span>{{ scope.row.depositBillType }}</span>
</template>
@ -147,8 +143,7 @@
<div class="pages">
<div class="tit"/>
<!-- 翻页 -->
<pagination v-show="total > 0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size"
class="pagination" @pagination="getList"/>
<pagination v-show="total > 0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
</div>
</div>
@ -173,8 +168,8 @@
import pageye from '@/components/pagination/pageye'
import divAdd from './xunidingdanAdd.vue'
import divInfo from './xunidingdaninfo.vue'
import xunidingjinAdd from "./xunidingjinAdd";
import xunidingjininfo from "./xunidingjininfo";
import xunidingjinAdd from './xunidingjinAdd'
import xunidingjininfo from './xunidingjininfo'
import hetongdanganguanliInfo from '@/views/hetongguanli/hetongdanganguanli/hetongdanganguanliInfo.vue'
@ -218,22 +213,22 @@
customerName: '',
billType: '',
startTime: '',
endTime: '',
},
endTime: ''
}
},
submitDto: {
businessSid: '',
userSid: window.sessionStorage.getItem('userSid'),
userSid: window.sessionStorage.getItem('userSid')
},
updateDto: {
nodeState: '',
sid: '',
sid: ''
},
nodeState: '',
selectDate: undefined,
temp: {}, // 添加和编辑
visible: true,
hetongdanganguanliInfoShow: false,
hetongdanganguanliInfoShow: false
// ------------------------------------
}
},
@ -243,8 +238,8 @@
'roles',
'rolesIds',
'departmentId',
'departmentCode',
]),
'departmentCode'
])
},
created() {
// 初始化变量
@ -273,7 +268,7 @@
handleReset() {
this.listQuery = {
current: 1,
size: 20,
size: 20
}
},
@ -330,31 +325,31 @@
const billType = bb.name
if (this.billTypeKey == '01') {
this.dialogVisible = false;
this.viewState = 5;
this.viewState = 5
this.$refs['divDing'].showAdd(billType, this.billTypeKey)
} else if (this.billTypeKey == '02') {
this.dialogVisible = false;
this.viewState = 2;
this.dialogVisible = false
this.viewState = 2
this.$refs['divadd'].showAdd(billType, this.billTypeKey)
}
} else {
this.$message({
message: '请选择虚拟订车单类型',
type: 'warning'
});
})
}
},
// 打开编辑
handleUpdate() {
if (this.sids.length == 1) {
if (this.billType[0] == '01') {
this.viewState = 5;
this.viewState = 5
this.dialogStatus = 'edit'
const sid = this.sids[0]
const nodeState = this.nodeState_list[0]
this.$refs['divDing'].showEdit(sid, nodeState)
} else {
this.viewState = 3;
this.viewState = 3
this.dialogStatus = 'edit'
const sid = this.sids[0]
const nodeState = this.nodeState_list[0]
@ -363,12 +358,12 @@
} else if (this.sids.length == 0) {
this.$notify({
title: '您还未选择，请选择数据！！！',
type: 'error',
type: 'error'
})
} else if (this.sids.length > 1) {
this.$notify({
title: '您未选择的数据过多，请选择一条数据编辑！！',
type: 'error',
type: 'error'
})
}
},
@ -468,14 +463,14 @@
title: '提示',
message: '删除成功',
type: 'success',
duration: 2000,
duration: 2000
})
this.getList()
} else {
this.$notify({
title: '删除失败',
message: response.msg,
type: 'error',
type: 'error'
})
}
})
@ -484,7 +479,7 @@
title: '提示',
message: '没有选择资方信息!!',
type: 'error',
duration: 2000,
duration: 2000
})
return
}
@ -495,11 +490,11 @@
console.log('111', row)
if (row.nodeState == '' || row.nodeState == '发起订单') {
if (row.depositBillTypeKey == '01') {
this.viewState = 5;
this.viewState = 5
this.dialogStatus = 'edit'
this.$refs['divDing'].showEdit(row.sid, row.nodeState)
} else if (row.depositBillTypeKey == '02') {
this.viewState = 3;
this.viewState = 3
this.dialogStatus = 'edit'
this.$refs['divadd'].showEdit(row.sid, row.nodeState)
}
@ -520,8 +515,8 @@
// duration: 2000,
// })
// })
},
},
}
}
}
</script>
<style scoped lang="scss">

193
anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjinAdd.vue
View File

@ -7,7 +7,7 @@
<el-button type="primary" size="small" @click="handleCreate()">保存</el-button>
<el-button type="primary" size="small" :disabled="disabled" @click="handleSubmit()">提交
</el-button>
<el-button type="primary" size="small">打印</el-button>
<!-- <el-button type="primary" size="small">打印</el-button>-->
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
@ -24,35 +24,43 @@
<el-col :span="4" class="tleftb">
<el-form-item><span slot="label">部门名称</span></el-form-item>
</el-col>
<el-col :span="8" class="trightb">
<el-col :span="4" class="trightb">
<el-form-item>
{{ temp.orgName }}
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<el-form-item><span slot="label">业务员</span></el-form-item>
<el-form-item><span slot="label">销售专员</span></el-form-item>
</el-col>
<el-col :span="8" class="trightb">
<el-col :span="4" class="trightb">
<el-form-item>
{{ temp.staffName }} <!-- ?? -->
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<el-form-item><span slot="label">虚拟订单类型</span></el-form-item>
</el-col>
<el-col :span="20" class="trightb">
<el-col :span="4" class="trightb">
<el-form-item>
<span>{{temp.depositBillType}}</span>
</el-form-item>
</el-col>
</el-row>
<!-- <el-row>-->
<!-- <el-col :span="4" class="tleftb">-->
<!-- <el-form-item><span slot="label">虚拟订单类型</span></el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="20" class="trightb">-->
<!-- <el-form-item>-->
<!-- <span>{{temp.depositBillType}}</span>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-row>
<el-col :span="4" class="tleftb">
<el-form-item><span slot="label"><span class="icon">*</span>付款人</span></el-form-item>
</el-col>
<el-col :span="8" class="trightb">
<el-col :span="4" class="trightb">
<el-form-item>
<el-input v-model="temp.draweeName" class="addinputw" placeholder=""
clearable/>
@ -61,7 +69,7 @@
<el-col :span="4" class="tleftb">
<el-form-item><span slot="label"><span class="icon">*</span>联系电话</span></el-form-item>
</el-col>
<el-col :span="8" class="trightb">
<el-col :span="12" class="trightb">
<el-form-item>
<el-input v-model="temp.draweeMobile" class="addinputw" placeholder="" clearable/>
</el-form-item>
@ -71,7 +79,7 @@
<el-col :span="4" class="tleftb">
<el-form-item><span slot="label">车辆台数</span></el-form-item>
</el-col>
<el-col :span="8" class="trightb">
<el-col :span="4" class="trightb">
<el-form-item>
<el-input v-model="temp.vehicleNum" class="addinputw" placeholder=""
clearable/>
@ -80,7 +88,7 @@
<el-col :span="4" class="tleftb">
<el-form-item><span slot="label"><span class="icon">*</span>订金金额</span></el-form-item>
</el-col>
<el-col :span="8" class="trightb">
<el-col :span="12" class="trightb">
<el-form-item>
<el-input v-model="temp.deposit" class="addinputw" placeholder="" clearable/>
</el-form-item>
@ -88,10 +96,10 @@
</el-row>
<el-row>
<el-col :span="3" class="tleftb">
<el-col :span="4" class="tleftb">
<el-form-item><span slot="label"><span class="icon">*</span>付款日期</span></el-form-item>
</el-col>
<el-col :span="5" class="trightb">
<el-col :span="4" class="trightb">
<el-form-item>
<el-date-picker
v-model="temp.paymentDate"
@ -101,26 +109,48 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<el-col :span="4" class="tleftb">
<el-form-item><span slot="label"><span class="icon">*</span>付款方式</span></el-form-item>
</el-col>
<el-col :span="5" class="trightb">
<el-col :span="4" class="trightb">
<el-form-item>
<el-select v-model="temp.payType" class="addinputw" placeholder="" @change="changePaymentType">
<el-option v-for="(item, index) in paymentType_list" :key="index.dictKey" :label="item.dictValue"
:value="item.dictKey"/>
<el-option v-for="(item, index) in paymentType_list" :key="index.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<el-col :span="4" class="tleftb">
<el-form-item><span slot="label"><span class="icon">*</span>付款银行账号</span></el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item>
<el-input v-model="temp.payBankAcc" class="addinputw" placeholder="" clearable/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<el-form-item><span slot="label"><span class="icon">*</span>收款银行</span></el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-select v-model="temp.proBankValue" class="addinputw" placeholder="" @change="changeproBank">
<el-option v-for="(item, index) in proBank_list" :key="index.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-col>
<el-col :span="4" class="tleftb">
<el-form-item><span slot="label"><span class="icon">*</span>收款银行账号</span></el-form-item>
</el-col>
<el-col :span="5" class="trightb">
<el-col :span="4" class="trightb">
<el-form-item>
<el-input v-model="temp.proBankAcc" class="addinputw" placeholder=""
clearable/>
<el-select v-model="temp.proBankAccValue" class="addinputw" placeholder="" @change="changeProBankAccValue">
<el-option v-for="(item, index) in ProBankAcc_list" :key="index.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
</el-col>
<el-col :span="4" class="trightb">
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
@ -128,8 +158,7 @@
</el-col>
<el-col :span="20" class="trightb">
<el-form-item>
<el-input v-model="temp.remarks" class="addinputw" placeholder=""
clearable/>
<el-input v-model="temp.remarks" class="addinputw" placeholder="" clearable/>
</el-form-item>
</el-col>
</el-row>
@ -218,6 +247,8 @@
list: [],
paymentType_list: [],
customer_list: [],
proBank_list: [],
ProBankAcc_list: [],
temp: {
sid: '',
billNo: '',
@ -272,8 +303,9 @@
},
created() {
// 初始化变量
this.init();
this.getPaymentType();
this.init()
this.getPaymentType()
this.getProBank()
},
methods: {
// --------------页面初始化--------------
@ -402,7 +434,57 @@
this.temp.payTypeKey = bb.key
console.log('name', this.temp.payType)
},
//--------------功能实现--------------
getProBank() {
typeValues({
type: 'receiptBank'
}).then((res) => {
if (res.code === '200') {
this.proBank_list = res.data
console.log('下拉框请求111', res.data)
}
})
},
changeproBank(value) {
console.log('触发下拉框按钮')
let bb = null
this.proBank_list.forEach((e) => {
if (e.dictKey == value) {
bb = {
type: e.dictType,
name: e.dictValue,
key: e.dictKey,
sid: e.sid
}
}
})
this.temp.proBankValue = bb.name
this.temp.proBankKey = bb.key
this.getProBankAcc(bb.sid)
},
getProBankAcc(sid) {
typeValues({ psid: sid, type: 'receiptAccount' }).then((res) => {
if (res.code === '200') {
this.ProBankAcc_list = res.data
console.log('下拉框请求111', res.data)
}
})
},
changeProBankAccValue(value) {
console.log('触发下拉框按钮')
let bb = null
this.ProBankAcc_list.forEach((e) => {
if (e.dictKey == value) {
bb = {
type: e.dictType,
name: e.dictValue,
key: e.dictKey,
sid: e.sid
}
}
})
this.temp.proBankAccValue = bb.name
this.temp.proBankAccKey = bb.key
},
// 添加数据
handleCreate() {
this.$refs['dataForm'].validate((valid) => {
@ -411,7 +493,7 @@
if (valid) {
this.FormLoading = true
this.dialogStatus = 'create'
if (this.stateId === '0') {
// if (this.stateId === '0') {
this.temp.staffSid = this.YongHuid.staffSid
this.temp.staffName = this.staffName
this.temp.orgName = this.orgName
@ -437,34 +519,35 @@
})
}
})
} else {
this.temp.staffSid = this.YongHuid.staffSid
this.temp.orgSid = this.YongHuid.organizationSid
this.temp.orgName = this.orgName
this.temp.staffName = this.staffName
this.temp.userSid = window.sessionStorage.getItem('userSid')
this.temp.customerList = this.list
this.getUrl()
update(this.temp).then((response) => {
this.dialogStatus = 'update'
this.FormLoading = false
if (response.code === '200') {
this.$notify({
title: '提示',
message: '修改成功',
type: 'success',
duration: 2000,
})
this.handleReturn('true')
} else {
this.$notify({
title: '失败',
message: '修改失败',
type: 'error',
})
}
})
}
// }
// else {
// this.temp.staffSid = this.YongHuid.staffSid
// this.temp.orgSid = this.YongHuid.organizationSid
// this.temp.orgName = this.orgName
// this.temp.staffName = this.staffName
// this.temp.userSid = window.sessionStorage.getItem('userSid')
// this.temp.customerList = this.list
// this.getUrl()
// update(this.temp).then((response) => {
// this.dialogStatus = 'update'
// this.FormLoading = false
// if (response.code === '200') {
// this.$notify({
// title: '提示',
// message: '修改成功',
// type: 'success',
// duration: 2000,
// })
// this.handleReturn('true')
// } else {
// this.$notify({
// title: '失败',
// message: '修改失败',
// type: 'error',
// })
// }
// })
// }
}
})
},

58
anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjininfo.vue
View File

@ -8,7 +8,7 @@
:disabled="this.nodeState == '' ? false : this.nodeState == '发起订单' ? false : true"
@click="handleSubmit()">提交
</el-button>
<el-button type="primary" size="small">打印</el-button>
<!-- <el-button type="primary" size="small">打印</el-button>-->
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
@ -25,30 +25,38 @@
<el-col :span="4" class="tleftb">
<el-form-item><span slot="label">部门名称</span></el-form-item>
</el-col>
<el-col :span="8" class="trightb">
<el-col :span="4" class="trightb">
<el-form-item>
{{ temp.orgName }}
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<el-form-item><span slot="label">业务员</span></el-form-item>
<el-form-item><span slot="label">销售专员</span></el-form-item>
</el-col>
<el-col :span="8" class="trightb">
<el-col :span="4" class="trightb">
<el-form-item>
{{ temp.staffName }}
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<el-form-item><span slot="label">虚拟订单类型</span></el-form-item>
</el-col>
<el-col :span="20" class="trightb">
<el-col :span="4" class="trightb">
<el-form-item>
<span>{{temp.depositBillType}}</span>
</el-form-item>
</el-col>
</el-row>
<!-- <el-row>-->
<!-- <el-col :span="4" class="tleftb">-->
<!-- <el-form-item><span slot="label">虚拟订单类型</span></el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="20" class="trightb">-->
<!-- <el-form-item>-->
<!-- <span>{{temp.depositBillType}}</span>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-row>
<el-col :span="4" class="tleftb">
<el-form-item><span slot="label"><span class="icon">*</span>付款人</span></el-form-item>
@ -87,30 +95,52 @@
</el-row>
<el-row>
<el-col :span="3" class="tleftb">
<el-col :span="4" class="tleftb">
<el-form-item><span slot="label"><span class="icon">*</span>付款日期</span></el-form-item>
</el-col>
<el-col :span="5" class="trightb">
<el-col :span="4" class="trightb">
<el-form-item>
{{ temp.paymentDate }}
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<el-col :span="4" class="tleftb">
<el-form-item><span slot="label"><span class="icon">*</span>付款方式</span></el-form-item>
</el-col>
<el-col :span="5" class="trightb">
<el-col :span="4" class="trightb">
<el-form-item>
{{ temp.payType }}
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<el-col :span="4" class="tleftb">
<el-form-item><span slot="label"><span class="icon">*</span>付款银行账号</span></el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item>
{{ temp.payBankAcc }}
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<el-form-item><span slot="label"><span class="icon">*</span>收款银行</span></el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item>
{{ temp.proBankValue }}
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<el-form-item><span slot="label"><span class="icon">*</span>收款银行账号</span></el-form-item>
</el-col>
<el-col :span="5" class="trightb">
<el-col :span="4" class="trightb">
<el-form-item>
{{ temp.proBankAcc }}
{{ temp.proBankAccValue }}
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
</el-col>
<el-col :span="4" class="trightb">
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">

Write Preview
Loading…
Cancel
Save