Merge branch 'master' into new_version

src/http/axios.js

@@ -51,7 +51,6 @@ export default function $axios(options) {
       },
 
       error => {
-        console.log(error,11111111111)
         // 请求错误时
         // 1. 判断请求超时
         if (error.code === 'ECONNABORTED' && error.message.indexOf('timeout') !== -1) {
@@ -92,6 +91,89 @@ export default function $axios(options) {
           router.push('/login')
         }
         
+        // switch (response.data.code) {
+        //   case 400:
+        //     Message({
+        //       message: '请求错误',
+        //       type: 'error',
+        //       duration: 2000
+        //     })
+        //     break
+        //   case 401:
+        //     Message({
+        //       message: '登录信息已过期，请重新登录！！！',
+        //       type: 'error',
+        //       duration: 2000
+        //     })
+        //     Cookies.remove('token')
+        //     Cookies.remove('user')
+        //     router.push('/login')
+        //     break
+        //   case 403:
+        //     Message({
+        //       message: '拒绝访问',
+        //       type: 'error',
+        //       duration: 2000
+        //     })
+        //     break
+        //   case 404:
+        //     Message({
+        //       message: '请求地址出错',
+        //       type: 'error',
+        //       duration: 2000
+        //     })
+        //     break
+        //   case 408:
+        //     Message({
+        //       message: '请求超时',
+        //       type: 'error',
+        //       duration: 2000
+        //     })
+        //     break
+        //   case 500:
+        //     Message({
+        //       message: response.data.msg,
+        //       type: 'error',
+        //       duration: 2000
+        //     })
+        //     break
+        //   case 501:
+        //     Message({
+        //       message: '服务未实现',
+        //       type: 'error',
+        //       duration: 2000
+        //     })
+        //     break
+        //   case 502:
+        //     Message({
+        //       message: '网关错误',
+        //       type: 'error',
+        //       duration: 2000
+        //     })
+        //     break
+        //   case 503:
+        //     Message({
+        //       message: '服务不可用',
+        //       type: 'error',
+        //       duration: 2000
+        //     })
+        //     break
+        //   case 504:
+        //     Message({
+        //       message: '网关超时',
+        //       type: 'error',
+        //       duration: 2000
+        //     })
+        //     break
+        //   case 505:
+        //     Message({
+        //       message: 'HTTP版本不受支持',
+        //       type: 'error',
+        //       duration: 2000
+        //     })
+        //     break
+        //   default:
+        // }
         // 根据返回的code值来做不同的处理
         switch (data.rc) {
           case 1:

src/views/AgreementManage/CarInsurance/SourceManagement.vue

@@ -1,227 +1,267 @@
 <template>
-    <div class="container" style="width: 99%; margin-top: 0px">
-        <templateTable  :searchData.sync="queryFrom" :tableConfig="tableConfig" :data="pageResult" @getList="findPage" :pagination="pageData">
-        </templateTable>
-    <el-dialog
-      title="税源管理"
-      :visible.sync="dialogVisible"
-      width="50%"
+  <div class="container" style="width: 99%; margin-top: 0px">
+    <templateTable
+      :searchData.sync="queryFrom"
+      :tableConfig="tableConfig"
+      :data="pageResult"
+      @getList="findPage"
+      :pagination="pageData"
     >
-    <el-tabs v-model="activeName"   >
+    </templateTable>
+    <el-dialog title="税源管理" :visible.sync="dialogVisible" width="50%">
+      <el-tabs v-model="activeName">
         <el-tab-pane label="协议选择" name="1">
-          <el-table
-          :data="tableData"
-          style="width: 100%">
-          <el-table-column
-            prop="license"
-            label="车牌"
-            width="100"
-          >
-      </el-table-column>
-        <el-table-column
-            label="协议选择"
-            align="center"
-            >
-            <template slot-scope="scope">
-              <el-select v-model="scope.row.agreementId" placeholder="请选择">
-                <el-option
-                  v-for="item in options"
-                  :key="item.id"
-                  :label="item.agreementName"
-                  :value="item.id">
-                </el-option>
-              </el-select>
-            </template>
-          </el-table-column>
-          <el-table-column
-            label="是否启动"
-            >
-            <template slot-scope="scope">
-              <el-switch  
-              v-model="scope.row.isTaxSource"
-              active-value="1"
-              inactive-value="0"
-              @change="isTaxSourceFun(scope.row.isTaxSource,scope.$index)"
-              >
-            </el-switch>
-            </template>
-          </el-table-column>
-          </el-table>   
+          <el-table :data="tableData" style="width: 100%">
+            <el-table-column prop="license" label="车牌" width="100">
+            </el-table-column>
+            <el-table-column label="协议选择" align="center">
+              <template slot-scope="scope">
+                <el-select v-model="scope.row.agreementId" placeholder="请选择">
+                  <el-option
+                    v-for="item in options"
+                    :key="item.id"
+                    :label="item.agreementName"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>
+              </template>
+            </el-table-column>
+            <el-table-column label="是否启动">
+              <template slot-scope="scope">
+                <el-switch
+                  v-model="scope.row.isTaxSource"
+                  active-value="1"
+                  inactive-value="0"
+                  @change="isTaxSourceFun(scope.row.isTaxSource, scope.$index)"
+                >
+                </el-switch>
+              </template>
+            </el-table-column>
+            <el-table-column label="">
+              <template slot-scope="scope">
+                <el-checkbox-group
+                  v-if="scope.row.isTaxSource * 1"
+                  v-model="scope.row.insuranceRepertoire"
+                >
+                  <el-checkbox
+                    v-for="item in insuranceRepertoire"
+                    :key="item.dictValue"
+                    :checked="item.status == 1"
+                    :label="item.dictValue"
+                    :value="item"
+                    >{{ item.dictTag }}</el-checkbox
+                  >
+                </el-checkbox-group>
+              </template>
+            </el-table-column>
+          </el-table>
         </el-tab-pane>
         <el-tab-pane label="排除部门" name="2">
-          <el-tree default-expand-all ref="tree" show-checkbox :data="treeData" node-key="id" :props="defaultProps" ></el-tree>
+          <el-tree
+            default-expand-all
+            ref="tree"
+            show-checkbox
+            :data="treeData"
+            node-key="id"
+            :props="defaultProps"
+          ></el-tree>
         </el-tab-pane>
         <el-tab-pane label="排除车牌" name="3">
           <el-checkbox-group v-model="checkList">
-            <el-checkbox v-for="val in tableData" :key="val.id" :label="val.license"></el-checkbox>
+            <el-checkbox
+              v-for="val in tableData"
+              :key="val.id"
+              :label="val.license"
+            ></el-checkbox>
           </el-checkbox-group>
         </el-tab-pane>
-    </el-tabs>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="dialogVisible = false">取 消</el-button>
-      <el-button type="primary" @click="submitDialog()">确 定</el-button>
-    </span>
+      </el-tabs>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="submitDialog()">确 定</el-button>
+      </span>
     </el-dialog>
-    </div>
+  </div>
 </template>
 <script>
-import templateTable from '@/components/TemplateTable/index.vue'
+import templateTable from "@/components/TemplateTable/index.vue";
 
 export default {
-    name: "sourceManagement",
+  name: "sourceManagement",
   components: { templateTable },
   data() {
     return {
-        dialogVisible:false,
-        activeName:'1',
-        defaultProps: {
-          children: 'children',
-          label: 'name'
-        },
-        checkList:[],
-        treeData:[],
-    pageResult: [], //表格数据
-    queryFrom: {}, //查询信息
-    tableConfig: {
+      dialogVisible: false,
+      activeName: "1",
+      defaultProps: {
+        children: "children",
+        label: "name",
+      },
+      checkList: [],
+      insuranceRepertoireList: [],
+      treeData: [],
+      pageResult: [], //表格数据
+      queryFrom: {}, //查询信息
+      tableConfig: {
         columns: [
           // 数据列
-          { prop: "name", label: "保险公司名称", type: 'text' },
+          { prop: "name", label: "保险公司名称", type: "text" },
           {
             prop: "id",
-            label: "id", type: 'text',
+            label: "id",
+            type: "text",
           },
         ],
         loading: true,
         isPaginationShow: true,
         isShowIndex: true,
-        operationWidth: '30',
+        operationWidth: "30",
         optBtns: [
           {
-            type: 'primary',
-            label: '税源管理',
-            type: 'text',
-            click: (row, index) => { return this.addSource(row) },
+            type: "primary",
+            label: "税源管理",
+            type: "text",
+            click: (row, index) => {
+              return this.addSource(row);
+            },
           },
-        ]
+        ],
       },
       pageData: {
         pageNum: 1,
         pageSize: 10,
-        totalSize: 0
+        totalSize: 0,
       },
-      tableData:[],
-      options:[],
-      rowData:{}
-    }
-},
-created() {
-  this.$api.dept.findTree().then((res) => {
-      if(res.code==200){
-          this.treeData=res.data
-      }   
-    })
-    
-    this.findPage()
+      tableData: [],
+      options: [],
+      rowData: {},
+      insuranceRepertoire: [], //产品代码列表
+    };
   },
-methods:{
+  created() {
+    this.$api.dept.findTree().then((res) => {
+      if (res.code == 200) {
+        this.treeData = res.data;
+      }
+    });
+    //获取产品代码列表
+    this.$api.insCompany.dicType("productsType").then((rescode) => {
+      if (rescode.code == 200) {
+        this.insuranceRepertoire = rescode.data.ddList;
+      }
+    });
+    this.findPage();
+  },
+  methods: {
+    //获取列表
     findPage() {
       this.tableConfig.loading = true;
-      this.$api.dept.insureCompany({ ...this.pageData })
-        .then((res) => {
-          this.tableConfig.loading = false;
-          this.pageResult = res.data.content;
-          this.pageData.pageNum = res.data.pageNum;
-          this.pageData.pageSize = res.data.pageSize;
-          this.pageData.totalSize = res.data.totalSize;
-
-        })
+      this.$api.dept.insureCompany({ ...this.pageData }).then((res) => {
+        this.tableConfig.loading = false;
+        this.pageResult = res.data.content;
+        this.pageData.pageNum = res.data.pageNum;
+        this.pageData.pageSize = res.data.pageSize;
+        this.pageData.totalSize = res.data.totalSize;
+      });
     },
-    licenseFun(){
+    //税源管理返回没值的话赋值方法
+    licenseFun() {
       this.$api.dept.license().then((res) => {
-      if(res.code==200){
-        res.data.forEach((ele,index) => {
-          ele.agreementId=''
-          ele.isTaxSource='0'
-        });
-          this.tableData=res.data
-      }   
-    })
-    },
-    addSource(row){
-        this.dialogVisible=true
-        this.rowData={
-          insCompanyId:row.id,
-          insCompanyName:row.name
+        if (res.code == 200) {
+          res.data.forEach((ele, index) => {
+            ele.agreementId = "";
+            ele.isTaxSource = "0";
+          });
+          this.tableData = res.data;
         }
-        this.$api.dept.getTaxSource(row.id)
-        .then((res) => {
-          if(res.code==200){
-            if(res.data.agreementTaxList.length>0){
-              this.tableData=res.data.agreementTaxList
-            }
-            else{
-              this.licenseFun()
-            }
-            if(res.data.agreementTaxExcludeDeptList.length>0){
-              this.$refs.tree.setCheckedKeys(res.data.agreementTaxExcludeDeptList)
-            }
-            else{
-              this.$refs.tree.setCheckedKeys([])
-            }
-            if(res.data.agreementTaxExcludeLicenseList.length>0){
-              this.checkList=res.data.agreementTaxExcludeLicenseList
-            }
-            else{
-              this.checkList=[]
-            }
+      });
+    },
+    //提交
+    addSource(row) {
+      this.dialogVisible = true;
+      this.rowData = {
+        insCompanyId: row.id,
+        insCompanyName: row.name,
+      };
+      this.$api.dept.getTaxSource(row.id).then((res) => {
+        if (res.code == 200) {
+          if (res.data.agreementTaxList.length > 0) {
+            res.data.agreementTaxList.forEach((ele, index) => {
+              if (ele.insuranceRepertoire == null) {
+                ele.insuranceRepertoire = [];
+              } else {
+                ele.insuranceRepertoire = ele.insuranceRepertoire.split(",");
+              }
+              console.log(ele.insuranceRepertoire);
+            });
+            this.tableData = res.data.agreementTaxList;
+          } else {
+            this.licenseFun();
           }
-        })
-        this.$api.dept.agreement(row.id)
-        .then((res) => {
-          if(res.code==200){
-            this.options=res.data
+          if (res.data.agreementTaxExcludeDeptList.length > 0) {
+            this.$refs.tree.setCheckedKeys(
+              res.data.agreementTaxExcludeDeptList
+            );
+          } else {
+            this.$refs.tree.setCheckedKeys([]);
           }
-        })
-    },
-    isTaxSourceFun(data,index){
-      if(data==1){
-        this.tableData.forEach((val,ind)=>{
-        val.isTaxSource='0'
-        if(index==ind){
-            this.tableData[index].isTaxSource='1'
-            this.$set( this.tableData,index,this.tableData[index])
+          if (res.data.agreementTaxExcludeLicenseList.length > 0) {
+            this.checkList = res.data.agreementTaxExcludeLicenseList;
+          } else {
+            this.checkList = [];
+          }
+        }
+      });
+      this.$api.dept.agreement(row.id).then((res) => {
+        if (res.code == 200) {
+          this.options = res.data;
         }
-      
-      })
+      });
+    },
+    isTaxSourceFun(data, index) {
+      if (data == 1) {
+        this.tableData.forEach((val, ind) => {
+          val.isTaxSource = "0";
+          if (index == ind) {
+            this.tableData[index].isTaxSource = "1";
+            this.$set(this.tableData, index, this.tableData[index]);
+          }
+        });
       }
     },
-    submitDialog(){
-      let agreementTaxList=[]
-      let agreementTaxExcludeDeptList=this.$refs.tree.getCheckedKeys()
-      let agreementTaxExcludeLicenseList=this.checkList
-      this.tableData.forEach(val=>{
+    submitDialog() {
+      let agreementTaxList = [];
+      let agreementTaxExcludeDeptList = this.$refs.tree.getCheckedKeys();
+      let agreementTaxExcludeLicenseList = this.checkList;
+      this.tableData.forEach((val) => {
         agreementTaxList.push({
-          agreementId:val.agreementId,
-          license:val.license,
-          isTaxSource:val.isTaxSource,
+          agreementId: val.agreementId,
+          license: val.license,
+          isTaxSource: val.isTaxSource,
+          insuranceRepertoire:val.insuranceRepertoire.join(","),
+        });
+      });
+      this.$api.dept
+        .saveTaxSource({
+          ...this.rowData,
+          agreementTaxList,
+          agreementTaxExcludeDeptList,
+          agreementTaxExcludeLicenseList,
         })
-      })
-      this.$api.dept.saveTaxSource({...this.rowData,agreementTaxList,agreementTaxExcludeDeptList,agreementTaxExcludeLicenseList})
         .then((res) => {
-          if(res.code==200){
-            this.dialogVisible=false
+          if (res.code == 200) {
+            this.dialogVisible = false;
             this.$message({
-                message: res.msg,
-                type: 'success'
-              });
-            this.findPage()
-          }
-          else{
-            this.$message.error(res.msg)
+              message: res.msg,
+              type: "success",
+            });
+            this.findPage();
+          } else {
+            this.$message.error(res.msg);
           }
-        })
+        });
     },
-}
-
-}
+  },
+};
 </script>

src/views/DistributionManage/CarInsurance/DistributionManage.vue

@@ -339,9 +339,27 @@
       //--left tree begin-------
       findLeftTreeData: function() {
         // 获取数据
-        this.$api.dept.findLeftDeptTree(this.peopledeptid).then(res => {
+        this.$api.dept.findTree().then((res) => {
+          this.treeDataRecursion(res.data, 2);
           this.ztreeNodes = res.data;
         });
+        this.$api.dept.findTree().then(res => {
+          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);
+          }
+        }
       },
       onZTreeCreated: function(ztreeObj) {
         this.ztreeObj = ztreeObj;
@@ -351,7 +369,6 @@
       },
       onZTreeClick: function(evt, treeId, treeNode) {
         // 点击事件
-        console.log(evt.type, treeNode);
         this.currentTreeNode = treeNode;
         this.pageRequest.columnFilters.deptid.value = this.currentTreeNode.id;
         this.findPage();
@@ -375,7 +392,6 @@
           this.activeTabs = 'first'
           // 查询机构信息
           this.$api.dept.getDeptById(this.currentTreeNode.id).then(res => {
-            console.log(res.data);
             if((res.data.deptType =='D') && (res.data.id.indexOf('M')>=0)){
               this.$api.dept.getDeptById(res.data.parentId).then(result => {
                 this.deptInfo = result.data;
@@ -407,17 +423,14 @@
           this.pageRequest.pageSize = data.pageRequest.pageSize;
         }
         this.$api.retail.findPage(this.pageRequest).then((res) => {
-          console.log(res.data)
           this.pageResult = res.data;
         }).then(data != null ? data.callback : '')
       },
       //编辑
       handleTableEdit(data) {
-        console.log(data);
         var deptid = data.row.deptid.split('D')[0];
         this.$api.dept.getDeptById(deptid).then(res => {
           if(res.code = 200){
-            console.log(data.row)
             this.deptInfo = res.data;
             this.deptInfo.teamid = data.row.deptid;
             this.deptInfo.teamname = data.row.deptname;
@@ -529,7 +542,6 @@
          param.disrate3 = '';
 
          for(let i=0;i<this.retailSettingForm.length;i++){
-           console.log('disrate'+this.retailSettingForm[i].retailLevel)
            param['disrate'+this.retailSettingForm[i].retailLevel] = this.retailSettingForm[i].retailRate;
          }
 

src/views/FinancialManagement/ExpenseManagement/ExpenseApplyFor.vue

@@ -304,13 +304,11 @@
           </el-row>
           <el-row style="margin-bottom: 20px">
             <el-col :span="12" style="text-align: center"
-              ><h3>支出方资金归属(%)</h3>
-              <span>(请输入资金归属百分比)</span></el-col
-            >
+              ><h3 style="margin-left: 120px">支出方资金归属</h3>
+            </el-col>
             <el-col :span="12" style="text-align: center"
-              ><h3>收入方资金归属(%)</h3>
-              <span>(请输入资金归属百分比)</span></el-col
-            >
+              ><h3 style="margin-left: 120px">收入方资金归属</h3>
+            </el-col>
           </el-row>
           <el-row class="profit_box">
             <el-col :span="12">
@@ -323,8 +321,8 @@
                 <el-input-number
                   v-model="item.profit"
                   :min="0"
-                  placeholder="请输入利润(%)"
-                  :max="100"
+                  placeholder="请输入利润"
+                  :max="999999999999999"
                   label=""
                 ></el-input-number>
               </el-form-item>
@@ -339,8 +337,8 @@
                 <el-input-number
                   v-model="item.profit"
                   :min="0"
-                  placeholder="请输入利润(%)"
-                  :max="100"
+                  placeholder="请输入利润"
+                  :max="999999999999999"
                   label=""
                 ></el-input-number>
               </el-form-item>
@@ -790,8 +788,8 @@ export default {
     },
     //搜索列表功能
     queryStaffInfo() {
-      this.pageRequest.pageNo = 1
-      this.pageRequest.pageSize = 20
+      this.pageRequest.pageNo = 1;
+      this.pageRequest.pageSize = 20;
       this.findPage();
     },
     //查询列表
@@ -800,10 +798,12 @@ export default {
         this.pageRequest.pageNo = data.pageRequest.pageNum;
         this.pageRequest.pageSize = data.pageRequest.pageSize;
       }
-      let obj = JSON.parse(JSON.stringify({ ...this.queryFrom, ...this.pageRequest }))
-      if (obj.applyTime!=null&&obj.applyTime.length>0) {
+      let obj = JSON.parse(
+        JSON.stringify({ ...this.queryFrom, ...this.pageRequest })
+      );
+      if (obj.applyTime != null && obj.applyTime.length > 0) {
         obj.applyTimeStart = obj.applyTime[0];
-        obj.applyTimeEnd= obj.applyTime[1];
+        obj.applyTimeEnd = obj.applyTime[1];
       }
       delete obj.applyTime;
       this.$api.expense
@@ -946,7 +946,7 @@ export default {
                   it.bankCardNum +
                   "   " +
                   it.bank;
-                it.nameValue =it.name
+                it.nameValue = it.name;
                 // it.nameValue =
                 //   item.accountName + "   " + it.bankCardNum + "   " + it.bank;
               });
@@ -987,7 +987,7 @@ export default {
     resetForm() {
       this.expenseDialog = false;
     },
-    //导出事件
+    //提交事件
     submitForm() {
       let params = JSON.parse(JSON.stringify(this.tableForm));
       this.$refs.tableForm.validate((valid) => {
@@ -1013,11 +1013,19 @@ export default {
           params.entProfit = {};
           params.outProfit = {};
           this.affiliationData.forEach((item) => {
-            params.entProfit[item.profitEng] = item.profit;
+            params.entProfit[item.profitEng] =
+              item.profit == null ? 0 : item.profit;
           });
           this.affiliationData2.forEach((item) => {
-            params.outProfit[item.profitEng] = item.profit*-1;
+            params.outProfit[item.profitEng] =
+              item.profit == 0 || item.profit == null ? 0 : item.profit * -1;
           });
+          // this.affiliationData.forEach((item) => {
+          //   params.entProfit[item.profitEng] = item.profit;
+          // });
+          // this.affiliationData2.forEach((item) => {
+          //   params.outProfit[item.profitEng] = item.profit==0?item.profit:item.profit*-1;
+          // });
           //转化资金归属
           if (this.expendDataId) {
             //修改

src/views/FinancialManagement/ExpenseManagement/ExpenseManagement.vue

@@ -182,7 +182,7 @@
       @current-change="refreshPageRequest"
       :current-page="pageRequest.pageNo"
       :page-size="pageRequest.pageSize"
-      :page-sizes="[10, 20, 50, 100, 200, 300, 400, 500]"
+      :page-sizes="[ 20, 50, 100, 200, 300, 400, 500]"
       :total="pageRequest.totalSize"
       style="float: left; margin-left: 20px; margin-top: 20px"
     >
@@ -355,12 +355,12 @@
         </el-row>
         <el-row>
           <el-col :span="12" style="text-align: center"
-            ><h3>支出方资金归属(%)</h3>
-            <span>(请输入资金归属百分比)</span></el-col
+            ><h3 style="margin-left: 120px;">支出方资金归属</h3>
+           </el-col
           >
           <el-col :span="12" style="text-align: center"
-            ><h3>收入方资金归属(%)</h3>
-            <span>(请输入资金归属百分比)</span></el-col
+            ><h3 style="margin-left: 120px;">收入方资金归属</h3>
+           </el-col
           >
         </el-row>
         <el-row class="profit_box">
@@ -374,8 +374,8 @@
               <el-input-number
                 v-model="item.profit"
                 :min="0"
-                placeholder="请输入利润(%)"
-                :max="100"
+                placeholder="请输入利润"
+                :max="99999999999999"
                 label=""
               ></el-input-number>
             </el-form-item>
@@ -390,8 +390,8 @@
               <el-input-number
                 v-model="item.profit"
                 :min="0"
-                placeholder="请输入利润(%)"
-                :max="100"
+                placeholder="请输入利润"
+                :max="99999999999999"
                 label=""
               ></el-input-number>
             </el-form-item>
@@ -756,7 +756,7 @@ export default {
       expendPageResult: {
         //支出表格参数
         pageNo: 1,
-        pageSize: 10,
+        pageSize: 20,
       },
       expendDialogVisible: false, //支出弹出框状态
       outCardNum: "", //点击支出按钮当条数据支出id
@@ -947,10 +947,10 @@ export default {
       obj.entProfit = {};
       obj.outProfit = {};
       this.affiliationData.forEach((item) => {
-        obj.entProfit[item.profitEng] = item.profit;
+        obj.entProfit[item.profitEng] = item.profit==null?0:item.profit;
       });
       this.affiliationData2.forEach((item) => {
-        obj.outProfit[item.profitEng] = item.profit*-1;
+        obj.outProfit[item.profitEng] = item.profit==0||item.profit==null?0:item.profit*-1;
       });
       //转化资金归属
       this.$refs.inComeFormData.validate((valid) => {
@@ -1223,7 +1223,7 @@ export default {
       this.type = 1; //账户类型
       this.formDataId = row.accountId;
       this.$api.expense
-        .getAccount({ accountId: this.formDataId, pageNo: 1, pageSize: 10 })
+        .getAccount({ accountId: this.formDataId, pageNo: 1, pageSize: 20 })
         .then((res) => {
           if (res.code == 200) {
             this.accountFormData = JSON.parse(

src/views/FinancialManagement/ExpenseManagement/PaymentManagement.vue

@@ -3,13 +3,8 @@
   <div class="container" style="width: 99%; margin-top: 0px">
     <!-- 顶部查询 -->
     <el-row class="top">
-      <el-form
-        v-model="pageRequest"
-        size="small"
-        label-width="95px"
-        class="form"
-      >
-        <el-form-item label="发票类型" label-width="80px" prop="invoiceType">
+      <el-form v-model="pageRequest" size="small" class="form" label-width="100px">
+        <el-form-item label="发票类型"  prop="invoiceType">
           <el-select
             v-model="pageRequest.invoiceType"
             placeholder="请选择发票类型"
@@ -23,7 +18,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="开票员" label-width="80px" prop="biller">
+        <el-form-item label="开票员" prop="biller">
           <el-input
             v-model="pageRequest.biller"
             placeholder="请输入开票员"
@@ -31,7 +26,7 @@
             clearable
           ></el-input>
         </el-form-item>
-        <el-form-item label="开票方" label-width="80px" prop="invoiceBy">
+        <el-form-item label="开票方" prop="invoiceBy">
           <el-input
             v-model="pageRequest.invoiceBy"
             placeholder="请输入开票方"
@@ -39,7 +34,7 @@
             clearable
           ></el-input>
         </el-form-item>
-        <el-form-item label="对方单位名称" label-width="110px" prop="otherUnit">
+        <el-form-item label="对方单位名称" prop="otherUnit">
           <el-input
             v-model="pageRequest.otherUnit"
             placeholder="请输入对方单位名称"
@@ -47,7 +42,7 @@
             clearable
           ></el-input>
         </el-form-item>
-        <el-form-item label="开票日期" label-width="95px" prop="invoiceTime">
+        <el-form-item label="开票日期" prop="invoiceTime">
           <el-date-picker
             v-model="pageRequest.invoiceTime"
             type="daterange"
@@ -58,28 +53,43 @@
           >
           </el-date-picker>
         </el-form-item>
+        <el-form-item label="进账日期" prop="applyTime">
+          <el-date-picker
+            v-model="pageRequest.applyTime"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            value-format="yyyy-MM-dd"
+          >
+          </el-date-picker>
+        </el-form-item>
         <el-form-item
-          ><el-button type="primary" size="small" @click="queryStaffInfo"
+          ><el-button
+            type="primary"
+            style="margin-left: 20px"
+            size="small"
+            @click="queryStaffInfo"
             >查询</el-button
           >
         </el-form-item>
+        <el-button
+          class="operation"
+          type="primary"
+          plain
+          size="medium"
+          @click="addPayment"
+          >开票新增</el-button
+        >
+        <el-button
+          class="operation"
+          type="primary"
+          plain
+          size="medium"
+          @click="expentData"
+          >导出</el-button
+        >
       </el-form>
-      <el-button
-        class="operation"
-        type="primary"
-        plain
-        size="medium"
-        @click="addPayment"
-        >开票新增</el-button
-      >
-      <el-button
-        class="operation"
-        type="primary"
-        plain
-        size="medium"
-        @click="expentData"
-        >导出</el-button
-      >
       <!-- 合计 -->
       <div style="margin-top: 20px">
         <el-descriptions title="" size="mini" border>
@@ -121,9 +131,13 @@
       editButtonName="进账"
       button3Name="撤销"
       button2Name="编辑"
+      button4Name="记录"
       button3Icon="fa fa-trash"
+      button4Icon="el-icon-s-order"
+      button4Background="#67C23A"
       button3Background="#f56c6c"
       button2Background="#E6A23C"
+      @handleButton4="handleTableDetail"
       @handleButton3="handleTableDelete"
       @handleButton2="handleDetail($event, 1)"
       @handleEdit="handleDetail($event, 2)"
@@ -364,13 +378,11 @@
             </el-row>
             <el-row>
               <el-col :span="12" style="text-align: center"
-                ><h3>收入方资金归属(%)</h3>
-                <span>(请输入资金归属百分比)</span></el-col
-              >
+                ><h3 style="margin-left: 120px">收入方资金归属</h3>
+              </el-col>
               <el-col :span="12" style="text-align: center"
-                ><h3>支出方资金归属(%)</h3>
-                <span>(请输入资金归属百分比)</span></el-col
-              >
+                ><h3 style="margin-left: 120px">支出方资金归属</h3>
+              </el-col>
             </el-row>
             <el-row class="profit_box">
               <el-col :span="12">
@@ -383,8 +395,8 @@
                   <el-input-number
                     v-model="item.profit"
                     :min="0"
-                    placeholder="请输入利润(%)"
-                    :max="100"
+                    placeholder="请输入利润"
+                    :max="9999999999999"
                     label=""
                   ></el-input-number>
                 </el-form-item>
@@ -399,8 +411,8 @@
                   <el-input-number
                     v-model="item.profit"
                     :min="0"
-                    placeholder="请输入利润(%)"
-                    :max="100"
+                    placeholder="请输入利润"
+                    :max="9999999999999"
                     label=""
                   ></el-input-number>
                 </el-form-item>
@@ -416,6 +428,32 @@
         }}</el-button>
       </div>
     </el-dialog>
+    <!-- 记录弹框 -->
+    <el-dialog
+      class="dialog expendDialog"
+      title="进账记录"
+      :close-on-click-modal="false"
+      :before-close="expendResetForm"
+      :visible.sync="expendDialogVisible"
+      width="70%"
+    >
+      <!-- 记录表格 -->
+      <kt-common-table
+        :operationWidth="130"
+        class="ktTable expendTable"
+        ref="expendTable"
+        :data="expendPageResult"
+        :columns="expendColumns"
+        :showBatchDelete="false"
+        :showOperation="true"
+        button3Name="撤销"
+        button3Icon="fa fa-trash"
+        button3Background="#f56c6c"
+        @handleButton3="handleTableRepeal"
+        @findPage="getRecordData"
+        :isshowpagination="true"
+      ></kt-common-table>
+    </el-dialog>
   </div>
 </template>
         <script>
@@ -455,7 +493,7 @@ export default {
       title: "开票新增",
       loading: true,
       detailDialog: false,
-      operationWidth: 220, //操作列宽度
+      operationWidth: 180, //操作列宽度
       queryFrom: {
         //查询条件
       },
@@ -467,6 +505,7 @@ export default {
         pageNo: 1,
         pageSize: 20,
         invoiceTime: "", //开票日期
+        applyTime: "", //进账日期
         invoiceBy: "", //开票方
         biller: "", //开票员
         invoiceType: "", //开票类型
@@ -474,12 +513,12 @@ export default {
       columns: [
         { prop: "invoiceId", label: "发票号码", type: "text", minWidth: 160 },
         { prop: "invoiceNum", label: "发票数", type: "text", minWidth: 60 },
-        { prop: "invoiceBy", label: "开票方", type: "text", minWidth: 180 },
+        { prop: "invoiceBy", label: "开票方", type: "text", minWidth: 360 },
         {
           prop: "otherUnit",
           label: "对方单位名称",
           type: "text",
-          minWidth: 180,
+          minWidth: 360,
         },
         {
           prop: "invoiceTypeName",
@@ -494,12 +533,6 @@ export default {
           minWidth: 100,
         },
         { prop: "invoiceTime", label: "开票日期", type: "text", minWidth: 100 },
-        {
-          prop: "payoutTime",
-          label: "进账日期",
-          type: "text",
-          minWidth: 100,
-        },
         { prop: "biller", label: "开票员", type: "text", minWidth: 70 },
         {
           prop: "invoiceSubjects",
@@ -547,7 +580,7 @@ export default {
       detailData: [],
       detailParams: {
         pageNo: 1,
-        pageSize: 10,
+        pageSize: 20,
         teamOrUserFlag: "2",
       },
       modelText: "提 交",
@@ -565,8 +598,8 @@ export default {
         invoiceType: "", //发票类型
         otherUnit: "", //对方单位
         payoutMoney: 0, //进账金额
-        payoutTime: "", //进账日期
         rate: 0, //税率
+        payoutTime: "", //进账日期
         payMethod: [], //支付方式
         fundUse: "", //资金用途
       },
@@ -597,12 +630,6 @@ export default {
           { required: true, message: "进账金额不能为空", trigger: "blur" },
         ],
         rate: [{ required: true, message: "税率不能为空", trigger: "blur" }],
-        payMethod: [
-          { required: true, message: "请选择支付方式", trigger: "change" },
-        ],
-        fundUse: [
-          { required: true, message: "请选择资金用途", trigger: "change" },
-        ],
         payoutTime: [
           {
             required: true,
@@ -610,6 +637,12 @@ export default {
             trigger: "change",
           },
         ],
+        payMethod: [
+          { required: true, message: "请选择支付方式", trigger: "change" },
+        ],
+        fundUse: [
+          { required: true, message: "请选择资金用途", trigger: "change" },
+        ],
         invoiceTime: [
           {
             required: true,
@@ -623,9 +656,65 @@ export default {
       formDataId: "", //编辑数据id
       profitObj: {},
       typeStatus: "", //1是编辑 2是进账
+      /**
+       * 记录模块
+       */
+      expendColumns: [
+        //记录表格数据列
+        {
+          prop: "revenueOutlayName",
+          label: "转账类型",
+          minWidth: 80,
+          sortable: false,
+        },
+        {
+          prop: "company",
+          label: "支出单位",
+          minWidth: 350,
+          sortable: false,
+        },
+        {
+          prop: "payMethod",
+          label: "支付方式",
+          minWidth: 100,
+          sortable: false,
+        },
+        {
+          prop: "createTime",
+          label: "支付时间",
+          minWidth: 100,
+          sortable: false,
+        },
+        { prop: "applyAmount", label: "金额", minWidth: 100, sortable: false },
+        {
+          prop: "fundUse",
+          label: "资金用途",
+          minWidth: 150,
+          sortable: false,
+        },
+        {
+          prop: "fundFen",
+          label: "资金用途分项",
+          minWidth: 150,
+          sortable: false,
+        },
+      ],
+      expendDialogVisible: false, //记录弹框显示状态
+      expendPageResult: {
+        //记录表格参数
+        pageNo: 1,
+        pageSize: 20,
+      },
+      invoiceId: "", //记录id
+      num: 1,
     };
   },
   watch: {
+    expendDialogVisible(n) {
+      if (!n) {
+        this.invoiceId = "";
+      }
+    },
     detailDialog(n) {
       if (!n) {
         this.formData = {
@@ -640,8 +729,8 @@ export default {
           invoiceType: "", //发票类型
           otherUnit: "", //对方单位
           payoutMoney: 0, //进账金额
-          payoutTime: "", //进账日期
           rate: 0, //税率
+          payoutTime: "", //进账日期
           payMethod: [], //支付方式
         };
         //支出收入资金归属值清空
@@ -660,6 +749,78 @@ export default {
     },
   },
   methods: {
+    /**
+     * 撤销转账记录
+     */
+     handleTableRepeal(index) {
+      let row = index.row;
+      console.log(row);
+      this.$confirm("确认撤销该  “"+row.revenueOutlayName+"”  记录吗?", "提示", {
+        type: "warning",
+      })
+        .then(() => {
+          this.$api.expense
+            .accountOperateDelete(row.accountOperateId)
+            .then((res) => {
+              if (res.code == 200) {
+                this.$message.success("撤销成功");
+                this.getRecordData();
+              } else {
+                this.$message.error(res.msg);
+              }
+            });
+        })
+        .catch(() => {});
+    },
+    //记录弹框取消重置
+    expendResetForm() {
+      this.expendDialogVisible = false;
+    },
+    //获取记录列表
+    getRecordData(data) {
+      if (data && data.pageRequest) {
+        this.expendPageResult.pageNo = data.pageRequest.pageNum;
+        this.expendPageResult.pageSize = data.pageRequest.pageSize;
+      }
+      let obj = {
+        pageNo: this.expendPageResult.pageNo,
+        pageSize: this.expendPageResult.pageSize,
+        invoiceId: this.invoiceId,
+      };
+      this.$api.expense
+        .getAccountOperate(obj)
+        .then((res) => {
+          res.data.records.forEach((item) => {
+            if (
+              item.revenueOutlay != null &&
+              item.revenueOutlay != undefined &&
+              item.revenueOutlay != ""
+            ) {
+              item.revenueOutlayName =
+                item.revenueOutlay == 0 ? "收入" : "支出";
+            }
+          });
+          this.expendPageResult = {
+            content: res.data.records,
+            pageNo: res.data.current,
+            pageSize: res.data.size,
+            totalPages: res.data.pages,
+            totalSize: res.data.total,
+          };
+        })
+        .then(data != null ? data.callback : "");
+    },
+    //点击记录方法
+    handleTableDetail(e) {
+      let row = e.row;
+      this.expendDialogVisible = true;
+      this.invoiceId = row.invoiceId;
+      if (this.num > 1) {
+        //第一次渲染页面表格组件会自动调用列表方法，所以给个值判断是否是第一次渲染页面只让执行一次
+        this.getRecordData();
+      }
+      this.num++;
+    },
     //转换
     businessZh(data, label, value) {
       let obj = data.find((item) => item[value] == label);
@@ -688,6 +849,16 @@ export default {
       let params = {
         ...JSON.parse(JSON.stringify(this.pageRequest)),
       };
+      if (params.invoiceTime != null && params.invoiceTime.length > 0) {
+        params.invoiceTimeStart = params.invoiceTime[0];
+        params.invoiceTimeEnd = params.invoiceTime[1];
+      }
+      if (params.applyTime != null && params.applyTime.length > 0) {
+        params.applyTimeStart = params.applyTime[0];
+        params.applyTimeEnd = params.applyTime[1];
+      }
+      delete params.applyTime;
+      delete params.invoiceTime;
       delete params.pageNo;
       delete params.pageSize;
       this.$api.expense.invAccountExcel(params).then((res) => {
@@ -700,7 +871,7 @@ export default {
           // 4.创建url之后可以模拟对此文件对象的一系列操作，例如：预览、下载
           let a = document.createElement("a");
           a.href = url;
-          a.download = "导出订单.xlsx";
+          a.download = "导出文件.xlsx";
           a.click();
           // 5.释放这个临时的对象url
           window.URL.revokeObjectURL(url);
@@ -780,7 +951,7 @@ export default {
                   it.bankCardNum +
                   "   " +
                   it.bank;
-                it.nameValue = it.name
+                it.nameValue = it.name;
                 // it.nameValue =
                 //   it.accountName + "   " + it.bankCardNum + "   " + it.bank;
                 arr.push(it);
@@ -821,11 +992,19 @@ export default {
             params.entProfit = {};
             params.outProfit = {};
             this.affiliationData.forEach((item) => {
-              params.entProfit[item.profitEng] = item.profit;
+              params.entProfit[item.profitEng] =
+                item.profit == null ? 0 : item.profit;
             });
             this.affiliationData2.forEach((item) => {
-              params.outProfit[item.profitEng] = item.profit * -1;
+              params.outProfit[item.profitEng] =
+                item.profit == 0 || item.profit == null ? 0 : item.profit * -1;
             });
+            // this.affiliationData.forEach((item) => {
+            //   params.entProfit[item.profitEng] = item.profit;
+            // });
+            // this.affiliationData2.forEach((item) => {
+            //   params.outProfit[item.profitEng] = item.profit * -1;
+            // });
             //转化资金归属
             let obj = {
               invoiceId: this.formDataId, //id
@@ -915,7 +1094,7 @@ export default {
     resetForm() {
       this.detailDialog = false;
       this.detailParams.pageNo = 1;
-      this.detailParams.pageSize = 10;
+      this.detailParams.pageSize = 20;
     },
     //编辑按钮
     handleDetail(index, type) {
@@ -968,7 +1147,12 @@ export default {
         params.invoiceTimeStart = params.invoiceTime[0];
         params.invoiceTimeEnd = params.invoiceTime[1];
       }
+      if (params.applyTime != null && params.applyTime.length > 0) {
+        params.applyTimeStart = params.applyTime[0];
+        params.applyTimeEnd = params.applyTime[1];
+      }
       delete params.invoiceTime;
+      delete params.applyTime;
       this.$api.expense
         .getInvAccountIncoice(params)
         .then((res) => {
@@ -1027,10 +1211,10 @@ export default {
 }
 .form {
   display: flex;
-  margin-top: 14px;
   align-items: center;
-  margin-left: -12px;
-  margin-bottom: 20px;
+  margin-top: 14px;
+  flex-wrap: wrap;
+  height: 100px;
 }
 .el-pagination {
   font-weight: normal;
@@ -1117,5 +1301,22 @@ export default {
 .profit_box .el-form-item {
   margin-bottom: 15px !important;
 }
+.expendDialog >>> .el-dialog__body {
+  overflow-y: auto;
+  height: 500px;
+}
+.expendDialog >>> .cell .el-button {
+  width: auto;
+}
+.expendTable >>> .bottomFixed {
+  position: static;
+  margin-top: 20px;
+}
+.expendTable >>> .el-table {
+  height: 400px !important;
+}
+.ktTable >>> .el-button span {
+  margin-left: 0 !important;
+}
 </style>
         

src/views/FinancialManagement/ExpenseManagement/TransferRecord.vue

@@ -83,14 +83,16 @@ export default {
     return {
       operationWidth: 100, //操作列宽度
       pageResult: {}, //表格参数
-      pageRequest: {  // 列表查询条件
+      pageRequest: {
+        // 列表查询条件
         pageNo: 1,
         pageSize: 10,
         company: "",
         fundUse: "",
         revenueOutlay: "",
       },
-      columns: [  // 数据列
+      columns: [
+        // 数据列
         {
           prop: "revenueOutlayName",
           label: "转账类型",
@@ -98,9 +100,9 @@ export default {
           sortable: false,
         },
         {
-          prop: "company",
-          label: "支出单位",
-          minWidth: 350,
+          prop: "createTime",
+          label: "创建时间",
+          minWidth: 100,
           sortable: false,
         },
         { prop: "fundFlow", label: "资金流向", minWidth: 350, sortable: false },
@@ -131,12 +133,16 @@ export default {
     /**
      * 撤销转账记录
      */
-     handleTableDelete(index) {
+    handleTableDelete(index) {
       let row = index.row;
       console.log(row);
-      this.$confirm("确认撤销该  “"+row.revenueOutlayName+"”  记录吗?", "提示", {
-        type: "warning",
-      })
+      this.$confirm(
+        "确认撤销该  “" + row.revenueOutlayName + "”  记录吗?",
+        "提示",
+        {
+          type: "warning",
+        }
+      )
         .then(() => {
           this.$api.expense
             .accountOperateDelete(row.accountOperateId)

src/views/FinancialManagement/ReconciliationSystem/ReceivablePayableCollection/ReceivablePayableCollection.vue

@@ -184,6 +184,22 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="应收导入日期">
+              <el-date-picker
+                v-model="revenueTime"
+                type="daterange"
+                @change="revenueTimeChange"
+                start-placeholder="开始日期"  
+                end-placeholder="结束日期"
+                class="widths"
+                value-format="yyyy-MM-dd"
+                style="width: 220px"
+                clearable
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div class="flex j-end" style="margin-right: 100px">
@@ -231,6 +247,7 @@ export default {
     return {
       clearingTime: [],
       signDateTime: [],
+      revenueTime: [],//导入日期
       pageRequest: {
         //查询的默认条件
         pageNum: 1,
@@ -253,6 +270,7 @@ export default {
         jqPolicyId: "",
         syPolicyId: "",
         nonCarPolicyId: "",
+        revenueTime:"",//导入日期
       },
       // 右侧列表查询数据Start
       pageResult: [],
@@ -261,6 +279,7 @@ export default {
         { prop: "operationsTeam", label: "运营团队", minWidth: 100 },
         { prop: "channelClassification", label: "渠道分类", minWidth: 100 },
         { prop: "signDate", label: "签单日期", minWidth: 160 },
+        { prop: "revenueTime", label: "应收导入日期", minWidth: 160 },
         { prop: "channel", label: "渠道", minWidth: 100 },
         { prop: "licenseNo", label: "车牌号", minWidth: 100 },
         { prop: "insuredName", label: "被保险人", minWidth: 160 },
@@ -341,6 +360,14 @@ export default {
   },
   mounted() {},
   methods: {
+    //接口传值处理
+    revenueTimeChange(e) {
+      if (e == null) {
+        this.pageRequest.revenueTime = "";
+      } else {
+        this.pageRequest.revenueTime = e.toString();
+      }
+    },
     clearingTimeChange(e) {
       if (e == null) {
         this.pageRequest.agencySettlementTimeStartTime = "";

src/views/FinancialManagement/ReconciliationSystem/ReceivablePayableCollection/Source.vue

@@ -77,6 +77,13 @@
               <el-input v-model="pageRequest.nonCarPolicyId" placeholder="请输入非车保单号" class="widths" clearable></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="导入日期">
+              <el-date-picker v-model="revenueTime" type="daterange" @change="revenueTimeChange"
+                start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd" clearable style="width: 250px">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div class="flex j-end" style="margin-right: 100px">
@@ -302,6 +309,7 @@ export default {
       insuranceClearingState: "",
       clearingTime: [],
       signingTime: [],
+      revenueTime: [],//导入日期
       pageRequest: {
         //查询的默认条件
         pageNum: 1,
@@ -312,6 +320,7 @@ export default {
         insuredName: "", //被保险人
         clearingTime: "", //结算日期
         signingTime: "", //出单日期
+        revenueTime: "", //导入日期
         jqPolicyId: "", //交强保单号
         syPolicyId: "", //商业保单号
         nonCarPolicyId: "", //非车保单号
@@ -396,6 +405,8 @@ export default {
         { prop: "licenseno", label: "车牌号", minWidth: 120 },
         { prop: "signingTime", label: "出单日期", minWidth: 160 },
         { prop: "clearingTime", label: "结算日期", minWidth: 160 },
+        { prop: "revenueTime", label: "导入日期", minWidth: 160 },
+        { prop: "revenueName", label: "导入人", minWidth: 160 },
         { prop: "taxamount", label: "车船税", minWidth: 140 },
         { prop: "jqReceivableRatio", label: "交强应收比例", minWidth: 140 },
         { prop: "jqPremiumRatio", label: "交强手续费比例", minWidth: 140 },
@@ -495,6 +506,14 @@ export default {
       this.createOrUpdateForm.insuranceName = selectedLabel;
     },
     //接口传值处理
+    revenueTimeChange(e) {
+      if (e == null) {
+        this.pageRequest.revenueTime = "";
+      } else {
+        this.pageRequest.revenueTime = e.toString();
+      }
+    },
+    //接口传值处理
     clearingTimeChange(e) {
       if (e == null) {
         this.pageRequest.clearingTime = "";

src/views/Letter/Letter.vue

@@ -1830,16 +1830,15 @@
                   </el-form-item>
                   <el-form-item label="选择份数" style="margin-right:30px;">
                     <el-input-number
-                      v-model="guoRenaccidentForm.quantity"
-                      @change="numberCopieschangeGr"
+                      v-model="guoRenaccidentForm.policyNum"
                       :min="1"
                       controls-position="right"
-                      :max="guoRenaccidentForm.policyNum"
+                      :max="guoRenaccidentForm.quantity"
                     ></el-input-number>
                     <!-- <span style="margin-left: 5px;">份</span> -->
                   </el-form-item>
                   <el-form-item label="保费：">
-                    <span>{{guoRenaccidentForm.premium}}&ensp;元</span>
+                    <span>{{guoRenaccidentForm.premium*guoRenaccidentForm.policyNum}}&ensp;元</span>
                   </el-form-item>
                 </el-form>
                 <el-table
@@ -3097,6 +3096,18 @@ export default {
         callback();
       }
     };
+    var carPhoneValid = (rule, value, callback) => {
+       const plateNumber = /^([京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}(([0-9]{5}[DF])|([DF]([A-HJ-NP-Z0-9])[0-9]{4})))|([京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9挂学警港澳]{1})$/
+       if (!value) {
+        callback(new Error("请输入车牌号"));
+      }
+       else if (plateNumber.test(value)) {
+           callback()
+       } else {
+           callback(new Error('请输入正确的车牌号'))
+       }
+       
+    }
     return {
       activeName:'1',
       isTaxSourceModel:'',
@@ -3479,7 +3490,8 @@ export default {
           { required: true, message: "请填写品牌型号", trigger: "blur" }
         ],
         licenseNo: [{ max: 8, message: "最多八个字符", trigger: "blur" },
-        { required: true, message: "请输入车牌号", trigger: "blur" }],
+        { required: true,validator:carPhoneValid,trigger: "blur" }],
+
         frameNo: [{ validator: checkframeNo, trigger: "blur" }],
         engineNo: [
           { required: true, message: "请填写发动机号", trigger: "blur" }
@@ -5023,7 +5035,8 @@ else{
             data.data.forEach(item => {
               num += Number(item.premium);
             });
-        this.accidentPremiumGr = num
+
+        // this.accidentPremiumGr = num
           this.accidentLoading=false
           this.guoRenaccidentDataListChild = data.data;
         }
@@ -5042,7 +5055,7 @@ else{
       this.guoRenaccidentForm={
         ... this.guoRenaccidentForm,
         premium:list.premium,
-        quantity:list.appnum,
+        quantity:Number(list.appnum),
         riskCode:list.riskCode,
         amount:list.amount,
         policyNum:Number(list.policyNum)
@@ -5080,10 +5093,6 @@ else{
     numberCopieschange(index) {
       this.accidentForm.premium = Number(this.accidentPremium) * index;
     },
-
-    numberCopieschangeGr(index) {
-      this.guoRenaccidentForm.premium = Number(this.accidentPremiumGr) * index;
-    },
     numberCopieschangeZM(index) {
       this.accidentFormZM.unitPremium = Number(this.accidentPremiumZM) * index;
     },
@@ -5265,6 +5274,9 @@ else{
               })
               this.ziJinInsuranceData = data;
             }
+            else{
+              this.$message.error(res.msg)
+            }
           });
           break;
           case '中国人寿':
@@ -5304,7 +5316,7 @@ else{
       })
     },
 
-   
+
     //恒邦驾意险选择
     HBDrivingChange(row){
       this.hengbangaccidentalDrivingVo=row;
@@ -5432,6 +5444,9 @@ else{
               })
               this.ziJinInsuranceData = data;
             }
+            else{
+              this.$message.error(res.msg)
+            }
           });
           break;
         case '安盛天平':
@@ -5446,6 +5461,9 @@ else{
               })
               this[name+"InsuranceData"] = data;
             }
+            else{
+              this.$message.error(res.msg)
+            }
           });
           break;
         case '中国人寿':
@@ -5462,6 +5480,9 @@ else{
               })
               this[name+"InsuranceData"] = data;
             }
+            else{
+              this.$message.error(res.msg)
+            }
           });
           break;
         case '中煤财险':
@@ -5471,6 +5492,9 @@ else{
               let data = res.data;
               this[name+"InsuranceData"] = data;
             }
+            else{
+              this.$message.error(res.msg)
+            }
           });
           break;
         case '大家财险':
@@ -5478,6 +5502,9 @@ else{
             if (res.code == 200) {
               this.dajiaInsuranceData = res.data;
             }
+            else{
+              this.$message.error(res.msg)
+            }
           });
           break;
         default:

src/views/PeopleManage/Agent/AgentExamine.vue

@@ -483,8 +483,10 @@
 import tree from "@/components/ztree.vue"; // 机构树组件
 import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
 import peopleImage from "@/components/PeopleImage/index.vue"; //影像组件
-import mixin from '../mixin' 
-
+import mixa from '../mixin' 
+const mixin = new mixa({
+  treeTypeNum:2 //树分类过滤参数
+})
 export default {
   components: {
     tree,

src/views/PeopleManage/Agent/AgentManage.vue

@@ -79,7 +79,7 @@
                     :options="ztreeNodes"
                     v-model="formData.deptId"
                     clearable
-                    :disabled="dialogTitle == '编辑代理人'"
+                    disabled
                     :show-all-levels="false"
                     :props="{
                       value: 'id',
@@ -439,8 +439,10 @@ 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' 
-
+import mixa from '../mixin' 
+const mixin = new mixa({
+  treeTypeNum:2 //树分类过滤参数
+})
 export default {
   components: {
     KtButton,
@@ -787,6 +789,10 @@ export default {
         this.$message.info("请选择所属公司或部门");
         return;
       }
+      if(this.currentTreeNode.comlevel!=null||this.currentTreeNode.managementSource!=2){ //团队代理人managementSource为2  渠道为1  后线为空
+        this.$message.info("请选择第六级机构");
+        return;
+      }
       this.dialogPassword = true;
       this.formData = {
         roleId: "20",

src/views/PeopleManage/Player/PlayerManage.vue

@@ -73,7 +73,7 @@
                     :options="ztreeNodes"
                     v-model="formData.deptId"
                     clearable
-                    :disabled="dialogTitle == '编辑渠道信息'"
+                    disabled
                     :show-all-levels="false"
                     :props="{
                       value: 'id',
@@ -198,7 +198,10 @@ import KtButton from "@/views/Core/KtButton"; // 按钮权限组件
 import tree from "@/components/ztree.vue"; // 机构树组件
 import templateTable from "../../../components/TemplateTable/index.vue";
 import peopleImage from "@/components/PeopleImage/index.vue";
-import mixin from '../mixin' 
+import mixa from '../mixin' 
+const mixin = new mixa({
+  treeTypeNum:1
+})
 export default {
   components: {
     KtButton,
@@ -428,6 +431,10 @@ export default {
         this.$message.info("请选择所属公司或部门");
         return;
       }
+      if(this.currentTreeNode.comlevel!=null||this.currentTreeNode.managementSource!=1){ //团队代理人managementSource为2  渠道为1  后线为空
+        this.$message.info("请选择第六级机构");
+        return;
+      }
       let statusArr = this.user_statusoptions.filter(
         (item) => item.label == "正常"
       );

src/views/PeopleManage/Player/PlayerManageteam.vue

@@ -73,7 +73,7 @@
                     :options="ztreeNodes"
                     v-model="formData.deptId"
                     clearable
-                    :disabled="dialogTitle == '编辑渠道信息'"
+                    disabled
                     :show-all-levels="false"
                     :props="{
                       value: 'id',
@@ -398,7 +398,10 @@ import KtButton from "@/views/Core/KtButton"; // 按钮权限组件
 import tree from "@/components/ztree.vue"; // 机构树组件
 import templateTable from "../../../components/TemplateTable/index.vue";
 import peopleImage from "@/components/PeopleImage/index.vue";
-import mixin from '../mixin' 
+import mixa from '../mixin' 
+const mixin = new mixa({
+  treeTypeNum:1 //树分类过滤参数
+})
 export default {
   components: {
     KtButton,
@@ -549,7 +552,8 @@ export default {
     onZTreeClick: function (evt, treeId, treeNode) {
         // 点击事件
         this.currentTreeNode = evt;
-        this.pageData.deptId = this.currentTreeNode.id;
+        // this.pageData.deptId = this.currentTreeNode.id;
+        this.deptId = this.currentTreeNode.id
         this.pageData.pageNum =1;
         this.findPage();
         this.formData.deptId = [];
@@ -651,6 +655,10 @@ export default {
         this.$message.info("请选择所属公司或部门");
         return;
       }
+      if(this.currentTreeNode.comlevel!=null||this.currentTreeNode.managementSource!=1){ //团队代理人managementSource为2  渠道为1  后线为空
+        this.$message.info("请选择第六级机构");
+        return;
+      }
       let statusArr = this.user_statusoptions.filter(
         (item) => item.label == "正常"
       );

src/views/PeopleManage/Staff/StaffExamine.vue

@@ -318,7 +318,10 @@
 import tree from "@/components/ztree.vue"; // 机构树组件
 import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
 import peopleImage from '@/components/PeopleImage/index.vue' //影像组件
-
+import mixa from '../mixin' 
+const mixin = new mixa({
+  treeTypeNum:null
+})
 
 export default {
   components: {
@@ -326,68 +329,11 @@ export default {
     KtCommonTable,
     peopleImage
   },
+  mixins: [mixin], 
   data() {
     return {
       activeName: '1',
       //56个民族
-      nationalList: [
-        "汉族",
-        "壮族",
-        "满族",
-        "回族",
-        "苗族",
-        "维吾尔族",
-        "土家族",
-        "彝族",
-        "蒙古族",
-        "藏族",
-        "布依族",
-        "侗族",
-        "瑶族",
-        "朝鲜族",
-        "白族",
-        "哈尼族",
-        "哈萨克族",
-        "黎族",
-        "傣族",
-        "畲族",
-        "傈僳族",
-        "仡佬族",
-        "东乡族",
-        "高山族",
-        "拉祜族",
-        "水族",
-        "佤族",
-        "纳西族",
-        "羌族",
-        "土族",
-        "仫佬族",
-        "锡伯族",
-        "柯尔克孜族",
-        "达斡尔族",
-        "景颇族",
-        "毛南族",
-        "撒拉族",
-        "布朗族",
-        "塔吉克族",
-        "阿昌族",
-        "普米族",
-        "鄂温克族",
-        "怒族",
-        "京族",
-        "基诺族",
-        "德昂族",
-        "保安族",
-        "俄罗斯族",
-        "裕固族",
-        "乌兹别克族",
-        "门巴族",
-        "鄂伦春族",
-        "独龙族",
-        "塔塔尔族",
-        "赫哲族",
-        "珞巴族",
-      ],
       //影像资料
       dataForm: {
         SFZ_01: "",
@@ -413,27 +359,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: "",
@@ -478,29 +403,13 @@ export default {
       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: [], //机构列表
-      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: {
     // 下一步
@@ -525,11 +434,6 @@ export default {
       );
       this.rightSplitWidth = 100 - this.leftSplitWidth;
     },
-    findLeftTreeData: function () {
-      this.$api.dept.findDeptTree().then((res) => {
-        this.ztreeNodes = res.data;
-      });
-    },
     onZTreeClick: function (evt, treeId, treeNode) {
       // 点击事件
       this.currentTreeNode = evt;

src/views/PeopleManage/Staff/StaffManage.vue

@@ -127,7 +127,7 @@
               <el-col :span="8">
                 <el-form-item label="机构名称" prop="deptId">
                   <el-cascader style="width:200px" :options="ztreeNodes" v-model="formData.deptId" clearable
-                  :disabled="dialogTitle == '编辑后线人员'"
+                    disabled
                     :show-all-levels="false" :props="{
                       value: 'id',
                       label: 'name',
@@ -368,7 +368,10 @@ import tree from "@/components/ztree.vue"; // 机构树组件
 import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
 import { validateSfz } from "../../../utils/validate.js";
 import peopleImage from '@/components/PeopleImage/index.vue' //影像组件
-
+import mixa from '../mixin' 
+const mixin = new mixa({
+  treeTypeNum:null
+})
 export default {
   components: {
     KtButton,
@@ -376,69 +379,12 @@ export default {
     KtCommonTable,
     peopleImage
   },
+  mixins: [mixin], 
   data() {
     return {
       activeName: '1',
       isShow:true,
       //56个民族
-      nationalList: [
-        "汉族",
-        "壮族",
-        "满族",
-        "回族",
-        "苗族",
-        "维吾尔族",
-        "土家族",
-        "彝族",
-        "蒙古族",
-        "藏族",
-        "布依族",
-        "侗族",
-        "瑶族",
-        "朝鲜族",
-        "白族",
-        "哈尼族",
-        "哈萨克族",
-        "黎族",
-        "傣族",
-        "畲族",
-        "傈僳族",
-        "仡佬族",
-        "东乡族",
-        "高山族",
-        "拉祜族",
-        "水族",
-        "佤族",
-        "纳西族",
-        "羌族",
-        "土族",
-        "仫佬族",
-        "锡伯族",
-        "柯尔克孜族",
-        "达斡尔族",
-        "景颇族",
-        "毛南族",
-        "撒拉族",
-        "布朗族",
-        "塔吉克族",
-        "阿昌族",
-        "普米族",
-        "鄂温克族",
-        "怒族",
-        "京族",
-        "基诺族",
-        "德昂族",
-        "保安族",
-        "俄罗斯族",
-        "裕固族",
-        "乌兹别克族",
-        "门巴族",
-        "鄂伦春族",
-        "独龙族",
-        "塔塔尔族",
-        "赫哲族",
-        "珞巴族",
-      ],
       pageData:{
         pageNum: 1,
         pageSize: 20,
@@ -485,27 +431,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: "",
@@ -551,9 +476,6 @@ export default {
       dialogVisible: false, // 新增编辑界面是否显示
       departmentList: [], // 选中公司的所有部门的集合
       deptInfo: {}, //选中机构的基本信息
-      sexoptions: JSON.parse(localStorage.getItem('sexOptions')) ,
-      user_statusoptions: JSON.parse(localStorage.getItem('user_statusoptions')) ,
-      roles: [],
       option: [], //机构列表
       //影像资料
       dataForm: {
@@ -567,25 +489,16 @@ export default {
       //影像上传列表
       imagesIdList:[],
       dialogPassword:false, //密码是否显示明文
-      postOption:[]
     };
   },
   created() {
-    this.$api.role.postViewAll().then((res) => {
-      res.data.forEach(ele=>{
-        ele.postId=ele.postId+''
-      })
-      this.postOption = res.data
-    })
     //获取所有下拉框数据(字典)
     // this.getDictItems("sex");
     // this.getDictItems("user_status");
-    this.findLeftTreeData(); // 获取机构树的数据
     this.getFindRoleByUserId();
   },
   mounted() {
     //用像素初始化左边的split的宽度
-    this.changeTreeWidth(240); // 初始化树的宽度
   },
   watch: {
     containsSubDeptChecked() {
@@ -643,18 +556,6 @@ export default {
       // return row.sex+'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.ztreeNodes = res.data;
-      });
-    },
     onZTreeClick: function (evt, treeId, treeNode) {
       // 点击事件
       this.currentTreeNode = evt;
@@ -709,12 +610,17 @@ export default {
         name:this.pageData.name,
         userId:this.pageData.userId,
         status:this.pageData.status,
+        agentFlag:0,
         roleId:'22',
       }
+      // .findUserList({
+      //     ...this.pageData,
+      //     dto: { ...data, roleId: "20", deptId: this.deptId,agentFlag: "2", },
+      //   })
       this.$api.user
-        .findPage({dto,pageNum:this.pageData.pageNum,pageSize:this.pageData.pageSize})
+        .findUserList({dto,pageNum:this.pageData.pageNum,pageSize:this.pageData.pageSize})
         .then((res) => {
-          res.data.content.forEach(val=>{
+          res.data.records.forEach(val=>{
             if(val.sex&& val.sex!==''&& val.sex!==null){
               val.sex=this.sexoptions.find(ele=>ele.value==val.sex).label
             }
@@ -723,7 +629,13 @@ export default {
             }
             val.roleId=val.roleName
           })
-          this.pageResult = res.data;
+          this.pageResult = {
+            content: res.data.records,
+            pageNum: res.data.current,
+            pageSize: res.data.size,
+            totalPages: res.data.pages,
+            totalSize: res.data.total,
+          };
         })
        
     },
@@ -781,18 +693,6 @@ export default {
       else {
         this.$message.error(res.msg);
       }
-      // this.$api.dept.findDeptTree().then((res) => {
-      //   this.option = res.data;
-      // });
-      // this.$api.user.getUserDatail(params.row.userId).then((result) => {
-      //   if(result.code==200){
-      //       result.data.status+=''
-      //     this.formData=result.data
-      //     this.formData.password=''
-      //   }
-      // })
-      // this.dialogTitle = "编辑后线人员";
-      // this.dialogVisible = true;
     },
     // 删除单个人员
     handleTableDeleteFlag(data) {
@@ -812,10 +712,19 @@ export default {
     },
     //添加人员
     handleAddButton() {
+      // console.log(this.currentTreeNode.managementSource)
+      // if (this.currentTreeNode == null) {
+      //   this.$message.info("请选择所属公司或部门");
+      //   return;
+      // }
       if (this.currentTreeNode == null) {
         this.$message.info("请选择所属公司或部门");
         return;
       }
+      if(this.currentTreeNode.comlevel!=null||this.currentTreeNode.managementSource!=null){ //团队代理人managementSource为2  渠道为1  后线为空
+        this.$message.info("请选择第六级机构");
+        return;
+      }
       this.formData = {
         roleId: '22',
         status: '',

src/views/PeopleManage/TeamLeader/TeamLeaderExamine.vue

@@ -342,8 +342,10 @@
 <script>
 import tree from "@/components/ztree.vue"; // 机构树组件
 import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
-import mixin from '../mixin' 
-
+import mixa from '../mixin' 
+const mixin = new mixa({
+  treeTypeNum:2 //树分类过滤参数
+})
 export default {
   components: {
     tree,

src/views/PeopleManage/TeamLeader/TeamLeaderManage.vue

@@ -145,7 +145,7 @@
                     :options="ztreeNodes"
                     v-model="formData.deptId"
                     clearable
-                    :disabled="dialogTitle == '编辑团队长'"
+                    disabled
                     :show-all-levels="false"
                     :props="{
                       value: 'id',
@@ -453,8 +453,10 @@ import KtButton from "@/views/Core/KtButton"; // 按钮权限组件
 import tree from "@/components/ztree.vue"; // 机构树组件
 import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
 import { validateSfz } from "../../../utils/validate.js";
-import mixin from '../mixin' 
-
+import mixa from '../mixin' 
+const mixin = new mixa({
+  treeTypeNum:2 //树分类过滤参数
+})
 export default {
   components: {
     KtButton,
@@ -746,6 +748,11 @@ export default {
         this.$message.info("请选择所属公司或部门");
         return;
       }
+      if(this.currentTreeNode.comlevel!=null||this.currentTreeNode.managementSource!=2){ //团队代理人managementSource为2  渠道为1  后线为空
+        this.$message.info("请选择第六级机构");
+        return;
+      }
+      
       // let deptId=''
       // if(this.formData.deptId){
       //    deptId = this.formData.deptId.at(-1);

src/views/PeopleManage/mixin.js

@@ -1,147 +1,151 @@
-export default { // 导出混入对象
+export default (params) => { // 导出混入对象
+  const { //树分类过滤参数
+    treeTypeNum=2
+  } = params;
+  return {
     data() {
       return {
         nationalList: [
-            "汉族",
-            "壮族",
-            "满族",
-            "回族",
-            "苗族",
-            "维吾尔族",
-            "土家族",
-            "彝族",
-            "蒙古族",
-            "藏族",
-            "布依族",
-            "侗族",
-            "瑶族",
-            "朝鲜族",
-            "白族",
-            "哈尼族",
-            "哈萨克族",
-            "黎族",
-            "傣族",
-            "畲族",
-            "傈僳族",
-            "仡佬族",
-            "东乡族",
-            "高山族",
-            "拉祜族",
-            "水族",
-            "佤族",
-            "纳西族",
-            "羌族",
-            "土族",
-            "仫佬族",
-            "锡伯族",
-            "柯尔克孜族",
-            "达斡尔族",
-            "景颇族",
-            "毛南族",
-            "撒拉族",
-            "布朗族",
-            "塔吉克族",
-            "阿昌族",
-            "普米族",
-            "鄂温克族",
-            "怒族",
-            "京族",
-            "基诺族",
-            "德昂族",
-            "保安族",
-            "俄罗斯族",
-            "裕固族",
-            "乌兹别克族",
-            "门巴族",
-            "鄂伦春族",
-            "独龙族",
-            "塔塔尔族",
-            "赫哲族",
-            "珞巴族",
-          ],
+          "汉族",
+          "壮族",
+          "满族",
+          "回族",
+          "苗族",
+          "维吾尔族",
+          "土家族",
+          "彝族",
+          "蒙古族",
+          "藏族",
+          "布依族",
+          "侗族",
+          "瑶族",
+          "朝鲜族",
+          "白族",
+          "哈尼族",
+          "哈萨克族",
+          "黎族",
+          "傣族",
+          "畲族",
+          "傈僳族",
+          "仡佬族",
+          "东乡族",
+          "高山族",
+          "拉祜族",
+          "水族",
+          "佤族",
+          "纳西族",
+          "羌族",
+          "土族",
+          "仫佬族",
+          "锡伯族",
+          "柯尔克孜族",
+          "达斡尔族",
+          "景颇族",
+          "毛南族",
+          "撒拉族",
+          "布朗族",
+          "塔吉克族",
+          "阿昌族",
+          "普米族",
+          "鄂温克族",
+          "怒族",
+          "京族",
+          "基诺族",
+          "德昂族",
+          "保安族",
+          "俄罗斯族",
+          "裕固族",
+          "乌兹别克族",
+          "门巴族",
+          "鄂伦春族",
+          "独龙族",
+          "塔塔尔族",
+          "赫哲族",
+          "珞巴族",
+        ],
         sexoptions: JSON.parse(localStorage.getItem("sexOptions")),
-        postOption:[],
-        bloodOption:[
-            {
-                label:'A型',
-                value:'A型'
-            }, {
-                label:'B型',
-                value:'B型'
-            }, {
-                label:'O型',
-                value:'O型'
-            }, {
-                label:'AB型',
-                value:'AB型'
-            }, 
+        postOption: [],
+        bloodOption: [
+          {
+            label: 'A型',
+            value: 'A型'
+          }, {
+            label: 'B型',
+            value: 'B型'
+          }, {
+            label: 'O型',
+            value: 'O型'
+          }, {
+            label: 'AB型',
+            value: 'AB型'
+          },
+        ],
+        educationOption: [
+          {
+            label: '小学',
+            value: '小学'
+          }, {
+            label: '初中',
+            value: '初中'
+          }, {
+            label: '高中',
+            value: '高中'
+          }, {
+            label: '专科',
+            value: '专科'
+          }, {
+            label: '本科',
+            value: '本科'
+          }, {
+            label: '硕士',
+            value: '硕士'
+          }, {
+            label: '博士',
+            value: '博士'
+          },
         ],
-        educationOption:[
+        healthOption: [
           {
-              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:'再婚'
-        }, 
-      ],
+            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")
-          ),
+          localStorage.getItem("user_statusoptions")
+        ),
         roles: JSON.parse(localStorage.getItem("find_all")),
         /**Split 开始 */
         ztreeNodes: [],
@@ -164,24 +168,24 @@ export default { // 导出混入对象
         },
         currentTreeNode: null,
         //----ztreeLeft end---------
-        }
-      },
-      created() {
-        this.$api.role.postViewAll().then((res) => {
-          res.data.forEach(ele=>{
-            ele.postId=ele.postId+''
-          })
-          this.postOption = res.data
+      }
+    },
+    created() {
+      this.$api.role.postViewAll().then((res) => {
+        res.data.forEach(ele => {
+          ele.postId = ele.postId + ''
         })
-    this.findLeftTreeData(); // 获取机构树的数据
+        this.postOption = res.data
+      })
+      this.findLeftTreeData(); // 获取机构树的数据
 
-      },
-      mounted() {
-        //用像素初始化左边的split的宽度
-        this.changeTreeWidth(240); // 初始化树的宽度
-      },
-   methods:{
-    changeTreeWidth(widthVal) {
+    },
+    mounted() {
+      //用像素初始化左边的split的宽度
+      this.changeTreeWidth(240); // 初始化树的宽度
+    },
+    methods: {
+      changeTreeWidth(widthVal) {
         // 初始化树的宽度
         this.leftSplitWidth = Math.ceil(
           (widthVal / this.$refs.elMain.$el.clientWidth) * 100
@@ -189,18 +193,19 @@ export default { // 导出混入对象
         this.rightSplitWidth = 100 - this.leftSplitWidth;
       },
       findLeftTreeData: function () {
-        this.$api.dept.findDeptTree().then((res) => {
-          this.treeDataRecursion(res.data, 2);
+        this.$api.dept.findTree().then((res) => {
+          // console.log(treeTypeNum);
+          this.treeDataRecursion(res.data, treeTypeNum);
           this.ztreeNodes = res.data;
         });
       },
-       //树过滤五级机构递归
-       treeDataRecursion(data, num, one) {
+      //树过滤五级机构递归
+      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) {
+          if (data[i].comlevel == 5 && (data[i].managementSource != num)) {
             data.splice(i, 1);
             i = i - 1;
           } else {
@@ -208,6 +213,7 @@ export default { // 导出混入对象
           }
         }
       },
-     
-   }
-  }
+
+    }
+  }
+}

src/views/Sys/User.vue

@@ -263,7 +263,7 @@
       //--left tree start-------
       findLeftTreeData: function() {
         // 获取数据
-        this.$api.dept.findLeftDeptTree(this.peopledeptid).then(res => {
+        this.$api.dept.findTree().then(res => {
           this.ztreeNodes = res.data;
         });
       },