Просмотр исходного кода

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

@dongkboy 2 лет назад
Родитель
Сommit
daa85f5fa3

+ 2 - 2
config/dev.env.js

@@ -9,9 +9,9 @@ module.exports = merge(prodEnv, {
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL: '"http://192.168.0.115:8080/"' //凯森
-  BASE_URL: '"http:///192.168.0.106:8080/"',//屈晨
+  // BASE_URL: '"http:///192.168.0.106:8080/"',//屈晨
   // BASE_URL: '"http:///192.168.0.253:8080/"',//田智
-  // BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
+  BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
   // BASE_URL: '"http://192.168.1.101:8080/"',
   // BASE_URL: '"http:///192.168.0.22:8080/"',//郝宇
   // BASE_URL: '"http:///192.168.0.103:8080/"',//

+ 5 - 1
src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/DocumentaryUnsettled.vue

@@ -77,7 +77,11 @@ export default {
           {
             type: 'primary',
             label: '结算',
-            perm: 'sys:documentaryFees2:balance',
+            hide:(row)=>{
+              if(row.invoicCommissionFeevalue-row.settleMentAmount>0){
+                return true
+              }
+            },
             click: (row, index) => { return this.openBalanceFun(row) },
           },
         ]

+ 5 - 0
src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/Notinvoiced.vue

@@ -97,6 +97,11 @@ export default {
           {
             type: 'primary',
             label: '开票',
+            hide:(row)=>{
+              if(row.otherFeevalue-row.invoicCommissionFeevalue>0){
+                return true
+              }
+            },
             click: (row, index) => { return this.openBalanceFun(row) },
           },
         ]

+ 20 - 2
src/views/PeopleManage/Generations/RegionalPerformance.vue

@@ -173,6 +173,7 @@
           <el-table-column type="index" label="序号" align="center" width="50"></el-table-column>
           <el-table-column v-if="isPersonnel" prop="userName" label="人员姓名" align="center" ></el-table-column>
           <el-table-column
+          v-else
               prop="insCompany"
               label="保险名称"
               align="center"
@@ -226,6 +227,11 @@
             align="center"
             :label="item.label"
           ></el-table-column>
+          <el-table-column label="操作"  v-if="isPersonnel">
+                    <template slot-scope="scope">
+                        <el-button @click="handleClick(scope.row)" type="text" size="small">详情</el-button>
+                    </template>
+                </el-table-column>
         </el-table>
       </div>
       <div slot="footer" class="dialog-footer">
@@ -244,14 +250,16 @@
         <el-button @click="resetForm" size="small">取 消</el-button>
       </div>
     </el-dialog>
+    <RegionTable ref="regionTable"></RegionTable>
   </div>
 </template>
         <script>
   import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
-  import KtButton from "@/views/Core/KtButton"; // 按钮权限组件
+import RegionTable from "../RegionTable.vue"; // 按钮权限组件
+
   export default {
     name: "InvoiceInformation",
-    components: { KtCommonTable, KtButton },
+    components: { KtCommonTable,RegionTable },
     data() {
       return {
         isPersonnel:false,
@@ -343,6 +351,16 @@
          })
     },
     methods: {
+      handleClick(row){
+      this.$refs.regionTable.detaiList={
+        userId:row.userId,
+        createTimeStart:this.formData.createTimeStart,
+        createTimeEnd:this.formData.createTimeEnd,
+        quMarks:'3'
+      }
+      this.$refs.regionTable.open()
+      this.$refs.regionTable.getDetailData()
+    },
       provinceFun(val){
         this.cityOptions=[]
         this.cityOptions=this.provinceOptions.filter(e=>e.areaCode==val)[0].child

+ 265 - 389
src/views/PeopleManage/Player/RegionPerformanceManage.vue

@@ -4,39 +4,22 @@
     <Split :gutterSize="2" style="height: calc(100vh - 120px)">
       <SplitArea :size="leftSplitWidth" :minSize="240">
         <div>
-          <el-tree
-            :data="ztreeNodes"
-            :props="{ children: 'children', label: 'name' }"
-            node-key="id"
-            :default-expanded-keys="['9']"
-            @node-click="onZTreeClick"
-          ></el-tree>
+          <el-tree :data="ztreeNodes" :props="{ children: 'children', label: 'name' }" node-key="id"
+            :default-expanded-keys="['9']" @node-click="onZTreeClick"></el-tree>
         </div>
       </SplitArea>
       <SplitArea :size="rightSplitWidth">
         <!-- 顶部查询 -->
         <el-row class="top">
-          <el-form
-            v-model="formData"
-            size="small"
-            label-width="95px"
-            :inline="true"
-            class="form"
-          >
+          <el-form v-model="formData" size="small" label-width="95px" :inline="true" class="form">
             <el-form-item label="省市区" prop="areaCode">
-              <el-select clearable  v-model="formData.areaCode" placeholder="请选择" @change="provinceFun">
-                <el-option
-                  v-for="item in provinceOptions"
-                  :key="item.areaCode"
-                  :label="item.areaCname"
+              <el-select clearable v-model="formData.areaCode" placeholder="请选择" @change="provinceFun">
+                <el-option v-for="item in provinceOptions" :key="item.areaCode" :label="item.areaCname"
                   :value="item.areaCode">
                 </el-option>
               </el-select>
-              <el-select   v-model="formData.cityCode" placeholder="请选择" clearable>
-                <el-option
-                  v-for="item in cityOptions"
-                  :key="item.areaCode"
-                  :label="item.areaCname"
+              <el-select v-model="formData.cityCode" placeholder="请选择" clearable>
+                <el-option v-for="item in cityOptions" :key="item.areaCode" :label="item.areaCname"
                   :value="item.areaCode">
                 </el-option>
               </el-select>
@@ -49,16 +32,8 @@
               ></el-cascader> -->
             </el-form-item>
             <el-form-item label="日期区间" label-width="95px" prop="applyTime">
-              <el-date-picker
-                v-model="formData.date"
-                type="daterange"
-                range-separator="至"
-                value-format="yyyy-MM-dd"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                @change="dateChange"
-                clearable
-              ></el-date-picker>
+              <el-date-picker v-model="formData.date" type="daterange" range-separator="至" value-format="yyyy-MM-dd"
+                start-placeholder="开始日期" end-placeholder="结束日期" @change="dateChange" clearable></el-date-picker>
             </el-form-item>
             <el-form-item>
               <el-button type="primary" size="small" @click="queryStaffInfo">查询</el-button>
@@ -66,278 +41,189 @@
           </el-form>
         </el-row>
         <!-- 表格 -->
-        <el-table
-          v-loading="loading"
-          element-loading-text="拼命加载中..."
-          element-loading-spinner="el-icon-loading"
-          :data="pageRequest.content"
-          :stripe="true"
-          row-key
-          border
-          default-expand-all
-          :header-cell-style="{
+        <el-table v-loading="loading" element-loading-text="拼命加载中..." element-loading-spinner="el-icon-loading"
+          :data="pageRequest.content" :stripe="true" row-key border default-expand-all :header-cell-style="{
             background: '#F2F7FC',
             fontWeight: '900',
             color: '#606266',
-          }"
-        >
-          <el-table-column type="index" label="序号" align="center" ></el-table-column>
-          <el-table-column
-              prop="areaName"
-              label="区域名称"
-              align="center"
-              >
-            </el-table-column>
+          }">
+          <el-table-column type="index" label="序号" align="center"></el-table-column>
+          <el-table-column prop="areaName" label="区域名称" align="center">
+          </el-table-column>
           <el-table-column label="主订单" align="center">
-            <el-table-column
-              prop="mainWaitAuditSum"
-              label="待核保"
-              align="center"
-              >
+            <el-table-column prop="mainWaitAuditSum" label="待核保" align="center">
             </el-table-column>
-            <el-table-column
-              prop="mainWaitPaySum"
-              label="已核保待缴费"
-              align="center"
-              >
+            <el-table-column prop="mainWaitPaySum" label="已核保待缴费" align="center">
             </el-table-column>
-            <el-table-column
-              prop="mainAcceptInsuranceSum" 
-              label="已承保"
-              align="center"
-              >
+            <el-table-column prop="mainAcceptInsuranceSum" label="已承保" align="center">
             </el-table-column>
-              </el-table-column>
-              <el-table-column label="子订单" align="center">
-            <el-table-column
-              prop="subWaitAuditSum"
-              label="待核保"
-              align="center"
-              >
+          </el-table-column>
+          <el-table-column label="子订单" align="center">
+            <el-table-column prop="subWaitAuditSum" label="待核保" align="center">
             </el-table-column>
-            <el-table-column
-              prop="subWaitPaySum"
-              label="已核保待缴费"
-              align="center"
-              >
+            <el-table-column prop="subWaitPaySum" label="已核保待缴费" align="center">
             </el-table-column>
-            <el-table-column
-              prop="subAcceptInsuranceSum"
-              label="已承保"
-              align="center"
-              >
+            <el-table-column prop="subAcceptInsuranceSum" label="已承保" align="center">
             </el-table-column>
-              </el-table-column>
-          <el-table-column
-            v-for="(item, index) in pageColumns"
-            :key="index"
-            :min-width="item.minWidth"
-            :prop="item.prop"
-            align="center"
-            :label="item.label"
-          ></el-table-column>
-          <el-table-column
-          width="130"
-          align="center"
-            label="操作">
+          </el-table-column>
+          <el-table-column v-for="(item, index) in pageColumns" :key="index" :min-width="item.minWidth" :prop="item.prop"
+            align="center" :label="item.label"></el-table-column>
+          <el-table-column width="130" align="center" label="操作">
             <template slot-scope="scope">
               <el-button @click="handleDetail(scope.row)" type="text" size="small">详情</el-button>
-              <el-button @click="handlePersonnelDetail(scope.row)"  type="text" size="small">人员详情</el-button>
+              <el-button @click="handlePersonnelDetail(scope.row)" type="text" size="small">人员详情</el-button>
             </template>
           </el-table-column>
         </el-table>
-        <el-pagination
-            @size-change="handleSizeList"
-            layout="total, sizes, prev, pager, next, jumper"
-            @current-change="refreshListData"
-            :current-page="pageRequest.pageNum"
-             :page-size="pageRequest.pageSize"
-            :page-sizes="[10,20, 50, 100, 200, 300, 400, 500]"
-            :total="pageRequest.totalSize"
-            style="float: left; margin-left: 20px"
-          ></el-pagination>
-      </SplitArea>
-    </Split>
-<RegionTable ref="regionTable" @handledetailClick="handledetailClick" > </RegionTable>
-    <!-- <el-dialog
-      class="dialog detailtTable"
-      :title="title"
-      :close-on-click-modal="false"
-      :before-close="resetForm"
-      :visible.sync="detailDialog"
-      width="70%"
-    >
-      <div class="dialog-body">
-        <el-table
+        <el-pagination @size-change="handleSizeList" layout="total, sizes, prev, pager, next, jumper"
+          @current-change="refreshListData" :current-page="pageRequest.pageNum" :page-size="pageRequest.pageSize"
+          :page-sizes="[10, 20, 50, 100, 200, 300, 400, 500]" :total="pageRequest.totalSize"
+          style="float: left; margin-left: 20px"></el-pagination>
+        <!-- <kt-common-table
+          v-if="flag"
           v-loading="loading"
           element-loading-text="拼命加载中..."
           element-loading-spinner="el-icon-loading"
-          :data="detailData"
-          :stripe="true"
-          row-key
-          border
-          default-expand-all
-          :header-cell-style="{
+          :operationWidth="operationWidth"
+          class="ktTable"
+          ref="dataTable"
+          :data="pageRequest"
+          :columns="columns"
+          :showBatchDelete="false"
+          :showOperation="showOperation"
+          button2Name="详情"
+          @findPage="findPage"
+          :isshowpagination="true"
+          @handleButton2="handleDetail"
+          button3Name="人员详情"
+          @handleButton3="handlePersonnelDetail"
+        >
+        </kt-common-table> -->
+      </SplitArea>
+    </Split>
+
+    <el-dialog class="dialog detailtTable" :title="title" :close-on-click-modal="false" :before-close="resetForm"
+      :visible.sync="detailDialog" width="70%">
+      <div class="dialog-body">
+        <el-table v-loading="loading" element-loading-text="拼命加载中..." element-loading-spinner="el-icon-loading"
+          :data="detailData" :stripe="true" row-key border default-expand-all :header-cell-style="{
             background: '#F2F7FC',
             fontWeight: '900',
             color: '#606266',
-          }"
-        >
+          }">
           <el-table-column type="index" label="序号" align="center" width="50"></el-table-column>
