From facb80c84fb77e0003213572cfa1851017286584 Mon Sep 17 00:00:00 2001
From: su1124 <1583764726@qq.com>
Date: 星期五, 08 三月 2024 14:43:23 +0800
Subject: [PATCH] su

---
 src/views/hosp/about/index.vue         |  181 +----
 src/views/system/biol/index.vue        |   20 
 src/views/hosp/Summary/index.vue       |   20 
 src/views/hosp/extension/index.vue     |   24 
 src/views/team/reporting/index.vue     |   39 
 src/views/hosp/settlement/index.vue    |  210 +----
 src/views/team/reportresults/index.vue |   17 
 src/views/team/teams/index.vue         | 1484 ++++++++++++++++++++++++-------------------
 src/views/team/disease/index.vue       |   19 
 9 files changed, 1,012 insertions(+), 1,002 deletions(-)

diff --git a/src/views/hosp/Summary/index.vue b/src/views/hosp/Summary/index.vue
index 4e65302..99cc69b 100644
--- a/src/views/hosp/Summary/index.vue
+++ b/src/views/hosp/Summary/index.vue
@@ -61,7 +61,6 @@
 import { getlistWater, getWater, getdatalist, addTjSummary, getNewDate, getbigntime } from "@/api/hosp/water";
 import { getInfo } from "@/api/login";
 import moment from "moment";
-import {getNewDateList} from "@/api/hosp/order";
 export default {
   name: "Water",
   data() {
@@ -137,26 +136,15 @@
           this.queryParams.tollCollectorId = response.user.userId;
         });
       });
-      // getNewDate().then((response) => {
-      //   if (response.code === 200) {
-      //     this.queryParams.accountEndTime = moment(response.data).format("YYYY-MM-DD HH:mm:ss")
-      //   }
-      // });
-      getNewDateList().then((response) => {
+      getNewDate().then((response) => {
         if (response.code === 200) {
-          this.queryParams.accountEndTime = moment(response.data).format("YYYY-MM-DD 23:59:00")
+          this.queryParams.accountEndTime = moment(response.data).format("YYYY-MM-DD HH:mm:ss")
         }
       });
-      // getbigntime().then((response) => {
-      //   if (response.code === 200) {
-      //     this.queryParams.accountBeginTime =
-      //       moment(response.data).format("YYYY-MM-DD HH:mm:ss")
-      //   }
-      // });
-      getNewDateList().then((response) => {
+      getbigntime().then((response) => {
         if (response.code === 200) {
           this.queryParams.accountBeginTime =
-            moment(response.data).format("YYYY-MM-DD 00:00:00")
+            moment(response.data).format("YYYY-MM-DD HH:mm:ss")
         }
       });
     },
diff --git a/src/views/hosp/about/index.vue b/src/views/hosp/about/index.vue
index abbc99b..2218f17 100644
--- a/src/views/hosp/about/index.vue
+++ b/src/views/hosp/about/index.vue
@@ -1,154 +1,63 @@
 <template>
   <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="110px"
-    >
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="110px">
       <el-row>
         <el-col :span="6">
-          <el-form-item
-            label="浜ゆ鍛�"
-            prop="tollCollectorName"
-            style="display: flex"
-          >
-            <el-select
-              v-model="queryParams.tollCollectorName"
-              filterable
-              placeholder="璇烽�夋嫨浜ゆ鍛�"
-              clearable
-              @clear="getCompanyList"
-              @change="idFn"
-            >
-              <el-option
-                v-for="dict in CompanyList"
-                :key="dict.userId"
-                :label="dict.nickName"
-                :value="dict.userId"
-              />
+          <el-form-item label="浜ゆ鍛�" prop="tollCollectorName" style="display: flex;">
+            <el-select v-model="queryParams.tollCollectorName" filterable placeholder="璇烽�夋嫨浜ゆ鍛�" clearable
+              @clear="getCompanyList" @change="idFn">
+              <el-option v-for="dict in CompanyList" :key="dict.userId" :label="dict.nickName" :value="dict.userId" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="14">
-          <el-form-item
-            label="浜よ处鏃堕棿"
-            prop="tollCollectorName"
-            style="display: flex"
-          >
-            <el-date-picker
-              v-model="value1"
-              type="datetimerange"
-              :picker-options="pickerOptions"
-              :default-time="['00:00:00', '23:59:00']"
-              format="yyyy-MM-dd HH:mm"
-              value-format="yyyy-MM-dd HH:mm"
-              start-placeholder="璧锋鏃ユ湡"
-              end-placeholder="缁堟鏃ユ湡"
-            >
+          <el-form-item label="浜よ处鏃堕棿" prop="tollCollectorName" style="display: flex;">
+            <el-date-picker v-model="value1" type="datetimerange" :picker-options="pickerOptions"
+              value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="璧锋鏃ユ湡" end-placeholder="缁堟鏃ユ湡"
+              :default-time="['12:00:00']">
             </el-date-picker>
           </el-form-item>
         </el-col>
         <el-col :span="3">
           <el-form-item>
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="handleQuery"
-              >鎼滅储</el-button
-            >
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
           </el-form-item>
         </el-col>
       </el-row>
+
+
+
     </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button icon="el-icon-edit" size="mini" @click="handleDelete"
-          >鎾ら攢</el-button
-        >
+        <el-button icon="el-icon-edit" size="mini" @click="handleDelete">鎾ら攢</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button icon="el-icon-edit" size="mini" @click="handledocument"
-          >琛ユ墦鍗曟嵁</el-button
-        >
+        <el-button icon="el-icon-edit" size="mini" @click="handledocument">琛ユ墦鍗曟嵁</el-button>
       </el-col>
     </el-row>
 
-    <el-table
-      :row-class-name="tableRowClassName"
-      style="width: 80%"
-      :data="tableData"
-      @selection-change="handleSelect"
-      ref="multipleTable"
-      border
-    >
+    <el-table :row-class-name="tableRowClassName" style="width: 80%" :data="tableData" @selection-change="handleSelect"
+      ref="multipleTable" border>
       <el-table-column type="selection" width="55"> </el-table-column>
-      <el-table-column
-        label="浜ゆ鍛�"
-        align="center"
-        prop="tollCollector"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="鏀惰垂閲戦"
-        align="center"
-        prop="amountReceived"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="閫�璐归噾棰�"
-        align="center"
-        prop="refundAmount"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="搴斾氦娆�"
-        align="center"
-        prop="payable"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="浜よ处鏃堕棿"
-        align="center"
-        prop="createTime"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="璧锋鏃堕棿"
-        align="center"
-        prop="accountBeginTime"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="鎴鏃堕棿"
-        align="center"
-        prop="accountEndTime"
-        :show-overflow-tooltip="true"
-      />
+      <el-table-column label="浜ゆ鍛�" align="center" prop="tollCollector" :show-overflow-tooltip="true" />
+      <el-table-column label="鏀惰垂閲戦" align="center" prop="amountReceived" :show-overflow-tooltip="true" />
+      <el-table-column label="閫�璐归噾棰�" align="center" prop="refundAmount" :show-overflow-tooltip="true" />
+      <el-table-column label="搴斾氦娆�" align="center" prop="payable" :show-overflow-tooltip="true" />
+      <el-table-column label="浜よ处鏃堕棿" align="center" prop="createTime" :show-overflow-tooltip="true" />
+      <el-table-column label="璧锋鏃堕棿" align="center" prop="accountBeginTime" :show-overflow-tooltip="true" />
+      <el-table-column label="鎴鏃堕棿" align="center" prop="accountEndTime" :show-overflow-tooltip="true" />
     </el-table>
 
     <div class="pag">
       <div class="pag1">
-        <pagination
-          v-show="total > 0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-        />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+          @pagination="getList" />
       </div>
     </div>
 
-    <el-table
-      :data="allList"
-      style="margin-top: 60px; width: 80%"
-      show-summary
-      border
-    >
+    <el-table :data="allList" style="margin-top: 60px; width: 80%" show-summary border>
       <el-table-column label="浠樻鏂瑰紡" align="center" prop="payType" />
       <el-table-column label="鏀惰垂閲戦" align="center" prop="amountReceived">
       </el-table-column>
@@ -159,13 +68,7 @@
 </template>
   
 <script>
-import { getNewDateList } from "@/api/hosp/order";
-import {
-  getcolllist,
-  getdatalist,
-  delById,
-  getNewDate,
-} from "@/api/hosp/water";
+import { getcolllist, getdatalist, delById, getNewDate } from "@/api/hosp/water";
 import { getInfo } from "@/api/login";
 import moment from "moment";
 
@@ -257,6 +160,7 @@
   created() {
     this.getList();
     this.getCompanyList();
+
   },
   methods: {
     /** 鏌ヨ浣撴娴佹按鍒楄〃 */
@@ -266,19 +170,11 @@
         this.queryParams.tollCollectorName = response.user.nickName;
       });
 
-      // getNewDate().then((response) => {
-      //   if (response.code === 200) {
-      //     this.value1 = [
-      //       moment(response.data).format("YYYY-MM-DD 00:00:00"),
-      //       moment(response.data).format("YYYY-MM-DD HH:mm:ss"),
-      //     ];
-      //   }
-      // });
-      getNewDateList().then((response) => {
+      getNewDate().then((response) => {
         if (response.code === 200) {
           this.value1 = [
             moment(response.data).format("YYYY-MM-DD 00:00:00"),
-            moment(response.data).format("YYYY-MM-DD 23:59:00"),
+            moment(response.data).format("YYYY-MM-DD HH:mm:ss")
           ];
         }
       });
@@ -341,7 +237,7 @@
       };
       getcolllist(data).then((res) => {
         this.tableData = res.data.list;
-        this.allList = [];
+        this.allList = []
         if (this.tableData.length != 0) {
           this.$nextTick(() => {
             this.$refs.multipleTable.toggleRowSelection(
@@ -362,7 +258,7 @@
         this.total = res.data.total;
       });
     },
-    handleUpdate() {},
+    handleUpdate() { },
 
     // 琛ㄦ牸鍗曢��
     handleSelect(selection, val) {
@@ -380,7 +276,7 @@
     },
     handledocument() {
       const viewNum = "809743614817824768";
-      let accountId = this.selectList[0].accountId;
+      let accountId = this.selectList[0].accountId
       const params = { viewNum, accountId };
       this.$tab.openPage("缁撹处鍗�", "/report/settlement", params);
     },
@@ -403,7 +299,7 @@
           type: "success",
         });
         this.getList();
-        this.handleQuery();
+        this.handleQuery()
       });
     },
   },
