Merge remote-tracking branch 'origin/dev' into dev

src/http/moudules/insCompany.js

@@ -851,7 +851,7 @@ export const queryAgencyUser = (params) => {
 }
 export const queryAgencyUserInsAreaPage = (data) => {
   return axios({
-    url: '/agency/queryAgencyUserInsAreaPage',
+    url: '/agency/queryInsAreaPageById',
     method: "post",
     data
   })

src/views/Core/components/detailsDialog.vue

@@ -546,7 +546,7 @@
                 </p>
               </div>
             </OpenCloseBox>
-            <OpenCloseBox id="dzbd" :ref="setItemRef" v-if="orderInfo && orderInfo.orderstatus == 3 && isAuditing">
+            <OpenCloseBox id="dzbd"  v-if="orderInfo && orderInfo.orderstatus == 3">
               <span slot="title">保单信息</span>
               <div slot="boby">
                 <el-row class="premium-style " :gutter="20">
@@ -1277,7 +1277,7 @@ export default {
     }
   },
   created() {
-    console.log(this.obj)
+    console.log(this.isAuditing)
     //获取操作符
     this.$api.dict.findPage(this.operator).then(res => {
       this.operatorlist = res.data.content;
@@ -1471,6 +1471,7 @@ export default {
       this.dialogVisible = backupVisible
     },
     imageFun(param) {
+      console.log(this.isAuditing)
       console.log(param)
       this.obj = param
     },

src/views/PeopleManage/InstitutionalExtraction.vue

@@ -57,11 +57,9 @@ export default {
           { prop: "deptId", label: "机构编码", type: "text" },
           { prop: "deptName", label: "机构名称", type: "text" },
           { prop: "sumpremium", label: "总保费", type: "text" },
-          { prop: "proportional", label: "抽成比例", type: "text" },
           { prop: "extractFee", label: "抽成总金额", type: "text" },
           { prop: "historyFee", label: "已提现金额", type: "text" },
           { prop: "cashFee", label: "可提现金额", type: "text" },
-          { prop: "startTime", label: "核算开始时间", type: "text" },
         ],
         optBtns: [
           {
@@ -115,8 +113,8 @@ export default {
             },
           ]},
           { prop: "licenseno", label: "车牌号", type: "text" },
-          { prop: "sypremium", label: "商业险", type: "text" },
           { prop: "jqpremium", label: "交强险", type: "text" },
+          { prop: "sypremium", label: "商业险", type: "text" },
           { prop: "jypremium", label: "驾意险", type: "text" },
           { prop: "sumpremium", label: "总保费", type: "text" },
 
@@ -129,15 +127,6 @@ export default {
       },
       pageResultpersonnel: [],
       pageResultdept: [],
-      rules: {
-        proportional: [
-          { required: true, message: '请输入抽成比例', trigger: 'blur' },
-        ],
-        userName: [
-          { required: true, message: '请选择名称', trigger: 'change' }
-        ],
-
-      },
       pageData: {
         pageNum: 1,
         pageSize: 10,
@@ -152,7 +141,6 @@ export default {
       pageResult: [],
       rowDept: '',
       userId: '',
-      startTime:''
     };
   },
   created() {
@@ -162,7 +150,6 @@ export default {
     detail(row) {
       this.dialogVisible = true
       this.rowDept = row.deptId
-      this.startTime = row.startTime
       this.findPagepersonnel({ deptId: row.deptId })
       this.findPagedept()
     },
@@ -193,7 +180,6 @@ export default {
         .queryAgencyUserInsAreaPage({
           userId: this.userId,
           deptId: this.rowDept,
-          startTime:this.startTime,
           ...data,
           ...this.pageDatadept
         })

src/views/PeopleManage/PartnerExtraction.vue

@@ -64,11 +64,9 @@ export default {
             type: "text",
           },
           { prop: "sumpremium", label: "总保费", type: "text" },
-          { prop: "proportional", label: "抽成比例", type: "text" },
           { prop: "extractFee", label: "抽成总金额", type: "text" },
           { prop: "historyFee", label: "已提现金额", type: "text" },
           { prop: "cashFee", label: "可提现金额", type: "text" },
-          // { prop: "startTime", label: "核算开始时间", type: "text" },
         ],
         optBtns: [
           {
@@ -98,7 +96,6 @@ export default {
            { prop: "sumpremium", label: "总保费", type: "text" },
           // { prop: "proportional", label: "抽成比例", type: "text" },
           // { prop: "extractFee", label: "总保费抽成费用", type: "text" },
-          { prop: "startTime", label: "核算开始时间", type: "text",width:170 },
         ],
         optBtns: [
           {
@@ -113,15 +110,6 @@ export default {
         isPaginationShow: true,
         isShowIndex: true,
       },
-      rules: {
-        proportional: [
-          { required: true, message: '请输入抽成比例', trigger: 'blur' },
-        ],
-        userName: [
-          { required: true, message: '请选择名称', trigger: 'change' }
-        ],
-
-      },
       pageData: {
         pageNum: 1,
         pageSize: 10,
@@ -174,8 +162,8 @@ export default {
             },
           ]},
           { prop: "licenseno", label: "车牌号", type: "text" },
-          { prop: "sypremium", label: "商业险", type: "text" },
           { prop: "jqpremium", label: "交强险", type: "text" },
+          { prop: "sypremium", label: "商业险", type: "text" },
           { prop: "jypremium", label: "驾意险", type: "text" },
           { prop: "sumpremium", label: "总保费", type: "text" },
           { prop: "createtime", label: "创建时间 ", type: "text" },
@@ -194,7 +182,6 @@ export default {
       },
       rowDept: '',
       userId: '',
-      startTime: '',
       dialogVisibledetail:false
     };
   },
@@ -210,7 +197,6 @@ export default {
     rowDetail(row) {
       this.dialogVisible = true
       this.rowDept = row.deptId
-      this.startTime = row.startTime
       this.findPagepersonnel({ deptId: row.deptId })
       this.findPagedept()
     },
@@ -253,7 +239,6 @@ export default {
         .queryAgencyUserInsAreaPage({
           userId: this.userId,
           deptId: this.rowDept,
-          startTime: this.startTime,
           ...data,
           ...this.pageDatadept
         })

src/views/PeopleManage/PcLoginRecord.vue

@@ -424,12 +424,12 @@ export default {
       }
     },
     onZTreeClick: function (evt, treeId, treeNode) {
-      if (this.deptPeopleValue) {
-        this.deptPeopleType = 1
-      }
-      else {
-        this.deptPeopleType = 2
-      }
+      // if (this.deptPeopleValue) {
+      //   this.deptPeopleType = 1
+      // }
+      // else {
+      //   this.deptPeopleType = 2
+      // }
       this.deptPeopleId = evt.id
       this.initMap();
     },

src/views/PeopleManage/UserMap.vue

@@ -438,12 +438,12 @@ export default {
      }
     },
     onZTreeClick: function (evt, treeId, treeNode) {
-      if(this.deptPeopleValue){
-        this.deptPeopleType=1
-      }
-      else{
-        this.deptPeopleType=2
-      }
+      // if(this.deptPeopleValue){
+      //   this.deptPeopleType=1
+      // }
+      // else{
+      //   this.deptPeopleType=2
+      // }
       this.deptPeopleId=evt.id
       this.initMap();
     },