diff --git a/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue b/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue
index f9a56c5d0..0a4a1c063 100644
--- a/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue
+++ b/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue
@@ -431,7 +431,8 @@ export default {
sameTrade: '', //是否同业
nationality: 'CHN', //国籍/地区
foreigners: '', //是否境外人员
- applGrade: '' //职级
+ applGrade: '', //职级
+ isRevoke: 0
},
areaList: areaList,
currentPopupIndex: '',
diff --git a/src/views/ebiz/agentEenter/SignContract.vue b/src/views/ebiz/agentEenter/SignContract.vue
index a5c4bee7c..b0e61e0db 100644
--- a/src/views/ebiz/agentEenter/SignContract.vue
+++ b/src/views/ebiz/agentEenter/SignContract.vue
@@ -17,7 +17,15 @@
{{ sign.name }}
- 重新签名
@@ -40,7 +48,15 @@
{{ sign.name }}
- 重新签名
diff --git a/src/views/ebiz/agentEenter/approve/ApproveList.vue b/src/views/ebiz/agentEenter/approve/ApproveList.vue
index 56f2a1d59..313a3c0cb 100644
--- a/src/views/ebiz/agentEenter/approve/ApproveList.vue
+++ b/src/views/ebiz/agentEenter/approve/ApproveList.vue
@@ -1,13 +1,5 @@
-
-
-
-
-
-
-
-
@@ -40,7 +32,7 @@
{{ item.createdDate }}
- 撤销申请
+ 撤销申请
审批
@@ -88,28 +80,111 @@ export default {
finishedText: '',
isSuccess: false,
basicId: 0,
- idNo: ''
+ idNo: '',
+ innerNodes: [
+ { type: 1, isFinished: false },
+ { type: 3, isFinished: false },
+ { type: 5, isFinished: false }
+ ]
}
},
async mounted() {
// 获取代理人信息
const res = await getAgentInfo({})
if (res.result == 0) {
- this.branchType = /^N{1}/.test(res.branchType) ? '1' : '0' //res.branchType 以N打头的是内勤 其他是外勤
+ // res.branchType 以N打头的是内勤 其他是外勤
+ this.branchType = /^N{1}/.test(res.branchType) ? '1' : '0'
this.approveName = encodeURI(res.name)
+ // 0: 外勤
if (this.branchType == '0') {
- this.getOrderList({
- pageNum: this.currentPage
- })
+ this.getOuterDataList()
+ }
+ // 1: 内勤
+ else {
+ this.getInnerDataList()
}
} else {
return this.$toast(res.resultMessage)
}
- this.getOrderList({
- pageNum: this.currentPage
- })
},
methods: {
+ // 外勤查询数据
+ async getOuterDataList() {
+ let data = {
+ pageNum: this.currentPage,
+ types: ['01'],
+ appntNode: null
+ }
+ const res = await agentAddApproval(data)
+ this.$toast.clear()
+ if (res.result == '0') {
+ this.currentPage++
+ let resData = res.content.approveWaitPageInfo
+ if (resData.list.length > 0) {
+ this.isSuccess = true
+ for (let data of resData.list) {
+ let exist = this.approveList.findIndex(item => {
+ return item.baseId === data.baseId
+ })
+ if (exist === -1) {
+ this.approveList.push(data)
+ }
+ }
+ if (resData.pageNum == resData.pages) {
+ this.finished = true
+ this.finishedText = '没有更多了'
+ }
+ this.loading = false
+ }
+ } else {
+ this.finished = true
+ this.loading = false
+ this.finishedText = res.resultMessage
+ }
+ },
+ async getInnerDataList() {
+ // 遍历内勤需要查询的节点
+ for (let node of this.innerNodes) {
+ let data = {
+ pageNum: this.currentPage,
+ types: ['01'],
+ appntNode: node.type
+ }
+ const res = await agentAddApproval(data)
+ console.log(res)
+ if (res.result == '0') {
+ let resData = res.content.approveWaitPageInfo
+ if (resData && resData.list.length > 0) {
+ this.isSuccess = true
+ for (let data of resData.list) {
+ let exist = this.approveList.findIndex(item => {
+ return item.baseId === data.baseId
+ })
+ if (exist === -1) {
+ node.type === 5 ? (data.canAddCertificateInfo = true) : (data.canAddCertificateInfo = false)
+ this.approveList.push(data)
+ }
+ }
+ this.loading = false
+ }
+ }
+ // 标记节点数据查询完成
+ else {
+ node.isFinished = true
+ this.loading = false
+ }
+ }
+ // 无数据将节点移除, 后续触发loadMore时不再查询该节点数据
+ this.innerNodes = this.innerNodes.filter(item => {
+ return !item.isFinished
+ })
+ if (!this.innerNodes.length) {
+ this.finished = true
+ this.finishedText = '没有更多了'
+ } else {
+ this.currentPage++
+ }
+ },
async checkData(action, done) {
if (action === 'confirm') {
if (!this.idNo.trim()) {
@@ -153,66 +228,11 @@ export default {
this.dialogShow = true
this.basicId = basicId
},
- change(tab) {
- this.currentPage = 1
- this.approveList = []
- this.finished = false
- this.loading = true
- this.finishedText = ''
- this.getOrderList(
- {
- pageNum: this.currentPage
- },
- tab
- )
- },
loadMore() {
- let pageInfo = {
- pageNum: this.currentPage
- // pageSize: this.pageSize
- }
- console.log('pageInfo==', pageInfo)
- this.getOrderList(pageInfo, this.appntNode)
+ this.branchType === '1' ? this.getInnerDataList() : this.getOuterDataList()
},
- //初始化审批列表
- getOrderList(pageInfo, appntNode = '1') {
- let data = {
- ...pageInfo,
- types: ['01'],
- appntNode: this.branchType === '1' ? appntNode : null
- }
- agentAddApproval(data).then(res => {
- this.$toast.clear()
- if (res.result == '0') {
- this.currentPage++
- let resData = res.content.approveWaitPageInfo
- if (resData.list.length > 0) {
- this.isSuccess = true
- for (let data of resData.list) {
- let exist = this.approveList.findIndex(item => {
- return item.baseId === data.baseId
- })
- if (exist === -1) {
- this.approveList.push(data)
- }
- }
- if (resData.pageNum == resData.pages) {
- this.finished = true
- this.finishedText = '没有更多了'
- }
- this.loading = false
- }
- } else {
- this.finished = true
- this.loading = false
- this.finishedText = res.resultMessage
- }
- })
- },
-
//审批
goApprove(baseId) {
- console.log(baseId)
this.$jump({
flag: 'h5',
extra: {
@@ -222,20 +242,6 @@ export default {
routerInfo: { path: `/agentEenter/approve/BasicInfo/${baseId}/${this.branchType}/${this.approveName}/${this.appntNode}` }
})
}
- },
- watch: {
- //审批级别变化时触发
- // appntNode(val) {
- // this.currentPage = 1
- // this.finished = false
- // this.loading = false
- // let pageInfo = {
- // pageNum: this.currentPage
- // }
- // this.approveList = []
- // // this.getOrderList(pageInfo, val)
- // this.loadMore()
- // }
}
}
diff --git a/src/views/ebiz/agentEenter/approve/BasicInfo.vue b/src/views/ebiz/agentEenter/approve/BasicInfo.vue
index 45cd7f9d8..0064b39b4 100644
--- a/src/views/ebiz/agentEenter/approve/BasicInfo.vue
+++ b/src/views/ebiz/agentEenter/approve/BasicInfo.vue
@@ -87,7 +87,7 @@
-
+
@@ -179,6 +179,7 @@ export default {
if (res.result == '0') {
if (res.content) {
this.BasicInfoDTO = res.content.ebizEnterCustomerDto
+ localStorage.setItem('ebizEnterCustomerDto', this.BasicInfoDTO)
this.agreements = res.content.ebizEnterCustomerDto.agreements
this.medias = res.content.ebizEnterCustomerDto.ebizMediaDtoLst
this.guarantorList = res.content.ebizEnterCustomerDto.ebizGuarantorList