@@ -415,9 +311,8 @@
   display: none;
 }
 
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner {
-  width: 100%;
+.el-date-editor--datetimerange.el-input, .el-date-editor--datetimerange.el-input__inner {
+    width: 100%;
 }
 
 .pag {
@@ -430,7 +325,7 @@
   width: 30%;
 }
 
-.el-table__body tr.current-row > td {
+.el-table__body tr.current-row>td {
   background-color: #f19944 !important;
   /* color: #f19944; */
   /* 璁剧疆鏂囧瓧棰滆壊锛屽彲浠ラ�夋嫨涓嶈缃� */
diff --git a/src/views/hosp/extension/index.vue b/src/views/hosp/extension/index.vue
index 53475eb..ab980b3 100644
--- a/src/views/hosp/extension/index.vue
+++ b/src/views/hosp/extension/index.vue
@@ -30,8 +30,9 @@
         <el-date-picker
           clearable
           v-model="createTimeList"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
+          :default-time="['00:00:00', '23:00:00']"
+              format="yyyy-MM-dd HH:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
           type="daterange"
           range-separator="-"
           start-placeholder="寮�濮嬫棩鏈�"
@@ -48,9 +49,10 @@
           start-placeholder="寮�濮嬫棩鏈�"
           end-placeholder="缁撴潫鏃ユ湡"
           :picker-options="pickerOptions"
-          value-format="yyyy-MM-dd"
+          :default-time="['00:00:00', '23:00:00']"
+              format="yyyy-MM-dd HH:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
           placeholder="璇烽�夋嫨浣撴瀹屾垚鏃堕棿"
-          style="width: 240px"
         >
         </el-date-picker>
       </el-form-item>
@@ -310,6 +312,8 @@
 import { listSendTemplate } from "@/api/hosp/sendTemplate";
 import ViewPdf from "@/components/ViewPdf";
 import { queryCompany } from "@/api/team/tuanti";
+import { getNewDateList } from "@/api/hosp/order";
+import moment from "moment";
 export default {
   components: {
     ViewPdf,
@@ -405,8 +409,9 @@
     };
   },
   created() {
-    this.getNowTime();
+    // this.getNowTime();
     this.getList();
+    this.getdate();
   },
   mounted() {
     this.$nextTick(() => {
@@ -414,6 +419,15 @@
     });
   },
   methods: {
+    getdate() {
+      getNewDateList().then((res) => {
+        this.finishTimeList = [
+          moment(res.data).format("YYYY-MM-DD 00:00:00"),
+          moment(res.data).format("YYYY-MM-DD 23:59:00"),
+        ];
+        console.log(this.createTimeList, 111);
+      });
+    },
     dialogVisibles() {
       this.$message.error("璇疯繛鎺ユ嫧鍙峰櫒锛�");
     },
diff --git a/src/views/hosp/settlement/index.vue b/src/views/hosp/settlement/index.vue
index 4adfab5..2e05485 100644
--- a/src/views/hosp/settlement/index.vue
+++ b/src/views/hosp/settlement/index.vue
@@ -1,159 +1,59 @@
 <template>
   <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="100px"
-    >
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-row>
         <el-col :span="6">
-          <el-form-item
-            label="鏀惰垂鍛�"
-            prop="tollCollectorName"
-            style="display: flex"
-          >
-            <el-input
-              v-model="queryParams.tollCollectorName"
-              placeholder="璇疯緭鍏ユ敹璐瑰憳"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="15">
-          <el-form-item
-            label="缁撹处鏃堕棿"
-            prop="tollCollectorName"
-            style="display: flex"
-          >
-            <el-date-picker
-              v-model="value1"
-              type="datetimerange"
-              start-placeholder="璧锋鏃ユ湡"
-              end-placeholder="缁堟鏃ユ湡"
-              :default-time="['00:00:00', '23:00:00']"
-              format="yyyy-MM-dd HH:mm:ss"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              @change="dateChangebirthday1"
-            >
-            </el-date-picker>
-          </el-form-item>
-        </el-col>
-      </el-row>
+      <el-form-item label="鏀惰垂鍛�" prop="tollCollectorName" style="display: flex;">
+        <el-input v-model="queryParams.tollCollectorName" placeholder="璇疯緭鍏ユ敹璐瑰憳" clearable @keyup.enter.native="handleQuery"
+          />
+      </el-form-item>
+      </el-col>
+      <el-col :span="15">
+      <el-form-item label="缁撹处鏃堕棿" prop="tollCollectorName" style="display: flex;">
+        <el-date-picker v-model="value1" type="datetimerange" start-placeholder="璧锋鏃ユ湡" end-placeholder="缁堟鏃ユ湡"  :default-time="['00:00:00', '23:00:00']"
+          format="yyyy-MM-dd HH:mm:ss"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          @change="dateChangebirthday1">
+        </el-date-picker>
+      </el-form-item>
+      </el-col>
+    </el-row>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-edit"
-          size="mini"
-          @click="handleUpdate"
-          >缁熻</el-button
-        >
+        <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleUpdate">缁熻</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-check"
-          size="mini"
-          @click="handlesettle"
-          :disabled="discode === 200 ? true : false"
-          >缁撹处</el-button
-        >
+        <el-button type="primary" icon="el-icon-check" size="mini" @click="handlesettle"
+          :disabled="discode === 200 ? true : false">缁撹处</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="primary" size="mini" @click="handleabout"
-          >鏃ョ粨鏌ヨ</el-button
-        >
+        <el-button type="primary" size="mini" @click="handleabout">鏃ョ粨鏌ヨ</el-button>
       </el-col>
     </el-row>
 
     <el-table :data="dataList" border style="width: 75%">
-      <el-table-column
-        label="濮撳悕"
-        align="center"
-        prop="cusName"
-        width="91px"
-      />
-      <el-table-column
-        label="璁㈠崟娴佹按鍙�"
-        align="center"
-        prop="waterId"
-        width="186px"
-      />
-      <el-table-column
-        label="搴旀敹閲戦"
-        align="center"
-        prop="copeWith"
-        width="90px"
-      />
-      <el-table-column
-        label="鎶樻墸"
-        align="center"
-        prop="discount"
-        width="90px"
-      />
-      <el-table-column
-        label="瀹炴敹閲戦"
-        align="center"
-        prop="paidIn"
-        width="90px"
-      />
-      <el-table-column
-        label="浠樻鐘舵��"
-        align="center"
-        prop="payStasus"
-        width="100px"
-      />
-      <el-table-column
-        label="浠樻鏂瑰紡"
-        align="center"
-        prop="payType"
-        width="100px"
-      />
-      <el-table-column
-        label="鏀惰垂鍛�"
-        align="center"
-        prop="updateBy"
-        width="140px"
-      />
-      <el-table-column
-        label="鏀惰垂鏃堕棿"
-        align="center"
-        prop="updateTime"
-        width="180px"
-      />
-      <el-table-column
-        label="閫�璐规椂闂�"
-        align="center"
-        prop="refundTime"
-        width="200px"
-      />
+      <el-table-column label="濮撳悕" align="center" prop="cusName" width="91px" />
+      <el-table-column label="璁㈠崟娴佹按鍙�" align="center" prop="waterId" width="186px" />
+      <el-table-column label="搴旀敹閲戦" align="center" prop="copeWith" width="90px" />
+      <el-table-column label="鎶樻墸" align="center" prop="discount" width="90px" />
+      <el-table-column label="瀹炴敹閲戦" align="center" prop="paidIn" width="90px" />
+      <el-table-column label="浠樻鐘舵��" align="center" prop="payStasus" width="100px" />
+      <el-table-column label="浠樻鏂瑰紡" align="center" prop="payType" width="100px" />
+      <el-table-column label="鏀惰垂鍛�" align="center" prop="updateBy" width="140px" />
+      <el-table-column label="鏀惰垂鏃堕棿" align="center" prop="updateTime" width="180px" />
+      <el-table-column label="閫�璐规椂闂�" align="center" prop="refundTime" width="200px" />
     </el-table>
 
     <div class="pag">
       <div class="pag1">
-        <pagination
-          v-show="total > 0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="handleUpdate"
-        />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+          @pagination="handleUpdate" />
       </div>
     </div>
 
-    <el-table
-      border
-      :data="allList"
-      style="margin-top: 30px; width: 75%"
-      :summary-method="getSummaries"
-      show-summary
-    >
+    <el-table border :data="allList" style="margin-top: 30px; width: 75%" :summary-method="getSummaries" show-summary>
       <el-table-column label="浠樻鏂瑰紡" align="center" prop="paytpe" />
       <el-table-column label="鏀惰垂閲戦" align="center" prop="vo.shoukuan">
       </el-table-column>
@@ -166,7 +66,6 @@
 <script>
 import { getLastTime, getList, collector, getNewDate } from "@/api/hosp/water";
 import { getInfo } from "@/api/login";
-import { getNewDateList } from "@/api/hosp/order";
 import moment from "moment";
 
 export default {
@@ -221,18 +120,8 @@
   },
   created() {
     this.getList();
-    this.getdate();
   },
   methods: {
-    getdate() {
-      getNewDateList().then((res) => {
-        this.value1 = [
-          moment(res.data).format("YYYY-MM-DD 00:00:00"),
-          moment(res.data).format("YYYY-MM-DD 23:59:00"),
-        ];
-        console.log(this.createTimeList, 111);
-      });
-    },
     /** 鏌ヨ浣撴娴佹按鍒楄〃 */
     getList() {
       this.loading = true;
@@ -240,36 +129,37 @@
         this.userId = response.user.userId;
         this.queryParams.tollCollectorName = response.user.nickName;
       });
-      // getLastTime().then((response) => {
-      //   if (response.code === 200) {
-      //     this.time = response.data;
-      //     getNewDate().then((response) => {
-      //       if (response.code === 200) {
-      //         this.value1 = [
-      //           moment(this.time).format("YYYY-MM-DD HH:mm:ss"),
-      //           moment(response.data).format("YYYY-MM-DD HH:mm:ss")
-      //         ];
-      //       }
-      //     });
-      //   }
-      // });
+      getLastTime().then((response) => {
+        if (response.code === 200) {
+          this.time = response.data;
+          getNewDate().then((response) => {
+            if (response.code === 200) {
+              this.value1 = [
+                moment(this.time).format("YYYY-MM-DD HH:mm:ss"),
+                moment(response.data).format("YYYY-MM-DD HH:mm:ss")
+              ];
+            }
+          });
+        }
+      });
+
     },
     // 鏃堕棿
     dateChangebirthday1(val) {
       this.value1 = val;
-      console.log(this.value1);
+      console.log(this.value1)
     },
 
     /** 缁熻 */
     handleUpdate() {
       this.loading = true;
-
+    
       let data = {
         pageNum: this.queryParams.pageNum,
         pageSize: this.queryParams.pageSize,
         userId: this.userId.toString(),
         beginTime: this.value1[0],
-        endTime: this.value1[1],
+        endTime: this.value1[1]
       };
       getList(data).then((res) => {
         this.dataList = res.data.list;
diff --git a/src/views/system/biol/index.vue b/src/views/system/biol/index.vue
index dac2732..1bc005d 100644
--- a/src/views/system/biol/index.vue
+++ b/src/views/system/biol/index.vue
@@ -10,8 +10,10 @@
       </el-form-item>
       <el-form-item label="鎶ュ憡鏃堕棿" prop="reportTimeList">
         <el-date-picker clearable v-model="queryParams.reportTimeList" type="daterange" range-separator="-"
-          start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡" :picker-options="pickerOptions" value-format="yyyy-MM-dd"
-          placeholder="璇烽�夋嫨鍑烘姤鍛婃椂闂�" style="width: 240px">
+          start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡" :picker-options="pickerOptions" :default-time="['00:00:00', '23:00:00']"
+              format="yyyy-MM-dd HH:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
+          placeholder="璇烽�夋嫨鍑烘姤鍛婃椂闂�" >
         </el-date-picker>
       </el-form-item>
       <!-- <el-form-item label="鍗曚綅鍚嶇О" prop="firmId">
@@ -287,7 +289,9 @@
   hasReport,
   hasPrintCode,
   getOrderListOO,
+  getNewDateList
 } from "@/api/hosp/order";
+import moment from "moment";
 import ViewPdf from "@/components/ViewPdf";
 import { SubmitCompany, getCompany, queryCompany } from "@/api/team/tuanti";
 import { chownSync } from "fs";
@@ -460,9 +464,10 @@
     };
   },
   created() {
-    this.getNowTime();
+    // this.getNowTime();
     this.getList();
     this.Company();
+    this.getdate();
   },
   mounted() {
     this.$nextTick(() => {
@@ -470,6 +475,15 @@
     });
   },
   methods: {
+    getdate() {
+      getNewDateList().then((res) => {
+        this.queryParams.reportTimeList = [
+          moment(res.data).format("YYYY-MM-DD 00:00:00"),
+          moment(res.data).format("YYYY-MM-DD 23:59:00"),
+        ];
+        console.log(this.createTimeList, 111);
+      });
+    },
     // / 澶勭悊榛樿閫変腑褰撳墠鏃ユ湡
     getNowTime() {
       var curDate = new Date().getTime();
diff --git a/src/views/team/disease/index.vue b/src/views/team/disease/index.vue
index c3bca27..837c8db 100644
--- a/src/views/team/disease/index.vue
+++ b/src/views/team/disease/index.vue
@@ -12,8 +12,9 @@
           clearable
           v-model="createTimeList"
           @change="dateChangebirthday1"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
+           :default-time="['00:00:00', '23:59:00']"
+          format="yyyy-MM-dd HH:mm"
+          value-format="yyyy-MM-dd HH:mm"
           type="daterange"
           range-separator="-"
           start-placeholder="寮�濮嬫棩鏈�"
@@ -251,6 +252,8 @@
 require("echarts/lib/component/tooltip");
 require("echarts/lib/component/legend");
 require("echarts/lib/chart/pie");
+import { getNewDateList } from "@/api/hosp/order";
+import moment from "moment";
 import {
   getPeopleList,
   getDeptAndDwDeptByComp,
@@ -327,12 +330,22 @@
     };
   },
   created() {
-    this.getNowTime();
+    // this.getNowTime();
     this.getList();
     this.getcomp();
     this.geticd();
+    this.getdate();
   },
   methods: {
+    getdate() {
+      getNewDateList().then((res) => {
+        this.createTimeList = [
+            moment(res.data).format("YYYY-MM-DD 00:00:00"),
+            moment(res.data).format("YYYY-MM-DD 23:59:00")
+          ];;
+        console.log(this.createTimeList,111);
+      });
+    },
     // / 澶勭悊榛樿閫変腑褰撳墠鏃ユ湡
     getNowTime() {
       var curDate = new Date().getTime();
diff --git a/src/views/team/reporting/index.vue b/src/views/team/reporting/index.vue
index 88e3663..55fb6f9 100644
--- a/src/views/team/reporting/index.vue
+++ b/src/views/team/reporting/index.vue
@@ -58,8 +58,9 @@
               clearable
               v-model="createTimeList"
               @change="dateChangebirthday1"
-              style="width: 240px"
-              value-format="yyyy-MM-dd"
+             :default-time="['00:00:00', '23:00:00']"
+              format="yyyy-MM-dd HH:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
               type="daterange"
               range-separator="-"
               start-placeholder="寮�濮嬫棩鏈�"
@@ -212,17 +213,19 @@
   getDeptAndDwDeptByComp,
 } from "@/api/team/disease";
 import { listComp } from "@/api/system/comp";
+import { getNewDateList } from "@/api/hosp/order";
+import moment from "moment";
 export default {
   data() {
     let checkPhoneNum = (rule, value, callback) => {
-         console.log( value)
+      console.log(value);
       let patter = new RegExp(/^1\s*[3456789]\s*(\d\s*){9}$/);
       if (value == "" && value == undefined && !value) {
-        return callback('');
-      }  else if(value != undefined && value != ""){
+        return callback("");
+      } else if (value != undefined && value != "") {
         return callback();
-      }else if (!patter.test(value)) {
-        return callback('');
+      } else if (!patter.test(value)) {
+        return callback("");
       }
     };
     return {
@@ -290,14 +293,14 @@
         compId: [
           {
             required: true,
-            validator: checkPhoneNum, 
+            validator: checkPhoneNum,
             trigger: "blur",
           },
         ],
         dwDeptId: [
           {
             required: true,
-            validator: checkPhoneNum, 
+            validator: checkPhoneNum,
             trigger: "blur",
           },
         ],
@@ -306,10 +309,20 @@
   },
   created() {
     this.getDeptTree();
-    this.getNowTime();
+    // this.getNowTime();
     this.getcomp();
+    this.getdate();
   },
   methods: {
+    getdate() {
+      getNewDateList().then((res) => {
+        this.createTimeList = [
+          moment(res.data).format("YYYY-MM-DD 00:00:00"),
+          moment(res.data).format("YYYY-MM-DD 23:59:00"),
+        ];
+        console.log(this.createTimeList, 111);
+      });
+    },
     /** 鏌ヨ浣撴鍗曚綅淇℃伅缁存姢鍒楄〃 */
     getcomp() {
       listComp().then((response) => {
@@ -381,9 +394,9 @@
     },
     baogao() {
       console.log(this.firmId);
-        console.log(this.firmDeptId);
-        this.firmId = this.compId;
-        this.firmDeptId = this.dwDeptId;
+      console.log(this.firmDeptId);
+      this.firmId = this.compId;
+      this.firmDeptId = this.dwDeptId;
       if (this.firmId === "" || this.firmDeptId === "") {
         this.$message.warning("璇烽�夋嫨鍗曚綅鍜屽崟浣嶉儴闂紒");
       } else {
diff --git a/src/views/team/reportresults/index.vue b/src/views/team/reportresults/index.vue
index 91a168d..4eb5c10 100644
--- a/src/views/team/reportresults/index.vue
+++ b/src/views/team/reportresults/index.vue
@@ -12,8 +12,9 @@
           clearable
           v-model="createTimeList"
           @change="dateChangebirthday1"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
+          :default-time="['00:00:00', '23:00:00']"
+              format="yyyy-MM-dd HH:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
           type="daterange"
           range-separator="-"
           start-placeholder="寮�濮嬫棩鏈�"
@@ -307,6 +308,8 @@
 require("echarts/lib/component/tooltip");
 require("echarts/lib/component/legend");
 require("echarts/lib/chart/pie");
+import { getNewDateList } from "@/api/hosp/order";
+import moment from "moment";
 import VTreeTransfer from "../../system/tijian/TreeTransfer.vue";
 import { projectGetList } from "@/api/system/tijian";
 import {
@@ -398,6 +401,7 @@
     };
   },
   created() {
+    this.getdate();
     this.getNowTime();
     this.getList();
     this.getcomp();
@@ -410,6 +414,15 @@
     },
   },
   methods: {
+    getdate() {
+      getNewDateList().then((res) => {
+        this.createTimeList = [
+          moment(res.data).format("YYYY-MM-DD 00:00:00"),
+          moment(res.data).format("YYYY-MM-DD 23:59:00"),
+        ];
+        console.log(this.createTimeList, 111);
+      });
+    },
     filterNode(value, data) {
       if (!value) return true;
       return data.proName.indexOf(value) !== -1;
diff --git a/src/views/team/teams/index.vue b/src/views/team/teams/index.vue
index e8b90c4..57b85f1 100644
--- a/src/views/team/teams/index.vue
+++ b/src/views/team/teams/index.vue
@@ -1,719 +1,889 @@
 <template>
-    <div class="app-container">
-        <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
-                <el-form :model="objs" :rules="rules" ref="form" size="small" :inline="true" label-width="80px">
-                    <el-form-item label="鍗曚綅鍚嶇О" prop="firmId">
-                        <el-select :remote-method="getRemoteData" v-model="objs.firmId" remote filterable
-                            style="width: 200px" placeholder="璇烽�夋嫨鍗曚綅鍚嶇О" clearable @change="idFn">
-                            <el-option v-for="dict in CompanyList" :key="dict.cnName" :label="dict.cnName"
-                                :value="dict.drugManufacturerId" />
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="閮ㄩ棬" prop="dwDeptId">
-                        <el-select v-model="objs.dwDeptId" placeholder="璇烽�夋嫨閮ㄩ棬" style="width: 200px" clearable
-                            @change="idBm">
-                            <el-option v-for="dict in deptList" :key="dict.id" :label="dict.dwDeptName" :value="dict.id" />
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="鍒嗙粍" prop="groupId">
-                        <el-select v-model="objs.groupId" placeholder="璇烽�夋嫨缁撶畻鏂瑰紡" style="width: 200px" clearable>
-                            <el-option v-for="dict in groupingList" :key="dict.id" :label="dict.groupingName"
-                                :value="dict.id" />
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="鐧昏鏃堕棿" prop="createTimeList">
-                        <el-date-picker v-model="createTimeList" type="datetimerange" align="right"
-                            :picker-options="pickerOptions" style="width: 260px" start-placeholder="寮�濮嬫棩鏈�"
-                            end-placeholder="缁撴潫鏃ユ湡" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
-                            @change="dateChangebirthday1">
-                        </el-date-picker>
-                    </el-form-item>
-                </el-form>
+  <div class="app-container">
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-form
+          :model="objs"
+          :rules="rules"
+          ref="form"
+          size="small"
+          :inline="true"
+          label-width="80px"
+        >
+          <el-form-item label="鍗曚綅鍚嶇О" prop="firmId">
+            <el-select
+              :remote-method="getRemoteData"
+              v-model="objs.firmId"
+              remote
+              filterable
+              style="width: 200px"
+              placeholder="璇烽�夋嫨鍗曚綅鍚嶇О"
+              clearable
+              @change="idFn"
+            >
+              <el-option
+                v-for="dict in CompanyList"
+                :key="dict.cnName"
+                :label="dict.cnName"
+                :value="dict.drugManufacturerId"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="閮ㄩ棬" prop="dwDeptId">
+            <el-select
+              v-model="objs.dwDeptId"
+              placeholder="璇烽�夋嫨閮ㄩ棬"
+              style="width: 200px"
+              clearable
+              @change="idBm"
+            >
+              <el-option
+                v-for="dict in deptList"
+                :key="dict.id"
+                :label="dict.dwDeptName"
+                :value="dict.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="鍒嗙粍" prop="groupId">
+            <el-select
+              v-model="objs.groupId"
+              placeholder="璇烽�夋嫨缁撶畻鏂瑰紡"
+              style="width: 200px"
+              clearable
+            >
+              <el-option
+                v-for="dict in groupingList"
+                :key="dict.id"
+                :label="dict.groupingName"
+                :value="dict.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="鐧昏鏃堕棿" prop="createTimeList">
+            <el-date-picker
+              v-model="createTimeList"
+              type="datetimerange"
+              align="right"
+              :picker-options="pickerOptions"
+              start-placeholder="寮�濮嬫棩鏈�"
+              end-placeholder="缁撴潫鏃ユ湡"
+              :default-time="['00:00:00', '23:59:00']"
+              format="yyyy-MM-dd HH:mm"
+              value-format="yyyy-MM-dd HH:mm"
+              @change="dateChangebirthday1"
+            >
+            </el-date-picker>
+          </el-form-item>
+        </el-form>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          size="mini"
+          @click="handlequery"
+          v-hasPermi="['system:user:import']"
+          >鏌ヨ</el-button
+        >
+      </el-col>
+    </el-row>
 
-            </el-col>
-            <el-col :span="1.5">
-                <el-button type="primary" size="mini" @click="handlequery"
-                    v-hasPermi="['system:user:import']">鏌ヨ</el-button>
-            </el-col>
-
-        </el-row>
-
-        <div style="margin: 5px 20px;width: 94%">
-            <el-row :gutter="10" class="mb8">
-                <!-- <el-col :span="1.5">
+    <div style="margin: 5px 20px; width: 94%">
+      <el-row :gutter="10" class="mb8">
+        <!-- <el-col :span="1.5">
                     <el-button type="primary" size="mini" :disabled="single" @click="handleTeamfees">淇濆瓨鍥㈤槦鏀惰垂鏄庣粏</el-button>
                 </el-col> -->
-                <el-col :span="1.5">
-                    <el-button type="primary" size="mini" @click="handleAll">鏌ョ湅璇︾粏淇℃伅</el-button>
-                </el-col>
-                <el-col :span="1.5">
-                    <el-button type="primary" size="mini" @click="handleothen"
-                        v-hasPermi="['system:user:import']">瀵煎嚭鍥㈤槦淇℃伅</el-button>
-                </el-col>
-            </el-row>
-            <div style="display: flex;" v-if="userList.length != 0">
-                <div>浜烘暟鍚堣锛歿{ Listdata.all }}</div>
-                <div style="margin: 0 20px;">妫�涓細{{ Listdata.jianzhong }}</div>
-                <div style="margin: 0 15px;">鏈锛歿{ Listdata.weijian }}</div>
-                <div>宸插畬鎴愶細{{ Listdata.yijian }}</div>
-            </div>
-            <el-table v-loading="loading" ref="tree" :data="userList" border @selection-change="handleSelectionChange">
-                <el-table-column label="鐘舵��" align="center" prop="tjStatus" width="75">
-                    <template slot-scope="scope">
-                        <dict-tag :options="dict.type.tj_status" :value="scope.row.tjStatus" />
-                    </template>
-                </el-table-column>
-                <el-table-column label="浣撴鍙�" align="center" prop="tjNumber" width="165" />
-                <el-table-column label="濮撳悕" align="center" prop="name" width="75" />
-                <el-table-column label="鎬у埆" align="center" prop="sex" width="75">
-                    <template slot-scope="scope">
-                        <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" />
-                    </template>
-                </el-table-column>
-                <el-table-column label="骞撮緞" align="center" prop="age" width="120" />
-                <el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phoe" width="120" />
-                <el-table-column label="韬唤璇佸彿" align="center" prop="idCard" width="200" />
-                <el-table-column label="鍗曚綅鍚嶇О" align="center" prop="company" width="200" />
-                <el-table-column label="閮ㄩ棬" align="center" prop="department" />
-                <el-table-column label="鍒嗙粍" align="center" prop="groupingName" />
-                <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="updateTime" width="165" />
-                <el-table-column label="棰勭害鏃堕棿" align="center" prop="reservationTime" />
-            </el-table>
-        </div>
+        <el-col :span="1.5">
+          <el-button type="primary" size="mini" @click="handleAll"
+            >鏌ョ湅璇︾粏淇℃伅</el-button
+          >
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            size="mini"
+            @click="handleothen"
+            v-hasPermi="['system:user:import']"
+            >瀵煎嚭鍥㈤槦淇℃伅</el-button
+          >
+        </el-col>
+      </el-row>
+      <div style="display: flex" v-if="userList.length != 0">
+        <div>浜烘暟鍚堣锛歿{ Listdata.all }}</div>
+        <div style="margin: 0 20px">妫�涓細{{ Listdata.jianzhong }}</div>
+        <div style="margin: 0 15px">鏈锛歿{ Listdata.weijian }}</div>
+        <div>宸插畬鎴愶細{{ Listdata.yijian }}</div>
+      </div>
+      <el-table
+        v-loading="loading"
+        ref="tree"
+        :data="userList"
+        border
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column label="鐘舵��" align="center" prop="tjStatus" width="75">
+          <template slot-scope="scope">
+            <dict-tag
+              :options="dict.type.tj_status"
+              :value="scope.row.tjStatus"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="浣撴鍙�"
+          align="center"
+          prop="tjNumber"
+          width="165"
+        />
+        <el-table-column label="濮撳悕" align="center" prop="name" width="75" />
+        <el-table-column label="鎬у埆" align="center" prop="sex" width="75">
+          <template slot-scope="scope">
+            <dict-tag
+              :options="dict.type.sys_user_sex"
+              :value="scope.row.sex"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="骞撮緞" align="center" prop="age" width="120" />
+        <el-table-column
+          label="鑱旂郴鐢佃瘽"
+          align="center"
+          prop="phoe"
+          width="120"
+        />
+        <el-table-column
+          label="韬唤璇佸彿"
+          align="center"
+          prop="idCard"
+          width="200"
+        />
+        <el-table-column
+          label="鍗曚綅鍚嶇О"
+          align="center"
+          prop="company"
+          width="200"
+        />
+        <el-table-column label="閮ㄩ棬" align="center" prop="department" />
+        <el-table-column label="鍒嗙粍" align="center" prop="groupingName" />
+        <el-table-column
+          label="鍒涘缓鏃堕棿"
+          align="center"
+          prop="updateTime"
+          width="165"
+        />
+        <el-table-column
+          label="棰勭害鏃堕棿"
+          align="center"
+          prop="reservationTime"
+        />
+      </el-table>
+    </div>
 
+    <!-- 鏌ョ湅璇︾粏淇℃伅瀵硅瘽妗� -->
+    <div class="dia">
+      <el-dialog
+        :title="title"
+        :visible.sync="open"
+        width="1300px"
+        append-to-body
+      >
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-input
+              v-model="bingZhong"
+              placeholder="璇疯緭鍏ョ梾绉嶅悕绉�"
+              clearable
+              @keyup.enter.native="handleQuery1"
+              style="width: 160px"
+            />
+          </el-col>
 
-        <!-- 鏌ョ湅璇︾粏淇℃伅瀵硅瘽妗� -->
-        <div class="dia">
-            <el-dialog :title="title" :visible.sync="open" width="1300px" append-to-body>
-                <el-row :gutter="10" class="mb8">
-                    <el-col :span="1.5">
-                        <el-input v-model="bingZhong" placeholder="璇疯緭鍏ョ梾绉嶅悕绉�" clearable @keyup.enter.native="handleQuery1"
-                            style="width: 160px;" />
-                    </el-col>
-
-                    <!-- <el-col :span="1.5">
+          <!-- <el-col :span="1.5">
                         <el-button type="primary" size="mini" :disabled="single" @click="handlecan"
                             style="margin-top: 5px;">鏌ョ湅</el-button>
                     </el-col> -->
-                    <el-col :span="1.5">
-                        <el-button type="primary" size="mini" @click="handlesetup" v-hasPermi="['system:user:import']"
-                            style="margin-top: 5px;">鏌ョ湅缁熻鍥�</el-button>
-                    </el-col>
-                    <!-- <el-col :span="1.5">
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              size="mini"
+              @click="handlesetup"
+              v-hasPermi="['system:user:import']"
+              style="margin-top: 5px"
+              >鏌ョ湅缁熻鍥�</el-button
+            >
+          </el-col>
+          <!-- <el-col :span="1.5">
                         <el-button type="primary" size="mini" @click="handlechart" v-hasPermi="['system:user:import']"
                             style="margin-top: 5px;">鏌ョ湅缁熻鍥�</el-button>
                     </el-col> -->
+        </el-row>
+        <el-row :gutter="20">
+          <!--閮ㄩ棬鏁版嵁-->
+          <el-col :span="7" :xs="24">
+            <el-table
+              v-loading="loading"
+              ref="treeTable"
+              :data="ListdataAll"
+              height="500"
+              border
+              @selection-change="handleChange"
+            >
+              <el-table-column type="selection" width="45"> </el-table-column>
+              <el-table-column
+                label="鐥呯"
+                align="center"
+                prop="rules.bingzhong"
+              />
 
-                </el-row>
-                <el-row :gutter="20">
-                    <!--閮ㄩ棬鏁版嵁-->
-                    <el-col :span="7" :xs="24">
-                        <el-table v-loading="loading" ref="treeTable" :data="ListdataAll" height="500" border
-                            @selection-change="handleChange">
-                            <el-table-column type="selection" width="45">
-                            </el-table-column>
-                            <el-table-column label="鐥呯" align="center" prop="rules.bingzhong" />
+              <el-table-column
+                label="鏁伴噺"
+                align="center"
+                prop="num"
+                width="75"
+              />
+            </el-table>
+          </el-col>
 
-                            <el-table-column label="鏁伴噺" align="center" prop="num" width="75" />
-                        </el-table>
-                    </el-col>
-
-                    <!--鐢ㄦ埛鏁版嵁-->
-                    <el-col :span="16" :xs="24">
-                        <el-table v-loading="loading" ref="tree" :data="orderList" border height="500">
-                            <el-table-column label="鐥呯" align="center" prop="bingzhong" width="100" />
-                            <el-table-column label="浣撴鍙�" align="center" prop="tjNumber" />
-                            <el-table-column label="濮撳悕" align="center" prop="cusName" width="60" />
-                            <el-table-column label="鎬у埆" align="center" prop="cusSex" width="55">
-                                <template slot-scope="scope">
-                                    <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.cusSex" />
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="骞撮緞" align="center" prop="cusAge" width="55" />
-                            <el-table-column label="鍗曚綅鍚嶇О" align="center" prop="dwName" width="150" />
-                            <el-table-column label="閮ㄩ棬" align="center" prop="dwDeptName" />
-                            <el-table-column label="鍒嗙粍" align="center" prop="groupName" width="78" />
-                        </el-table>
-                    </el-col>
-                </el-row>
-            </el-dialog>
-        </div>
-
-        <!-- 鏌ョ湅缁熻鍥� -->
-        <div class="dia">
-            <el-dialog :title="title2" :visible.sync="open2" width="1300px" append-to-body>
-                <div style=" height:620px;margin-top: 10px;">
-                    <div id="main" style="width:95%;height:400px"> </div>
-                </div>
-            </el-dialog>
-        </div>
-
-        <!-- 璁剧疆瀵硅瘽妗� -->
-        <div class="dia">
-            <el-dialog :title="title1" :visible.sync="open1" width="960px" append-to-body>
-                <div style="text-align: center;">
-                    <el-transfer style="text-align: left; display: inline-block;" v-model="value" filterable
-                        :render-content="renderFunc" :titles="['鏄剧ず鐥呯', '闅愯棌鐥呯']" :button-texts="['鏄剧ず', '闅愯棌']"
-                        @change="handleChange1" :data="datalist">
-                    </el-transfer>
-                </div>
-                <div slot="footer" class="dialog-footer2">
-                    <el-button type="primary" @click="submitFormS">鐢熸垚缁熻鍥�</el-button>
-                </div>
-            </el-dialog>
-        </div>
-
+          <!--鐢ㄦ埛鏁版嵁-->
+          <el-col :span="16" :xs="24">
+            <el-table
+              v-loading="loading"
+              ref="tree"
+              :data="orderList"
+              border
+              height="500"
+            >
+              <el-table-column
+                label="鐥呯"
+                align="center"
+                prop="bingzhong"
+                width="100"
+              />
+              <el-table-column label="浣撴鍙�" align="center" prop="tjNumber" />
+              <el-table-column
+                label="濮撳悕"
+                align="center"
+                prop="cusName"
+                width="60"
+              />
+              <el-table-column
+                label="鎬у埆"
+                align="center"
+                prop="cusSex"
+                width="55"
+              >
+                <template slot-scope="scope">
+                  <dict-tag
+                    :options="dict.type.sys_user_sex"
+                    :value="scope.row.cusSex"
+                  />
+                </template>
+              </el-table-column>
+              <el-table-column
+                label="骞撮緞"
+                align="center"
+                prop="cusAge"
+                width="55"
+              />
+              <el-table-column
+                label="鍗曚綅鍚嶇О"
+                align="center"
+                prop="dwName"
+                width="150"
+              />
+              <el-table-column label="閮ㄩ棬" align="center" prop="dwDeptName" />
+              <el-table-column
+                label="鍒嗙粍"
+                align="center"
+                prop="groupName"
+                width="78"
+              />
+            </el-table>
+          </el-col>
+        </el-row>
+      </el-dialog>
     </div>
+
+    <!-- 鏌ョ湅缁熻鍥� -->
+    <div class="dia">
+      <el-dialog
+        :title="title2"
+        :visible.sync="open2"
+        width="1300px"
+        append-to-body
+      >
+        <div style="height: 620px; margin-top: 10px">
+          <div id="main" style="width: 95%; height: 400px"></div>
+        </div>
+      </el-dialog>
+    </div>
+
+    <!-- 璁剧疆瀵硅瘽妗� -->
+    <div class="dia">
+      <el-dialog
+        :title="title1"
+        :visible.sync="open1"
+        width="960px"
+        append-to-body
+      >
+        <div style="text-align: center">
+          <el-transfer
+            style="text-align: left; display: inline-block"
+            v-model="value"
+            filterable
+            :render-content="renderFunc"
+            :titles="['鏄剧ず鐥呯', '闅愯棌鐥呯']"
+            :button-texts="['鏄剧ず', '闅愯棌']"
+            @change="handleChange1"
+            :data="datalist"
+          >
+          </el-transfer>
+        </div>
+        <div slot="footer" class="dialog-footer2">
+          <el-button type="primary" @click="submitFormS">鐢熸垚缁熻鍥�</el-button>
+        </div>
+      </el-dialog>
+    </div>
+  </div>
 </template>
   
 <script>
 import { Deptlist, getDwAndDwDept } from "@/api/system/comp";
 import { getCompany, queryCompany } from "@/api/team/tuanti";
-import { tuanTiListById, tuanTiBingById, tuanTiBingChart } from "@/api/team/teams";
-const echarts = require('echarts/lib/echarts');
-require('echarts/lib/component/title');
-require('echarts/lib/component/tooltip');
-require('echarts/lib/component/legend');
-require('echarts/lib/chart/pie');
+import {
+  tuanTiListById,
+  tuanTiBingById,
+  tuanTiBingChart,
+} from "@/api/team/teams";
+import { getNewDateList } from "@/api/hosp/order";
+import moment from "moment";
+const echarts = require("echarts/lib/echarts");
+require("echarts/lib/component/title");
+require("echarts/lib/component/tooltip");
+require("echarts/lib/component/legend");
+require("echarts/lib/chart/pie");
 
 export default {
-    name: "Tijian",
-    dicts: [
-        "dict_user_national",
-        "dict_user_marry",
-        "sys_yes_no",
-        "sys_user_sex",
-        "reservation_pay_type",
-        "sys_normal_disable",
-        "tj_status"
-    ],
-    data() {
-        let checkPhoneNum = (rule, value, callback) => {
-         console.log( value)
+  name: "Tijian",
+  dicts: [
+    "dict_user_national",
+    "dict_user_marry",
+    "sys_yes_no",
+    "sys_user_sex",
+    "reservation_pay_type",
+    "sys_normal_disable",
+    "tj_status",
+  ],
+  data() {
+    let checkPhoneNum = (rule, value, callback) => {
+      console.log(value);
       let patter = new RegExp(/^1\s*[3456789]\s*(\d\s*){9}$/);
       if (value == "" && value == undefined && !value) {
-        return callback('');
-      }  else if(value != undefined && value != ""){
+        return callback("");
+      } else if (value != undefined && value != "") {
         return callback();
-      }else if (!patter.test(value)) {
-        return callback('');
+      } else if (!patter.test(value)) {
+        return callback("");
       }
     };
-        return {
-            datalist: [],
-            value: [],
-            renderFunc(h, option) {
-                return <span>{option.label}</span>;
+    return {
+      datalist: [],
+      value: [],
+      renderFunc(h, option) {
+        return <span>{option.label}</span>;
+      },
+      objs: {
+        firmId: "",
+        dwDeptId: "",
+        groupId: "",
+        beginTime: "",
+        endTime: "",
+        pageNum: 1,
+        pageSize: 10,
+      },
+      data: {
+        dwId: "",
+        deptId: "",
+      },
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      bingZhong: "",
+      Listdata: {},
+      ListdataAll: [],
+      aidList: [],
+      // 寮瑰嚭灞傛爣棰�
+      title1: "",
+      title2: "",
+      deptList: [],
+      CompanyList: [],
+      groupingList: [],
+      orderList: [],
+      userList: [],
+      menuIds: [],
+      proIds: [],
+      valueList: [],
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      open1: false,
+      open2: false,
+      // 闈炲崟涓鐢�
+      single: false,
+      cnName: "",
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "鏈�杩戜竴鍛�",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date(new Date().setHours(0, 0, 0, 0));
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
             },
-            objs: {
-                firmId: "",
-                dwDeptId: "",
-                groupId: "",
-                beginTime: "",
-                endTime: "",
-                pageNum: 1,
-                pageSize: 10,
+          },
+          {
+            text: "鏈�杩戜竴涓湀",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date(new Date().setHours(0, 0, 0, 0));
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "鏈�杩戜笁涓湀",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date(new Date().setHours(0, 0, 0, 0));
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+      // 琛ㄥ崟鏍¢獙
+      rules: {
+        firmId: [
+          { required: true, validator: checkPhoneNum, trigger: "change" },
+        ],
+        beginTime: [
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
+        ],
+        dwDeptId: [
+          { required: true, validator: checkPhoneNum, trigger: "change" },
+        ],
+        groupId: [
+          { required: true, validator: checkPhoneNum, trigger: "change" },
+        ],
+      },
+    };
+  },
+  created() {
+    // this.getNowTime();
+    this.getList();
+    this.getdate();
+  },
 
-            },
-            data: {
-                dwId: "",
-                deptId: "",
-            },
-            // 寮瑰嚭灞傛爣棰�
-            title: "",
-            bingZhong: "",
-            Listdata: {},
-            ListdataAll: [],
-            aidList: [],
-            // 寮瑰嚭灞傛爣棰�
-            title1: "",
-            title2: "",
-            deptList: [],
-            CompanyList: [],
-            groupingList: [],
-            orderList: [],
-            userList: [],
-            menuIds: [],
-            proIds: [],
-            valueList: [],
-            // 鏄惁鏄剧ず寮瑰嚭灞�
-            open: false,
-            open1: false,
-            open2: false,
-            // 闈炲崟涓鐢�
-            single: false,
-            cnName: "",
-            // 琛ㄥ崟鍙傛暟
-            form: {},
-            pickerOptions: {
-                shortcuts: [
-                    {
-                        text: "鏈�杩戜竴鍛�",
-                        onClick(picker) {
-                            const end = new Date();
-                            const start = new Date(new Date().setHours(0, 0, 0, 0));
-                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-                            picker.$emit("pick", [start, end]);
-                        },
-                    },
-                    {
-                        text: "鏈�杩戜竴涓湀",
-                        onClick(picker) {
-                            const end = new Date();
-                            const start = new Date(new Date().setHours(0, 0, 0, 0));
-                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-                            picker.$emit("pick", [start, end]);
-                        },
-                    },
-                    {
-                        text: "鏈�杩戜笁涓湀",
-                        onClick(picker) {
-                            const end = new Date();
-                            const start = new Date(new Date().setHours(0, 0, 0, 0));
-                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-                            picker.$emit("pick", [start, end]);
-                        },
-                    },
-                ],
-            },
-            // 琛ㄥ崟鏍¢獙
-            rules: {
-                firmId: [
-                    { required: true, validator: checkPhoneNum,  trigger: "change" },
-                ],
-                beginTime: [
-                    { required: true, validator: checkPhoneNum,  trigger: "blur" },
-                ],
-                dwDeptId: [
-                    { required: true, validator: checkPhoneNum,  trigger: "change" },
-                ],
-                groupId: [
-                    { required: true, validator: checkPhoneNum,  trigger: "change" },
-                ],
-            },
+  methods: {
+    getdate() {
+      getNewDateList().then((res) => {
+        this.createTimeList = [
+          moment(res.data).format("YYYY-MM-DD 00:00:00"),
+          moment(res.data).format("YYYY-MM-DD 23:59:00"),
+        ];
+        console.log(this.createTimeList, 111);
+      });
+    },
+    getList() {
+      this.loading = true;
+      getCompany(this.queryParam).then((response) => {
+        this.CompanyList = response.data;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    handlequery() {
+      if (this.objs.firmId && this.objs.dwDeptId) {
+        this.objs.beginTime = this.createTimeList[0];
+        this.objs.endTime = this.createTimeList[1];
+        tuanTiListById(this.objs).then((response) => {
+          this.Listdata = response.data;
+          this.userList = response.data.list;
+        });
+      } else {
+        this.$message.warning("甯︽槦鍙蜂负蹇呭~椤�");
+      }
+    },
+    handleQuery1() {
+      let data = {
+        firmId: this.data.dwId,
+        firmDeptId: this.data.deptId,
+        bingZhong: this.bingZhong,
+      };
+      tuanTiBingById(data).then((response) => {
+        this.ListdataAll = response.data;
+      });
+    },
+    // 澶氶�夋閫変腑鏁版嵁
+    handleSelectionChange(selection) {
+      // this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+    },
+    // 琛ㄥ崟閲嶇疆
+    reset() {
+      this.form = {
+        company: null,
+        payType: null,
+        name: null,
+        phoe: null,
+        signingPic: null,
+        pacStatus: "鍚敤",
+      };
+      this.resetForm("form");
+    },
+    idFn(value) {
+      if (value) {
+        this.data.dwId = value;
+        Deptlist(value).then((response) => {
+          this.deptList = response.data;
+        });
+      }
+    },
+    idBm(value) {
+      if (value) {
+        this.data.deptId = value;
+        getDwAndDwDept(this.data).then((response) => {
+          this.groupingList = response.data;
+        });
+      }
+    },
+
+    // 鎼滅储
+    getRemoteData(query) {
+      if (query) {
+        let compName = query;
+        queryCompany(compName).then((response) => {
+          this.CompanyList = response.data;
+          this.CompanyList.forEach((item) => {
+            this.objs = item;
+          });
+        });
+      }
+    },
+    // / 澶勭悊榛樿閫変腑褰撳墠鏃ユ湡
+    getNowTime() {
+      var curDate = new Date().getTime();
+      var dayNum = 7 * 24 * 3600 * 1000;
+      var threeDays = curDate - dayNum;
+      var sDay = this.getLocalTime(threeDays);
+      var end = this.getLocalTime(curDate);
+      this.createTimeList = [sDay, end];
+    },
+    add0(m) {
+      return m < 10 ? "0" + m : m;
+    },
+    getLocalTime(nS) {
+      var time = new Date(nS);
+      var y = time.getFullYear();
+      var m = time.getMonth() + 1;
+      var d = time.getDate();
+      // var h = time.getHours();
+      // var mm = time.getMinutes();
+      return y + "-" + this.add0(m) + "-" + this.add0(d);
+    },
+    //鑾峰彇鏃堕棿
+    dateChangebirthday1(val) {
+      if (val == null) {
+        this.createTimeList = [];
+      } else {
+        this.createTimeList = val;
+      }
+    },
+    // 鍙栨秷鎸夐挳
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    /** 鏌ョ湅璇︾粏淇℃伅鎸夐挳鎿嶄綔 */
+    handleAll() {
+      if (this.data.dwId && this.data.deptId) {
+        this.open = true;
+        this.title = "鍥㈡妫�鍑虹巼";
+        let data = {
+          firmId: this.data.dwId,
+          firmDeptId: this.data.deptId,
         };
+        tuanTiBingById(data).then((response) => {
+          this.ListdataAll = response.data;
+        });
+      } else {
+        this.$message.warning("璇烽�夋嫨鍗曚綅鎴栭儴闂�");
+      }
     },
-    created() {
-        this.getNowTime()
-        this.getList();
+    handleothen() {},
+    handleChange(selection) {
+      if (selection.length > 1) {
+        const newRows = selection.filter((it, index) => {
+          if (index == selection.length - 1) {
+            this.$refs.treeTable.toggleRowSelection(it, true);
+            return true;
+          } else {
+            this.$refs.treeTable.toggleRowSelection(it, false);
+            return false;
+          }
+        });
+
+        newRows.forEach((item) => {
+          this.orderList = item.orderList;
+        });
+      } else {
+        selection.forEach((item) => {
+          this.orderList = item.orderList;
+        });
+      }
     },
+    handleTeamfees() {},
+    handlecan() {},
 
-    methods: {
-        getList() {
-            this.loading = true;
-            getCompany(this.queryParam).then((response) => {
-                this.CompanyList = response.data;
-                this.total = response.total;
-                this.loading = false;
-            });
-        },
-        handlequery() {
-            if (this.objs.firmId && this.objs.dwDeptId) {
-                this.objs.beginTime = this.createTimeList[0]
-                this.objs.endTime = this.createTimeList[1]
-                tuanTiListById(this.objs).then((response) => {
-                    this.Listdata = response.data
-                    this.userList = response.data.list;
-                });
-            } else {
-                this.$message.warning("甯︽槦鍙蜂负蹇呭~椤�")
-            }
+    handlechart() {
+      this.open2 = true;
+      this.title2 = "缁熻鍥捐〃";
+      let data = {
+        firmId: this.data.dwId,
+        firmDeptId: this.data.deptId,
+        aidList: this.aidList,
+      };
+      console.log(data);
+      tuanTiBingChart(data).then((res) => {
+        console.log(res);
+        this.$nextTick(() => {
+          var chartDom = document.getElementById("main");
+          var myChart = echarts.init(chartDom);
+          var option;
 
-        },
-        handleQuery1() {
-            let data = {
-                firmId: this.data.dwId,
-                firmDeptId: this.data.deptId,
-                bingZhong: this.bingZhong
-            }
-            tuanTiBingById(data).then((response) => {
-                this.ListdataAll = response.data
-            });
-        },
-        // 澶氶�夋閫変腑鏁版嵁
-        handleSelectionChange(selection) {
+          const data = genData(50);
+          option = {
+            title: {
+              text: "鍥㈤槦浣撴鎯呭喌",
+              // subtext: '绾睘铏氭瀯',
+              left: "center",
+            },
+            tooltip: {
+              trigger: "item",
+              formatter: "{a} <br/>{b} : {c} ({d}%)",
+            },
+            legend: {
+              // type: 'scroll',
+              orient: "vertical",
+              right: 10,
+              top: 80,
+              bottom: 20,
+              data: data.legendData,
+            },
+            series: [
+              {
+                name: "濮撳悕",
+                type: "pie",
+                radius: "55%",
+                center: ["25%", "60%"],
+                // labelLine: {
+                //     normal: {
+                //         length: 40,
+                //         length2: 30,
+                //         lineStyle: {
+                //             width: 1
+                //         }
+                //     }
+                // },
 
-            // this.ids = selection.map((item) => item.id);
-            this.single = selection.length !== 1;
-        },
-        // 琛ㄥ崟閲嶇疆
-        reset() {
-            this.form = {
-                company: null,
-                payType: null,
-                name: null,
-                phoe: null,
-                signingPic: null,
-                pacStatus: "鍚敤"
-            };
-            this.resetForm("form");
-        },
-        idFn(value) {
-            if (value) {
-                this.data.dwId = value
-                Deptlist(value).then((response) => {
-                    this.deptList = response.data;
-                });
-            }
-
-        },
-        idBm(value) {
-            if (value) {
-                this.data.deptId = value
-                getDwAndDwDept(this.data).then((response) => {
-                    this.groupingList = response.data;
-                });
-            }
-        },
-
-        // 鎼滅储
-        getRemoteData(query) {
-            if (query) {
-                let compName = query;
-                queryCompany(compName).then((response) => {
-                    this.CompanyList = response.data;
-                    this.CompanyList.forEach((item) => {
-                        this.objs = item;
-                    });
-                });
-            }
-        },
-        // / 澶勭悊榛樿閫変腑褰撳墠鏃ユ湡
-        getNowTime() {
-            var curDate = new Date().getTime();
-            var dayNum = 7 * 24 * 3600 * 1000;
-            var threeDays = curDate - dayNum;
-            var sDay = this.getLocalTime(threeDays);
-            var end = this.getLocalTime(curDate);
-            this.createTimeList = [sDay, end];
-        },
-        add0(m) {
-            return m < 10 ? "0" + m : m;
-        },
-        getLocalTime(nS) {
-            var time = new Date(nS);
-            var y = time.getFullYear();
-            var m = time.getMonth() + 1;
-            var d = time.getDate();
-            // var h = time.getHours();
-            // var mm = time.getMinutes();
-            return (
-                y +
-                "-" +
-                this.add0(m) +
-                "-" +
-                this.add0(d)
-            );
-        },
-        //鑾峰彇鏃堕棿
-        dateChangebirthday1(val) {
-            if (val == null) {
-                this.createTimeList = []
-            } else {
-                this.createTimeList = val;
-            }
-        },
-        // 鍙栨秷鎸夐挳
-        cancel() {
-            this.open = false;
-            this.reset();
-        },
-        /** 鏌ョ湅璇︾粏淇℃伅鎸夐挳鎿嶄綔 */
-        handleAll() {
-            if (this.data.dwId && this.data.deptId) {
-                this.open = true;
-                this.title = "鍥㈡妫�鍑虹巼";
-                let data = {
-                    firmId: this.data.dwId,
-                    firmDeptId: this.data.deptId,
-                }
-                tuanTiBingById(data).then((response) => {
-                    this.ListdataAll = response.data
-                });
-            } else {
-                this.$message.warning("璇烽�夋嫨鍗曚綅鎴栭儴闂�")
-            }
-
-        },
-        handleothen() {
-
-        },
-        handleChange(selection) {
-
-            if (selection.length > 1) {
-                const newRows = selection.filter((it, index) => {
-                    if (index == selection.length - 1) {
-                        this.$refs.treeTable.toggleRowSelection(it, true);
-                        return true;
-                    } else {
-                        this.$refs.treeTable.toggleRowSelection(it, false);
-                        return false;
-                    }
-                });
-
-                newRows.forEach(item => {
-                    this.orderList = item.orderList
-                })
-            } else {
-                selection.forEach(item => {
-                    this.orderList = item.orderList
-                })
-            }
-        },
-        handleTeamfees() {
-
-        },
-        handlecan() {
-
-        },
-
-        handlechart() {
-            this.open2 = true;
-            this.title2 = "缁熻鍥捐〃";
-            let data = {
-                firmId: this.data.dwId,
-                firmDeptId: this.data.deptId,
-                aidList: this.aidList
-            }
-            console.log(data)
-            tuanTiBingChart(data).then(res => {
-                console.log(res)
-                this.$nextTick(() => {
-
-                    var chartDom = document.getElementById('main');
-                    var myChart = echarts.init(chartDom);
-                    var option;
-
-                    const data = genData(50);
-                    option = {
-                        title: {
-                            text: '鍥㈤槦浣撴鎯呭喌',
-                            // subtext: '绾睘铏氭瀯',
-                            left: 'center',
-                        },
-                        tooltip: {
-                            trigger: 'item',
-                            formatter: '{a} <br/>{b} : {c} ({d}%)'
-                        },
-                        legend: {
-                            // type: 'scroll',
-                            orient: 'vertical',
-                            right: 10,
-                            top: 80,
-                            bottom: 20,
-                            data: data.legendData
-                        },
-                        series: [
-                            {
-                                name: '濮撳悕',
-                                type: 'pie',
-                                radius: '55%',
-                                center: ['25%', '60%'],
-                                // labelLine: {
-                                //     normal: {
-                                //         length: 40,
-                                //         length2: 30,
-                                //         lineStyle: {
-                                //             width: 1
-                                //         }
-                                //     }
-                                // },
-
-                                data: data.seriesData,
-                                emphasis: {
-                                    itemStyle: {
-                                        shadowBlur: 10,
-                                        shadowOffsetX: 0,
-                                        shadowColor: 'rgba(0, 0, 0, 0.5)'
-                                    }
-                                }
-                            }
-                        ]
-                    };
-                    function genData(count) {
-                        // prettier-ignore
-                        const nameList = [
+                data: data.seriesData,
+                emphasis: {
+                  itemStyle: {
+                    shadowBlur: 10,
+                    shadowOffsetX: 0,
+                    shadowColor: "rgba(0, 0, 0, 0.5)",
+                  },
+                },
+              },
+            ],
+          };
+          function genData(count) {
+            // prettier-ignore
+            const nameList = [
                             '璧�', '閽�', '瀛�', '鏉�', '鍛�', '鍚�', '閮�', '鐜�', '鍐�', '闄�', '瑜�', '鍗�', '钂�', '娌�', '闊�', '鏉�', '鏈�', '绉�', '灏�', '璁�', '浣�', '鍚�', '鏂�', '寮�', '瀛�', '鏇�', '涓�', '鍗�', '閲�', '榄�', '闄�', '濮�', '鎴�', '璋�', '閭�', '鍠�', '鏌�', '姘�', '绐�', '绔�', '浜�', '鑻�', '娼�', '钁�', '濂�', '鑼�', '褰�', '閮�', '椴�', '闊�', '鏄�', '椹�', '鑻�', '鍑�', '鑺�', '鏂�', '淇�', '浠�', '琚�', '鏌�', '閰�', '椴�', '鍙�', '鍞�', '璐�', '寤�', '宀�', '钖�', '闆�', '璐�', '鍊�', '姹�', '婊�', '娈�', '缃�', '姣�', '閮�', '閭�', '瀹�', '甯�', '涔�', '浜�', '鏃�', '鍌�', '鐨�', '鍗�', '榻�', '搴�', '浼�', '浣�', '鍏�', '鍗�', '椤�', '瀛�', '骞�', '榛�', '鍜�', '绌�', '钀�', '灏�', '濮�', '閭�', '婀�', '姹�', '绁�', '姣�', '绂�', '鐙�', '绫�', '璐�', '鏄�', '鑷�', '璁�', '浼�', '鎴�', '鎴�', '璋�', '瀹�', '鑼�', '搴�', '鐔�', '绾�', '鑸�', '灞�', '椤�', '绁�', '钁�', '姊�', '鏉�', '闃�', '钃�', '闂�', '甯�', '瀛�', '楹�', '寮�', '璐�', '璺�', '濞�', '鍗�'
                         ];
-                        const legendData = [];
-                        const seriesData = [];
-                        for (var i = 0; i < count; i++) {
-                            var name =
-                                Math.random() > 0.65
-                                    ? makeWord(4, 1) + '路' + makeWord(3, 0)
-                                    : makeWord(2, 1);
-                            legendData.push(name);
-                            seriesData.push({
-                                name: name,
-                                value: Math.round(Math.random() * 100000)
-                            });
-                        }
-                        return {
-                            legendData: legendData,
-                            seriesData: seriesData
-                        };
-                        function makeWord(max, min) {
-                            const nameLen = Math.ceil(Math.random() * max + min);
-                            const name = [];
-                            for (var i = 0; i < nameLen; i++) {
-                                name.push(nameList[Math.round(Math.random() * nameList.length - 1)]);
-                            }
-                            return name.join('');
-                        }
-                    }
-
-                    option && myChart.setOption(option);
-                    let sizeFun = function () {
-                        myChart.resize()
-                    }
-                    window.addEventListener("resize", sizeFun)
-
-                });
-            })
-
-
-        },
-        handlesetup() {
-            this.open1 = true;
-            this.title1 = "缁熻鍥捐缃�";
-            this.datalist = []
-            if (this.data.dwId && this.data.deptId) {
-                let data = {
-                    firmId: this.data.dwId,
-                    firmDeptId: this.data.deptId,
-                }
-                tuanTiBingById(data).then((response) => {
-                    response.data.forEach((item, index) => {
-                        this.datalist.push(
-                            {
-                                key: item.rules.aid,
-                                label: item.rules.bingzhong,
-                            }
-                        )
-                    })
-                });
-            } else {
-                this.$message.warning("璇烽�夋嫨鍗曚綅鎴栭儴闂�")
+            const legendData = [];
+            const seriesData = [];
+            for (var i = 0; i < count; i++) {
+              var name =
+                Math.random() > 0.65
+                  ? makeWord(4, 1) + "路" + makeWord(3, 0)
+                  : makeWord(2, 1);
+              legendData.push(name);
+              seriesData.push({
+                name: name,
+                value: Math.round(Math.random() * 100000),
+              });
             }
-
-        },
-        handleChange1(value, direction, movedKeys) {
-            this.valueList = value
-        },
-        submitFormS() {
-            if (this.valueList.length >= 1) {
-                this.aidList = []
-                this.datalist.forEach((item, index) => {
-                    this.aidList.push(item.key)
-                })
-                let num = this.valueList.length
-                this.aidList.forEach((item, index) => {
-                    this.valueList.forEach((item1, index1) => {
-                        if (item == item1) {
-                            this.aidList.splice(index, num)
-                        }
-                    })
-                })
-            }else if(this.valueList.length == 0){
-                this.aidList = []
-                this.datalist.forEach((item, index) => {
-                    this.aidList.push(item.key)
-                })
+            return {
+              legendData: legendData,
+              seriesData: seriesData,
+            };
+            function makeWord(max, min) {
+              const nameLen = Math.ceil(Math.random() * max + min);
+              const name = [];
+              for (var i = 0; i < nameLen; i++) {
+                name.push(
+                  nameList[Math.round(Math.random() * nameList.length - 1)]
+                );
+              }
+              return name.join("");
             }
-            this.open2 = true;
-            this.title2 = "缁熻鍥捐〃";
-            let bingZhongVO = {
-                firmId: this.data.dwId,
-                firmDeptId: this.data.deptId,
-                aidList: this.aidList
-            }
-            tuanTiBingChart(bingZhongVO).then(res => {
-                this.echartsList = res.data
-                this.$nextTick(() => {
-                    var chartDom = document.getElementById('main');
-                    var myChart = echarts.init(chartDom);
-                    var option;
+          }
 
-                    option = {
-                        title: {
-                            text: '鍥㈤槦浣撴鎯呭喌',
-                            // subtext: '绾睘铏氭瀯',
-                            left: 'center',
-                        },
-                        tooltip: {
-                            trigger: 'item',
-                            formatter: '{a} <br/>{b} : {c} ({d}%)'
-                        },
-                        legend: {
-                            // type: 'scroll',
-                            orient: 'vertical',
-                            right: 10,
-                            top: 80,
-                            bottom: 20,
-                            data:this.echartsList 
-                        },
-                        series: [
-                            {
-                                name: '鐥呯鍚嶇О',
-                                type: 'pie',
-                                radius: '55%',
-                                center: ['25%', '60%'],
-
-                                data: this.echartsList ,
-                                emphasis: {
-                                    itemStyle: {
-                                        shadowBlur: 10,
-                                        shadowOffsetX: 0,
-                                        shadowColor: 'rgba(0, 0, 0, 0.5)'
-                                    }
-                                }
-                            }
-                        ]
-                    };
-
-
-                    option && myChart.setOption(option);
-                    let sizeFun = function () {
-                        myChart.resize()
-                    }
-                    window.addEventListener("resize", sizeFun)
-
-                });
-            })
-        }
+          option && myChart.setOption(option);
+          let sizeFun = function () {
+            myChart.resize();
+          };
+          window.addEventListener("resize", sizeFun);
+        });
+      });
     },
+    handlesetup() {
+      this.open1 = true;
+      this.title1 = "缁熻鍥捐缃�";
+      this.datalist = [];
+      if (this.data.dwId && this.data.deptId) {
+        let data = {
+          firmId: this.data.dwId,
+          firmDeptId: this.data.deptId,
+        };
+        tuanTiBingById(data).then((response) => {
+          response.data.forEach((item, index) => {
+            this.datalist.push({
+              key: item.rules.aid,
+              label: item.rules.bingzhong,
+            });
+          });
+        });
+      } else {
+        this.$message.warning("璇烽�夋嫨鍗曚綅鎴栭儴闂�");
+      }
+    },
+    handleChange1(value, direction, movedKeys) {
+      this.valueList = value;
+    },
+    submitFormS() {
+      if (this.valueList.length >= 1) {
+        this.aidList = [];
+        this.datalist.forEach((item, index) => {
+          this.aidList.push(item.key);
+        });
+        let num = this.valueList.length;
+        this.aidList.forEach((item, index) => {
+          this.valueList.forEach((item1, index1) => {
+            if (item == item1) {
+              this.aidList.splice(index, num);
+            }
+          });
+        });
+      } else if (this.valueList.length == 0) {
+        this.aidList = [];
+        this.datalist.forEach((item, index) => {
+          this.aidList.push(item.key);
+        });
+      }
+      this.open2 = true;
+      this.title2 = "缁熻鍥捐〃";
+      let bingZhongVO = {
+        firmId: this.data.dwId,
+        firmDeptId: this.data.deptId,
+        aidList: this.aidList,
+      };
+      tuanTiBingChart(bingZhongVO).then((res) => {
+        this.echartsList = res.data;
+        this.$nextTick(() => {
+          var chartDom = document.getElementById("main");
+          var myChart = echarts.init(chartDom);
+          var option;
+
+          option = {
+            title: {
+              text: "鍥㈤槦浣撴鎯呭喌",
+              // subtext: '绾睘铏氭瀯',
+              left: "center",
+            },
+            tooltip: {
+              trigger: "item",
+              formatter: "{a} <br/>{b} : {c} ({d}%)",
+            },
+            legend: {
+              // type: 'scroll',
+              orient: "vertical",
+              right: 10,
+              top: 80,
+              bottom: 20,
+              data: this.echartsList,
+            },
+            series: [
+              {
+                name: "鐥呯鍚嶇О",
+                type: "pie",
+                radius: "55%",
+                center: ["25%", "60%"],
+
+                data: this.echartsList,
+                emphasis: {
+                  itemStyle: {
+                    shadowBlur: 10,
+                    shadowOffsetX: 0,
+                    shadowColor: "rgba(0, 0, 0, 0.5)",
+                  },
+                },
+              },
+            ],
+          };
+
+          option && myChart.setOption(option);
+          let sizeFun = function () {
+            myChart.resize();
+          };
+          window.addEventListener("resize", sizeFun);
+        });
+      });
+    },
+  },
 };
 </script>
   
 <style>
 .el-transfer-panel {
-    width: 360px;
-    height: 480px;
+  width: 360px;
+  height: 480px;
 }
 
 .el-transfer-panel__body {
-    /* border: 1px solid red; */
-    height: 480px;
+  /* border: 1px solid red; */
+  height: 480px;
 }
 
 .el-transfer-panel__list.is-filterable {
-    height: 352px;
+  height: 352px;
 }
 
 .el-button--primary.el-transfer__button {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-
+  display: flex;
+  justify-content: center;
+  align-items: center;
 }
 
 .el-transfer__button:first-child {
-    width: 82px;
-    margin-bottom: 10px;
+  width: 82px;
+  margin-bottom: 10px;
 }
 
-.el-button+.el-button {
-    margin-left: 0px;
+.el-button + .el-button {
+  margin-left: 0px;
 }
 </style>
\ No newline at end of file

--
Gitblit v1.8.0