Merge branch 'feature/GFRS-2334【需求】出单信息通知查询需求' into dev

src/api/ebiz/branchOffice/branchOffice.js

@@ -36,3 +36,13 @@ export function getOrgList(data) {
     data
   })
 }
+
+// 获取MIS全部机构 (分级)接口--因内勤多加一级，所以用这个接口
+export function getMisBranchComList(data) {
+  return request({
+    url: getUrl('/data/performance/getMisBranchComList', 1),
+    method: 'post',
+    data
+  })
+}
+

src/views/ebiz/billingDetail/billingDetail.vue

@@ -2,17 +2,30 @@
   <div>
     <div class="classification">
       <span>机构名称: </span>
-      <span @click="isOrgLv2ConditionShow = true">
+      <span v-if="manageLv == '06' || manageLv == '07' || manageLv == '08'">
+        <span>{{ OrgLv2Name }}</span>
+        <van-icon name="arrow" />
+      </span>
+      <span v-else-if="manageLv == '04' || manageLv == '05'" @click="isOrgLv2ConditionShow = true">
         <span>{{ OrgLv2Name }}</span>
         <van-icon name="arrow-down" />
       </span>
+
       <template v-if="isMoreConditionShow">
-        <span @click="isOrgLv3ConditionShow = true">
+        <span v-if="manageLv == '07' || manageLv == '08'">
-          <span>{{ OrgLv4Name }}</span>
+          <span>{{ OrgLv3Name }}</span>
+          <van-icon name="arrow" />
+        </span>
+        <span v-else-if="manageLv == '04' || manageLv == '05' || manageLv == '06'" @click="isOrgLv3ConditionShow = true">
+          <span>{{ OrgLv3Name }}</span>
           <van-icon name="arrow-down" />
         </span>
-        <span @click="isOrgLv4ConditionShow = true">
+
-          <span>{{ OrgLv3Name }}</span>
+        <span v-if="manageLv == '08'">
+          <span>{{ OrgLv4Name }}</span>
+        </span>
+        <span v-else-if="manageLv == '04' || manageLv == '05' || manageLv == '06' || manageLv == '07'" @click="isOrgLv4ConditionShow = true">
+          <span>{{ OrgLv4Name }}</span>
           <van-icon name="arrow-down" />
         </span>
       </template>
@@ -70,7 +83,7 @@
 <script>
 import { Icon } from 'vant'
 import tableDetail from '@/components/ebiz/billingDetail/tableDetail'
-import { getComPerformance, getOrgList } from '@/api/ebiz/branchOffice/branchOffice'
+import { getMisBranchComList } from '@/api/ebiz/branchOffice/branchOffice'
 import FieldDatePicter from '@/components/ebiz/FieldDatePicter'
 import { queryOutOrderList, getBranchByUser } from '@/api/ebiz/billingDetail/billingDetail'
 
