Merge branch 'dev' of http://www.baoxianzhanggui.com:8090/sxzgd/vue-insagent-pc into dev

src/http/moudules/insCompany.js

@@ -1130,4 +1130,13 @@ export const findTree = (data) => {
     method: 'post',
     data
   })
+}
+
+// 协议调度排序
+export const modifySort = (params) => {
+  return axios({
+    url: '/tax/manager/modifySort',
+    method: "get",
+    params,
+  })
 }

src/http/moudules/task.js

@@ -1865,4 +1865,13 @@ export const queryPartnerCompaniesList = (status) => {
     url: "/fnc/importAsync/queryPartnerCompaniesList?status="+status,
     method: "get",
   })
+}
+
+//财务审核驳回订单
+export const getAllRejectOrders = (data) => {
+  return axios({
+    url: "/api/externalOrder/getAllRejectOrders",
+    method: "post",
+    data
+  })
 }

src/utils/websocket.js

@@ -17,6 +17,7 @@ function websocketonmessage (e) {
 export function websocketSend (agentData) {
   // 加延迟是为了尽量让ws连接状态变为OPEN
   setTimeout(() => {
+    if(websock){
     // 添加状态判断，当为OPEN时，发送消息
     if (websock.readyState === websock.OPEN) { // websock.OPEN = 1
       // 发给后端的数据需要字符串化
@@ -27,6 +28,18 @@ export function websocketSend (agentData) {
       // Message.error('ws连接异常，请稍候重试')
       errorCallback()
     }
+  }
+else{
+  let userId = sessionStorage.getItem("user");
+  let data = {
+    ...agentData,
+    userId,
+  };
+  sendWebsocket(
+    `${process.env.SOCKET_Url}/pcWebsocket/${userId}`,
+    data
+  );
+}
   }, 500)
 }
 

src/views/AgreementManage/CarInsurance/SourceManagement.vue

@@ -200,6 +200,20 @@
         <el-button size="small" type="primary" @click="configAdd">确 定</el-button>
       </span>
     </el-dialog>
+
+    <el-dialog title="排序" :visible.sync="paixudialogVisible" width="30%">
+      <div>
+        <el-form size="small">
+          <el-form-item label="排序">
+            <el-input size="small" v-model="paixuData.sort" placeholder="请输入排序" style="width: 300px;"></el-input>
+          </el-form-item>
+        </el-form>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="paixudialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="subPaixu">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -306,6 +320,13 @@ export default {
               return this.configuration(row);
             },
           },