-          <el-table-column v-if="isPersonnel" prop="userName" label="人员姓名" align="center" ></el-table-column>
-          <el-table-column
-              v-else
-              prop="insCompany"
-              label="保险名称"
-              align="center"
-              >
-            </el-table-column>
+          <el-table-column v-if="isPersonnel" prop="userName" label="人员姓名" align="center"></el-table-column>
+          <el-table-column v-else prop="insCompany" label="保险名称" align="center">
+          </el-table-column>
           <el-table-column label="主订单" align="center">
-            <el-table-column
-              prop="mainWaitAuditSum"
-              label="待核保"
-              align="center"
-              >
+            <el-table-column prop="mainWaitAuditSum" label="待核保" align="center">
             </el-table-column>
-            <el-table-column
-              prop="mainWaitPaySum"
-              label="已核保待缴费"
-              align="center"
-              >
+            <el-table-column prop="mainWaitPaySum" label="已核保待缴费" align="center">
             </el-table-column>
-            <el-table-column
-              prop="mainAcceptInsuranceSum"
-              label="已承保"
-              align="center"
-              >
+            <el-table-column prop="mainAcceptInsuranceSum" label="已承保" align="center">
             </el-table-column>
-              </el-table-column>
-              <el-table-column label="子订单" align="center">
-            <el-table-column
-              prop="subWaitAuditSum"
-              label="待核保"
-              align="center"
-              >
+          </el-table-column>
+          <el-table-column label="子订单" align="center">
+            <el-table-column prop="subWaitAuditSum" label="待核保" align="center">
             </el-table-column>
-            <el-table-column
-              prop="subWaitPaySum"
-              label="已核保待缴费"
-              align="center"
-              >
+            <el-table-column prop="subWaitPaySum" label="已核保待缴费" align="center">
             </el-table-column>
-            <el-table-column
-              prop="subAcceptInsuranceSum"
-              label="已承保"
-              align="center"
-              >
+            <el-table-column prop="subAcceptInsuranceSum" label="已承保" align="center">
             </el-table-column>
-              </el-table-column>
-          <el-table-column
-            v-for="(item, index) in detailColumns"
-            :key="index"
-            :min-width="item.minWidth"
-            :prop="item.prop"
-            align="center"
-            :label="item.label"
-          ></el-table-column>
-          <el-table-column
-            label="操作">
-            <template slot-scope="scope">
-              <el-button @click="handleClick(scope.row)" type="text" size="small">详情</el-button>
-            </template>
           </el-table-column>
+          <el-table-column v-for="(item, index) in detailColumns" :key="index" :min-width="item.minWidth"
+            :prop="item.prop" align="center" :label="item.label"></el-table-column>
+            <el-table-column label="操作"  v-if="isPersonnel">
+                    <template slot-scope="scope">
+                        <el-button @click="handleClick(scope.row)" type="text" size="small">详情</el-button>
+                    </template>
+                </el-table-column>
         </el-table>
       </div>
       <div slot="footer" class="dialog-footer">
         <div class="bottomFixed" style="padding-bottom: 50px;" ref="bottomFixed">
-          <el-pagination
-            @size-change="handleSizeChange"
-            layout="total, sizes, prev, pager, next, jumper"
-            @current-change="refreshformData"
-            :current-page="detailParams.pageNum"
-             :page-size="detailParams.pageSize"
-            :page-sizes="[10,20, 50, 100, 200, 300, 400, 500]"
-            :total="detailParams.totalSize"
-            style="float: left; margin-left: 20px"
-          ></el-pagination>
+          <el-pagination @size-change="handleSizeChange" layout="total, sizes, prev, pager, next, jumper"
+            @current-change="refreshformData" :current-page="detailParams.pageNum" :page-size="detailParams.pageSize"
+            :page-sizes="[10, 20, 50, 100, 200, 300, 400, 500]" :total="detailParams.totalSize"
+            style="float: left; margin-left: 20px"></el-pagination>
         </div>
         <el-button @click="resetForm" size="small">取 消</el-button>
       </div>
-    </el-dialog> -->
+    </el-dialog>
+    <RegionTable ref="regionTable"></RegionTable>
   </div>
 </template>
-        <script>
-  import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
-  import KtButton from "@/views/Core/KtButton"; // 按钮权限组件
-  import RegionTable from "../RegionTable.vue"; // 按钮权限组件
-  export default {
-    name: "InvoiceInformation",
-    components: { KtCommonTable, KtButton ,RegionTable},
-    data() {
-      return {
-        isPersonnel:false,
-        provinceOptions:[],
-        cityOptions:[],
-     /**Split 开始 */
-     leftSplitWidth: 15,
-        rightSplitWidth: 85,
-        ztreeObj: null,
-        ztreeSetting: {
-          check: {
-            enable: false,
-          },
-          data: {
-            simpleData: {
-              enable: true,
-              pIdKey: "parentId",
-            },
-          },
-          view: {
-            showIcon: false,
-          },
+<script>
+import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
+import RegionTable from "../RegionTable.vue"; // 按钮权限组件
+export default {
+  name: "InvoiceInformation",
+  components: { KtCommonTable,RegionTable },
+  data() {
+    return {
+      isPersonnel: false,
+      provinceOptions: [],
+      cityOptions: [],
+      /**Split 开始 */
+      leftSplitWidth: 15,
+      rightSplitWidth: 85,
+      ztreeObj: null,
+      ztreeSetting: {
+        check: {
+          enable: false,
         },
-        userId: '',
-        ztreeNodes: [],
-        currentTreeNode: null,
-        title: "详情",
-        loading: true,
-        detailDialog: false,
-        showOperation:true,
-        operationWidth: 160, //操作列宽度
-        queryFrom: {
-          //查询条件
+        data: {
+          simpleData: {
+            enable: true,
+            pIdKey: "parentId",
+          },
         },
-        pageRequest: {
-          content:[],
-          pageNum: 1,
-          pageSize: 10,
-        }, //表格参数
-        formData: {
-          // 列表查询条件
-         
-          date: [], //日期区间数组
-          createTimeStart: "", //日期开始时间
-          createTimeEnd: "", //日期结束时间
+        view: {
+          showIcon: false,
         },
-        detailParams: {
-          pageNum: 1,
-          pageSize: 10,
+      },
+      userId: '',
+      ztreeNodes: [],
+      currentTreeNode: null,
+      title: "详情",
+      loading: true,
+      detailDialog: false,
+      showOperation: true,
+      operationWidth: 160, //操作列宽度
+      queryFrom: {
+        //查询条件
+      },
+      pageRequest: {
+        content: [],
+        pageNum: 1,
+        pageSize: 10,
+      }, //表格参数
+      formData: {
+        // 列表查询条件
+
+        date: [], //日期区间数组
+        createTimeStart: "", //日期开始时间
+        createTimeEnd: "", //日期结束时间
+      },
+      detailParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      pageColumns: [
+        { prop: "quoteNum", label: "报价次数", type: "text" },
+        { prop: "submitNum", label: "提交核保次数", type: "text" },
+        { prop: "hasInsuredNum", label: "已承保数量", type: "text" },
+        { prop: "taxaMountSum", label: "车船税", type: "text" },
+        { prop: "jqPremiumSum", label: "交强险费用", type: "text" },
+        { prop: "syPremiumSum", label: "商业保费", type: "text" },
+        {
+          prop: "totalSumpremium",
+          label: "总承保保费总数",
+          type: "text",
         },
-        pageColumns: [
-          { prop: "quoteNum", label: "报价次数", type: "text" },
-          { prop: "submitNum", label: "提交核保次数", type: "text" },
-          { prop: "hasInsuredNum", label: "已承保数量", type: "text" },
-          { prop: "taxaMountSum", label: "车船税", type: "text" },
-          { prop: "jqPremiumSum", label: "交强险费用", type: "text" },
-          { prop: "syPremiumSum", label: "商业保费", type: "text" },
-          {
-            prop: "totalSumpremium",
-            label: "总承保保费总数",
-            type: "text",
-          },
-        ],
-        detailData:[],
-        detailColumns: [
+      ],
+      detailData: [],
+      detailColumns: [
         {
           prop: "quoteNum",
           label: "报价次数",
@@ -370,67 +256,67 @@
           type: "text",
         },
       ],
-      quMarks:''
-      };
+      quMarks: ''
+    };
+  },
+  created() {
+    this.findLeftTreeData(); // 获取机构树的数据
+    this.findPage(); // 
+    this.$api.dept.queryTree().then((res) => {
+      if (res.code == 200) {
+        this.formData.areaCode = '140000'
+        this.provinceOptions = res.data
+        this.cityOptions = res.data.filter(e => e.areaCode == '140000')[0].child
+      }
+    })
+  },
+  methods: {
+    provinceFun(val) {
+      this.cityOptions = []
+      this.cityOptions = this.provinceOptions.filter(e => e.areaCode == val)[0].child
     },
-    created() {
-         this.findLeftTreeData(); // 获取机构树的数据
-         this.findPage(); // 
-         this.$api.dept.queryTree().then((res) => {
-            if(res.code==200){
-              this.formData.areaCode='140000'
-              this.provinceOptions=res.data
-              this.cityOptions=res.data.filter(e=>e.areaCode=='140000')[0].child
-            }
-         })
+    /**Split 开始 */
+    changeTreeWidth(widthVal) {
+      // 初始化树的宽度
+      this.leftSplitWidth = Math.ceil(
+        (widthVal / this.$refs.elMain.$el.clientWidth) * 100
+      );
+      this.rightSplitWidth = 100 - this.leftSplitWidth;
     },
-    methods: {
-      provinceFun(val){
-        this.cityOptions=[]
-        this.cityOptions=this.provinceOptions.filter(e=>e.areaCode==val)[0].child
-      },
-       /**Split 开始 */
-       changeTreeWidth(widthVal) {
-        // 初始化树的宽度
-        this.leftSplitWidth = Math.ceil(
-          (widthVal / this.$refs.elMain.$el.clientWidth) * 100
-        );
-        this.rightSplitWidth = 100 - this.leftSplitWidth;
-      },
-      async findLeftTreeData() {
-        this.formData.areaCode='140000'
-        this.formData.level='1'
-        let data=await this.$api.user.personnelFindTree() 
-        if(data.code==200){
-          this.ztreeNodes = data.data;
-          this.userId=data.data[0].id
-        }
-        else{
-          this.$message.error(data.msg)
-          this.ztreeNodes=[]
-          this.userId=''
-        }
-     },
-      onZTreeClick: function (evt, treeId, treeNode) {
-        // 点击事件
-        this.currentTreeNode = evt;
-        this.userId = this.currentTreeNode.id;
-        this.formData.areaCode='140000'
-        this.formData.level='1'
-        this.findPage();
-      },
-      //--left tree start-------
-      //选择时间区间
-      dateChange(e) {
-        if (e == null) {
-          this.formData.createTimeStart = "";
-          this.formData.createTimeEnd = "";
-        } else {
-          this.formData.createTimeStart = e[0];
-          this.formData.createTimeEnd = e[1];
-        }
-      },
-      // 换页刷新
+    async findLeftTreeData() {
+      this.formData.areaCode = '140000'
+      this.formData.level = '1'
+      let data = await this.$api.user.personnelFindTree()
+      if (data.code == 200) {
+        this.ztreeNodes = data.data;
+        this.userId = data.data[0].id
+      }
+      else {
+        this.$message.error(data.msg)
+        this.ztreeNodes = []
+        this.userId = ''
+      }
+    },
+    onZTreeClick: function (evt, treeId, treeNode) {
+      // 点击事件
+      this.currentTreeNode = evt;
+      this.userId = this.currentTreeNode.id;
+      this.formData.areaCode = '140000'
+      this.formData.level = '1'
+      this.findPage();
+    },
+    //--left tree start-------
+    //选择时间区间
+    dateChange(e) {
+      if (e == null) {
+        this.formData.createTimeStart = "";
+        this.formData.createTimeEnd = "";
+      } else {
+        this.formData.createTimeStart = e[0];
+        this.formData.createTimeEnd = e[1];
+      }
+    },
+    // 换页刷新
     refreshformData: function (pageNum) {
       this.detailParams.pageNum = pageNum;
       this.getDetailData()
@@ -440,8 +326,8 @@
       this.detailParams.pageSize = pageSize;
       this.getDetailData()
     },
-        // 列表换页刷新
-        refreshListData: function (pageNum) {
+    // 列表换页刷新
+    refreshListData: function (pageNum) {
       this.pageRequest.pageNum = pageNum;
       this.findPage()
     },
@@ -459,42 +345,23 @@
     //查看详情
     handleDetail(index) {
       this.detailParams.areaCode = index.areaCode;
-      this.$refs.regionTable.detaiList={
-        userId:this.userId,
-        createTimeStart:this.formData.createTimeStart,
-        createTimeEnd:this.formData.createTimeEnd,
-        quMarks:'1'
-      }
-      this.$refs.regionTable.open()
-      this.$refs.regionTable.getDetailData()
-      // this.detailDialog = true;
-      // this.quMarks='1'
-      // this.getDetailData()
-      // this.isPersonnel=false
+      this.detailDialog = true;
+      this.quMarks = '1'
+      this.getDetailData()
+      this.isPersonnel = false
     },
     handlePersonnelDetail(index) {
-      // this.quMarks='2'
+      this.quMarks = '2'
       this.detailParams.areaCode = index.areaCode;
-      this.$refs.regionTable.detaiList={
-        userId:this.userId,
-        createTimeStart:this.formData.createTimeStart,
-        createTimeEnd:this.formData.createTimeEnd,
-        quMarks:'2'
-      }
-      this.$refs.regionTable.open()
-      this.$refs.regionTable.getDetailData()
-      // this.detailDialog = true;
-      // this.getDetailData()
-      // this.isPersonnel=true
-    },
-    handledetailClick(row){
-      console.log(111111);
+      this.detailDialog = true;
+      this.getDetailData()
+      this.isPersonnel = true
     },
-    getDetailData(data){
+    getDetailData() {
       this.loading = true;
-      this.$api.user.quUserNumDetail({...this.detailParams,userId:this.userId,createTimeStart:this.formData.createTimeStart,createTimeEnd:this.formData.createTimeEnd,quMarks:this.quMarks }).then((res) => {
+      this.$api.user.quUserNumDetail({ ...this.detailParams, userId: this.userId, createTimeStart: this.formData.createTimeStart, createTimeEnd: this.formData.createTimeEnd, quMarks: this.quMarks }).then((res) => {
         if (res.code == 200) {
-          this.tableData = res.data.records;
+          this.detailData = res.data.records;
           this.detailParams.pageNum = res.data.current;
           this.detailParams.pageSize = res.data.size;
           this.detailParams.totalPages = res.data.pages;
@@ -506,41 +373,50 @@
         }
       });
     },
-      //获取页面数据
-      async  findPage() {
-        let areaCode=''
-          this.formData.level=''
-          if(this.formData.cityCode){
-            areaCode=this.formData.cityCode
-              this.formData.level='2'
-          }
-          else{
-            areaCode=this.formData.areaCode
-            this.formData.level='1'
-          }
-        this.loading = true;
-        let res=await this.$api.user.quUserNumList({...this.formData,userId: this.userId,areaCode,pageNum:this.pageRequest.pageNum,pageSize:this.pageRequest.pageSize })
-        if (res.code == 200) {
-            this.pageRequest = {
-                content: res.data.records,
-                pageNum: res.data.current,
-                pageSize: res.data.size,
-                totalSize: res.data.total,
-            };
-            this.loading = false;
-        } else {
-            this.$message.error(res.msg);
-        }
-      },
-      // 查询
-      queryStaffInfo() {
-        this.pageRequest.pageNum = 1;
-        this.findPage();
-      },
+    handleClick(row){
+      this.$refs.regionTable.detaiList={
+        userId:row.userId,
+        createTimeStart:this.formData.createTimeStart,
+        createTimeEnd:this.formData.createTimeEnd,
+        quMarks:'3'
+      }
+      this.$refs.regionTable.open()
+      this.$refs.regionTable.getDetailData()
+    },
+    //获取页面数据
+    async findPage() {
+      let areaCode = ''
+      this.formData.level = ''
+      if (this.formData.cityCode) {
+        areaCode = this.formData.cityCode
+        this.formData.level = '2'
+      }
+      else {
+        areaCode = this.formData.areaCode
+        this.formData.level = '1'
+      }
+      this.loading = true;
+      let res = await this.$api.user.quUserNumList({ ...this.formData, userId: this.userId, areaCode, pageNum: this.pageRequest.pageNum, pageSize: this.pageRequest.pageSize })
+      if (res.code == 200) {
+        this.pageRequest = {
+          content: res.data.records,
+          pageNum: res.data.current,
+          pageSize: res.data.size,
+          totalSize: res.data.total,
+        };
+        this.loading = false;
+      } else {
+        this.$message.error(res.msg);
+      }
+    },
+    // 查询
+    queryStaffInfo() {
+      this.pageRequest.pageNum = 1;
+      this.findPage();
     },
-  };
-  </script>
+  },
+};
+</script>
         
-  <style scoped>
-</style>
+<style scoped></style>
         

+ 8 - 20
src/views/PeopleManage/RegionTable.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
         <el-dialog ref="dialog" title="详情" :close-on-click-modal="false" :before-close="resetForm"
-            :visible.sync="dialogVisible" width="70%">
+            :visible.sync="dialogVisible" width="65%">
             <el-table v-loading="loading" element-loading-text="拼命加载中..." element-loading-spinner="el-icon-loading"
                 :data="tableData" :stripe="true" row-key border default-expand-all :header-cell-style="{
                     background: '#F2F7FC',
@@ -9,8 +9,12 @@
                     color: '#606266',
                 }">
                 <el-table-column type="index" label="序号" align="center" width="50"></el-table-column>
-                <el-table-column v-if="detaiList.quMarks == '1'" prop="insCompany" label="保险名称" align="center"></el-table-column>
-                <el-table-column v-if="detaiList.quMarks == '2'" prop="userName" label="人员姓名" align="center"></el-table-column>
+                <el-table-column
+                    prop="insCompany"
+                    label="保险名称"
+                    align="center"
+                    >
+                    </el-table-column>
                 <el-table-column label="主订单" align="center">
                     <el-table-column prop="mainWaitAuditSum" label="待核保" align="center">
                     </el-table-column>
@@ -29,11 +33,6 @@
                 </el-table-column>
                 <el-table-column v-for="(item, index) in columns" :key="index" :prop="item.prop" align="center"
                     :label="item.label"></el-table-column>
-                <el-table-column label="操作" v-if="detaiList.quMarks == '2'">
-                    <template slot-scope="scope">
-                        <el-button @click="handleClick(scope.row)" type="text" size="small">详情</el-button>
-                    </template>
-                </el-table-column>
             </el-table>
             <el-pagination @size-change="handleSizeChange" layout="total, sizes, prev, pager, next, jumper"
                 @current-change="refreshformData" :current-page="detailParams.pageNum" :page-size="detailParams.pageSize"
@@ -93,12 +92,6 @@ export default {
 
         }
     },
-    props: {
-        isType: {
-            type: String,
-            default: ''
-        },
-    },
     created() {
         // this.getDetailData()
     },
@@ -107,22 +100,17 @@ export default {
             this.dialogVisible = true
         },
         resetForm() {
-            this.dialogVisible = true
+            this.dialogVisible = false
         },
         // 每页条数发生改变
         handleSizeChange(pageSize) {
             this.detailParams.pageSize = pageSize;
-            // this.$emit('findPage',this.detailParams)
             this.getDetailData()
 
         },
         refreshformData: function (pageNum) {
             this.detailParams.pageNum = pageNum;
             this.getDetailData()
-            // this.$emit('findPage',this.detailParams)
-        },
-        handleClick(row) {
-            this.$emit('handledetailClick',row)
         },
         getDetailData() {
             this.loading = true;