@@ -112,7 +125,7 @@ export default {
   data() {
     return {
       currentIndex: 0, //0 当月 1当天
-      theads: ['姓名', '产品名称', '保费（万元）', '预收时间', '承保时间'],
+      theads: ['姓名', '产品名称', '保费（元）', '预收时间', '承保时间'],
       tableData: [],
       maxDate: new Date(),
       filterDate: '',
@@ -135,7 +148,7 @@ export default {
       OrgLv2s: [],
       OrgLv3Code: '',
       OrgLv3s: [],
-      areaCode: '',
+      OrgLv4Code: '',
       OrgLv4s: [],
       params: {
         // 86: 全国
@@ -155,6 +168,7 @@ export default {
   methods: {
     //切换当月、当天
     switchDayOrMonth(index) {
+      this.filterDate = ''
       // currentIndex 0 当月 1当天
       let nowDate = new Date()
       let month = nowDate.getMonth() + 1
@@ -199,10 +213,9 @@ export default {
       this.manageLv = resData.content.level
       // 1、如果内勤（四级和五级）查看出单详情，选择机构名称时，可以选择内勤所辖区，可能存在一个或者多个；
       // 2、如果外勤（组长及以上）查看出单详情，选择机构名称时，区只有一个。
-      //（内勤）level 04时 服务机构  （外勤）level 05时 区
+      //（内勤）level 04,05时 服务机构  （外勤）level 06,07,08时 区
-      console.log(this.manageLv)
+      if (this.manageLv == '04' || this.manageLv == '05') {
-      if (this.manageLv == '04') {
+        const res = await getMisBranchComList({
-        const res = await getOrgList({
           bussinessType: 'normal',
           manageCode: resData.content.code,
           manageLv: resData.content.level
@@ -212,16 +225,30 @@ export default {
           this.OrgLv2Name = this.OrgLv2s[0].name
           this.OrgLv2Code = this.OrgLv2s[0].code
           // this.orgCode = this.OrgLv2s[0].code
-          this.onOrgLv2ConditionConfirmGetData(this.OrgLv2Name)
+          this.onOrgLv2ConditionConfirm(this.OrgLv2Name, 'false')
         } else {
           this.$toast(res.resultMessage)
         }
-      } else if (this.manageLv == '05') {
+      } else if (this.manageLv == '06') {
-        this.OrgLv2s.push(resData.content)
+        // 区
-        this.OrgLv2Name = this.OrgLv2s[0].name
+        this.OrgLv2Name = resData.content.name
-        this.OrgLv2Code = this.OrgLv2s[0].code
+        this.OrgLv2Code = resData.content.code
-        // this.orgCode = this.OrgLv2s[0].code
+        this.onOrgLv2ConditionConfirm(this.OrgLv2Name, 'false')
-        this.onOrgLv2ConditionConfirmGetData(this.OrgLv2Name)
+      } else if (this.manageLv == '07') {
+        //部
+        this.OrgLv2Name = resData.content.distName
+        this.OrgLv2Code = resData.content.distCode
+        this.OrgLv3Name = resData.content.name
+        this.OrgLv3Code = resData.content.code
+        this.onOrgLv3ConditionConfirm(this.OrgLv3Name, 'false')
+      } else if (this.manageLv == '08') {
+        //组
+        this.OrgLv2Name = resData.content.distName
+        this.OrgLv2Code = resData.content.distCode
+        this.OrgLv3Name = resData.content.depName
+        this.OrgLv3Code = resData.content.depCode
+        this.OrgLv4Name = resData.content.name
+        this.OrgLv4Code = resData.content.code
       }
       this.queryOutOrderListFunc()
       // 查询默认数据
@@ -234,7 +261,7 @@ export default {
         appntDate: this.postDate,
         distCode: this.OrgLv2Code,
         depCode: this.OrgLv3Code,
-        orgCode: this.areaCode,
+        orgCode: this.OrgLv4Code,
         pageNum: this.pageNum,
         pageSize: this.pageSize
       }).then(res => {
@@ -254,40 +281,8 @@ export default {
         }
       })
     },
-    // 筛选二级机构-区--数据加载
-    async onOrgLv2ConditionConfirmGetData(data) {
-      this.isOrgLv2ConditionShow = false
-      let OrgLv2 = this.OrgLv2s.find(item => item.name === data)
-      if (OrgLv2) {
-        this.OrgLv2Code = OrgLv2.code
-        this.params.manageCode = this.OrgLv2Code
-        this.params.manageLv = '02'
-      }
-      if (data === '全国') {
-        this.params.manageCode = '86'
-        this.params.manageLv = '01'
-      }
-      this.OrgLv2Name = data
-      this.OrgLv4Name = '全部'
-      this.OrgLv3Name = '全部'
-      this.OrgLv3Code = ''
-      this.areaCode = ''
-      // // 点击其他筛选条件-重置当前页为第一页
-      // this.pageNum = 1
-      // this.tableData = []
-      // this.queryOutOrderListFunc()
-      // 查询三级机构
-      const res = await getOrgList({
-        bussinessType: 'normal',
-        manageCode: this.OrgLv2Code,
-        manageLv: '05'
-      })
-      this.OrgLv3s.splice(0)
-      this.OrgLv3s.push(...res.content)
-      //   this.setRankData()
-    },
     // 筛选二级机构-区
-    async onOrgLv2ConditionConfirm(data) {
+    async onOrgLv2ConditionConfirm(data, status) {
       this.isOrgLv2ConditionShow = false
       let OrgLv2 = this.OrgLv2s.find(item => item.name === data)
       if (OrgLv2) {
@@ -295,33 +290,34 @@ export default {
         this.params.manageCode = this.OrgLv2Code
         this.params.manageLv = '02'
       }
-      if (data === '全国') {
+      // if (data === '全国') {
-        this.params.manageCode = '86'
+      //   this.params.manageCode = '86'
-        this.params.manageLv = '01'
+      //   this.params.manageLv = '01'
-      }
+      // }
       this.OrgLv2Name = data
       this.OrgLv4Name = '全部'
       this.OrgLv3Name = '全部'
       this.OrgLv3Code = ''
-      this.areaCode = ''
+      this.OrgLv4Code = ''
       // 点击其他筛选条件-重置当前页为第一页
+      if (status != 'false') {
         this.pageNum = 1
         this.tableData = []
         this.queryOutOrderListFunc()
+      }
       // 查询三级机构
-      const res = await getOrgList({
+      const res = await getMisBranchComList({
         bussinessType: 'normal',
         manageCode: this.OrgLv2Code,
-        manageLv: '05'
+        manageLv: '06'
       })
       this.OrgLv3s.splice(0)
       this.OrgLv3s.push(...res.content)
-      //   this.setRankData()
     },
     // 筛选三级机构-部
-    async onOrgLv3ConditionConfirm(data) {
+    async onOrgLv3ConditionConfirm(data, status) {
       this.isOrgLv3ConditionShow = false
-      this.OrgLv4Name = data
+      this.OrgLv3Name = data
       let OrgLv3 = this.OrgLv3s.find(item => item.name === data)
       if (OrgLv3) {
         this.OrgLv3Code = OrgLv3.code
@@ -331,45 +327,46 @@ export default {
       if (data === '全部') {
         this.params.manageCode = this.OrgLv2Code
         this.params.manageLv = '02'
+        this.OrgLv3Code = ''
       }
-      this.OrgLv3Name = '全部'
+      this.OrgLv4Code = ''
+      this.OrgLv4Name = '全部'
       // this.OrgLv2Code = ''
-      this.areaCode = ''
+      // this.OrgLv4Code = ''
       // 点击其他筛选条件-重置当前页为第一页
+      if (status != 'false') {
         this.pageNum = 1
         this.tableData = []
         this.queryOutOrderListFunc()
+      }
       // 查询四级机构
-      const res = await getOrgList({
+      const res = await getMisBranchComList({
         bussinessType: 'normal',
         manageCode: this.OrgLv3Code,
-        manageLv: '06'
+        manageLv: '07'
       })
       this.OrgLv4s.splice(0)
       this.OrgLv4s.push(...res.content)
-      //   this.setRankData()
     },
     // 筛选四级机构-组
     async onOrgLv4ConditionConfirm(data) {
       this.isOrgLv4ConditionShow = false
-      this.OrgLv3Name = data
+      this.OrgLv4Name = data
       let area = this.OrgLv4s.find(item => item.name === data)
       if (area) {
-        this.areaCode = area.code
+        this.OrgLv4Code = area.code
-        this.params.manageCode = this.areaCode
+        this.params.manageCode = this.OrgLv4Code
         this.params.manageLv = '04'
       }
       if (data === '全部') {
         this.params.manageCode = this.OrgLv3Code
         this.params.manageLv = '03'
+        this.OrgLv4Code = ''
       }
-      // this.OrgLv2Code = ''
-      // this.OrgLv3Code = ''
       // 点击其他筛选条件-重置当前页为第一页
       this.pageNum = 1
       this.tableData = []
       this.queryOutOrderListFunc()
-      //   this.setRankData()
     }
   },
   created() {