fix:优化

src/components/form/FormRow.vue

@@ -41,7 +41,6 @@
         style="width: 100%"
         v-model="formState.cityId"
         placeholder="请选择市机构"
-        @change="cityHandleChange"
         allowClear
       >
         <a-select-option
@@ -135,6 +134,28 @@
         allowClear
       ></a-input>
     </a-form-item>
+    <a-form-item
+      label="管理人"
+      :labelCol="{ span: 5 }"
+      :colon="false"
+      v-show="showManage"
+    >
+      <a-select
+        placeholder="请选择"
+        v-model="formState.leaderId"
+        allowClear
+        show-search
+        :filter-option="filterOption"
+      >
+        <a-select-option
+          v-for="item in manageList"
+          :key="item.id"
+          :value="item.id"
+        >
+          {{ item.name }}
+        </a-select-option>
+      </a-select>
+    </a-form-item>
     <a-form-item
       label="             "
       :labelCol="{ span: 5 }"
@@ -153,11 +174,13 @@
 </template>
 
 <script>
+import manageminxin from "../../minins/manageMixin";
+
 import mixin from "../../minins/mixin";
 
 export default {
   name: "FormRow",
-  mixins: [mixin],
+  mixins: [mixin, manageminxin],
   props: {
     formState: {},
     search: {
@@ -175,6 +198,9 @@ export default {
     showStore: {
       default: true,
     },
+    showManage: {
+      default: false,
+    },
   },
   watch: {
     "formState.provinceId"(val) {
@@ -188,6 +214,13 @@ export default {
     },
   },
   methods: {
+    filterOption(input, option) {
+      return (
+        option.componentOptions.children[0].text
+          .toLowerCase()
+          .indexOf(input.toLowerCase()) >= 0
+      );
+    },
     wholeHandleChange(val) {
       if (val) {
         this.getProvinceList(this.formState.whole);

src/components/tree/agentChanell.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="tree">
     <a-tree
-      v-if="treeData && treeData.length > 0 && type"
+      v-if="treeData && treeData.length > 0 && type == 'a'"
       :tree-data="treeData"
       :title="'11'"
       :replaceFields="replaceFields"
@@ -11,8 +11,6 @@
       @check="onCheck"
       v-model="checkList"
       :auto-expand-parent="autoExpandParent"
-      :expanded-keys="expandedKeys"
-      @expand="onExpand"
       ref="tree"
     >
       <template slot="custom" slot-scope="item">
@@ -21,7 +19,7 @@
       </template>
     </a-tree>
     <a-tree
-      v-if="userTreeData && userTreeData.length > 0 && type == false"
+      v-if="userTreeData && userTreeData.length > 0 && type == 'b'"
       :tree-data="userTreeData"
       :title="'11'"
       :replaceFields="replaceFields"
@@ -30,8 +28,6 @@
       @check="onCheck"
       v-model="checkList"
       :auto-expand-parent="autoExpandParent"
-      :expanded-keys="expandedKeys"
-      @expand="onExpand"
       ref="tree"
     >
       <template slot="custom" slot-scope="item">

src/layouts/AdminLayout.vue

@@ -131,7 +131,7 @@ export default {
     },
     sideMenuData() {
       const { layout, menuData, subMenu } = this;
-      console.log(subMenu);
+      // //console.log(subMenu);
 
       return layout === "mix" ? subMenu : menuData;
     },

src/pages/agreement/index.vue

@@ -29,7 +29,48 @@
       </a-button>
     </a-row>
     <div class="main">
-      <fromRow :formState="formState" @getList="search" :showTab="3"></fromRow>
+      <fromRow :formState="formState" @getList="search" :showTab="3"> </fromRow>
+      <a-form layout="inline" :model="formState" class="form">
+        <a-form-item label="是否有效" :labelCol="{ span: 6 }" :colon="false">
+          <a-select
+            placeholder="请选择"
+            v-model="formState.validStatus"
+            allowClear
+            :filter-option="filterOption"
+            style="width: 200px"
+          >
+            <a-select-option value="1">
+              {{ "有效" }}
+            </a-select-option>
+            <a-select-option value="0">
+              {{ "无效" }}
+            </a-select-option>
+          </a-select>
+        </a-form-item>
+        <a-form-item label="是否启用" :labelCol="{ span: 6 }" :colon="false">
+          <a-select
+            placeholder="请选择"
+            v-model="formState.isEenabled"
+            allowClear
+            :filter-option="filterOption"
+            style="width: 200px"
+          >
+            <a-select-option value="1">
+              {{ "启用" }}
+            </a-select-option>
+            <a-select-option value="0">
+              {{ "禁用" }}
+            </a-select-option>
+          </a-select>
+        </a-form-item>
+        <a-form-item label="对接人" :labelCol="{ span: 6 }" :colon="false">
+          <a-input
+            placeholder="请输入手机号"
+            v-model="formState.dockingPerson"
+            allowClear
+          ></a-input>
+        </a-form-item>
+      </a-form>
       <standard-table
         bordered
         :columns="columns"
@@ -42,7 +83,7 @@
         <div slot="validStatus" slot-scope="{ record }">
           <!-- {{text}} -->
           <a-tag
-            v-if="record.isEenabled == 1"
+            v-if="record.validStatus == 1"
             style="
               background: rgba(120, 148, 242, 0.2);
               border-radius: 2px 2px 2px 2px;
@@ -91,7 +132,7 @@ const columns = [
     width: "100px",
   },
   {
-    title: "协议名称",
+    title: "协议描述",
     dataIndex: "agreeName",
     scopedSlots: { customRender: "agreeName" },
   },
@@ -330,6 +371,9 @@ export default {
     padding: 15px;
     box-sizing: border-box;
   }
+  .ant-form.form {
+    padding-top: 0;
+  }
 }
 .insurer-list {
   // display:flex;

src/pages/business/agent.vue

@@ -3,17 +3,27 @@
     <div class="quote-tree" style="border-radius: 8px">
       <div>
         <h2>组织树</h2>
-        <!-- <a-tabs default-active-key="1" :tab-position="tabPosition">
-          <a-tab-pane key="1" tab="Tab 1"> 部门 </a-tab-pane>
-          <a-tab-pane key="2" tab="Tab 2"> 人员 </a-tab-pane>
+        <!-- <a-tabs default-active-key="true" :tab-position="tabPosition">
+          <a-tab-pane key="true" tab="Tab 1"> 部门 </a-tab-pane>
+          <a-tab-pane key="false" tab="Tab 2"> 人员 </a-tab-pane>
         </a-tabs> -->
-        <a-switch
+        <!-- <a-switch
           v-model="radio"
           checked-children="机构"
           un-checked-children="人员"
           default-checked
           :disabled="disabled"
-        />
+        /> -->
+        <a-radio-group
+          default-value="a"
+          button-style="solid"
+          v-model="radio"
+          style="margin-left: 10px"
+          size="small"
+        >
+          <a-radio-button value="a"> 机构 </a-radio-button>
+          <a-radio-button value="b"> 人员 </a-radio-button>
+        </a-radio-group>
       </div>
       <div>
         <!-- <a-tree  :tree-data="treeData" /> -->
@@ -209,6 +219,10 @@ const columns = [
     title: "工号",
     dataIndex: "userId",
   },
+  {
+    title: "归属机构",
+    dataIndex: "deptName",
+  },
   {
     title: "机构来源",
     dataIndex: "managementSource",
@@ -285,9 +299,9 @@ export default {
         { title: "Tree Node", key: "2", isLeaf: true },
       ],
       amount: {},
-      radio: true,
+      radio: "a",
       disabled: false,
-      treeType: "",
+      treeType: 1,
     };
   },
   mounted() {
@@ -304,7 +318,7 @@ export default {
     },
     chooseUser(val) {
       this.formState.treeUserId = val.id;
-      if (val.type) {
+      if (val.type == "a") {
         this.treeType = 1;
       } else {
         this.treeType = 2;

src/pages/business/channel.vue

@@ -3,13 +3,16 @@
     <div class="quote-tree" style="border-radius: 8px">
       <div>
         <h2>组织树</h2>
-        <a-switch
+        <a-radio-group
+          default-value="a"
+          button-style="solid"
           v-model="radio"
-          checked-children="机构"
-          un-checked-children="人员"
-          default-checked
-          :disabled="disabled"
-        />
+          style="margin-left: 10px"
+          size="small"
+        >
+          <a-radio-button value="a"> 机构 </a-radio-button>
+          <a-radio-button value="b"> 人员 </a-radio-button>
+        </a-radio-group>
       </div>
       <div>
         <!-- <a-tree  :tree-data="treeData" /> -->
@@ -205,6 +208,10 @@ const columns = [
     dataIndex: "userId",
     // scopedSlots: { customRender: "parterCompanyName" },
   },
+  {
+    title: "归属机构",
+    dataIndex: "deptName",
+  },
   {
     title: "机构来源",
     dataIndex: "managementSource",
@@ -281,7 +288,7 @@ export default {
       ],
       amount: {},
       treeType: "",
-      radio: true,
+      radio: "a",
       disabled: false,
     };
   },
@@ -299,7 +306,7 @@ export default {
     },
     chooseUser(val) {
       this.formState.treeUserId = val.id;
-      if (val.type) {
+      if (val.type == "a") {
         this.treeType = 1;
       } else {
         this.treeType = 2;

src/pages/financial/receivables.vue

@@ -84,7 +84,7 @@ const columns = [
   },
   {
     title: "未收",
-    dataIndex: "readyCommissionFeevalue",
+    dataIndex: "noSettlementAmount",
     // scopedSlots: { customRender: "qutationCount" },
 
     // sorter: true,
@@ -98,7 +98,7 @@ const columns = [
   },
   {
     title: "开票未结算",
-    dataIndex: "noSettlementAmount",
+    dataIndex: "readyCommissionFeevalue",
     needTotal: true,
     // scopedSlots: { customRender: "qutationCount" },
   },

src/pages/financial/verification.vue

@@ -63,6 +63,35 @@
         <a-radio-button value="交三"> 交三 </a-radio-button>
         <a-radio-button value="交商"> 交商 </a-radio-button>
       </a-radio-group>
+      <a-form layout="inline" :model="formState" class="users">
+        <a-form-item label="保险公司" :labelCol="{ span: 8 }" :colon="false">
+          <a-select
+            placeholder="请选择"
+            v-model="formState.leaderId"
+            allowClear
+            show-search
+            :filter-option="filterOption"
+          >
+            <a-select-option
+              v-for="item in manageList"
+              :key="item.id"
+              :value="item.id"
+            >
+              {{ item.name }}
+            </a-select-option>
+          </a-select>
+        </a-form-item>
+        <a-form-item label="审核人员" :labelCol="{ span: 8 }" :colon="false">
+          <a-input
+            placeholder="请输入审核人员"
+            v-model="formState.userId"
+            allowClear
+          ></a-input>
+        </a-form-item>
+
+        <a-form-item label="审核时间" :labelCol="{ span: 5 }" :colon="false">
+        </a-form-item>
+      </a-form>
     </div>
     <standard-table
       bordered
@@ -79,6 +108,13 @@
       <div slot="quotationRate" slot-scope="{ text }">
         {{ (text * 100).toFixed(2) + "%" }}
       </div>
+      <template slot="footer">
+        <div>合计</div>
+        <div>已审（条）:{{ totalObj.allAuditstatusOrders }}</div>
+        <div>自动：{{ totalObj.allAutomaticAudit }}</div>
+        <div>人工：{{ totalObj.allPersionAudit }}</div>
+        <div>未审（条）：{{ totalObj.allAuditOrder }}</div>
+      </template>
     </standard-table>
   </div>
 </template>
@@ -160,6 +196,7 @@ export default {
       cityList: [],
       areaList: [],
       storeList: [],
+      totalObj: {},
     };
   },
   watch: {
@@ -192,9 +229,9 @@ export default {
       this.getStoreList(this.formState.countyId);
     },
 
-    getVerification() {
+    async getVerification() {
       this.loading = true;
-      this.$API.financial
+      await this.$API.financial
         .getVerificationList({
           pageNum: this.pagination.current,
           pageSize: this.pagination.defaultPageSize,
@@ -203,7 +240,7 @@ export default {
         .then((res) => {
           if (res.data.code === 200) {
             this.loading = false;
-            this.tableList = res.data.data.records;
+            this.tableList = [...res.data.data.records];
             this.pagination = {
               current: res.data.data.current,
               defaultPageSize: res.data.data.size,
@@ -211,6 +248,27 @@ export default {
             };
           }
         });
+      await this.$API.financial
+        .getCostCenterTotal({
+          pageNum: this.pagination.current,
+          pageSize: this.pagination.defaultPageSize,
+          ...this.formState,
+        })
+        .then((res) => {
+          if (res.data.code === 200) {
+            this.totalObj = { ...res.data.data };
+            // this.pagination.defaultPageSize =
+            //   this.pagination.defaultPageSize + 1;
+            // this.tableList.push({
+            //   insuranceCompanyName: "合计",
+            //   auditstatusOrders: res.data.data.allAuditstatusOrders,
+            //   automaticAudit: res.data.data.allAutomaticAudit,
+            //   persionAudit: res.data.data.allPersionAudit,
+            //   auditOrder: res.data.data.allAuditOrder,
+            // });
+            // console.log(this.tableList);
+          }
+        });
     },
     onClear() {
       this.$message.info("您清空了勾选的所有行");
@@ -289,4 +347,10 @@ export default {
     }
   }
 }
+/deep/.ant-table.ant-table-bordered .ant-table-footer {
+  display: flex;
+  > div {
+    flex: 1;
+  }
+}
 </style>

src/pages/personnelManage/channel.vue

@@ -78,7 +78,7 @@
             allowClear
           ></a-input>
         </a-form-item>
-        <a-form-item label="管理员" :labelCol="{ span: 5 }" :colon="false">
+        <a-form-item label="管理人" :labelCol="{ span: 5 }" :colon="false">
           <a-select
             style="width: 300px"
             placeholder="请选择"
@@ -300,6 +300,7 @@ export default {
           totalManpower: item.totalManpower,
           totalPremium: item.totalPremium,
           orderManpower: item.orderManpower,
+          time: this.formState.time,
         },
       });
     },

src/pages/personnelManage/channel/message.vue

@@ -197,7 +197,7 @@ export default {
         // phoneNumber: "",
         // name: "",
         // userCode: "",
-        time: "",
+        time: [],
         days: undefined,
         createtimeEnd: undefined,
         createtimeStart: undefined,
@@ -228,7 +228,12 @@ export default {
     },
   },
   created() {
-    this.getList();
+    this.$nextTick(() => {
+      this.formState.time = this.$route.query.time;
+      this.formState.createtimeStart = this.$route.query.time[0];
+      this.formState.createtimeEnd = this.$route.query.time[1];
+      this.getList();
+    });
   },
   methods: {
     handleFinish() {
@@ -239,6 +244,7 @@ export default {
         path: "/personnelManage/channel/task",
         query: {
           userId: item.userId,
+          time: this.formState.time,
         },
       });
     },
@@ -247,6 +253,7 @@ export default {
         path: "/personnelManage/channel/order",
         query: {
           userId: item.userId,
+          time: this.formState.time,
         },
       });
     },
@@ -258,6 +265,7 @@ export default {
       this.$API.personnel
         .getTeamUserDetails({
           userId: item.userId,
+          ...this.formState,
         })
         .then((res) => {
           if (res.data.code === 200) {

src/pages/personnelManage/channel/order.vue

@@ -10,7 +10,10 @@
     <div class="back-line-main">
       <div class="back-line-header" v-show="mode == 'big'">
         <div class="back-line-header-title">
-          <h2>合计</h2>
+          <h2>
+            <a-icon type="arrow-left" @click="$router.back()" />
+            合计
+          </h2>
           <div>
             <dl>
               <dt><img src="../../../assets/img/car.png" alt="" /></dt>
@@ -373,7 +376,11 @@ export default {
     },
   },
   mounted() {
+    this.formState.time = this.$route.query.time;
+    this.formState.beginDate = this.$route.query.time[0];
+    this.formState.endDate = this.$route.query.time[1];
     this.getVerification();
+
     // setTimeout(() => {
     // }, 1000);
   },

src/pages/personnelManage/channel/task.vue

@@ -2,7 +2,10 @@
   <div class="back-line-main">
     <div class="back-line-header">
       <div class="back-line-header-title">
-        <h2>渠道数据</h2>
+        <h2>
+          <a-icon type="arrow-left" @click="$router.back()" />
+          渠道数据
+        </h2>
         <div>
           <span>时间筛选</span>
           <a-range-picker
@@ -229,6 +232,10 @@ export default {
     },
   },
   mounted() {
+    this.formState.time = this.$route.query.time;
+    this.formState.beginDate = this.$route.query.time[0];
+    this.formState.endDate = this.$route.query.time[1];
+
     this.getList();
     // setTimeout(() => {
 

src/pages/personnelManage/front/order.vue

@@ -10,7 +10,7 @@
     <div class="back-line-main">
       <div class="back-line-header">
         <div class="back-line-header-title">
-          <h2>财务应收</h2>
+          <h2><a-icon type="arrow-left" @click="$router.back()" />财务应收</h2>
           <div>
             <span>时间筛选</span>
             <a-range-picker
@@ -255,6 +255,9 @@ export default {
     };
   },
   mounted() {
+    this.formState.time = this.$route.query.time;
+    this.formState.beginDate = this.$route.query.time[0];
+    this.formState.endDate = this.$route.query.time[1];
     this.getVerification();
 
     // setTimeout(() => {

src/pages/personnelManage/front/personnel.vue

@@ -17,10 +17,12 @@
       <fromRow
         :formState="formState"
         @getList="query"
-        :search="false"
+        :search="true"
+        :showManage="true"
         :className="'item-4'"
       ></fromRow>
-      <div
+
+      <!-- <div
         style="
           display: flex;
           align-items: center;
@@ -30,7 +32,7 @@
         "
       >
         <a-button type="primary" @click="query">查询</a-button>
-      </div>
+      </div> -->
       <a-spin :spinning="loading">
         <a-row class="personnel-message">
           <a-col v-for="(item, index) in list" :key="item.userId" :span="5">
@@ -249,6 +251,7 @@ export default {
         createtimeEnd: moment().format("YYYY-MM-DD"),
         time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")],
         days: undefined,
+        leaderId: undefined,
       },
       rankForm: {
         provinceId: "140000",
@@ -388,6 +391,7 @@ export default {
           totalManpower: item.totalManpower,
           totalPremium: item.totalPremium,
           orderManpower: item.orderManpower,
+          time: this.formState.time,
         },
       });
     },
@@ -438,7 +442,7 @@ export default {
     .ant-form {
       display: flex;
       flex-wrap: wrap;
-      justify-content: flex-end;
+      // justify-content: flex-end;
       > .ant-form-item {
         flex: none;
         width: 23%;

src/pages/personnelManage/front/resources.vue

@@ -247,6 +247,7 @@ export default {
           totalManpower: item.totalManpower,
           totalPremium: item.totalPremium,
           orderManpower: item.orderManpower,
+          time: this.formState.time,
         },
       });
     },

src/pages/personnelManage/front/task.vue

@@ -2,7 +2,7 @@
   <div class="back-line-main">
     <div class="back-line-header">
       <div class="back-line-header-title">
-        <h2>渠道数据</h2>
+        <h2><a-icon type="arrow-left" @click="$router.back()" />渠道数据</h2>
         <div>
           <span>时间筛选</span>
           <a-range-picker
@@ -229,6 +229,9 @@ export default {
     },
   },
   mounted() {
+    this.formState.time = this.$route.query.time;
+    this.formState.beginDate = this.$route.query.time[0];
+    this.formState.endDate = this.$route.query.time[1];
     this.getList();
     // setTimeout(() => {
 

src/pages/personnelManage/front/teammanage.vue

@@ -256,6 +256,7 @@ export default {
         path: "/personnelManage/front/task",
         query: {
           userId: item.userId,
+          time: this.$route.query.time,
         },
       });
     },
@@ -264,6 +265,7 @@ export default {
         path: "/personnelManage/front/order",
         query: {
           userId: item.userId,
+          time: this.$route.query.time,
         },
       });
     },

src/pages/sys/permissionsAuth.vue

@@ -55,7 +55,7 @@
               ></a-input>
             </a-form-item>
 
-            <a-form-item label="管理员" :labelCol="{ span: 5 }" :colon="false">
+            <a-form-item label="管理人" :labelCol="{ span: 5 }" :colon="false">
               <a-select
                 style="width: 200px"
                 placeholder="请选择"

src/pages/task/agent.vue

@@ -73,7 +73,7 @@
           ></a-input>
         </a-form-item>
 
-        <a-form-item label="管理员" :labelCol="{ span: 5 }" :colon="false">
+        <a-form-item label="管理人" :labelCol="{ span: 5 }" :colon="false">
           <a-select
             placeholder="请选择"
             v-model="formState.leaderId"
@@ -472,6 +472,13 @@ export default {
     // }, 1000);
   },
   methods: {
+    filterOption(input, option) {
+      return (
+        option.componentOptions.children[0].text
+          .toLowerCase()
+          .indexOf(input.toLowerCase()) >= 0
+      );
+    },
     watchMessage(item) {
       //
       this.detailsObj = { ...item };

src/pages/task/channel.vue

@@ -81,7 +81,7 @@
             ></a-input>
           </a-form-item>
 
-          <a-form-item label="管理员" :labelCol="{ span: 5 }" :colon="false">
+          <a-form-item label="管理人" :labelCol="{ span: 5 }" :colon="false">
             <a-select
               placeholder="请选择"
               v-model="formState.leaderId"
@@ -99,7 +99,7 @@
             </a-select>
           </a-form-item>
         </a-form>
-        <!-- <a-form-item label="管理员" :labelCol="{ span: 5 }" :colon="false">
+        <!-- <a-form-item label="管理人" :labelCol="{ span: 5 }" :colon="false">
           <a-select
             style="width: 300px"
             placeholder="请选择"
@@ -499,6 +499,13 @@ export default {
     // }, 1000);
   },
   methods: {
+    filterOption(input, option) {
+      return (
+        option.componentOptions.children[0].text
+          .toLowerCase()
+          .indexOf(input.toLowerCase()) >= 0
+      );
+    },
     watchMessage(item) {
       //
       this.detailsObj = { ...item };

src/pages/wallet/channel.vue

@@ -135,6 +135,9 @@
                 <p>
                   <span>已提现：{{ item.withdrawn || 0 }}</span>
                 </p>
+                <p>
+                  <span>提现中：{{ item.withdrawingAmount || 0 }}</span>
+                </p>
                 <p>
                   <span>未提现：{{ item.notWithdrawn || 0 }}</span>
                 </p>

src/router/config.js

@@ -198,7 +198,7 @@ router.beforeEach(async (to, from, next) => {
 
 
   let userInfo = store.state.setting.userInfo
-  console.log(to)
+  //console.log(to)
   // let token = Cookies.get('Authorization')
 
   if (!to.matched.some(record => record.meta.requiresAuth)) {

src/services/financial.js

@@ -19,6 +19,10 @@ export async function getMonthReceivablesList(data) {
 export async function getCarList(data) {
     return request("/financialReceivables/queryPrivateCar", METHOD.POST, data)
 }
+//获取费用校验合计
+export async function getCostCenterTotal(data) {
+    return request("/taskStatistics/costCenterTotal", METHOD.POST, data)
+}
 
 
 
@@ -26,5 +30,6 @@ export default {
     getVerificationList,
     getReceivablesList,
     getMonthReceivablesList,
-    getCarList
+    getCarList,
+    getCostCenterTotal
 }