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

src/components/TemplateForm/index.vue

@@ -1,18 +1,18 @@
 <template>
     <el-form :model="formData" 
-    :rules="rules"
      ref="publicForm" :inline="true" size="small" >
         <el-row :gutter="20"> 
             <el-col :span="8" v-for="f in ruleForm" :key="f.prop">
-                <el-form-item :label="f.label" :prop="f.prop" label-width="120px" >
+                <el-form-item :label="f.label" :prop="f.prop" :label-width="labelWidth||'120px'" >
                     <template>
                         <template v-if="f.type === 'input'">
                             <el-input
+                                size="small"
                                 v-model="formData[f.prop]"
                                 :readonly="f.readonly"
-                                :type="f.type ?? 'text'"
+                                :type="f.type ?f.type: ''"
                                 :placeholder="'请输入' + f.label"
-                                :disabled="f.disabled" 
+                                :disabled="f.disabled || false"
                                 :showPassword="f.showPassword"
                                 :clearable="f.clearable||true"/>
                         </template>
@@ -79,7 +79,7 @@
                             ></el-date-picker>
                             </template>
                         <!-- 日期范围选择器 -->
-                        <template v-else-if="item.type === 'daterange'">
+                        <template v-else-if="f.type === 'daterange'">
                             <el-date-picker
                                 type="daterange"
                                 :placeholder="'请输入' + f.label"
@@ -155,9 +155,9 @@ export default {
             type: Object,
             default: {}
         },
-        rules: {
-            type: Object,
-            default: {}
+        labelWidth: {
+            type: String,
+            default: ''
         },
     },
     data() {

src/views/FinancialManagement/AcountWithdrawal/ExtendFee.vue

@@ -67,13 +67,20 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="8" style="height: 40px;">
+              <el-form-item label="结算状态">
+                <el-select v-model="queryForm.settlestatus" placeholder="请选择" style="width: 100%;" clearable>
+                    <el-option label="未结算" value="0"></el-option>
+                    <el-option label="已结算" value="1"></el-option>
+                  </el-select>
+              </el-form-item>
+            </el-col>
           <el-col :span="8">
-            <el-form-item label="出单时间">
+            <el-form-item label="签单时间">
               <el-date-picker style="width: 220px;"
                 size="small"
-                v-model="queryForm.date"
+                v-model="queryForm.signDate"
                 type="daterange"
-                align="left"
                 @change="dateChange"
                 range-separator="至"
                 value-format="yyyy-MM-dd"
@@ -152,6 +159,10 @@ export default {
             name: "startdate",
             value: "",
           },
+          settlestatus: {
+            name: "settlestatus",
+            value: "",
+          },
           enddate: {
             name: "enddate",
             value: "",
@@ -165,6 +176,7 @@ export default {
         { prop: "licenseno", label: "车牌号", minWidth: 100 },
         { prop: "riskcode", label: "险种", minWidth: 100 },
         { prop: "deptname", label: "机构", minWidth: 100 },
+        { prop: "settlestatus", label: "结算状态"},
         { prop: "inscompany", label: "保险公司", minWidth: 100 },
         { prop: "refereescode", label: "工号", minWidth: 100 },
         { prop: "refereesname", label: "姓名", minWidth: 100 },
@@ -230,6 +242,7 @@ export default {
       this.pageRequest.columnFilters.username.value = this.queryForm.username;
       this.pageRequest.columnFilters.licenseNo.value = this.queryForm.licenseNo;
       this.pageRequest.columnFilters.inscompany.value = this.queryForm.inscompany;
+      this.pageRequest.columnFilters.settlestatus.value = this.queryForm.settlestatus;
       this.pageRequest.pageNum = 1;
       this.findPage();
     },
@@ -244,6 +257,9 @@ export default {
       that.$api.task
         .queryCommission(that.pageRequest)
         .then((res) => {
+          res.data.content.forEach(row=>{
+            row.settlestatus=row.settlestatus==='1'?'已结算':'未结算'
+          })
           that.pageResult = res.data;
         })
         .then(data != null ? data.callback : "");

src/views/FinancialManagement/CarInsurance/PersonSettlement/CommissionList.vue

@@ -39,10 +39,24 @@
               </el-form-item>
             </el-col>
 
-            <el-col :span="12" style="height: 40px;">
+            <!-- <el-col :span="12" style="height: 40px;">
               <el-form-item label="出单时间">
                 <el-date-picker v-model="queryForm.date" style="width:100%"  type="daterange" align="left" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"> </el-date-picker>
               </el-form-item>
+            </el-col> -->
+			
+			<el-col :span="6" style="height: 40px;">
+              <el-form-item label="结算状态">
+                <el-select v-model="queryForm.settlestatus" placeholder="请选择" style="width: 100%;" clearable>
+                    <el-option label="未结算" value="0"></el-option>
+                    <el-option label="已结算" value="1"></el-option>
+                  </el-select>
+              </el-form-item>
+            </el-col>
+			<el-col :span="6" style="height: 40px;">
+              <el-form-item label="签单时间">
+                <el-date-picker v-model="queryForm.signDate" style="width:100%"  type="daterange" align="left" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"> </el-date-picker>
+              </el-form-item>
             </el-col>
             <el-col :span="24" class="u-f u-f-je" style="height:40px;">
               <div class="u-f" style="margin-bottom: 20px; width: 60px;height: 32px; border-radius: 5px;overflow: hidden;" @click="queryEsmInfo" >
@@ -1130,6 +1144,7 @@ export default {
         { prop: "userid", label: "工号", minWidth: 160 },
         { prop: "username", label: "姓名", minWidth: 160 },
         { prop: "deptid", label: "机构代码", minWidth: 160 },
+        { prop: "settlestatus", label: "结算状态"},
         { prop: "deptname", label: "机构名称", minWidth: 160 },
         { prop: "createtime", label: "出单日期", minWidth: 160 },
         {
@@ -1271,6 +1286,7 @@ export default {
         this.queryForm.inscompany;
       this.pageRequest.columnFilters.licenseNo.value = this.queryForm.licenseNo;
       this.pageRequest.columnFilters.policyno.value = this.queryForm.policyno;
+      this.pageRequest.columnFilters.settlestatus.value = this.queryForm.settlestatus;
       this.pageRequest.pageNum = 1;
       this.findPage();
     },
@@ -1300,6 +1316,9 @@ export default {
       that.$api.task
         .queryInsCompanyFee(that.pageRequest)
         .then((res) => {
+			res.data.content.forEach(row=>{
+				 row.settlestatus=row.settlestatus==='1'?'已结算':'未结算'
+			})
           that.pageResult = res.data;
         })
         .then(data != null ? data.callback : "");

src/views/FinancialManagement/ExpenseManagement/ExpenseApplyFor.vue

@@ -281,19 +281,19 @@
           </el-row>
           <el-row style="margin-bottom: 20px">
             <el-col :span="12" style="text-align: center"
-              ><h3>收入方资金归属(%)</h3>
+              ><h3>支出方资金归属(%)</h3>
               <span>(请输入资金归属百分比)</span></el-col
             >
             <el-col :span="12" style="text-align: center"
-              ><h3>支出方资金归属(%)</h3>
+              ><h3>收入方资金归属(%)</h3>
               <span>(请输入资金归属百分比)</span></el-col
             >
           </el-row>
           <el-row class="profit_box">
             <el-col :span="12">
               <el-form-item
-                v-for="item in affiliationData"
-                :key="item.profitId + 'sr'"
+                v-for="item in affiliationData2"
+                :key="item.profitId + 'zc'"
                 :label="item.profitName"
                 prop="entProfit"
               >
@@ -308,8 +308,8 @@
             </el-col>
             <el-col :span="12">
               <el-form-item
-                v-for="item in affiliationData2"
-                :key="item.profitId + 'zc'"
+                v-for="item in affiliationData"
+                :key="item.profitId + 'sr'"
                 :label="item.profitName"
                 prop="entProfit"
               >

src/views/FinancialManagement/ExpenseManagement/ExpenseManagement.vue

@@ -269,7 +269,7 @@
               >
                 <el-option
                   v-for="item in collectionData"
-                  :key="item.accountId"
+                  :key="item.bankCardNum"
                   :label="item.name"
                   :value="item.nameValue"
                 >
@@ -369,18 +369,18 @@
         </el-row>
         <el-row>
           <el-col :span="12" style="text-align: center"
-            ><h3>收入方资金归属(%)</h3>
+            ><h3>支出方资金归属(%)</h3>
             <span>(请输入资金归属百分比)</span></el-col
           >
           <el-col :span="12" style="text-align: center"
-            ><h3>支出方资金归属(%)</h3>
+            ><h3>收入方资金归属(%)</h3>
             <span>(请输入资金归属百分比)</span></el-col
           >
         </el-row>
         <el-row class="profit_box">
           <el-col :span="12">
             <el-form-item
-              v-for="item in affiliationData"
+              v-for="item in affiliationData2"
               :key="item.profitId + 'sr'"
               :label="item.profitName"
               prop="entProfit"
@@ -396,7 +396,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item
-              v-for="item in affiliationData2"
+              v-for="item in affiliationData"
               :key="item.profitId + 'zc'"
               :label="item.profitName"
               prop="entProfit"
@@ -720,25 +720,25 @@ export default {
         {
           prop: "collectionMessage",
           label: "收账方",
-          minWidth: 80,
+          minWidth: 160,
           sortable: false,
         },
         {
           prop: "applyAmount",
           label: "金额",
-          minWidth: 150,
+          minWidth: 100,
           sortable: false,
         },
         {
           prop: "applyTime",
           label: "转账日期",
-          minWidth: 150,
+          minWidth: 100,
           sortable: false,
         },
         {
           prop: "transferFlagName",
           label: "转账状态",
-          minWidth: 150,
+          minWidth: 80,
           sortable: false,
         },
       ],
@@ -899,6 +899,7 @@ export default {
           res.data.forEach((item) => {
             if (item.invAccountCardList != null) {
               item.invAccountCardList.forEach((it) => {
+                it.outerFlag = item.outerFlag;
                 it.name =
                   (item.outerFlag == 0 ? "内部用户" : "外部用户") +
                   "   " +
@@ -922,6 +923,11 @@ export default {
     //选择收款单位change事件
     companyChange(val) {
       const item = this.collectionData.find((item) => item.nameValue === val);
+      if(item.outerFlag==0&&item.bankCardNum!=this.enterCardId){
+        this.$message.error('转账方必须为外部账户或与收款方账户一致')
+        this.inComeFormData.company=""
+        return
+      }
       this.companyItem = item;
     },
     //点击确认收入事件
@@ -932,8 +938,8 @@ export default {
       obj.fundFlow = obj.company + "→" + obj.collectionMessage; //资金流向
       obj.payMethod = obj.payMethod.join(",");//支付方式
       obj.revenueOutlay = "0";
-      obj.fundUse = obj.fundUse[obj.fundUse.length - 2]; //资金用途
-      obj.fundFen = obj.fundUse[obj.fundUse.length - 1]; //资金用途分项
+      obj.fundUse = this.inComeFormData.fundUse[this.inComeFormData.fundUse.length - 2]; //资金用途
+      obj.fundFen = this.inComeFormData.fundUse[this.inComeFormData.fundUse.length - 1]; //资金用途分项
       //转化资金归属
       obj.entProfit = {};
       obj.outProfit = {};
@@ -948,7 +954,8 @@ export default {
         if (valid) {
           this.$api.expense.insertAccountOperate(obj).then((res) => {
             if (res.code == 200) {
-              this.$message.success("添加成功！");
+              this.$message.success("转账成功！");
+              this.findPage();
               this.incomeDialogVisible = false;
             } else {
               this.$message.error(res.msg);
@@ -1023,6 +1030,7 @@ export default {
               if (res.code == 200) {
                 this.$message.success("确认转账成功");
                 this.getExpendData();
+                this.findPage();
               } else {
                 this.$message.error(res.msg);
               }

src/views/FinancialManagement/ExpenseManagement/ExpenseMessage.vue

@@ -10,12 +10,21 @@
       @click="addAmount"
       >新增科目</el-button
     >
+    <el-button
+      class="operation"
+      type="primary"
+      plain
+      size="medium"
+      @click="setexpandAll"
+      >全部展开/折叠</el-button
+    >
 
     <!-- 表格 -->
     <el-table
-    class="expendtable"
+      v-if="refTable"
+      class="expendtable"
       :stripe="true"
-      default-expand-all
+      :default-expand-all="expandStatus"
       :header-cell-style="{
         background: '#F2F7FC',
         fontWeight: '900',
@@ -27,7 +36,7 @@
       border
       :tree-props="{ children: 'child', hasChildren: 'hasChildren' }"
     >
-      <el-table-column prop="category" align="center" label="类目">
+      <el-table-column prop="category" align="left" width="300" label="类目">
       </el-table-column>
       <el-table-column prop="remark" align="center" label="备注">
       </el-table-column>
@@ -106,19 +115,19 @@
   <script>
 import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
 import KtButton from "@/views/Core/KtButton"; // 按钮权限组件
-import CommonUtil from "@/utils/comutil.js";
 
 export default {
   name: "ExpenseMessage",
   components: { KtCommonTable, KtButton },
   created() {
-    // this.business();
   },
   mounted() {
     this.findPage();
   },
   data() {
     return {
+      refTable:true,//表格重新渲染
+      expandStatus: false, //是否全部展开
       title: "新增明细",
       tableData: [], //表格数据
       button3Name: "删除",
@@ -148,6 +157,13 @@ export default {
     },
   },
   methods: {
+    setexpandAll() {
+      this.expandStatus = !this.expandStatus;
+      this.refTable = false;
+      this.$nextTick(() => {
+        this.refTable = true;
+      });
+    },
     //删除
     handleDelete(index, row) {
       let id = row.expensesId;
@@ -346,7 +362,7 @@ export default {
 .frame >>> .el-date-editor {
   width: 100%;
 }
-.expendtable >>> .el-table__body-wrapper{
+.expendtable >>> .el-table__body-wrapper {
   overflow-y: auto;
   height: 600px;
 }

src/views/FinancialManagement/ExpenseManagement/PaymentManagement.vue

@@ -852,7 +852,7 @@ export default {
             let obj = {
               invoiceId: this.formDataId, //id
               payoutMoney: this.formData.payoutMoney, //进账金额
-              fundFlow: params.otherUnit + "→" + this.formData.invoiceBy, //资金流向
+              fundFlow: params.otherUnit.nameValue + "→" + this.formData.invoiceBy.nameValue, //资金流向
               payMethod: params.payMethod.join(","), //支付方式
               fundUse: this.formData.fundUse[this.formData.fundUse.length - 2], //资金用途
               fundFen: this.formData.fundUse[this.formData.fundUse.length - 1], //资金用途分项
@@ -959,7 +959,7 @@ export default {
             res.data.invoiceBy = obj;
           }
           if (obj2) {
-            res.data.otherUnit = obj;
+            res.data.otherUnit = obj2;
           }
           if (this.typeStatus == 1) {
             res.data.invoiceSubjects1 = res.data.invoiceSubjects.split('*')[0]

src/views/FinancialManagement/OfflinePolicy/PolicyInquiry.vue

@@ -20,16 +20,258 @@
      ></el-cascader>
     </template>
     </templateTable>
+    <el-dialog
+      title="详情"
+      width="1400px"
+      :visible.sync="dialogVisible"
+     >
+     <templateForm :ruleForm="ruleForm" :formData="formData" :labelWidth="labelWidth"></templateForm>
+    </el-dialog>
   </div>
 </template>
 <script>
 import templateTable from "@/components/TemplateTable/index.vue";
+import templateForm from "@/components/TemplateForm/index.vue";
+
 export default {
   name: "policyImport",
-  components: { templateTable },
+  components: { templateTable,templateForm },
   data() {
     return {
       deptId:'',
+      formData:{},
+      labelWidth:'180px',
+      ruleForm:[
+        {
+          label:'保险公司编码',
+          prop:'companyId',
+          type:'input',
+          disabled:true
+        },
+        {
+          label:'保险公司名称',
+          prop:'companyName',
+          type:'input',
+          disabled:true
+        }, {
+          label:'协议号',
+          prop:'agreementId',
+          type:'input',
+          disabled:true
+        }, {
+          label:'订单号',
+          prop:'orderno',
+          type:'input',
+          disabled:true
+        }, {
+          label:'保单号',
+          prop:'policyno',
+          type:'input',
+          disabled:true
+        }, {
+          label:'机构代码',
+          prop:'deptId',
+          type:'input',
+          disabled:true
+        },
+        {
+          label:'机构名称',
+          prop:'deptName',
+          type:'input',
+          disabled:true
+        },
+        {
+          label:'业务员工号',
+          prop:'userId',
+          type:'input',
+          disabled:true
+        }, {
+          label:'业务员姓名',
+          prop:'userName',
+          type:'input',
+          disabled:true
+        }, {
+          label:'险种',
+          prop:'riskcode',
+          type:'input',
+          disabled:true
+        }, {
+          label:'车牌号',
+          prop:'licenseno',
+          type:'input',
+          disabled:true
+        }, {
+          label:'投保人',
+          prop:'applyname',
+          type:'input',
+          disabled:true
+        },
+        {
+          label:'投保人联系方式',
+          prop:'applyphone',
+          type:'input',
+          disabled:true
+        },
+        {
+          label:'被保人',
+          prop:'insurername',
+          type:'input',
+          disabled:true
+        }, {
+          label:'被保人联系方式',
+          prop:'insurerphone',
+          type:'input',
+          disabled:true
+        }, {
+          label:'出单时间',
+          prop:'payDate',
+          type:'input',
+          disabled:true
+        }, {
+          label:'起保时间',
+          prop:'startDate',
+          type:'input',
+          disabled:true
+        }, {
+          label:'终保时间',
+          prop:'endDate',
+          type:'input',
+          disabled:true
+        },
+        {
+          label:'车船税',
+          prop:'taxamount',
+          type:'input',
+          disabled:true
+        }, {
+          label:'保费',
+          prop:'premium',
+          type:'input',
+          disabled:true
+        }, {
+          label:'不含税保费',
+          prop:'noTaxPremium',
+          type:'input',
+          disabled:true
+        }, {
+          label:'手续费费用比例（%）',
+          prop:'commissionFeerate',
+          type:'input',
+          disabled:true
+        }, {
+          label:'手续费费用',
+          prop:'commissionFeevalue',
+          type:'input',
+          disabled:true
+        }, {
+          label:'其他费用比例（%）',
+          prop:'otherFeerate',
+          type:'input',
+          disabled:true
+        }, {
+          label:'其他费用',
+          prop:'otherFeevalue',
+          type:'input',
+          disabled:true
+        },
+        {
+          label:'一级机构管理费比例（%）',
+          prop:'firstDeptProportion',
+          type:'input',
+          disabled:true
+        }, {
+          label:'一级机构管理费',
+          prop:'firstDeptPremiums',
+          type:'input',
+          disabled:true
+        }, {
+          label:'二级机构管理费比例（%）',
+          prop:'secondDeptProportion',
+          type:'input',
+          disabled:true
+        }, 
+        {
+          label:'二级机构管理费',
+          prop:'secondDeptPremiums',
+          type:'input',
+          disabled:true
+        }, {
+          label:'三级机构管理费比例（%）',
+          prop:'thirdDeptProportion',
+          type:'input',
+          disabled:true
+        }, {
+          label:'三级机构管理费',
+          prop:'thirdDeptPremiums',
+          type:'input',
+          disabled:true
+        },
+        {
+          label:'四级机构管理费比例（%）',
+          prop:'forthDeptProportion',
+          type:'input',
+          disabled:true
+        }, {
+          label:'四级机构管理费',
+          prop:'forthDeptPremiums',
+          type:'input',
+          disabled:true
+        }, {
+          label:'五级机构管理费比例（%）',
+          prop:'fifthDeptProportion',
+          type:'input',
+          disabled:true
+        },
+        {
+          label:'五级机构管理费',
+          prop:'fifthDeptPremiums',
+          type:'input',
+          disabled:true
+        }, {
+          label:'一级分销费比例（%）',
+          prop:'firstDetailProportion',
+          type:'input',
+          disabled:true
+        }, {
+          label:'一级分销费',
+          prop:'firstDetailPremiums',
+          type:'input',
+          disabled:true
+        }, {
+          label:'二级分销费比例（%）',
+          prop:'secondDetailProportion',
+          type:'input',
+          disabled:true
+        }, {
+          label:'二级分销费',
+          prop:'secondDetailPremiums',
+          type:'input',
+          disabled:true
+        },
+        {
+          label:'三级分销费比例（%）',
+          prop:'thirdDetailProportion',
+          type:'input',
+          disabled:true
+        },
+        {
+          label:'三级分销费',
+          prop:'thirdDetailPremiums',
+          type:'input',
+          disabled:true
+        }, {
+          label:'业务员结算比例（%）',
+          prop:'userFeeProportion',
+          type:'input',
+          disabled:true
+        }, {
+          label:'业务员结算金额',
+          prop:'userFeelPremiums',
+          type:'input',
+          disabled:true
+        }, 
+      ],
+      dialogVisible: false,
       formList: [
         {
           label: "保险公司",
@@ -67,6 +309,11 @@ export default {
       tableData: [],
       tableConfig: {
         columns: [
+          {
+            prop: "policyno",
+            label: "保单号",
+            type: "text"
+          },
           {
             prop: "companyName",
             label: "保险公司名称",
@@ -102,12 +349,18 @@ export default {
             label: "出单时间",
             type: "text"
           },
-         
-       
-         
         ],
         loading: true,
-        isPaginationShow: true
+        isPaginationShow: true,
+        optBtns: [
+          {
+            type: "primary",
+            label: "详情",
+            click: (row, index) => {
+              return this.handleTableView(row);
+            },
+          },
+        ],
       },
       options:[]
     };
@@ -145,6 +398,10 @@ export default {
     },
     handleBaseValue(val){
       this.deptId= val[val.length - 1];
+    },
+    handleTableView(row){
+      this.formData=row
+      this.dialogVisible=true
     }
   }
 };

src/views/PeopleManage/Agent/AgentExamine.vue

@@ -275,61 +275,30 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="婚姻状况" prop="maritalStatus">
-                  <el-select
-                    disabled
-                    v-model="formDataDetail.maritalStatus"
-                    placeholder="请选择婚姻状况"
-                    style="width: 200px"
-                  >
-                    <el-option label="未婚" value="未婚"></el-option>
-                    <el-option label="已婚" value="已婚"></el-option>
-                    <el-option label="离异" value="离异"></el-option>
-                    <el-option label="再婚" value="再婚"></el-option>
+                  <el-select disabled v-model="formDataDetail.maritalStatus" placeholder="请选择婚姻状况" style="width:200px">
+                    <el-option v-for="val in maritalStatusOption" :key="val.value" :label="val.label" :value="val.value"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="民族" prop="nations">
-                  <el-select
-                    disabled
-                    style="width: 200px"
-                    v-model="formDataDetail.nations"
-                    placeholder="请选择民族"
-                  >
-                    <el-option
-                      :label="national"
-                      :value="national"
-                      v-for="national in nationalList"
-                      :key="national"
-                    ></el-option>
+                  <el-select disabled style="width:200px" v-model="formDataDetail.nations" placeholder="请选择民族">
+                    <el-option :label="national" :value="national" v-for="national in nationalList"
+                      :key="national"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="政治面貌" prop="politicsStatus">
-                  <el-select
-                    disabled
-                    style="width: 200px"
-                    v-model="formDataDetail.politicsStatus"
-                    placeholder="请选择"
-                  >
-                    <el-option label="群众" value="群众"></el-option>
-                    <el-option label="共青团员" value="共青团员"></el-option>
-                    <el-option label="中共党员" value="中共党员"></el-option>
+                  <el-select disabled style="width:200px" v-model="formDataDetail.politicsStatus" placeholder="请选择">
+                    <el-option v-for="val in politicsStatusOption" :key="val.value" :label="val.label" :value="val.value"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="健康状况" prop="health">
-                  <el-select
-                    disabled
-                    style="width: 200px"
-                    v-model="formDataDetail.health"
-                    placeholder="请选择"
-                  >
-                    <el-option label="健康" value="健康"></el-option>
-                    <el-option label="亚健康" value="亚健康"></el-option>
-                    <el-option label="疾病" value="疾病"></el-option>
+                  <el-select disabled style="width:200px" v-model="formDataDetail.health" placeholder="请选择">
+                    <el-option v-for="val in healthOption" :key="val.value" :label="val.label" :value="val.value"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -358,10 +327,7 @@
                     v-model="formDataDetail.bloodType"
                     placeholder="请选择"
                   >
-                    <el-option label="A型" value="A型"></el-option>
-                    <el-option label="B型" value="B型"></el-option>
-                    <el-option label="O型" value="O型"></el-option>
-                    <el-option label="AB型" value="AB型"></el-option>
+                  <el-option v-for="val in bloodOption" :key="val.value" :label="val.label" :value="val.value"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -517,6 +483,7 @@
 import tree from "@/components/ztree.vue"; // 机构树组件
 import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
 import peopleImage from "@/components/PeopleImage/index.vue"; //影像组件
+import mixin from '../mixin' 
 
 export default {
   components: {
@@ -524,68 +491,10 @@ export default {
     KtCommonTable,
     peopleImage,
   },
+  mixins: [mixin], 
   data() {
     return {
       activeName: "1",
-      //56个民族
-      nationalList: [
-        "汉族",
-        "壮族",
-        "满族",
-        "回族",
-        "苗族",
-        "维吾尔族",
-        "土家族",
-        "彝族",
-        "蒙古族",
-        "藏族",
-        "布依族",
-        "侗族",
-        "瑶族",
-        "朝鲜族",
-        "白族",
-        "哈尼族",
-        "哈萨克族",
-        "黎族",
-        "傣族",
-        "畲族",
-        "傈僳族",
-        "仡佬族",
-        "东乡族",
-        "高山族",
-        "拉祜族",
-        "水族",
-        "佤族",
-        "纳西族",
-        "羌族",
-        "土族",
-        "仫佬族",
-        "锡伯族",
-        "柯尔克孜族",
-        "达斡尔族",
-        "景颇族",
-        "毛南族",
-        "撒拉族",
-        "布朗族",
-        "塔吉克族",
-        "阿昌族",
-        "普米族",
-        "鄂温克族",
-        "怒族",
-        "京族",
-        "基诺族",
-        "德昂族",
-        "保安族",
-        "俄罗斯族",
-        "裕固族",
-        "乌兹别克族",
-        "门巴族",
-        "鄂伦春族",
-        "独龙族",
-        "塔塔尔族",
-        "赫哲族",
-        "珞巴族",
-      ],
       pageData: {
         pageNum: 1,
         pageSize: 20,
@@ -595,7 +504,6 @@ export default {
         mobile: "",
       },
       formData: {},
-      roles: [],
       formDataRules: {
         remark: [
           { required: true, message: "请填写驳回原因", trigger: "blur" },
@@ -605,27 +513,6 @@ export default {
       filterObject: {},
       peopleid: "",
       peopledeptid: "",
-      /**Split 开始 */
-      leftSplitWidth: 20,
-      rightSplitWidth: 80,
-      ztreeObj: null,
-      ztreeSetting: {
-        check: {
-          enable: false,
-        },
-        data: {
-          simpleData: {
-            enable: true,
-            pIdKey: "parentId",
-          },
-        },
-        view: {
-          showIcon: false,
-        },
-      },
-      ztreeNodes: [],
-      currentTreeNode: null,
-      //----ztreeLeft end---------
       recommenderList: [],
       teamleadername: "",
       teamleaderid: "",
@@ -670,10 +557,6 @@ export default {
       dialogVisible: false, // 新增编辑界面是否显示
       departmentList: [], // 选中公司的所有部门的集合
       deptInfo: {}, //选中机构的基本信息
-      sexoptions: JSON.parse(localStorage.getItem("sexOptions")),
-      user_statusoptions: JSON.parse(
-        localStorage.getItem("user_statusoptions")
-      ),
       option: [], //机构列表
       //影像资料
       dataForm: {
@@ -686,25 +569,9 @@ export default {
       },
       //影像上传列表
       imagesIdList:[],
-      postOption:[]
-
     };
   },
   created() {
-    this.$api.role.findAll().then((res) => {
-      this.roles = res.data;
-    });
-    this.$api.role.postViewAll().then((res) => {
-      res.data.forEach(ele=>{
-        ele.postId=ele.postId+''
-      })
-      this.postOption = res.data
-    })
-    this.findLeftTreeData(); // 获取机构树的数据
-  },
-  mounted() {
-    //用像素初始化左边的split的宽度
-    this.changeTreeWidth(240); // 初始化树的宽度
   },
   methods: {
     handleDialogBefore(done) {
@@ -723,33 +590,6 @@ export default {
       this.pageData.userId = this.queryFrom.userId;
       this.findPage();
     },
-    changeTreeWidth(widthVal) {
-      // 初始化树的宽度
-      this.leftSplitWidth = Math.ceil(
-        (widthVal / this.$refs.elMain.$el.clientWidth) * 100
-      );
-      this.rightSplitWidth = 100 - this.leftSplitWidth;
-    },
-    findLeftTreeData: function () {
-      this.$api.dept.findDeptTree().then((res) => {
-        this.treeDataRecursion(res.data, 2);
-        this.ztreeNodes = res.data;
-      });
-    },
-     //树过滤五级机构递归
-     treeDataRecursion(data, num, one) {
-      data = data || this.ztreeNodes;
-      one = one || 0;
-      one++;
-      for (let i = 0; i < data.length; i++) {
-        if (data[i].comlevel == 5 && data[i].managementSource != num) {
-          data.splice(i, 1);
-          i = i - 1;
-        } else {
-          this.treeDataRecursion(data[i].children, num, one);
-        }
-      }
-    },
     onZTreeClick: function (evt, treeId, treeNode) {
       // 点击事件
       this.currentTreeNode = evt;
@@ -812,39 +652,11 @@ export default {
       }
       this.dialogVisible = false;
     },
-    // 新增或修改的弹出框Start
-    getDictItems(typeName) {
-      //--数据字典--
-      this.$api.dict
-        .findByLableName(typeName)
-        .then((response) => {
-          this[typeName + "options"] = response.data; // 把获取到的数据赋给this.data
-        })
-        .catch((error) => {
-          this[typeName + "options"] = [];
-        });
-    },
     // 下一步
     nextStep(num) {
       this.$refs.formData.validate((valid) => {
         if (valid) {
           this.activeName = num;
-          // this.formData.deptIdCom= this.formData.deptId
-          // this.formData.deptId =  this.formData.deptId.at(-1);
-          // if (this.formData.referrerId) {
-          //   this.formData.referrerName = this.recommenderOptions.find(val => this.formData.referrerId == val.id).name
-          // }
-          // this.$api.user.saveOrUpdate(this.formData).then((res) => {
-          //   if (res.code == 200) {
-          //   this.activeName='2'
-          //   this.basicInformation=res.data
-          //   } else {
-          //     this.$message({
-          //       message: `操作失败，请重新添加,(${res.msg})`,
-          //       type: "error",
-          //     });
-          //   }
-          // });
         }
       });
     },

src/views/PeopleManage/Agent/AgentManage.vue

@@ -60,7 +60,7 @@
       @close="closeDialog"
       v-dialogDrag
     >
-      <el-tabs v-model="activeName" :before-leave="beforeTabLeave">
+      <el-tabs v-model="activeName" >
         <el-tab-pane label="基本信息" name="1">
           <el-form
             :model="formData"
@@ -262,57 +262,30 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="婚姻状况" prop="maritalStatus">
-                  <el-select
-                    v-model="formDataDetail.maritalStatus"
-                    placeholder="请选择婚姻状况"
-                    style="width: 200px"
-                  >
-                    <el-option label="未婚" value="未婚"></el-option>
-                    <el-option label="已婚" value="已婚"></el-option>
-                    <el-option label="离异" value="离异"></el-option>
-                    <el-option label="再婚" value="再婚"></el-option>
+                  <el-select  v-model="formDataDetail.maritalStatus" placeholder="请选择婚姻状况" style="width:200px">
+                    <el-option v-for="val in maritalStatusOption" :key="val.value" :label="val.label" :value="val.value"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="民族" prop="nations">
-                  <el-select
-                    style="width: 200px"
-                    v-model="formDataDetail.nations"
-                    placeholder="请选择民族"
-                  >
-                    <el-option
-                      :label="national"
-                      :value="national"
-                      v-for="national in nationalList"
-                      :key="national"
-                    ></el-option>
+                  <el-select  style="width:200px" v-model="formDataDetail.nations" placeholder="请选择民族">
+                    <el-option :label="national" :value="national" v-for="national in nationalList"
+                      :key="national"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="政治面貌" prop="politicsStatus">
-                  <el-select
-                    style="width: 200px"
-                    v-model="formDataDetail.politicsStatus"
-                    placeholder="请选择"
-                  >
-                    <el-option label="群众" value="群众"></el-option>
-                    <el-option label="共青团员" value="共青团员"></el-option>
-                    <el-option label="中共党员" value="中共党员"></el-option>
+                  <el-select  style="width:200px" v-model="formDataDetail.politicsStatus" placeholder="请选择">
+                    <el-option v-for="val in politicsStatusOption" :key="val.value" :label="val.label" :value="val.value"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="健康状况" prop="health">
-                  <el-select
-                    style="width: 200px"
-                    v-model="formDataDetail.health"
-                    placeholder="请选择"
-                  >
-                    <el-option label="健康" value="健康"></el-option>
-                    <el-option label="亚健康" value="亚健康"></el-option>
-                    <el-option label="疾病" value="疾病"></el-option>
+                  <el-select  style="width:200px" v-model="formDataDetail.health" placeholder="请选择">
+                    <el-option v-for="val in healthOption" :key="val.value" :label="val.label" :value="val.value"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -334,10 +307,7 @@
                     v-model="formDataDetail.bloodType"
                     placeholder="请选择"
                   >
-                    <el-option label="A型" value="A型"></el-option>
-                    <el-option label="B型" value="B型"></el-option>
-                    <el-option label="O型" value="O型"></el-option>
-                    <el-option label="AB型" value="AB型"></el-option>
+                  <el-option v-for="val in bloodOption" :key="val.value" :label="val.label" :value="val.value"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -469,6 +439,8 @@ import tree from "@/components/ztree.vue"; // 机构树组件
 import templateTable from "../../../components/TemplateTable/index.vue";
 import peopleImage from "@/components/PeopleImage/index.vue";
 import { validateSfz } from "../../../utils/validate.js";
+import mixin from '../mixin' 
+
 export default {
   components: {
     KtButton,
@@ -476,69 +448,11 @@ export default {
     templateTable,
     peopleImage,
   },
+  mixins: [mixin], 
   data() {
     return {
       activeName: "1",
       isShow: true,
-      //56个民族
-      nationalList: [
-        "汉族",
-        "壮族",
-        "满族",
-        "回族",
-        "苗族",
-        "维吾尔族",
-        "土家族",
-        "彝族",
-        "蒙古族",
-        "藏族",
-        "布依族",
-        "侗族",
-        "瑶族",
-        "朝鲜族",
-        "白族",
-        "哈尼族",
-        "哈萨克族",
-        "黎族",
-        "傣族",
-        "畲族",
-        "傈僳族",
-        "仡佬族",
-        "东乡族",
-        "高山族",
-        "拉祜族",
-        "水族",
-        "佤族",
-        "纳西族",
-        "羌族",
-        "土族",
-        "仫佬族",
-        "锡伯族",
-        "柯尔克孜族",
-        "达斡尔族",
-        "景颇族",
-        "毛南族",
-        "撒拉族",
-        "布朗族",
-        "塔吉克族",
-        "阿昌族",
-        "普米族",
-        "鄂温克族",
-        "怒族",
-        "京族",
-        "基诺族",
-        "德昂族",
-        "保安族",
-        "俄罗斯族",
-        "裕固族",
-        "乌兹别克族",
-        "门巴族",
-        "鄂伦春族",
-        "独龙族",
-        "塔塔尔族",
-        "赫哲族",
-        "珞巴族",
-      ],
       //影像资料
       dataForm: {
         SFZ_01: "",
@@ -635,16 +549,6 @@ export default {
       },
       formDataDetail: {},
       formDataRulesDetail: {
-        // accountno: [{ required: true, message: "请填写开户账号", trigger: "blur" }],
-        // address: [{ required: true, message: "请填写居住地址", trigger: "blur" }],
-        // bankName: [{ required: true, message: "请填写开户行", trigger: "blur" }],
-        // birthday: [{ required: true, message: "请填写出生日期", trigger: "blur" }],
-        // identity:
-        // [{ required: true, message: "请填写身份证号" },
-        // { validator: validateSfz }],
-        // koseki: [{ required: true, message: "请填写户籍", trigger: "blur" }],
-        // maritalStatus: [{ required: true, message: "请选择婚姻状况", trigger: "change" }],
-        // nations: [{ required: true, message: "请选择民族", trigger: "change" }],
       },
       formDataRules: {
         deptId: [{ required: true, message: "请选择机构", trigger: "change" }],
@@ -673,74 +577,25 @@ export default {
       filterObject: {},
       peopleid: "",
       peopledeptid: "",
-      /**Split 开始 */
-      leftSplitWidth: 20,
-      rightSplitWidth: 80,
-      ztreeObj: null,
-      ztreeSetting: {
-        check: {
-          enable: false,
-        },
-        data: {
-          simpleData: {
-            enable: true,
-            pIdKey: "parentId",
-          },
-        },
-        view: {
-          showIcon: false,
-        },
-      },
-      ztreeNodes: [],
-      currentTreeNode: null,
-      // 右侧列表查询数据Start
       queryFrom: {},
       pageResult: [],
-      containsSubDeptChecked: true, //是否包含下级机构
       dialogTitle: "",
       dialogVisible: false, // 新增编辑界面是否显示
       departmentList: [], // 选中公司的所有部门的集合
       deptInfo: {}, //选中机构的基本信息
-      sexoptions: JSON.parse(localStorage.getItem("sexOptions")),
-      user_statusoptions: JSON.parse(
-        localStorage.getItem("user_statusoptions")
-      ),
-      roles: JSON.parse(localStorage.getItem("find_all")),
       option: [], //机构列表
       dialogPassword: true, //密码是否显示明文
-      postOption:[]
     };
   },
   created() {
-    this.$api.role.postViewAll().then((res) => {
-      res.data.forEach(ele=>{
-        ele.postId=ele.postId+''
-      })
-      this.postOption = res.data
-    })
     // this.$api.role.findAll().then((res) => {
     //   this.roles = res.data
     // })
     //获取所有下拉框数据(字典)
     // this.getDictItems("sex");
     // this.getDictItems("user_status");
-    this.findLeftTreeData(); // 获取机构树的数据
     this.findPage();
   },
-  mounted() {
-    //用像素初始化左边的split的宽度
-    this.changeTreeWidth(240); // 初始化树的宽度
-  },
-  watch: {
-    containsSubDeptChecked() {
-      // 监听是否包含下级
-      // this.pageData.containsSubDept.value = this
-      //   .containsSubDeptChecked
-      //   ? "1"
-      //   : "0";
-      this.findPage();
-    },
-  },
   methods: {
     //状态改变时
     statusChange(e) {
@@ -788,33 +643,6 @@ export default {
       // console.log(val,1)
       // console.log(val,1)
     },
-    changeTreeWidth(widthVal) {
-      // 初始化树的宽度
-      this.leftSplitWidth = Math.ceil(
-        (widthVal / this.$refs.elMain.$el.clientWidth) * 100
-      );
-      this.rightSplitWidth = 100 - this.leftSplitWidth;
-    },
-    findLeftTreeData() {
-      this.$api.dept.findDeptTree().then((res) => {
-        this.treeDataRecursion(res.data, 2);
-        this.ztreeNodes = res.data;
-      });
-    },
-    //树过滤五级机构递归
-    treeDataRecursion(data, num, one) {
-      data = data || this.ztreeNodes;
-      one = one || 0;
-      one++;
-      for (let i = 0; i < data.length; i++) {
-        if (data[i].comlevel == 5 && data[i].managementSource != num) {
-          data.splice(i, 1);
-          i = i - 1;
-        } else {
-          this.treeDataRecursion(data[i].children, num, one);
-        }
-      }
-    },
     onZTreeClick: function (evt, treeId, treeNode) {
       // 点击事件
       this.currentTreeNode = evt;
@@ -971,18 +799,6 @@ export default {
       this.dialogTitle = "新增代理人";
       this.dialogVisible = true;
     },
-    // 新增或修改的弹出框Start
-    getDictItems(typeName) {
-      //--数据字典--
-      this.$api.dict
-        .findByLableName(typeName)
-        .then((response) => {
-          this[typeName + "options"] = response.data; // 把获取到的数据赋给this.data
-        })
-        .catch((error) => {
-          this[typeName + "options"] = [];
-        });
-    },
     handleDialogBefore(done) {
       // 退出对话框之前确认提示
       this.$confirm("确认关闭？")
@@ -1070,17 +886,6 @@ export default {
         }
       });
     },
-    beforeTabLeave() {
-      // let p = new Promise((resolve, reject) => {
-      //   this.$refs.formData.validate(async (valid) => {
-      //     valid ? resolve() : reject();
-      //     if (valid !== resolve()) {
-      //       // this.$message.error("请完善基本信息！");
-      //     }
-      //   });
-      // });
-      // return p;
-    },
     // 下一步
     nextStep() {
       this.$refs.formData.validate((valid) => {

src/views/PeopleManage/Player/PlayerManage.vue

@@ -315,81 +315,24 @@ export default {
       filterObject: {},
       peopleid: "",
       peopledeptid: "",
-      /**Split 开始 */
-      leftSplitWidth: 20,
-      rightSplitWidth: 80,
-      ztreeObj: null,
-      ztreeSetting: {
-        check: {
-          enable: false,
-        },
-        data: {
-          simpleData: {
-            enable: true,
-            pIdKey: "parentId",
-          },
-        },
-        view: {
-          showIcon: false,
-        },
-      },
-      ztreeNodes: [],
-      currentTreeNode: null,
       queryFrom: {}, // 右侧列表查询数据Start
       pageResult: [],
       containsSubDeptChecked: true, //是否包含下级机构
       dialogTitle: "", //弹框title
       dialogVisible: false, // 新增编辑界面是否显示
-      user_statusoptions: JSON.parse(
-        localStorage.getItem("user_statusoptions")
-      ),
-      roles: JSON.parse(localStorage.getItem("find_all")),
       option: [], //机构列表
       dialogPassword: true, //密码是否显示明文
     };
   },
   created() {
-    this.findLeftTreeData(); // 获取机构树的数据
     this.findPage();
   },
-  mounted() {
-    //用像素初始化左边的split的宽度
-    this.changeTreeWidth(240); // 初始化树的宽度
-  },
   watch: {
     containsSubDeptChecked() {
       this.findPage();
     },
   },
   methods: {
-    // 初始化树的宽度
-    changeTreeWidth(widthVal) {
-      this.leftSplitWidth = Math.ceil(
-        (widthVal / this.$refs.elMain.$el.clientWidth) * 100
-      );
-      this.rightSplitWidth = 100 - this.leftSplitWidth;
-    },
-    // 获取机构树的数据
-    findLeftTreeData() {
-      this.$api.dept.findDeptTree().then((res) => {
-        this.treeDataRecursion(res.data, 1);
-        this.ztreeNodes = res.data;
-      });
-    },
-    //树过滤五级机构递归
-    treeDataRecursion(data, num, one) {
-      data = data || this.ztreeNodes;
-      one = one || 0;
-      one++;
-      for (let i = 0; i < data.length; i++) {
-        if (data[i].comlevel == 5 && data[i].managementSource != num) {
-          data.splice(i, 1);
-          i = i - 1;
-        }  else {
-          this.treeDataRecursion(data[i].children, num, one);
-        }
-      }
-    },
     // 点击事件
     onZTreeClick(evt, treeId, treeNode) {
       this.currentTreeNode = evt;

src/views/PeopleManage/Player/PlayerManageteam.vue

@@ -245,57 +245,30 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="婚姻状况" prop="maritalStatus">
-                  <el-select
-                    v-model="formDataDetail.maritalStatus"
-                    placeholder="请选择婚姻状况"
-                    style="width: 200px"
-                  >
-                    <el-option label="未婚" value="未婚"></el-option>
-                    <el-option label="已婚" value="已婚"></el-option>
-                    <el-option label="离异" value="离异"></el-option>
-                    <el-option label="再婚" value="再婚"></el-option>
+                  <el-select  v-model="formDataDetail.maritalStatus" placeholder="请选择婚姻状况" style="width:200px">
+                    <el-option v-for="val in maritalStatusOption" :key="val.value" :label="val.label" :value="val.value"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="民族" prop="nations">
-                  <el-select
-                    style="width: 200px"
-                    v-model="formDataDetail.nations"
-                    placeholder="请选择民族"
-                  >
-                    <el-option
-                      :label="national"
-                      :value="national"
-                      v-for="national in nationalList"
-                      :key="national"
-                    ></el-option>
+                  <el-select  style="width:200px" v-model="formDataDetail.nations" placeholder="请选择民族">
+                    <el-option :label="national" :value="national" v-for="national in nationalList"
+                      :key="national"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="政治面貌" prop="politicsStatus">
-                  <el-select
-                    style="width: 200px"
-                    v-model="formDataDetail.politicsStatus"
-                    placeholder="请选择"
-                  >
-                    <el-option label="群众" value="群众"></el-option>
-                    <el-option label="共青团员" value="共青团员"></el-option>
-                    <el-option label="中共党员" value="中共党员"></el-option>
+                  <el-select  style="width:200px" v-model="formDataDetail.politicsStatus" placeholder="请选择">
+                    <el-option v-for="val in politicsStatusOption" :key="val.value" :label="val.label" :value="val.value"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="健康状况" prop="health">
-                  <el-select
-                    style="width: 200px"
-                    v-model="formDataDetail.health"
-                    placeholder="请选择"
-                  >
-                    <el-option label="健康" value="健康"></el-option>
-                    <el-option label="亚健康" value="亚健康"></el-option>
-                    <el-option label="疾病" value="疾病"></el-option>
+                  <el-select  style="width:200px" v-model="formDataDetail.health" placeholder="请选择">
+                    <el-option v-for="val in healthOption" :key="val.value" :label="val.label" :value="val.value"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -542,25 +515,6 @@ export default {
       filterObject: {},
       peopleid: "",
       peopledeptid: "",
-      /**Split 开始 */
-      leftSplitWidth: 20,
-      rightSplitWidth: 80,
-      ztreeObj: null,
-      ztreeSetting: {
-        check: {
-          enable: false,
-        },
-        data: {
-          simpleData: {
-            enable: true,
-            pIdKey: "parentId",
-          },
-        },
-        view: {
-          showIcon: false,
-        },
-      },
-      currentTreeNode: null,
       queryFrom: {}, // 右侧列表查询数据Start
       pageResult: [],
       containsSubDeptChecked: true, //是否包含下级机构

src/views/PeopleManage/TeamLeader/TeamLeaderExamine.vue

@@ -202,10 +202,7 @@
               <el-col :span="8">
                 <el-form-item label="婚姻状况" prop="maritalStatus">
                   <el-select disabled v-model="formDataDetail.maritalStatus" placeholder="请选择婚姻状况" style="width:200px">
-                    <el-option label="未婚" value="未婚"></el-option>
-                    <el-option label="已婚" value="已婚"></el-option>
-                    <el-option label="离异" value="离异"></el-option>
-                    <el-option label="再婚" value="再婚"></el-option>
+                    <el-option v-for="val in maritalStatusOption" :key="val.value" :label="val.label" :value="val.value"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -220,18 +217,14 @@
               <el-col :span="8">
                 <el-form-item label="政治面貌" prop="politicsStatus">
                   <el-select disabled style="width:200px" v-model="formDataDetail.politicsStatus" placeholder="请选择">
-                    <el-option label="群众" value="群众"></el-option>
-                    <el-option label="共青团员" value="共青团员"></el-option>
-                    <el-option label="中共党员" value="中共党员"></el-option>
+                    <el-option v-for="val in politicsStatusOption" :key="val.value" :label="val.label" :value="val.value"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="健康状况" prop="health">
                   <el-select disabled style="width:200px" v-model="formDataDetail.health" placeholder="请选择">
-                    <el-option label="健康" value="健康"></el-option>
-                    <el-option label="亚健康" value="亚健康"></el-option>
-                    <el-option label="疾病" value="疾病"></el-option>
+                    <el-option v-for="val in healthOption" :key="val.value" :label="val.label" :value="val.value"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -249,23 +242,14 @@
               <el-col :span="8">
                 <el-form-item label="血型" prop="bloodType">
                   <el-select disabled style="width:200px" v-model="formDataDetail.bloodType" placeholder="请选择">
-                    <el-option label="A型" value="A型"></el-option>
-                    <el-option label="B型" value="B型"></el-option>
-                    <el-option label="O型" value="O型"></el-option>
-                    <el-option label="AB型" value="AB型"></el-option>
+                    <el-option v-for="val in bloodOption" :key="val.value" :label="val.label" :value="val.value"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="学历" prop="education">
                   <el-select disabled style="width:200px" v-model="formDataDetail.education" placeholder="请选择">
-                    <el-option label="小学" value="小学"></el-option>
-                    <el-option label="初中" value="初中"></el-option>
-                    <el-option label="高中" value="高中"></el-option>
-                    <el-option label="专科" value="专科"></el-option>
-                    <el-option label="本科" value="本科"></el-option>
-                    <el-option label="硕士" value="硕士"></el-option>
-                    <el-option label="博士" value="博士"></el-option>
+                  <el-option v-for="val in educationOption" :key="val.value" :label="val.label" :value="val.value"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -386,27 +370,6 @@ export default {
       filterObject: {},
       peopleid: "",
       peopledeptid: "",
-      /**Split 开始 */
-      leftSplitWidth: 20,
-      rightSplitWidth: 80,
-      ztreeObj: null,
-      ztreeSetting: {
-        check: {
-          enable: false,
-        },
-        data: {
-          simpleData: {
-            enable: true,
-            pIdKey: "parentId",
-          },
-        },
-        view: {
-          showIcon: false,
-        },
-      },
-      ztreeNodes: [],
-      currentTreeNode: null,
-      //----ztreeLeft end---------
       recommenderList: [],
       teamleadername: "",
       teamleaderid: "",
@@ -451,7 +414,6 @@ export default {
       dialogVisible: false, // 新增编辑界面是否显示
       departmentList: [], // 选中公司的所有部门的集合
       deptInfo: {}, //选中机构的基本信息
-      user_statusoptions: JSON.parse(localStorage.getItem('user_statusoptions')) ,
       option: [], //机构列表
     };
   },
@@ -459,13 +421,6 @@ export default {
     this.$api.role.findAll().then((res) => {
       this.roles = res.data
     })
-  
-    this.findLeftTreeData(); // 获取机构树的数据
-
-  },
-  mounted() {
-    //用像素初始化左边的split的宽度
-    this.changeTreeWidth(240); // 初始化树的宽度
   },
   methods: {
     handleDialogBefore(done) {
@@ -484,33 +439,6 @@ export default {
         this.pageData.userId = this.queryFrom.userId;
       this.findPage();
     },
-    changeTreeWidth(widthVal) {
-      // 初始化树的宽度
-      this.leftSplitWidth = Math.ceil(
-        (widthVal / this.$refs.elMain.$el.clientWidth) * 100
-      );
-      this.rightSplitWidth = 100 - this.leftSplitWidth;
-    },
-    findLeftTreeData: function () {
-      this.$api.dept.findDeptTree().then((res) => {
-        this.treeDataRecursion(res.data, 2);
-        this.ztreeNodes = res.data;
-      });
-    },
-     //树过滤五级机构递归
-     treeDataRecursion(data, num, one) {
-      data = data || this.ztreeNodes;
-      one = one || 0;
-      one++;
-      for (let i = 0; i < data.length; i++) {
-        if (data[i].comlevel == 5 && data[i].managementSource != num) {
-          data.splice(i, 1);
-          i = i - 1;
-        } else {
-          this.treeDataRecursion(data[i].children, num, one);
-        }
-      }
-    },
     onZTreeClick: function (evt, treeId, treeNode) {
       // 点击事件
       this.currentTreeNode = evt;

src/views/PeopleManage/TeamLeader/TeamLeaderManage.vue

@@ -306,57 +306,30 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="婚姻状况" prop="maritalStatus">
-                  <el-select
-                    v-model="formDataDetail.maritalStatus"
-                    placeholder="请选择婚姻状况"
-                    style="width: 200px"
-                  >
-                    <el-option label="未婚" value="未婚"></el-option>
-                    <el-option label="已婚" value="已婚"></el-option>
-                    <el-option label="离异" value="离异"></el-option>
-                    <el-option label="再婚" value="再婚"></el-option>
+                  <el-select  v-model="formDataDetail.maritalStatus" placeholder="请选择婚姻状况" style="width:200px">
+                    <el-option v-for="val in maritalStatusOption" :key="val.value" :label="val.label" :value="val.value"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="民族" prop="nations">
-                  <el-select
-                    style="width: 200px"
-                    v-model="formDataDetail.nations"
-                    placeholder="请选择民族"
-                  >
-                    <el-option
-                      :label="national"
-                      :value="national"
-                      v-for="national in nationalList"
-                      :key="national"
-                    ></el-option>
+                  <el-select  style="width:200px" v-model="formDataDetail.nations" placeholder="请选择民族">
+                    <el-option :label="national" :value="national" v-for="national in nationalList"
+                      :key="national"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="政治面貌" prop="politicsStatus">
-                  <el-select
-                    style="width: 200px"
-                    v-model="formDataDetail.politicsStatus"
-                    placeholder="请选择"
-                  >
-                    <el-option label="群众" value="群众"></el-option>
-                    <el-option label="共青团员" value="共青团员"></el-option>
-                    <el-option label="中共党员" value="中共党员"></el-option>
+                  <el-select  style="width:200px" v-model="formDataDetail.politicsStatus" placeholder="请选择">
+                    <el-option v-for="val in politicsStatusOption" :key="val.value" :label="val.label" :value="val.value"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="健康状况" prop="health">
-                  <el-select
-                    style="width: 200px"
-                    v-model="formDataDetail.health"
-                    placeholder="请选择"
-                  >
-                    <el-option label="健康" value="健康"></el-option>
-                    <el-option label="亚健康" value="亚健康"></el-option>
-                    <el-option label="疾病" value="疾病"></el-option>
+                  <el-select  style="width:200px" v-model="formDataDetail.health" placeholder="请选择">
+                    <el-option v-for="val in healthOption" :key="val.value" :label="val.label" :value="val.value"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -378,10 +351,7 @@
                     v-model="formDataDetail.bloodType"
                     placeholder="请选择"
                   >
-                    <el-option label="A型" value="A型"></el-option>
-                    <el-option label="B型" value="B型"></el-option>
-                    <el-option label="O型" value="O型"></el-option>
-                    <el-option label="AB型" value="AB型"></el-option>
+                  <el-option v-for="val in bloodOption" :key="val.value" :label="val.label" :value="val.value"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -392,13 +362,7 @@
                     v-model="formDataDetail.education"
                     placeholder="请选择"
                   >
-                    <el-option label="小学" value="小学"></el-option>
-                    <el-option label="初中" value="初中"></el-option>
-                    <el-option label="高中" value="高中"></el-option>
-                    <el-option label="专科" value="专科"></el-option>
-                    <el-option label="本科" value="本科"></el-option>
-                    <el-option label="硕士" value="硕士"></el-option>
-                    <el-option label="博士" value="博士"></el-option>
+                  <el-option v-for="val in educationOption" :key="val.value" :label="val.label" :value="val.value"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -536,48 +500,16 @@ export default {
       },
       formDataDetail: {},
       formDataRulesDetail: {
-        // accountno: [{ required: true, message: "请填写开户账号", trigger: "blur" }],
-        // address: [{ required: true, message: "请填写居住地址", trigger: "blur" }],
-        // bankName: [{ required: true, message: "请填写开户行", trigger: "blur" }],
-        // birthday: [{ required: true, message: "请填写出生日期", trigger: "blur" }],
-        // identity:
-        // [{ required: true, message: "请填写身份证号" },
-        // { validator: validateSfz }],
-        // koseki: [{ required: true, message: "请填写户籍", trigger: "blur" }],
-        // maritalStatus: [{ required: true, message: "请选择婚姻状况", trigger: "change" }],
-        // nations: [{ required: true, message: "请选择民族", trigger: "change" }],
       },
       filterObject: {},
       peopleid: "",
       peopledeptid: "",
-      /**Split 开始 */
-      leftSplitWidth: 20,
-      rightSplitWidth: 80,
-      ztreeObj: null,
-      ztreeSetting: {
-        check: {
-          enable: false,
-        },
-        data: {
-          simpleData: {
-            enable: true,
-            pIdKey: "parentId",
-          },
-        },
-        view: {
-          showIcon: false,
-        },
-      },
-      ztreeNodes: [],
-      currentTreeNode: null,
-      //----ztreeLeft end---------
       recommenderList: [],
       teamleadername: "",
       teamleaderid: "",
       // 右侧列表查询数据Start
       queryFrom: {},
       pageResult: {},
-      containsSubDeptChecked: true, //是否包含下级机构
       columns: [
         // 数据列
         { prop: "deptId", label: "部门编码", minWidth: 80, sortable: false },
@@ -618,26 +550,9 @@ export default {
       deptInfo: {}, //选中机构的基本信息
        option: [], //机构列表
       dialogPassword: false, //密码是否明文
-      postOption:[]
     };
   },
   created() {
-    // this.$api.role.findAll().then((res) => {
-    //   this.roles = res.data
-    // })
-    //获取所有下拉框数据(字典)
-    // this.getDictItems("sex");
-    // this.getDictItems("user_status");
-  },
-  watch: {
-    containsSubDeptChecked() {
-      // 监听是否包含下级
-      // this.pageData.containsSubDept.value = this
-      //   .containsSubDeptChecked
-      //   ? "1"
-      //   : "0";
-      this.findPage();
-    },
   },
   methods: {
     //状态改变时

src/views/PeopleManage/mixin.js

@@ -76,11 +76,94 @@ export default { // 导出混入对象
                 value:'AB型'
             }, 
         ],
+        educationOption:[
+          {
+              label:'小学',
+              value:'小学'
+          }, {
+              label:'初中',
+              value:'初中'
+          }, {
+              label:'高中',
+              value:'高中'
+          }, {
+              label:'专科',
+              value:'专科'
+          },  {
+            label:'本科',
+            value:'本科'
+          }, {
+              label:'硕士',
+              value:'硕士'
+          }, {
+            label:'博士',
+            value:'博士'
+        }, 
+      ],
+      healthOption:[
+        {
+            label:'健康',
+            value:'健康'
+        }, {
+            label:'亚健康',
+            value:'亚健康'
+        }, {
+            label:'疾病',
+            value:'疾病'
+        }, 
+      ],
+      politicsStatusOption:[
+        {
+            label:'群众',
+            value:'群众'
+        }, {
+            label:'共青团员',
+            value:'共青团员'
+        }, {
+            label:'中共党员',
+            value:'中共党员'
+        }, 
+      ],
+      maritalStatusOption:[
+        {
+            label:'未婚',
+            value:'未婚'
+        }, {
+            label:'已婚',
+            value:'已婚'
+        }, {
+            label:'离异',
+            value:'离异'
+        }, {
+          label:'再婚',
+          value:'再婚'
+        }, 
+      ],
         user_statusoptions: JSON.parse(
             localStorage.getItem("user_statusoptions")
           ),
         roles: JSON.parse(localStorage.getItem("find_all")),
+        /**Split 开始 */
         ztreeNodes: [],
+        leftSplitWidth: 20,
+        rightSplitWidth: 80,
+        ztreeObj: null,
+        ztreeSetting: {
+          check: {
+            enable: false,
+          },
+          data: {
+            simpleData: {
+              enable: true,
+              pIdKey: "parentId",
+            },
+          },
+          view: {
+            showIcon: false,
+          },
+        },
+        currentTreeNode: null,
+        //----ztreeLeft end---------
         }
       },
       created() {

src/views/Report/StatisticalReport/ManagerFeePayableStatistics.vue

@@ -0,0 +1,295 @@
+<template>
+  <div class="page-container">
+    <div class="queryForm"  style="padding-top:10px;padding-left:15px;">
+      <el-form size="mini" ref="queryForm" :model="queryForm" label-width="120px">
+        <el-row>
+          <el-col :span="6" style="height: 40px;">
+            <el-form-item label="所属机构">
+              <el-cascader class="widths" :options="institutionOptions" v-model="queryForm.deptId" :props="{
+              checkStrictly: true, value: 'id',
+              label: 'name',
+            }" @change="handleChange" clearable></el-cascader>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" style="height: 40px;">
+            <el-form-item label="保险公司">
+              <el-select v-model="queryForm.insCompany"  filterable  class="widths" clearable>
+                <el-option v-for="val in insureComList" :key='val.id' :label="val.name" :value="val.id" ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" style="height: 40px;">
+            <el-form-item label="签单日期">
+              <el-date-picker v-model="quoteDate" style="width:100%" @change="changeQuoteDate" type="daterange" align="left" value-format="yyyy-MM-dd"
+                              range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"> </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="2" class="u-f u-f-je" style="height: 40px;">
+            <el-button type="primary" icon="el-icon-arrow-left" size="mini" @click="returnUpper">返回上层</el-button>
+          </el-col>
+          <el-col :span="22" class="u-f u-f-je" style="height: 40px;">
+            <el-button type="primary" style="margin-right: 40px;" @click="queryData">查询</el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+
+    <!-- 数据列表显示区域 -->
+    <el-table size="mini" border stripe :data="dataList" :height="clientHeight" v-loading="loading" :stripe="true"
+              :header-cell-style="{background:'#F2F7FC',fontWeight: '700',color:'#606266',textAlign: 'center'}"
+              :cell-style="{textAlign: 'center'}" style="width: 100%;margin-bottom: 60px;">
+      <el-table-column  fixed  label="机构名称" width="200">
+        <template slot-scope="scope">
+          <i class="el-icon-paperclip"></i>
+          <span style="margin-left: 10px" @click="drillingData(scope.row)">{{ scope.row.institution }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="waitPayCostsPremiums"  label="待付管理费" width="200"></el-table-column>
+      <el-table-column prop="paidCostsPremiums"  label="已付管理费" width="200"></el-table-column>
+      <el-table-column prop="sumCostsPremiums"  label="管理费合计" width="200"></el-table-column>
+      <el-table-column     label="操作" width="200">
+        <template slot-scope="scope">
+          <el-button type="primary" size="small" @click="exportListExcel(scope.row)">本行清单导出</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 底部分页 -->
+    <div class="bottomFixed">
+      <el-row>
+        <el-col :span="2">
+          <el-button type="primary" style="margin-right: 40px;" @click="exportExcel">全部导出</el-button>
+        </el-col>
+        <el-col :span="22">
+          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+                         :page-sizes="[10, 20, 50, 100]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="totalSum">
+          </el-pagination>
+        </el-col>
+
+      </el-row>
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+        loading: false,
+        insureComList:[], //保险公司列表
+        institutionOptions: [],//所属机构列表
+        clientHeight:0,//表格高度
+        currentPage: 1, //当前页面
+        pageSize: 10, //每页显示条数
+        totalSum: 0, //全部的数据条数
+        quoteDate:"",//签单日期
+        //查询的表单
+        queryForm: {
+          deptId: "",
+          insCompany:"",
+          quoteStartDate: "",
+          quoteEndDate: "",
+          pageNum: 1,
+          pageSize: 10,
+          isDrilling:"0",// 0正常查询  1下钻查询  2返回上层
+        },
+        dataList: [],//查询结果数据
+        //返回上层查询对象
+        returnForm:{
+          deptId: "",
+          teamCode:"",
+        }
+      };
+    },
+    created(){
+      // 设置表格的高度
+      this.clientHeight = (document.documentElement.clientHeight - 350)+'px';
+      //获取机构树
+      this.$api.report.findDeptTree().then((res) => {
+        this.institutionOptions = res.data;
+      });
+      //获取保险公司
+      this.$api.letter.gainTopList().then(res=>{
+        this.insureComList=res.data
+      })
+    },
+    mounted() {
+      const that = this;
+      // 设置表格的高度
+      window.onresize = function temp() {
+        that.clientHeight = (document.documentElement.clientHeight - 350)+'px';
+      };
+    },
+    methods: {
+      //返回上层
+      returnUpper(){
+        this.queryForm.isDrilling="2";
+        this.queryForm.deptId= this.returnForm.deptId;
+        this.findPage();
+      },
+      // 按照查询条件查询
+      drillingData(obj) {
+        this.queryForm.pageNum = 1;
+        this.queryForm.pageSize = 10;
+        this.queryForm.isDrilling="1";
+        this.queryForm.deptId="";
+        this.queryForm.deptId=obj.institutionId;
+        this.findPage();
+      },
+      //联级选择器触发事件
+      handleChange(val) {
+        if (val.length !== 0) {
+          this.queryForm.deptId = val.at(-1);
+        }
+        else {
+          this.queryForm.deptId = ''
+          //级联清空 团队  业务员
+          this.queryForm.teamCode='';
+          this.queryForm.userId='';
+        }
+      },
+      //报价日期处理
+      changeQuoteDate(e) {
+        if (e === null) {
+          this.queryForm.quoteStartDate = e;
+          this.queryForm.quoteEndDate = e;
+        } else {
+          this.queryForm.quoteStartDate = e[0];
+          this.queryForm.quoteEndDate = e[1];
+        }
+      },
+      // 按照查询条件查询
+      queryData() {
+        if((this.queryForm.deptId ==null || this.queryForm.deptId=='') ){
+          this.$message.error('所属机构必须录入！')
+          return
+        }
+        if((this.quoteDate ==null || this.quoteDate=='') ){
+          this.$message.error('签单日期必须录入！')
+          return
+        }
+        this.queryForm.pageNum = 1;
+        this.queryForm.pageSize = 10;
+        this.queryForm.isDrilling="0";
+        this.findPage();
+      },
+      //数据
+      findPage() {
+        this.loading = true;
+        this.$api.report.getPayApplyDeptReport(this.queryForm).then((res) => {
+          if (res.code == "200") {
+            this.loading = false;
+            this.dataList = res.data.content;
+            for(let item of this.dataList){
+              this.returnForm.deptId=item.institutionId;
+            }
+            this.currentPage = res.data.pageNum;
+            this.totalSum = res.data.totalSize;
+          } else {
+            this.$message.error(res.msg)
+            this.loading = false;
+          }
+        })
+      },
+      // 每页条数发生改变
+      handleSizeChange(val) {
+        this.pageSize = val;
+        this.currentPage = 1;
+        this.queryForm.pageNum = 1;
+        this.queryForm.pageSize = val;
+        this.findPage();
+      },
+      // 当前页发生改变
+      handleCurrentChange(val) {
+        this.currentPage = val;
+        this.queryForm.pageNum = val;
+        this.findPage();
+      },
+
+      //全部导出
+      exportExcel(){
+        if((this.queryForm.deptId ==null || this.queryForm.deptId=='') ){
+          this.$message.error('所属机构必须录入！')
+          return
+        }
+        if((this.quoteDate ==null || this.quoteDate=='')  ){
+          this.$message.error('签单日期必须录入！')
+          return
+        }
+        this.$api.report.exportPayApplyDeptReport(this.queryForm).then(res=>{
+          let url = process.env.BASE_URL+'/upload/'+res.data // 3.创建一个临时的url指向blob对象
+          // 4.创建url之后可以模拟对此文件对象的一系列操作，例如：预览、下载
+          let a = document.createElement("a");
+          a.href = url;
+          a.download = "出单量及费用统计报表.xlsx";
+          a.click();
+          // 5.释放这个临时的对象url
+          window.URL.revokeObjectURL(url);
+        })
+      },
+
+      //清单导出
+      exportListExcel(obj){
+        let  queryListForm={}
+        queryListForm.quoteStartDate=this.queryForm.quoteStartDate;
+        queryListForm.quoteEndDate=this.queryForm.quoteEndDate;
+        queryListForm.insCompany=this.queryForm.insCompany;
+        queryListForm.deptId=obj.institutionId;
+        this.$api.report.exportPayApplyDeptReportListData(queryListForm).then(res=>{
+          let url = process.env.BASE_URL+'/upload/'+res.data // 3.创建一个临时的url指向blob对象
+          // 4.创建url之后可以模拟对此文件对象的一系列操作，例如：预览、下载
+          let a = document.createElement("a");
+          a.href = url;
+          a.download = "出单量及费用统计报表-清单.xlsx";
+          a.click();
+          // 5.释放这个临时的对象url
+          window.URL.revokeObjectURL(url);
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  /* 底部固定分页 */
+  .bottomFixed {
+    height: 50px;
+    position: fixed;
+    bottom: 0;
+    width: 100%;
+    background: #fff;
+  }
+
+  /* 顶部查询条件样式Start */
+  .queryFrom .el-row {
+    margin: 10px 0px;
+  }
+
+  .queryFrom .el-form-item {
+    margin-bottom: 0px;
+  }
+
+  .queryFrom .queryButton .el-form-item__content {
+    margin-left: 40px !important;
+  }
+
+  /* 顶部查询条件样式End */
+
+  .el-form-item{
+    margin-bottom: 0px!important;
+  }
+  .el-dialog__body{
+    padding: 10px 20px!important;
+  }
+
+  /deep/ .el-select{
+    width: 100%;
+  }
+
+  /deep/ .el-cascader--mini{
+    width: 100%;
+  }
+</style>