+          {
+            label: "排序",
+            type: "text",
+            click: (row, index) => {
+              return this.openPaixu(row);
+            },
+          },
         ],
       },
       pageData: {
@@ -321,6 +342,11 @@ export default {
         insCompanyId: "",
         agreementTaxExcludeDeptList: [],
       },
+      paixudialogVisible: false,
+      paixuData: {
+        companyId: '',
+        sort: '',
+      },
     };
   },
   created() {
@@ -358,6 +384,30 @@ export default {
     this.findPage();
   },
   methods: {
+    closePaixu() {
+      this.paixudialogVisible = false
+      this.paixuData = {
+        companyId: '',
+        sort: '',
+      }
+    },
+    subPaixu() {
+      this.$api.insCompany.modifySort(this.paixuData).then((res) => {
+        if (res.code == 200) {
+          this.$message.success(res.msg)
+          this.findPage()
+          this.closePaixu()
+        } else {
+          this.$message.error(res.msg)
+        }
+      })
+    },
+    openPaixu(row) {
+      // this.rowData = row
+      console.log(row)
+      this.paixuData.companyId = row.id
+      this.paixudialogVisible = true
+    },
     agreementChange(e) {
       this.agreementList.forEach((val, index) => {
         if (val.id ==  e) {

src/views/FinancialManagement/CarInsurance/Verifytasks/RejectOrders.vue

@@ -0,0 +1,221 @@
+<template>
+  <!--布局容器-->
+  <div class="InvoicedAndSettled" style="width: 99%; margin-top: 0px">
+    <templateTable
+      :formList="formList"
+      :searchData.sync="searchData"
+      :tableConfig="tableConfig"
+      :data="tableData"
+      @getList="getList"
+      @handleSearchList="handleSearchList"
+      :pagination="pageData"
+    >
+    </templateTable>
+    <detailsDialog  title="详情" ref="detailsDialog" :visible.sync="backupVisible" :before-close="handleClose" :orderInfo.sync="orderInfo" :Feepermissions="false"></detailsDialog>
+  </div>
+</template>
+<script>
+import templateTable from "@/components/TemplateTable/index.vue";
+import detailsDialog from "@/views/Core/components/detailsDialog.vue";
+import { mapState } from "vuex";
+
+export default {
+  name: "baosi",
+  components: { templateTable,detailsDialog},
+  created() {},
+  computed: {
+    ...mapState({
+      perms: (state) => state.user.perms,
+    }),
+  },
+  data() {
+    return {
+      orderInfo: {
+        //选中的订单
+        ownerinfo: {},
+        carinfo: {},
+        applyinfo: {},
+        insureinfo: {},
+        kindinfo: [],
+        riskinfo: [],
+        ownerinfo: {},
+        orderCommissionVo: {},
+        extendInfo: {}
+      },
+      feeOrderNewVoList: {},
+      queryOrders:{},
+      fileList: [],
+      searchData: {},
+      formList: [
+        {
+          label: "订单号",
+          prop: "id",
+          type: "input",
+        },
+        {
+          label: "车牌号",
+          prop: "licenseno",
+          type: "input",
+        },
+      ],
+      tableConfig: {
+        columns: [
+          {
+            prop: "id",
+            label: "订单号",
+            type: "text",
+          },
+          {
+            prop: "licenseno",
+            label: "车牌号",
+            type: "text",
+          },
+          {
+            prop: "auditname",
+            label: "审核人",
+            type: "text",
+          },
+          {
+            prop: "rejectinfo",
+            label: "驳回原因",
+            type: "text",
+          },
+          {
+            prop: "jqpremium",
+            label: "交强保费",
+            type: "text",
+          },
+          {
+            prop: "sypremium",
+            label: "商业保费",
+            type: "text",
+          },
+          {
+            prop: "taxamount",
+            label: "车船税",
+            type: "text",
+          },
+          {
+            prop: "sumpremium",
+            label: "保费合计",
+            type: "text",
+          },
+        ],
+        loading: true,
+        isPaginationShow: true,
+        optBtns: [
+          {
+            type: "primary",
+            label: "详情",
+            click: (row, index) => {
+              return this.haldNewDetail(row);
+            },
+          },
+        ],
+      },
+      tableData: [],
+      pageData: {
+        pageNum: 1,
+        pageSize: 20,
+        totalSize: 0
+      },
+      backupVisible: false,
+    };
+   },
+  created() {
+    this.getList();
+  },
+  methods: {
+    // 查询
+    handleSearchList(data) {
+      this.getList(data);
+    },
+    //列表数据
+    getList(data) {
+      console.log(data)
+      this.tableConfig.loading = true;
+      this.$api.task.getAllRejectOrders({ ...this.pageData, ...data }).then((res) => {
+        if (res.code == 200) {
+          this.tableData = res.data.records;
+          this.pageData.pageNum = res.data.current;
+          this.pageData.pageSize = res.data.size;
+          this.pageData.totalSize = res.data.total;
+          this.tableConfig.loading = false;
+        } else {
+          this.$message.error(res.msg);
+        }
+      });
+    },
+    handleClose() {
+      this.backupVisible = false;
+    },
+    haldNewDetail(row) {
+      let params = {
+        companyId: row.id
+      };
+      this.$api.letter.getByCompanyId(params).then(res => {
+        if (res.code == 200) {
+          this.licenseNo = res.data.licenseno; //车牌号
+          this.inscompany = res.data.inscompany; //保险公司
+          if (res.data.accidentInfo) {
+            res.data.accidentInfo.constructor === Object
+              ? [res.data.accidentInfo]
+              : res.data.accidentInfo;
+          }
+          Object.assign(this.orderInfo, res.data);
+          if (this.orderInfo.riskinfo && this.orderInfo.riskinfo.length > 0) {
+            for (let i = 0; i < this.orderInfo.riskinfo.length; i++) {
+              if (this.orderInfo.riskinfo[i].riskCode == "0510") {
+                for (let j = 0; j < this.orderInfo.kindinfo.length; j++) {
+                  for (let m = 0; m < this.global.insureList.length; m++) {
+                    if (
+                      this.orderInfo.kindinfo[j].kindCode ==
+                      this.global.insureList[m].kindCode
+                    ) {
+                      this.global.insureList[
+                        m
+                      ].coveragePremium = this.orderInfo.kindinfo[
+                        j
+                      ].coveragePremium;
+                      if (this.orderInfo.kindinfo[j].kindCode == "B") {
+                        this.global.insureList[9].amtList[0].value = this.orderInfo.kindinfo[
+                          j
+                        ].amount;
+                      }
+                      if (this.orderInfo.kindinfo[j].kindCode == "A") {
+                        this.global.insureList[m].amount = "1";
+                      } else if (this.global.insureList[m].kindCode == "D4") {
+                        this.global.insureList[
+                          m
+                        ].amount = this.orderInfo.kindinfo[j].unitAmount;
+                      } else if (
+                        this.global.insureList[m].isMainRisk ||
+                        this.global.insureList[m].kindCode == "BD" ||
+                        this.global.insureList[m].kindCode == "L"
+                      ) {
+                        this.global.insureList[
+                          m
+                        ].amount = this.orderInfo.kindinfo[j].amount;
+                      } else {
+                        this.global.insureList[
+                          m
+                        ].amount = this.orderInfo.kindinfo[j].deductibleRate;
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+          this.$refs.detailsDialog.setBackupVisible(true);
+        } else {
+          this.$message.error("订单获取失败");
+        }
+      });
+    },
+  }
+};
+</script>
+      
+<style scoped lang="scss">
+</style>

src/views/Home.vue

@@ -30,11 +30,13 @@ export default {
     setInterval(() => {
       setTimeout(() => {
         if (Cookies.get("token")) {
+          let userId = sessionStorage.getItem("user");
           getUserIP((ip) => {
             getAddressLocation(ip, (info) => {
               let data = {
                 ...info,
                 systemType: '1',
+                userId
               };
               websocketSend(
                 data

src/views/PeopleManage/Agent/AgentExamine.vue

@@ -483,6 +483,7 @@ export default {
   mixins: [mixin],
   data() {
     return {
+      deptId: "99",
       searchLeaderOptions: {},
       showRemark: false, // 驳回弹窗
       activeName: "1",
@@ -672,7 +673,7 @@ export default {
         this.pageData.pageSize = data.pageRequest.pageSize;
       }
       let dto = {
-        deptId: this.pageData.deptId,
+        deptId: this.deptId,
         mobile: this.pageData.mobile,
         name: this.pageData.realName,
         userId: this.pageData.userId,

src/views/PeopleManage/Agent/AgentManage.vue

@@ -451,6 +451,7 @@ export default {
   mixins: [mixin],
   data() {
     return {
+      deptId: "99",
       showOut: false, // 离司
       logoutTime: "", // 离司 离职时间
       logoutImg: "", // 离司 图片
@@ -612,7 +613,7 @@ export default {
         pageSize: 10,
         totalSize: 0,
       },
-      deptId: JSON.parse(localStorage.getItem("user_data")).deptId,
+      //deptId: JSON.parse(localStorage.getItem("user_data")).deptId,
       formData: {
         roleId: "20",
       },

src/views/PeopleManage/PcLoginRecord.vue

@@ -224,23 +224,26 @@
             </el-table-column>
             <el-table-column prop="carNumber" label="车险录单">
               <template slot-scope="scope">
-              <el-tooltip class="item" effect="dark" :content="scope.row.carNumberTime" placement="bottom">
+              <el-tooltip v-if="scope.row.carNumber" class="item" effect="dark" :content="scope.row.carNumberTime" placement="bottom">
                   <span >{{ scope.row.carNumber }}</span>
                 </el-tooltip>
+              <span v-else>{{ scope.row.carNumber }}</span>
               </template > 
             </el-table-column>
             <el-table-column prop="orderNumber" label="订单查询">
               <template slot-scope="scope">
-              <el-tooltip class="item" effect="dark" :content="scope.row.orderNumberTime" placement="bottom">
+              <el-tooltip v-if="scope.row.orderNumber" class="item" effect="dark" :content="scope.row.orderNumberTime" placement="bottom">
                   <span >{{ scope.row.orderNumber }}</span>
                 </el-tooltip>
+                <span v-else>{{ scope.row.orderNumber }}</span>
               </template > 
             </el-table-column>
             <el-table-column prop="walletNumber" label="钱包">
               <template slot-scope="scope">
-              <el-tooltip class="item" effect="dark" :content="scope.row.walletNumberTime" placement="bottom">
+              <el-tooltip v-if="scope.row.walletNumber" class="item" effect="dark" :content="scope.row.walletNumberTime" placement="bottom">
                   <span >{{ scope.row.walletNumber }}</span>
                 </el-tooltip>
+                <span v-else>{{ scope.row.walletNumber }}</span>
               </template > 
             </el-table-column>  
           </el-table>
@@ -1000,6 +1003,7 @@ export default {
     },
     markerClick(e,) {
       let _this = this
+      _this.personnelPageNum=1
       this.position = e.target._position
       // _this.morelFun()
       let data = {
@@ -1011,7 +1015,7 @@ export default {
         queryId: this.deptPeopleId,
         type: this.deptPeopleType,
         lng: e.target._position[0], lat: e.target._position[1], source: this.source, pageSize: 3,
-        pageNum: this.personnelPageNum, ...data
+        pageNum: 1, ...data
       })
         .then(res => {
           if (res.code == 200) {

src/views/PeopleManage/Player/PerformanceManage.vue

@@ -185,7 +185,8 @@ export default {
           showIcon: false,
         },
       },
-      deptId: JSON.parse(localStorage.getItem("user_data")).deptId,
+      //deptId: JSON.parse(localStorage.getItem("user_data")).deptId,
+      deptId: "99",
       ztreeNodes: [],
       currentTreeNode: null,
       title: "详情",

src/views/PeopleManage/Player/PlayerExamine.vue

@@ -506,6 +506,7 @@ export default {
   mixins: [mixin],
   data() {
     return {
+      deptId: "99",
       searchLeaderOptions: {},
       showRemark: false, // 驳回弹窗
       activeName: "1",
@@ -708,7 +709,7 @@ export default {
       }
       this.isQueryStaff = false
       let dto = {
-        deptId: this.pageData.deptId,
+        deptId: this.deptId,
         mobile: this.pageData.mobile,
         name: this.pageData.realName,
         userId: this.pageData.userId,

src/views/PeopleManage/Player/PlayerExamineTeam.vue

@@ -472,6 +472,7 @@ export default {
   mixins: [mixin],
   data() {
     return {
+      deptId: "99",
       showRemark: false, // 驳回弹窗
       activeName: "1",
       pageData: {
@@ -686,7 +687,7 @@ export default {
       }
       this.isQueryStaff = false
       let dto = {
-        deptId: this.pageData.deptId,
+        deptId: this.deptId,
         mobile: this.pageData.mobile,
         name: this.pageData.realName,
         userId: this.pageData.userId,

src/views/PeopleManage/Player/PlayerManage.vue

@@ -466,6 +466,7 @@ export default {
   mixins: [mixin],
   data() {
     return {
+      deptId: "99",
       showOut: false, // 离司
       logoutTime: "", // 离司 离职时间
       logoutImg: "", // 离司 图片
@@ -614,7 +615,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
       },
-      deptId: JSON.parse(localStorage.getItem("user_data")).deptId,
+      //deptId: JSON.parse(localStorage.getItem("user_data")).deptId,
       formData: {
         roleId: "19",
       },

src/views/PeopleManage/Player/PlayerManageteam.vue

@@ -422,6 +422,7 @@ export default {
   mixins: [mixin],
   data() {
     return {
+      deptId: "99",
       //影像资料
       dataForm: {
         SFZ_01: "",
@@ -575,7 +576,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
       },
-      deptId: JSON.parse(localStorage.getItem("user_data")).deptId,
+      //deptId: JSON.parse(localStorage.getItem("user_data")).deptId,
       formData: {
         roleId: "21",
       },

src/views/PeopleManage/Sales/SalesExamine.vue

@@ -503,6 +503,7 @@ export default {
   mixins: [mixin],
   data() {
     return {
+      deptId: "99",
       managerOptions:[], //电销管理集合
       showRemark: false, // 驳回弹窗
       activeName: "1",
@@ -722,7 +723,7 @@ export default {
       }
       this.isQueryStaff = false
       let dto = {
-        deptId: this.pageData.deptId,
+        deptId: this.deptId,
         mobile: this.pageData.mobile,
         name: this.pageData.realName,
         userId: this.pageData.userId,

src/views/PeopleManage/Sales/SalesExamineGroup.vue

@@ -503,6 +503,7 @@ export default {
   mixins: [mixin],
   data() {
     return {
+      deptId: "99",
       managerOptions:[], //电销管理集合
       showRemark: false, // 驳回弹窗
       activeName: "1",
@@ -718,7 +719,7 @@ export default {
       }
       this.isQueryStaff = false
       let dto = {
-        deptId: this.pageData.deptId,
+        deptId: this.deptId,
         mobile: this.pageData.mobile,
         name: this.pageData.realName,
         userId: this.pageData.userId,

src/views/PeopleManage/Sales/SalesManage.vue

@@ -552,6 +552,7 @@ export default {
   mixins: [mixin],
   data() {
     return {
+      deptId: "99",
       managerOptions:[], //电销管理集合
       logoutTime: "", // 离司 离职时间
       logoutImg: "", // 离司 图片

src/views/PeopleManage/Sales/SalesManageGroup.vue

@@ -552,6 +552,7 @@ export default {
   mixins: [mixin],
   data() {
     return {
+      deptId: "99",
       managerOptions:[], //电销管理集合
       logoutTime: "", // 离司 离职时间
       logoutImg: "", // 离司 图片

src/views/PeopleManage/Staff/StaffExamine.vue

@@ -458,6 +458,7 @@ export default {
   mixins: [mixin],
   data() {
     return {
+      deptId: "99",
       showRemark: false, // 驳回弹窗
       activeName: "1",
       //56个民族
@@ -665,7 +666,7 @@ export default {
       }
       this.isQueryStaff = false
       let dto = {
-        deptId: this.pageData.deptId,
+        deptId: this.deptId,
         mobile: this.pageData.mobile,
         name: this.pageData.realName,
         userId: this.pageData.userId,

src/views/PeopleManage/Staff/StaffManage.vue

@@ -517,6 +517,7 @@ export default {
   mixins: [mixin],
   data() {
     return {
+      deptId: "99",
       logoutTime: "", // 离司 离职时间
       logoutImg: "", // 离司 图片
       logoutImgId: "",

src/views/PeopleManage/TeamLeader/TeamLeaderExamine.vue

@@ -457,6 +457,7 @@ export default {
   mixins: [mixin],
   data() {
     return {
+      deptId: "99",
       showRemark: false, // 驳回弹窗
       //影像资料
       dataForm: {
@@ -648,7 +649,7 @@ export default {
         this.pageData.pageSize = data.pageRequest.pageSize;
       }
       let dto = {
-        deptId: this.pageData.deptId,
+        deptId: this.deptId,
         mobile: this.pageData.mobile,
         name: this.pageData.realName,
         userId: this.pageData.userId,

src/views/PeopleManage/TeamLeader/TeamLeaderManage.vue

@@ -516,6 +516,7 @@ export default {
   mixins: [mixin],
   data() {
     return {
+      deptId: "99",
       logoutTime: "", // 离司 离职时间
       logoutImg: "", // 离司 图片
       logoutImgId: "",

src/views/PeopleManage/UserMap.vue

@@ -232,37 +232,42 @@
           </el-table-column>
           <el-table-column prop="carNumber" label="车险录单">
             <template slot-scope="scope">
-              <el-tooltip class="item" effect="dark" :content="scope.row.carNumberTime" placement="bottom">
+              <el-tooltip v-if="scope.row.carNumber" class="item" effect="dark" :content="scope.row.carNumberTime" placement="bottom">
                   <span >{{ scope.row.carNumber }}</span>
                 </el-tooltip>
+              <span v-else>{{ scope.row.carNumber }}</span>
               </template > 
           </el-table-column>
           <el-table-column prop="memberNumber" label="会员分享">
-            <template slot-scope="scope">
-              <el-tooltip class="item" effect="dark" :content="scope.row.memberNumberTime" placement="bottom">
+            <template  slot-scope="scope">
+              <el-tooltip v-if="scope.row.memberNumber" class="item" effect="dark" :content="scope.row.memberNumberTime" placement="bottom">
                   <span >{{ scope.row.memberNumber }}</span>
                 </el-tooltip>
+              <span v-else>{{ scope.row.memberNumber }}</span>
               </template > 
           </el-table-column>
           <el-table-column prop="managementNumber" label="会员管理">
             <template slot-scope="scope">
-              <el-tooltip class="item" effect="dark" :content="scope.row.managementNumberTime" placement="bottom">
+              <el-tooltip v-if="scope.row.managementNumber" class="item" effect="dark" :content="scope.row.managementNumberTime" placement="bottom">
                   <span >{{ scope.row.managementNumber }}</span>
                 </el-tooltip>
+              <span v-else>{{ scope.row.managementNumber }}</span>
               </template > 
           </el-table-column>
           <el-table-column prop="walletNumber" label="钱包">
             <template slot-scope="scope">
-              <el-tooltip class="item" effect="dark" :content="scope.row.walletNumberTime" placement="bottom">
+              <el-tooltip v-if="scope.row.walletNumber" class="item" effect="dark" :content="scope.row.walletNumberTime" placement="bottom">
                   <span >{{ scope.row.walletNumber }}</span>
                 </el-tooltip>
+              <span v-else>{{ scope.row.walletNumber }}</span>
               </template > 
           </el-table-column>
           <el-table-column prop="posterNumber" label="海报管理">
             <template slot-scope="scope">
-              <el-tooltip class="item" effect="dark" :content="scope.row.posterNumberTime" placement="bottom">
+              <el-tooltip v-if="scope.row.posterNumber" class="item" effect="dark" :content="scope.row.posterNumberTime" placement="bottom">
                   <span >{{ scope.row.posterNumber }}</span>
                 </el-tooltip>
+                <span v-else>{{ scope.row.posterNumber }}</span>
               </template > 
           </el-table-column>
         </el-table>
@@ -922,6 +927,7 @@ export default {
     },
     markerClick(e) {
       let _this = this
+      // personnelPageNum.personnelPageNum=1
       this.position = e.target._position
       let data = {
         startTime: this.historyData.length > 0 && this.positionType == 2 ? this.historyData[0] : '',
@@ -932,7 +938,7 @@ export default {
         queryId: this.deptPeopleId,
         type: this.deptPeopleType,
         lng: e.target._position[0], lat: e.target._position[1], pageSize: 3,
-        pageNum: this.personnelPageNum, ...data
+        pageNum: 1, ...data
       })
         .then(res => {
           if (res.code == 200) {

src/views/Task/AgentPoolChannel/AgentPoolChannel1.vue

@@ -103,6 +103,7 @@ export default {
       columns: [
         { prop: "subOrderId", label: "订单号", minWidth: 180 },
         { prop: "product", label: "投保险种", minWidth: 100 },
+        { prop: "areaInfo", label: "归属信息", minWidth: 150 },
         { prop: "username", label: "业务员姓名", minWidth: 180 },
         { prop: "leaderName", label: "管理人", minWidth: 160, },
         { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },

src/views/Task/AgentPoolChannel/AgentPoolChannel2.vue

@@ -110,6 +110,7 @@ export default {
       columns: [
         { prop: "subOrderId", label: "订单号", minWidth: 180 },
         { prop: "product", label: "投保险种", minWidth: 100 },
+        { prop: "areaInfo", label: "归属信息", minWidth: 150 },
         { prop: "username", label: "业务员姓名", minWidth: 180 },
         { prop: "leaderName", label: "管理人", minWidth: 160, },
         { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },

src/views/Task/AgentPoolChannel/AgentPoolChannel3.vue

@@ -84,6 +84,7 @@ export default {
       columns1: [
         { prop: "subOrderId", label: "订单号", minWidth: 180 },
         { prop: "product", label: "投保险种", minWidth: 100 },
+        { prop: "areaInfo", label: "归属信息", minWidth: 150 },
         { prop: "username", label: "业务员姓名", minWidth: 180 },
         { prop: "leaderName", label: "管理人", minWidth: 160, },
         { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },

src/views/Task/AgentPoolChannel/AgentPoolChannel4.vue

@@ -105,6 +105,7 @@ export default {
       ], columns: [
         { prop: "subOrderId", label: "订单号", minWidth: 180 },
         { prop: "product", label: "投保险种", minWidth: 100 },
+        { prop: "areaInfo", label: "归属信息", minWidth: 150 },
         { prop: "username", label: "业务员姓名", minWidth: 180 },
         { prop: "leaderName", label: "管理人", minWidth: 160, },
         { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },

src/views/Task/CompanyPoolChannel/CompanyPoolChannel1.vue

@@ -104,6 +104,7 @@ export default {
       columns: [
         { prop: "subOrderId", label: "订单号", minWidth: 180 },
         { prop: "product", label: "投保险种", minWidth: 100 },
+        { prop: "areaInfo", label: "归属信息", minWidth: 150 },
         { prop: "username", label: "业务员姓名", minWidth: 180 },
         { prop: "leaderName", label: "管理人", minWidth: 160, },
         { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },

src/views/Task/CompanyPoolChannel/CompanyPoolChannel2.vue

@@ -181,6 +181,7 @@ export default {
       columns: [
         { prop: "subOrderId", label: "订单号", minWidth: 180 },
         { prop: "product", label: "投保险种", minWidth: 100 },
+        { prop: "areaInfo", label: "归属信息", minWidth: 150 },
         { prop: "username", label: "业务员姓名", minWidth: 180 },
         { prop: "leaderName", label: "管理人", minWidth: 160, },
         { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },

src/views/Task/CompanyPoolChannel/CompanyPoolChannel3.vue

@@ -222,6 +222,7 @@ export default {
       columns1: [
         { prop: "subOrderId", label: "订单号", minWidth: 180 },
         { prop: "product", label: "投保险种", minWidth: 100 },
+        { prop: "areaInfo", label: "归属信息", minWidth: 150 },
         { prop: "username", label: "业务员姓名", minWidth: 180 },
         { prop: "leaderName", label: "管理人", minWidth: 160, },
         { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },

src/views/Task/CompanyPoolChannel/CompanyPoolChannel4.vue

@@ -109,6 +109,7 @@ export default {
       columns: [
         { prop: "subOrderId", label: "订单号", minWidth: 180 },
         { prop: "product", label: "投保险种", minWidth: 100 },
+        { prop: "areaInfo", label: "归属信息", minWidth: 150 },
         { prop: "username", label: "业务员姓名", minWidth: 180 },
         { prop: "leaderName", label: "管理人", minWidth: 160, },
         { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },

src/views/Task/DaikeLetter.vue

@@ -137,10 +137,17 @@
         highlight-current-row
         @row-dblclick="reslistCurrentChange"
       >
+        <el-table-column prop="twoDeptName" label="二级机构" align="center"></el-table-column>
+        <el-table-column prop="threeDeptName" label="三级机构" align="center"></el-table-column>
+        <el-table-column prop="fourDeptName" label="四级机构" align="center"></el-table-column>
+        <el-table-column prop="fiveDeptName" label="五级机构" align="center"></el-table-column>
         <el-table-column prop="userId" label="工号" align="center" ></el-table-column>
         <el-table-column prop="name" label="	业务员名称" align="center" ></el-table-column>
         <el-table-column prop="mobile" label="手机号" align="center"></el-table-column>
         <el-table-column prop="identity" label="身份证号" align="center"></el-table-column>
+        <el-table-column prop="weChatAuthenticationFlag" label="是否微信认证" align="center"></el-table-column>
+        <el-table-column prop="alipayCertificationFlag" label="是否支付宝认证" align="center"></el-table-column>
+        <el-table-column prop="bindBankNumberFlag" label="是否绑定银行卡信息" align="center"></el-table-column>
       </el-table>
     </el-dialog>
   </div>

src/views/Task/ElectricSales/AgentPoolChannel.vue

@@ -79,6 +79,7 @@ export default {
       columns: [
         { prop: "subOrderId", label: "订单号", minWidth: 180 },
         { prop: "product", label: "投保险种", minWidth: 100 },
+        { prop: "areaInfo", label: "归属信息", minWidth: 150 },
         { prop: "username", label: "业务员姓名", minWidth: 180 },
         { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },
         { prop: "entryStatus", label: "录入来源", minWidth: 160, formatter: this.entryStatusFormatter },

src/views/Task/ElectricSales/AgentPoolChannel1.vue

@@ -102,6 +102,7 @@ export default {
       ], columns: [
         { prop: "subOrderId", label: "订单号", minWidth: 180 },
         { prop: "product", label: "投保险种", minWidth: 100 },
+        { prop: "areaInfo", label: "归属信息", minWidth: 150 },
         { prop: "username", label: "业务员姓名", minWidth: 180 },
         // { prop: "userid", label: "业务员", minWidth: 160, formatter: this.useridFormatter },
         { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },

src/views/Task/ElectricSales/AgentPoolChannel2.vue

@@ -110,6 +110,7 @@ export default {
       columns: [
         { prop: "subOrderId", label: "订单号", minWidth: 180 },
         { prop: "product", label: "投保险种", minWidth: 100 },
+        { prop: "areaInfo", label: "归属信息", minWidth: 150 },
         { prop: "username", label: "业务员姓名", minWidth: 180 },
         // { prop: "userid", label: "业务员", minWidth: 160, formatter: this.useridFormatter },
         { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },

src/views/Task/ElectricSales/AgentPoolChannel3.vue

@@ -84,6 +84,7 @@ export default {
       columns1: [
         { prop: "subOrderId", label: "订单号", minWidth: 180 },
         { prop: "product", label: "投保险种", minWidth: 100 },
+        { prop: "areaInfo", label: "归属信息", minWidth: 150 },
         { prop: "username", label: "业务员姓名", minWidth: 180 },
         // { prop: "userid", label: "业务员", minWidth: 160, formatter: this.useridFormatter },
         { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },

src/views/Task/ElectricSales/AgentPoolChannel4.vue

@@ -106,6 +106,7 @@ export default {
       columns: [
         { prop: "subOrderId", label: "订单号", minWidth: 180 },
         { prop: "product", label: "投保险种", minWidth: 100 },
+        { prop: "areaInfo", label: "归属信息", minWidth: 150 },
         { prop: "username", label: "业务员姓名", minWidth: 180 },
         // { prop: "userid", label: "业务员", minWidth: 160, formatter: this.useridFormatter },
         { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },

src/views/Task/External/Check.vue

@@ -6,7 +6,7 @@
       :searchData.sync="searchData"
       :tableConfig="tableConfig"
       :data="tableData"
-      @findPage="getList"
+      @getList="getList"
       @handleSearchList="handleSearchList"
       :pagination="pageData"
     >
@@ -137,9 +137,9 @@ export default {
       this.$api.task.orderCheckPage({ ...this.pageData, ...data }).then((res) => {
         if (res.code == 200) {
           this.tableData = res.data.records;
-          this.pageData.pageNum = res.data.pageNum;
-          this.pageData.pageSize = res.data.pageSize;
-          //this.pageData.totalSize = res.data.total;
+          this.pageData.pageNum = res.data.current;
+          this.pageData.pageSize = res.data.size;
+          this.pageData.totalSize = res.data.total;
           this.tableConfig.loading = false;
         } else {
           this.$message.error(res.msg);

src/views/Task/TaskPoolChannel/TaskPoolChannel1.vue

@@ -101,6 +101,7 @@ export default {
       columns: [
         { prop: "subOrderId", label: "订单号", minWidth: 180 },
         { prop: "product", label: "投保险种", minWidth: 100 },
+        { prop: "areaInfo", label: "归属信息", minWidth: 150 },
         { prop: "username", label: "业务员姓名", minWidth: 180 },
         { prop: "leaderName", label: "管理人", minWidth: 160, },
         { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },

src/views/Task/TaskPoolChannel/TaskPoolChannel2.vue

@@ -110,6 +110,7 @@ export default {
       columns: [
         { prop: "subOrderId", label: "订单号", minWidth: 180 },
         { prop: "product", label: "投保险种", minWidth: 100 },
+        { prop: "areaInfo", label: "归属信息", minWidth: 150 },
         { prop: "username", label: "业务员姓名", minWidth: 180 },
         { prop: "leaderName", label: "管理人", minWidth: 160, },
         { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },

src/views/Task/TaskPoolChannel/TaskPoolChannel3.vue

@@ -81,6 +81,7 @@ export default {
       columns1: [
         { prop: "subOrderId", label: "订单号", minWidth: 180 },
         { prop: "product", label: "投保险种", minWidth: 100 },
+        { prop: "areaInfo", label: "归属信息", minWidth: 150 },
         { prop: "username", label: "业务员姓名", minWidth: 180 },
         { prop: "leaderName", label: "管理人", minWidth: 160, },
         { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },

src/views/Task/TaskPoolChannel/TaskPoolChannel4.vue

@@ -106,6 +106,7 @@ export default {
       columns: [
         { prop: "subOrderId", label: "订单号", minWidth: 180 },
         { prop: "product", label: "投保险种", minWidth: 100 },
+        { prop: "areaInfo", label: "归属信息", minWidth: 150 },
         { prop: "username", label: "业务员姓名", minWidth: 180 },
         { prop: "leaderName", label: "管理人", minWidth: 160, },
         { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },

src/views/Task/daikeComponents/KtOrder.vue

@@ -2781,7 +2781,7 @@ export default {
                       if (this.orderInfo.crossInsurance.length > 0) {
                         this.orderInfo.crossInsurance.map((ele) => {
                           this.$api.letter
-                            .zijingetPolicyPrint({
+                            .obtainWarranty({
                               companyId: item.id,
                               policyNumber: ele.policyNumber,
                               riskCode: "0513",

src/views/Task/mixin.js

@@ -146,6 +146,7 @@ export const mixin = { // 导出混入对象
       columns: [
         { prop: "subOrderId", label: "订单号", minWidth: 180 },
         { prop: "product", label: "投保险种", minWidth: 100 },
+        { prop: "areaInfo", label: "归属信息", minWidth: 150 },
         { prop: "username", label: "业务员姓名", minWidth: 180 },
         { prop: "leaderName", label: "管理人", minWidth: 160, },
         { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },
@@ -167,6 +168,7 @@ export const mixin = { // 导出混入对象
       columns1: [
         { prop: "subOrderId", label: "订单号", minWidth: 180 },
         { prop: "product", label: "投保险种", minWidth: 100 },
+        { prop: "areaInfo", label: "归属信息", minWidth: 150 },
         { prop: "username", label: "业务员姓名", minWidth: 180 },
         { prop: "leaderName", label: "管理人", minWidth: 160, },
         { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },