Skip to content

P
portalhtml
Commit 4d9e5758 authored by jiangqihao's avatar jiangqihao
Browse files
Options

Merge branch 'dev' of http://120.25.63.219:6088/rex/portalhtml into dev

parents a681a5c7 5fe23907
Expand all Show whitespace changes
Inline Side-by-side
Showing with 507 additions and 106 deletions
src/api/customers.js
View file @ 4d9e5758
......@@ -99,6 +99,14 @@ export function ProcessApproval(data){
data
})
}
//审批流程历史记录
export function processHistory(data){
return request({
url: '/processHistory/searchAll',
method: 'post',
data
})
}
// // 客户发布记录
// export const releaseRecord = {
// createUrl: '/releaserecord/create',
......
src/router/modules/customers.js
View file @ 4d9e5758
......@@ -37,7 +37,14 @@ const customersRouter = {
path: '/potential-list',
component: () => import('@/views/customers/potential-list'),
name: 'PotentialList',
meta: {title: '代理商审批'},
meta: {title: '省级代理商审批'},
hidden: true,
},
{
path: '/citypotential-list',
component: () => import('@/views/customers/citypotenial-list'),
name: 'CityPotenialList',
meta: {title: '城市代理商审批'},
hidden: true,
},
{
......
src/views/customers/citypotenial-list/index.vue 0 → 100644
View file @ 4d9e5758
This diff is collapsed.
src/views/customers/potential-customers/index.vue
View file @ 4d9e5758
......@@ -11,7 +11,6 @@
<ele-table
ref="eleTable"
v-bind="tableConfig"
:expand-params="expandParams"
:listeners="tableListeners"
/>
......@@ -27,7 +26,6 @@ export default {
inject: ['reload'],
data() {
return {
expandParams: {}, // 筛选条件
tableListeners: {}, // 事件监听对象，供ele-table内部调用
tableConfig: constant
}
......@@ -43,7 +41,12 @@ export default {
methods: {
// 编辑
handleEdit(val) {
if(val.ExtCustomerType_SDK=='101'){
this.$router.push({ path: '/potential-list',query:{id:val.ObjectID} })
}else{
this.$router.push({ path: '/citypotential-list',query:{id:val.ObjectID} })
}
},
}
......
src/views/customers/potential-list/index.vue
View file @ 4d9e5758
......@@ -8,10 +8,46 @@
v-model="formData"
:rules="rules"
:sections="sections"
>
<template v-slot:ExtLockCity_SDK="{ formData }">
<!-- 插槽内容有el-form-item组件包裹 -->
<el-select v-model="formData.ExtLockCity_SDK" style="width: 91%" multiple filterable placeholder="请选择" no-match-text="无匹配数据">
<el-option
v-for="item in province"
:key="item.AccountID"
:label="item.Name"
:value="item.ExtSocialUnifiedCreditCode_SDK"
/>
</el-select>
</template>
</ele-form-section>
<div class="table-contain">
<div class="form-container">审批意见</div>
<div class="btn">
<el-button type="primary" @click="approve">审批</el-button>
<el-button type="" @click="reject">退回</el-button>
</div>
<el-table :data="tableData"
border
style="width: 100%">
<el-table-column prop="Status"
label="审批节点">
</el-table-column>
<el-table-column prop="Name"
label="审批结果">
</el-table-column>
<el-table-column prop="OperName"
label="审批时间">
</el-table-column>
<el-table-column prop="CreditCode"
label="备注">
</el-table-column>
</el-table>
<pagination v-show="TotalRecords>0"
:total="TotalRecords"
:page.sync="page.currentPage"
:limit.sync="page.pageSize"
@pagination="getList" />
</div>
<el-dialog title="审批意见" :visible.sync="dialogFormVisible">
<el-form :model="form">
......@@ -31,22 +67,19 @@
<script>
import Title from '@/components/Title'
import { customerCreate, provinceSearch, citySearch, districtSearch,getCustomer,typeSearch,lockRsp,ProcessApproval } from '@/api/customers';
import { getCustomer,typeSearch,lockRsp,ProcessApproval,processHistory, province } from '@/api/customers';
import { Country } from '@/api/qcc'
import Pagination from '@/components/Pagination'
export default {
components: {
Pagination,
Title,
customerCreate,
provinceSearch,
citySearch,
districtSearch
},
data () {
return {
form:{},
dialogFormVisible:false,
title: '代理商审批',
title: '省级代理商审批',
addBtnStart: false,
objectId: '',
id:'',
......@@ -106,66 +139,27 @@ export default {
title: '地址信息',
formDesc: {
ExtProvince_SDK: {
type: 'select',
type: 'input',
label: '省份',
layout: 12,
disabled:true,
options: async data => {
const res = await provinceSearch({})
var result = res.results.map(item => {
return {
text: item.Name,
value: item.Code
}
})
return result
},
},
ExtCity_SDK: {
type: 'select',
type: 'input',
label: '城市',
layout: 12,
isOptions: true,
disabled:true,
optionsLinkageFields: ['ExtProvince_SDK'],
options: async data => {
if (!data.ExtProvince_SDK) {
return []
}
const res = await citySearch({
provinceCode: data.ExtProvince_SDK
})
var result = res.results.map(item => {
return {
text: item.Name,
value: item.Code
}
})
return result
},
},
ExtDistrict_SDK: {
type: 'select',
type: 'input',
label: '县市',
layout: 12,
isOptions: true,
disabled:true,
optionsLinkageFields: ['ExtProvince_SDK', 'ExtCity_SDK'],
options: async data => {
if (!data.ExtCity_SDK) {
return []
}
const res = await districtSearch({
cityCode: data.ExtCity_SDK
})
var result = res.results.map(item => {
return {
text: item.Name,
value: item.Code
}
})
return result
},
},
ExtAddressDetail_SDK: {
type: 'input',
......@@ -238,51 +232,28 @@ export default {
title: '签约信息',
formDesc: {
ExtChannelType_SDK : {
type: 'select',
type: 'input',
label: '签约渠道类型',
layout: 12,
options: async data => {
const res = await typeSearch({code:'ExtChannelType_SDK',module:'Customer'})
var result = res.map(item => {
return {
text: item.content,
value: item.keyword
}
})
return result
},
disabled:true
},
ExtLockRsp_SDK: {
type: 'select',
label: '锁定RSP',
type: 'input',
label: '签约产品组',
layout: 12,
isOptions: true,
options: [
// async data => {
// const res = await lockRsp({
// ExtProvinceCode_SDK: data.ExtProvinceCode_SDK
// })
// var result = res.results.map(item => {
// return {
// text: item.Name,
// value: item.Code
// }
// })
// return result
// },
],
attrs: {
multiple: true
}
disabled:true
},
ExtTotalAgent_SDK: {
type: 'input',
label: '签约总代',
layout: 12,
disabled:true
},
ExtLockCity_SDK: {
type: 'select',
label: '覆盖范围(城市)',
layout: 12,
isOptions: true,
options: []
},
}
},
{
......@@ -292,22 +263,23 @@ export default {
extStartDate_SDK: {
type: 'date',
label: '初始合作开始时间',
layout: 12
},
extAuthenticationDate_SDK: {
type: 'date',
label: '高级认证日期',
layout: 12
layout: 12,
disabled:true
},
extEndDate_SDK: {
type: 'date',
label: '合作终止日期',
layout: 12
layout: 12,
disabled:true
},
}
},
],
tableData:[],
TotalRecords:0,
page:{},
// 同 vue-ele-form
rules: {
Name: {required: true, message: '名称必填'},
......@@ -320,23 +292,36 @@ export default {
}
},
watch:{
// province:{
// handler(newVal,oldVal){
// this.province=newVal
// },
// deep:true
// }
},
created(){
this.id=this.$route.query.id
this.getList()
// this.selectList()
this.getHistoryList()
},
methods: {
getList(){
getCustomer({objectID:this.id}).then((resp)=>{
this.formData=resp.results[0]
// lockRsp({extProvince_SDK: resp.results[0].ExtProvince_SDK}).then((resp)=>{
// this.province=resp.results
// })
const app={provinceCode:resp.results[0].ExtProvince_SDK}
this.$request(Country.searchCity,app).then((resp) => {
this.province=resp.results
})
})
},
selectList(){
lockRsp({ExtProvince_SDK: this.formData.ExtProvince_SDK}).then((resp)=>{
console.log('ddddd',resp)
getHistoryList(){
processHistory({businessObjectID:this.id}).then((resp)=>{
this.tableData=resp.results
})
},
handleSuccess () {
......@@ -363,12 +348,14 @@ extChannelType_SDK:this.formData.ExtChannelType_SDK}
ProcessApproval(add).then((resp)=>{
this.$message.success("审批成功!")
this.dialogFormVisible=false
this.$router.back()
})
}else{
const bdd={customerDTO:cc,note:this.form.note,result:"reject"}
ProcessApproval(bdd).then((resp)=>{
this.$message.success("退回成功!")
this.dialogFormVisible=false
this.$router.back()
})
}
......@@ -407,5 +394,12 @@ extChannelType_SDK:this.formData.ExtChannelType_SDK}
}
.btn {
margin-left: 45%;
margin-bottom: 8px;
}
.table-contain {
padding: 0 80px 0 20px;
margin-left: 65px;
background: #fff;
border-radius: 2px;
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment