From 3435a2b1b3e237ee53c98ae7c044d0e84cfa521c Mon Sep 17 00:00:00 2001
From: su1124 <1583764726@qq.com>
Date: 星期四, 25 一月 2024 18:01:18 +0800
Subject: [PATCH] su

---
 src/views/doctor/check/index.vue          |    6 
 src/views/hosp/harmType/index.vue         |  679 +++++++++++++----------
 src/views/system/comp/index.vue           |    6 
 src/views/system/dept/index.vue           |    6 
 src/api/team/reportresults.js             |   10 
 src/views/reservation/resercopy/index.vue |    1 
 src/views/team/reportresults/index.vue    |  913 ++++++++++++++++++++------------
 7 files changed, 961 insertions(+), 660 deletions(-)

diff --git a/src/api/team/reportresults.js b/src/api/team/reportresults.js
new file mode 100644
index 0000000..7b639e5
--- /dev/null
+++ b/src/api/team/reportresults.js
@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 鍥㈡鐥呯椤甸潰鏌ヨ浜哄憳鍒楄〃鎺ュ彛
+export function getPeopleList(query) {
+    return request({
+      url: '/group/inspection/getPeopleList',
+      method: 'get',
+      params: query
+    })
+  }
\ No newline at end of file
diff --git a/src/views/doctor/check/index.vue b/src/views/doctor/check/index.vue
index 3d9e750..8ead2cd 100644
--- a/src/views/doctor/check/index.vue
+++ b/src/views/doctor/check/index.vue
@@ -223,7 +223,7 @@
               <el-select
                 v-model="form.hzDeptId"
                 multiple
-                filterable
+                filterable569-0=
                 style="width: 100%"
               >
                 <el-option
@@ -1315,9 +1315,9 @@
         }
       });
     },
-    hb(){
+    hb() {
       console.log(this.queryParams.tjNumber);
-       if (this.queryParams.tjNumber != "") {
+      if (this.queryParams.tjNumber != "") {
         this.submitForm();
       }
     },
diff --git a/src/views/hosp/harmType/index.vue b/src/views/hosp/harmType/index.vue
index a8217c7..d419b00 100644
--- a/src/views/hosp/harmType/index.vue
+++ b/src/views/hosp/harmType/index.vue
@@ -1,331 +1,406 @@
 <template>
-    <div class="app-container">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="缂栫爜" prop="harmCode">
+        <el-input
+          v-model="queryParams.harmCode"
+          placeholder="璇疯緭鍏ョ紪鐮�"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="鍚嶇О" prop="harmType">
+        <el-input
+          v-model="queryParams.harmType"
+          placeholder="璇疯緭鍏ヨ亴涓氱梾鎷奸煶鐮�"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="鎷奸煶鐮�" prop="harmPinYin">
+        <el-input
+          v-model="queryParams.harmPinYin"
+          placeholder="璇疯緭鍏ヨ亴涓氱梾鎷奸煶鐮�"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
 
-            <el-form-item label="缂栫爜" prop="harmCode">
-                <el-input v-model="queryParams.harmCode" placeholder="璇疯緭鍏ョ紪鐮�" clearable @keyup.enter.native="handleQuery" />
-            </el-form-item>
-            <el-form-item label="鍚嶇О" prop="harmType">
-                <el-input v-model="queryParams.harmType" placeholder="璇疯緭鍏ヨ亴涓氱梾鎷奸煶鐮�" clearable
-                    @keyup.enter.native="handleQuery" />
-            </el-form-item>
-            <el-form-item label="鎷奸煶鐮�" prop="harmPinYin">
-                <el-input v-model="queryParams.harmPinYin" placeholder="璇疯緭鍏ヨ亴涓氱梾鎷奸煶鐮�" clearable
-                    @keyup.enter.native="handleQuery" />
-            </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >鎼滅储</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >閲嶇疆</el-button
+        >
+      </el-form-item>
+    </el-form>
 
-            <el-form-item>
-                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
-                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
-            </el-form-item>
-        </el-form>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['hosp:harmType:add']"
+          >鏂板
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['hosp:harmType:edit']"
+          >淇敼
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['hosp:harmType:remove']"
+          >鍒犻櫎
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['hosp:harmType:export']"
+          >瀵煎嚭
+        </el-button>
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
 
-        <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
-                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                    v-hasPermi="['hosp:harmType:add']">鏂板
-                </el-button>
-            </el-col>
-            <el-col :span="1.5">
-                <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
-                    v-hasPermi="['hosp:harmType:edit']">淇敼
-                </el-button>
-            </el-col>
-            <el-col :span="1.5">
-                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-                    v-hasPermi="['hosp:harmType:remove']">鍒犻櫎
-                </el-button>
-            </el-col>
-            <el-col :span="1.5">
-                <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-                    v-hasPermi="['hosp:harmType:export']">瀵煎嚭
-                </el-button>
-            </el-col>
-            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
+    <el-table
+      v-loading="loading"
+      :data="harmTypeList"
+      @selection-change="handleSelectionChange"
+      border
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="鎺掑簭" align="center" prop="newID" />
+      <el-table-column label="鑱屼笟鐥呯紪鐮�" align="center" prop="harmCode" />
+      <el-table-column label="鑱屼笟鐥呭悕绉�" align="center" prop="harmType" />
+      <el-table-column label="鑱屼笟鐥呮嫾闊崇爜" align="center" prop="harmPinYin" />
+      <el-table-column label="鎻忚堪" align="center" prop="harmInfo" />
+      <el-table-column label="闃叉姢鎺柦" align="center" prop="protection" />
+      <el-table-column
+        label="鎿嶄綔"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['hosp:harmType:edit']"
+            title="淇敼"
+            >
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['hosp:harmType:remove']"
+            title="鍒犻櫎"
+            >
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
 
-        <el-table v-loading="loading" :data="harmTypeList" @selection-change="handleSelectionChange" border>
-            <el-table-column type="selection" width="55" align="center" />
-            <el-table-column label="鎺掑簭" align="center" prop="sort" />
-            <el-table-column label="鑱屼笟鐥呯紪鐮�" align="center" prop="harmCode" />
-            <el-table-column label="鑱屼笟鐥呭悕绉�" align="center" prop="harmType" />
-            <el-table-column label="鑱屼笟鐥呮嫾闊崇爜" align="center" prop="harmPinYin" />
-            <el-table-column label="鎻忚堪" align="center" prop="harmInfo" />
-            <el-table-column label="闃叉姢鎺柦" align="center" prop="protection" />
-            <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
-                <template slot-scope="scope">
-                    <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                        v-hasPermi="['hosp:harmType:edit']">淇敼
-                    </el-button>
-                    <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                        v-hasPermi="['hosp:harmType:remove']">鍒犻櫎
-                    </el-button>
-                </template>
-            </el-table-column>
-        </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" />
-            </div>
-        </div>
-
-
-        <!-- 娣诲姞鎴栦慨鏀硅亴涓氱梾瀵硅瘽妗� -->
-        <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-            <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-                <el-form-item label="鎺掑簭" prop="sort">
-                    <el-input v-model="form.sort" placeholder="璇疯緭鍏ユ帓搴�" />
-                </el-form-item>
-                <el-form-item label="缂栫爜" prop="harmCode">
-                    <el-input v-model="form.harmCode" placeholder="璇疯緭鍏ョ紪鐮�" />
-                </el-form-item>
-                <el-form-item label="鎷奸煶鐮�" prop="harmPinYin">
-                    <el-input v-model="form.harmPinYin" placeholder="璇疯緭鍏ユ嫾闊崇爜" />
-                </el-form-item>
-                <el-form-item label="鍚嶇О" prop="harmType">
-                    <el-input v-model="form.harmType" placeholder="璇疯緭鍏ュ悕绉�" />
-                </el-form-item>
-
-                <el-form-item label="鎻忚堪" prop="harmInfo">
-                    <el-input v-model="form.harmInfo" type="textarea" placeholder="璇疯緭鍏ユ弿杩�" />
-                </el-form-item>
-
-
-                <el-form-item label="闃叉姢鎺柦" prop="protection">
-                    <el-input v-model="form.protection" placeholder="璇疯緭鍏ラ槻鎶ゆ帾鏂�" />
-                </el-form-item>
-            </el-form>
-            <div slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
-                <el-button @click="cancel">鍙� 娑�</el-button>
-            </div>
-        </el-dialog>
+    <div class="pag">
+      <div class="pag1">
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </div>
     </div>
+
+    <!-- 娣诲姞鎴栦慨鏀硅亴涓氱梾瀵硅瘽妗� -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="鏁板瓧" prop="sort">
+          <el-input v-model="form.sort" placeholder="璇疯緭鍏ユ帓搴�" />
+        </el-form-item>
+        <el-form-item label="缂栫爜" prop="harmCode">
+          <el-input v-model="form.harmCode" placeholder="璇疯緭鍏ョ紪鐮�" />
+        </el-form-item>
+        <el-form-item label="鎷奸煶鐮�" prop="harmPinYin">
+          <el-input v-model="form.harmPinYin" placeholder="璇疯緭鍏ユ嫾闊崇爜" />
+        </el-form-item>
+        <el-form-item label="鍚嶇О" prop="harmType">
+          <el-input v-model="form.harmType" placeholder="璇疯緭鍏ュ悕绉�" />
+        </el-form-item>
+
+        <el-form-item label="鎻忚堪" prop="harmInfo">
+          <el-input
+            v-model="form.harmInfo"
+            type="textarea"
+            placeholder="璇疯緭鍏ユ弿杩�"
+          />
+        </el-form-item>
+
+        <el-form-item label="闃叉姢鎺柦" prop="protection">
+          <el-input v-model="form.protection" placeholder="璇疯緭鍏ラ槻鎶ゆ帾鏂�" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
+        <el-button @click="cancel">鍙� 娑�</el-button>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
 import {
-    listHarmType,
-    getHarmType,
-    delHarmType,
-    addHarmType,
-    updateHarmType
+  listHarmType,
+  getHarmType,
+  delHarmType,
+  addHarmType,
+  updateHarmType,
 } from "@/api/hosp/harmType";
 
 export default {
-    name: "HarmType",
-    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 (!patter.test(value)) {
-                return callback('');
-            }
-        };
-        return {
-            // 閬僵灞�
-            loading: true,
-            // 閫変腑鏁扮粍
-            ids: [],
-            // 闈炲崟涓鐢�
-            single: true,
-            // 闈炲涓鐢�
-            multiple: true,
-            // 鏄剧ず鎼滅储鏉′欢
-            showSearch: true,
-            // 鎬绘潯鏁�
-            total: 0,
-            // 鑱屼笟鐥呰〃鏍兼暟鎹�
-            harmTypeList: [],
-            // 寮瑰嚭灞傛爣棰�
-            title: "",
-            // 鏄惁鏄剧ず寮瑰嚭灞�
-            open: false,
-            // 鏌ヨ鍙傛暟
-            queryParams: {
-                pageNum: 1,
-                pageSize: 10,
-                harmpinyin: null,
-                harmtype: null,
-                sort: null,
-                harminfo: null,
-                externalcode: null,
-                harmcode: null,
-                type: null,
-                protection: null
-            },
-            // 琛ㄥ崟鍙傛暟
-            form: {},
-            // 琛ㄥ崟鏍¢獙
-            rules: {
-                sort: [
-                    { required: true, validator: checkPhoneNum, trigger: "blur" }
-                ],
-                harmCode: [
-                    { required: true, validator: checkPhoneNum, trigger: "blur" }
-                ],
-                
-                harmPinYin: [
-                    { required: true, validator: checkPhoneNum, trigger: "blur" }
-                ],
-                
-                harmType: [
-                    { required: true, validator: checkPhoneNum, trigger: "blur" }
-                ],
-                
-                harmInfo: [
-                    { required: true, validator: checkPhoneNum, trigger: "blur" }
-                ],
-                
-                protection: [
-                    { required: true, validator: checkPhoneNum, trigger: "blur" }
-                ],
-                
+  name: "HarmType",
+  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 (!patter.test(value)) {
+        return callback("");
+      }
+    };
+    return {
+      // 閬僵灞�
+      loading: true,
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: true,
+      // 鎬绘潯鏁�
+      total: 0,
+      // 鑱屼笟鐥呰〃鏍兼暟鎹�
+      harmTypeList: [],
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        harmpinyin: null,
+        harmtype: null,
+        sort: null,
+        harminfo: null,
+        externalcode: null,
+        harmcode: null,
+        type: null,
+        protection: null,
+      },
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      // 琛ㄥ崟鏍¢獙
+      rules: {
+        // sort: [{ required: true, validator: checkPhoneNum, trigger: "blur" }],
+        // harmCode: [
+        //   { required: true, validator: checkPhoneNum, trigger: "blur" },
+        // ],
 
-            
-            }
-        };
+        harmPinYin: [
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
+        ],
+
+        harmType: [
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
+        ],
+
+        // harmInfo: [
+        //   { required: true, validator: checkPhoneNum, trigger: "blur" },
+        // ],
+
+        protection: [
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 鏌ヨ鑱屼笟鐥呭垪琛� */
+    getList() {
+      this.loading = true;
+      listHarmType(this.queryParams).then((response) => {
+         response.rows.forEach((item, index) => {
+          item.newID = (this.queryParams.pageNum - 1) * this.queryParams.pageSize + index + 1;
+        });
+        this.harmTypeList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
     },
-    created() {
-        this.getList();
+    // 鍙栨秷鎸夐挳
+    cancel() {
+      this.open = false;
+      this.reset();
     },
-    methods: {
-        /** 鏌ヨ鑱屼笟鐥呭垪琛� */
-        getList() {
-            this.loading = true;
-            listHarmType(this.queryParams).then(response => {
-                this.harmTypeList = response.rows;
-                this.total = response.total;
-                this.loading = false;
+    // 琛ㄥ崟閲嶇疆
+    reset() {
+      this.form = {
+        aid: null,
+        harmpinyin: null,
+        harmtype: null,
+        sort: null,
+        harminfo: null,
+        externalcode: null,
+        harmcode: null,
+        type: null,
+        protection: null,
+      };
+      this.resetForm("form");
+    },
+    /** 鎼滅储鎸夐挳鎿嶄綔 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 閲嶇疆鎸夐挳鎿嶄綔 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 澶氶�夋閫変腑鏁版嵁
+    handleSelectionChange(selection) {
+      this.ids = [];
+      this.ids = selection.map((item) => item.aid);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 鏂板鎸夐挳鎿嶄綔 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "娣诲姞鑱屼笟鐥�";
+    },
+    /** 淇敼鎸夐挳鎿嶄綔 */
+    handleUpdate(row) {
+      this.reset();
+      const aid = row.aid || this.ids;
+      getHarmType(aid).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "鏈夊鍥犵礌";
+      });
+    },
+    /** 鎻愪氦鎸夐挳 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.aid != null) {
+            updateHarmType(this.form).then((response) => {
+              this.$modal.msgSuccess("淇敼鎴愬姛");
+              this.open = false;
+              this.getList();
             });
-        },
-        // 鍙栨秷鎸夐挳
-        cancel() {
-            this.open = false;
-            this.reset();
-        },
-        // 琛ㄥ崟閲嶇疆
-        reset() {
-            this.form = {
-                aid: null,
-                harmpinyin: null,
-                harmtype: null,
-                sort: null,
-                harminfo: null,
-                externalcode: null,
-                harmcode: null,
-                type: null,
-                protection: null
-            };
-            this.resetForm("form");
-        },
-        /** 鎼滅储鎸夐挳鎿嶄綔 */
-        handleQuery() {
-            this.queryParams.pageNum = 1;
-            this.getList();
-        },
-        /** 閲嶇疆鎸夐挳鎿嶄綔 */
-        resetQuery() {
-            this.resetForm("queryForm");
-            this.handleQuery();
-        },
-        // 澶氶�夋閫変腑鏁版嵁
-        handleSelectionChange(selection) {
-            this.ids = []
-            this.ids = selection.map(item => item.aid)
-            this.single = selection.length !== 1
-            this.multiple = !selection.length
-        },
-        /** 鏂板鎸夐挳鎿嶄綔 */
-        handleAdd() {
-            this.reset();
-            this.open = true;
-            this.title = "娣诲姞鑱屼笟鐥�";
-        },
-        /** 淇敼鎸夐挳鎿嶄綔 */
-        handleUpdate(row) {
-            this.reset();
-            const aid = row.aid || this.ids
-            getHarmType(aid).then(response => {
-                this.form = response.data;
-                this.open = true;
-                this.title = "鏈夊鍥犵礌";
-            });
-        },
-        /** 鎻愪氦鎸夐挳 */
-        submitForm() {
-            this.$refs["form"].validate((valid) => {
-                if (valid) {
-                    if (this.form.aid != null) {
-                        updateHarmType(this.form).then((response) => {
-                            this.$modal.msgSuccess("淇敼鎴愬姛");
-                            this.open = false;
-                            this.getList();
-                        });
-                    } else {
-                        if(this.form.harmPinYin && this.form.harmType && this.form.harmCode){
-                            addHarmType(this.form).then((response) => {
-                            this.$modal.msgSuccess("鏂板鎴愬姛");
-                            this.open = false;
-                            this.getList();
-                        });
-                        }else{
-                            this.$modal.msgError("璇峰~鍐欏繀濉」淇℃伅");
-                        }
-                       
-                    }
-                }
-            });
-        },
-        /** 鍒犻櫎鎸夐挳鎿嶄綔 */
-        handleDelete(row) {
-            if (row) {
-                this.ids = []
-                this.ids.push(row.aid)
+          } else {
+            if (
+              this.form.harmPinYin &&
+              this.form.harmType &&
+              this.form.harmCode
+            ) {
+              addHarmType(this.form).then((response) => {
+                this.$modal.msgSuccess("鏂板鎴愬姛");
+                this.open = false;
+                this.getList();
+              });
+            } else {
+              this.$modal.msgError("璇峰~鍐欏繀濉」淇℃伅");
             }
-
-            const ids = this.ids;
-            this.$modal
-                .confirm('鏄惁纭鍒犻櫎advice缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�')
-                .then(function () {
-                    return delHarmType(ids);
-                })
-                .then(() => {
-                    this.getList();
-                    this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-                })
-                .catch(() => { });
-        },
-
-
-        SelectionChange(selection) { },
-
-
-
-        /** 瀵煎嚭鎸夐挳鎿嶄綔 */
-        handleExport() {
-
+          }
         }
-    }
-}
-    ;
+      });
+    },
+    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+    handleDelete(row) {
+      if (row) {
+        this.ids = [];
+        this.ids.push(row.aid);
+      }
+
+      const ids = this.ids;
+      this.$modal
+        .confirm('鏄惁纭鍒犻櫎advice缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�')
+        .then(function () {
+          return delHarmType(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+        })
+        .catch(() => {});
+    },
+
+    SelectionChange(selection) {},
+
+    /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+    handleExport() {},
+  },
+};
 </script>
 
 
 <style>
 .pag {
-    width: 100%;
-    display: flex;
-    justify-content: center;
+  width: 100%;
+  display: flex;
+  justify-content: center;
 }
 
 .pag1 {
-    width: 30%;
+  width: 30%;
 }
 </style>
diff --git a/src/views/reservation/resercopy/index.vue b/src/views/reservation/resercopy/index.vue
index c33d7c6..3cbefa5 100644
--- a/src/views/reservation/resercopy/index.vue
+++ b/src/views/reservation/resercopy/index.vue
@@ -964,6 +964,7 @@
         newConfirm(data).then((res) => {
           this.$modal.msgSuccess("鎻愪氦鎴愬姛");
           this.confirm = true;
+           this.userList = [];
         });
       } else {
         this.$modal.msgError("璇峰~鍐欏甫鏄熷彿鍐呭");
diff --git a/src/views/system/comp/index.vue b/src/views/system/comp/index.vue
index 30afc43..5f9ac22 100644
--- a/src/views/system/comp/index.vue
+++ b/src/views/system/comp/index.vue
@@ -1022,6 +1022,12 @@
         dwgrouping(data).then(res => {
           if (res.code == 200) {
             this.beCurrent()
+            this.forms.groupingName = "";
+            this.forms.sex = "";
+            this.forms.pacName = "";
+            this.forms.price = "";
+            this.forms.ysPrice = "";
+            this.forms.payType = "";
           }
         })
       }
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 1eb767f..685b27a 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -267,7 +267,7 @@
               v-for="dict in hospList"
               :key="dict.hospAreaName"
               :label="dict.hospAreaName"
-              :value="dict.hospAreaName"
+              :value="dict.hospAreaId"
             />
           </el-select>
         </el-form-item>
@@ -421,7 +421,6 @@
   components: { Treeselect },
   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("");
@@ -527,6 +526,7 @@
     getlistHosp() {
       listHosp(this.queryParams).then((response) => {
         this.hospList = response.rows;
+        console.log(this.hospList);
       });
     },
     /** 杞崲閮ㄩ棬鏁版嵁缁撴瀯 */
@@ -659,11 +659,9 @@
       // console.log(11111)
       // this.reset();
       this.form = row;
-      console.log(this.form )
       // this.form.parentId = this.form.parentId.toString()
       if(this.form.parentId == 0){
         this.deptOption.push({ "id": 0, "label": "涓荤被鐩�", });
-        console.log(this.deptOption);
       }
       this.open = true;
       this.title = "绉戝淇℃伅缁存姢  ";
diff --git a/src/views/team/reportresults/index.vue b/src/views/team/reportresults/index.vue
index d341afd..013d714 100644
--- a/src/views/team/reportresults/index.vue
+++ b/src/views/team/reportresults/index.vue
@@ -1,372 +1,583 @@
 <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="drugManufacturerId">
-                        <el-select :remote-method="getRemoteData" v-model="objs.drugManufacturerId" 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="dwDeptName">
-                        <el-select v-model="objs.dwDeptName" 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="payType">
-                        <el-select v-model="objs.payType" 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-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="鏃堕棿" prop="applicationTime">
+        <el-date-picker
+          clearable
+          v-model="createTimeList"
+          @change="dateChangebirthday1"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="寮�濮嬫棩鏈�"
+          end-placeholder="缁撴潫鏃ユ湡"
+          :picker-options="pickerOptions"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="鍗曚綅" prop="compId">
+        <el-select
+          v-model="queryParams.compId"
+          placeholder="璇烽�夋嫨鍗曚綅"
+          clearable
+          style="width: 200px"
+          @change="cmp"
+        >
+          <el-option
+            v-for="dict in compList"
+            :key="dict.drugManufacturerId"
+            :label="dict.cnName"
+            :value="dict.drugManufacturerId"
+          />
+        </el-select>
+        <!-- <el-input v-model="queryParams.compId" placeholder="璇疯緭鍏ュ崟浣�" clearable @keyup.enter.native="handleQuery" style="width: 170px"/> -->
+      </el-form-item>
+      <el-form-item label="閮ㄩ棬" prop="deptName">
+        <el-input
+          v-model="queryParams.deptName"
+          placeholder="璇疯緭鍏ラ儴闂�"
+          clearable
+          @keyup.enter.native="handleQuery"
+          style="width: 200px"
+        />
+      </el-form-item>
+      <el-form-item label="鍗曚綅閮ㄩ棬" prop="dwDeptId">
+        <el-select
+          v-model="queryParams.dwDeptId"
+          placeholder="璇烽�夋嫨鍗曚綅閮ㄩ棬"
+          clearable
+          style="width: 200px"
+          @change="dw"
+        >
+          <el-option
+            v-for="dict in dwList"
+            :key="dict.id"
+            :label="dict.dwDeptName"
+            :value="dict.id"
+          />
+        </el-select>
+        <!-- <el-input v-model="queryParams.dwDeptId" placeholder="璇疯緭鍏ュ崟浣嶉儴闂�" clearable @keyup.enter.native="handleQuery" style="width: 110px"/> -->
+      </el-form-item>
+      <el-form-item label="鍒嗙粍" prop="groupingId">
+        <el-select
+          v-model="queryParams.groupingId"
+          placeholder="璇烽�夋嫨鍒嗙粍"
+          clearable
+          style="width: 200px"
+          @change="dw"
+        >
+          <el-option
+            v-for="dict in gropList"
+            :key="dict.id"
+            :label="dict.groupingName"
+            :value="dict.id"
+          />
+        </el-select>
+        <!-- <el-input v-model="queryParams.groupingId" placeholder="璇疯緭鍏ュ垎缁�" clearable @keyup.enter.native="handleQuery" style="width: 110px"/> -->
+      </el-form-item>
+      <!-- <el-form-item label="鐥呯鍚嶇О" prop="name">
+        <el-input
+          v-model="queryParam.name"
+          placeholder="璇疯緭鍏ラ儴闂�"
+          clearable
+          @keyup.enter.native="handleQuery"
+          style="width: 200px"
+        />
+      </el-form-item> -->
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >鏌ヨ</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >閲嶇疆</el-button
+        >
+      </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 :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" size="mini" @click="tongji"
+          >缁熻缁撴灉</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" size="mini" @click="clear"
+          >娓呯┖宸查�夎緭鍑哄垪</el-button
+        >
+      </el-col>
+    </el-row>
 
-        </el-row>
-
-        <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="handlesetup">娣诲姞鍏ㄩ儴鍩虹椤圭洰</el-button>
-                </el-col>
-                <el-col :span="1.5">
-                    <el-button type="primary" size="mini" :disabled="single" @click="handleAll">缁熻缁撴灉</el-button>
-                </el-col>
-
-            </el-row>
-            <el-row :gutter="20">
-                <!--閮ㄩ棬鏁版嵁-->
-                <el-col :span="7" :xs="24">
-                    <el-table v-loading="loading" ref="tree" :data="userList" border height="500"
-                        @selection-change="handleSelectionChange">
-                        <el-table-column type="selection" width="55">
-                        </el-table-column>
-                        <el-table-column label="浣撴鍙�" align="center" prop="name"  />
-                        <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>
-                </el-col>
-                <el-col :span="8" :xs="24">
-                    <el-table v-loading="loading" ref="tree" :data="userList" border height="500"
-                        @selection-change="handleSelectionChange">
-                        <el-table-column label="鏀惰垂椤圭洰鍚嶇О" align="center" prop="name" />
-                    </el-table>
-                </el-col>
-                <el-col :span="8" :xs="24">
-                    <el-table v-loading="loading" ref="tree" :data="userList" border height="500"
-                        @selection-change="handleSelectionChange">
-                        <el-table-column label="宸查�夐」鐩悕绉�" align="center" prop="name"  />
-                    </el-table>
-                </el-col>
-            </el-row>
-
-        </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
-                        :left-default-checked="[2, 3]" :right-default-checked="[1]" :render-content="renderFunc"
-                        :titles="['鏄剧ず鐥呯', '闅愯棌鐥呯']" :button-texts="['鏄剧ず', '闅愯棌']" :format="{
-                            noChecked: '${total}',
-                            hasChecked: '${checked}/${total}'
-                        }" @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 style="width: 100%; margin-left: 10px; display: flex">
+      <div style="width: 40%; margin-right: 30px">
+        <el-table
+          border
+          :data="tableData"
+          style="width: 100%"
+          @selection-change="handleSelectionChanges"
+        >
+          <el-table-column type="selection" width="40" align="center" />
+          <el-table-column
+            prop="tjNumber"
+            label="浣撴鍙�"
+            width="160"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="濮撳悕"
+            align="center"
+            :show-overflow-tooltip="true"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="sex"
+            label="鎬у埆"
+            align="center"
+            width="70px"
+            :show-overflow-tooltip="true"
+          >
+            <template slot-scope="scope">{{
+              scope.row.sex === 0 ? "鐢�" : "濂�"
+            }}</template>
+          </el-table-column>
+          <el-table-column
+            prop="age"
+            label="骞撮緞"
+            align="center"
+            width="70"
+            :show-overflow-tooltip="true"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="company"
+            label="鍗曚綅"
+            align="center"
+            :show-overflow-tooltip="true"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="department"
+            label="閮ㄩ棬"
+            align="center"
+            :show-overflow-tooltip="true"
+          >
+          </el-table-column>
+        </el-table>
+      </div>
+      <div style="width: 50%; display: flex">
+        <el-tabs
+        type="border-card"
+        style="height: 560px; margin: 0 10px; width: 100%"
+      >
+        <el-tab-pane label="鍗曢」">
+          <div class="tab3">
+            <!-- <div class="tab2"> -->
+            <v-tree-transfer
+              :treeData="treedataList"
+              :defaultProps="{ children: 'tjProjectList', label: 'proName' }"
+              :defaultKeys="defaultKeys"
+              @changeKeys="changeCategoryKeys"
+              :key="datekey"
+            ></v-tree-transfer>
+            <!-- <el-tree ref="tree" :data="treedataList" show-checkbox node-key="proId" :props="defaultProps"
+                :default-expanded-keys="treeId" :default-checked-keys="treeList" @check-change="handleCurrentChecked">
+              </el-tree> -->
+            <!-- </div> -->
+            <!-- <el-button
+                style="
+                  width: 20px;
+                  height: 100px;
+                  margin-left: 10px;
+                  margin-top: 20%;
+                  font-size: 10px;
+                "
+                type="primary"
+                size="mini"
+                @click="submit"
+                ><i style="font-size: 18px" class="el-icon-d-arrow-right"></i
+              ></el-button> -->
+          </div>
+        </el-tab-pane>
+      </el-tabs>
+      </div>
     </div>
+    <div style="margin-right: 64%">
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.page"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </div>
+
+    <!-- <div style="width: 100%; display: flex">
+      <el-pagination
+        v-show="totals > 0"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="currentPage4"
+        :page-sizes="[10, 20, 30, 40]"
+        :page-size="10"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="totals"
+      >
+      </el-pagination>
+    </div> -->
+    <!-- 鏌ョ湅缁熻鍥� -->
+    <div class="dia">
+      <el-dialog
+        :title="title2"
+        :visible.sync="open"
+        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>
 </template>
-  
+
 <script>
-import { Deptlist, getDwAndDwDept } from "@/api/system/comp";
-import { getCompany, queryCompany } from "@/api/team/tuanti";
-
+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 VTreeTransfer from "../../system/tijian/TreeTransfer.vue";
+import {
+  deptTreeSelect,
+  projectGetList,
+  getOrder,
+  getCusIdcard,
+  getPackageListName,
+  getaddtTransition,
+  getTransitionList,
+  getByTeamNo,
+  getLoadFile,
+  getIsRequired,
+  getconfigKey,
+  getHistryTjOrderProByCusIdCard,
+} from "@/api/system/tijian";
+import {
+  getPeopleList,
+  getDeptAndDwDeptByComp,
+  getDwGroupingByDwDeptId,
+  getTjRules,
+  getStatist,
+} from "@/api/team/disease";
+import { listComp } from "@/api/system/comp";
 export default {
-    name: "Tijian",
-
-    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 (!patter.test(value)) {
-        return callback('');
-      }
+  components: {
+    VTreeTransfer,
+  },
+  data() {
+    return {
+      datekey: Date.now(),
+      defaultKeys: [],
+      defaultProps: {
+        children: "tjProjectList",
+        label: "proName",
+      },
+      tjProjectList: [],
+      treedataList: [],
+      rongjiList: [],
+      aids: [],
+      tjNums: [],
+      title2: "",
+      open: false,
+      currentPage4: 1,
+      gropList: [],
+      dwList: [],
+      compList: [],
+      total: 0,
+      totals: 0,
+      tableData: [],
+      tableData2: [],
+      createTimeList: [],
+      queryParam: {
+        name: null,
+        page: 1,
+        pageSize: 10,
+        groupingId: null,
+      },
+      queryParams: {
+        page: 1,
+        pageSize: 10,
+        compId: null,
+        deptName: null,
+        groupingId: null,
+        beginTime: null,
+        endTime: null,
+        dwDeptId: null,
+      },
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "鏈�杩戜竴鍛�",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "鏈�杩戜竴涓湀",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "鏈�杩戜笁涓湀",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
     };
-        const generateData = _ => {
-            const data = [];
-            for (let i = 1; i <= 15; i++) {
-                data.push({
-                    key: i,
-                    label: `澶囬�夐」 ${i}`,
-                    disabled: i % 4 === 0
-                });
-            }
-            return data;
-        };
-        return {
-            datalist: generateData(),
-            value: [1],
-            value4: [1],
-            renderFunc(h, option) {
-                return <span>{option.key} - {option.label}</span>;
-            },
-            objs: {
-                drugManufacturerId: "",
-                dwDeptName: "",
-                reservationTime: "",
-            },
-            data: {
-                dwId: "",
-                deptId: "",
-            },
-            // 寮瑰嚭灞傛爣棰�
-            title1: "",
-            deptList: [],
-            CompanyList: [],
-            groupingList: [],
-            userList: [],
-            menuIds: [],
-            proIds: [],
-            open1: false,
-            // 闈炲崟涓鐢�
-            single: false,
-            // 琛ㄥ崟鍙傛暟
-            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: {
-                drugManufacturerId: [
-                    { required: true, validator: checkPhoneNum,  trigger: "change" },
-                ],
-                reservationTime: [
-                    { required: true, validator: checkPhoneNum,  trigger: "blur" },
-                ],
-                dwDeptName: [
-                    { required: true, validator: checkPhoneNum,  trigger: "change" },
-                ],
-            },
-        };
+  },
+  created() {
+    this.getNowTime();
+    this.getList();
+    this.getcomp();
+    this.getData();
+    this.datekey = Date.now();
+  },
+  methods: {
+    changeCategoryKeys(val) {
+        console.log(val);
+      this.proIds = [];
+      this.proIds = val;
+      // if (this.DataList.length != 0) {
+      //   this.DataList.forEach((item) => {
+      //     this.proIds.push(item.proId);
+      //   });
+      // } else {
+      //   this.proIds = [];
+      // }
     },
-    created() {
-        this.getNowTime()
-        this.getList();
+    getData() {
+      /** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
+      this.loading = true;
+      projectGetList().then((response) => {
+        this.treedataList = response.data.list;
+        console.log(this.treedataList);
+        this.dXData = response.data.list;
+        this.loading = false;
+        return;
+      });
     },
 
-    methods: {
-        getList() {
-            this.loading = true;
-            getCompany(this.queryParam).then((response) => {
-                this.CompanyList = response.data;
-                this.total = response.total;
-                this.loading = false;
-            });
-        },
-        handlequery() {
+    // / 澶勭悊榛樿閫変腑褰撳墠鏃ユ湡
+    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();
+      return y + "-" + this.add0(m) + "-" + this.add0(d);
+    },
+    // 鍥㈡鐥呯椤甸潰鏌ヨ浜哄憳鍒楄〃
+    getList() {
+      this.queryParams.beginTime = this.createTimeList[0];
+      this.queryParams.endTime = this.createTimeList[1];
+      getPeopleList(this.queryParams).then((res) => {
+        this.tableData = res.data.voList;
+        this.total = res.data.total;
+      });
+    },
 
-        },
-        handleQuery() {
-            console.log(1111)
-        },
-        // 澶氶�夋閫変腑鏁版嵁
-        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: "鍚敤"
+    handleSizeChange(val) {
+      this.queryParam.pageSize = val;
+      this.geticd();
+    },
+    handleCurrentChange(val) {
+      this.queryParam.page = val;
+      this.geticd();
+    },
+    /** 鏌ヨ浣撴鍗曚綅淇℃伅缁存姢鍒楄〃 */
+    getcomp() {
+      listComp().then((response) => {
+        this.compList = response.rows;
+      });
+    },
+    // 鏍规嵁鍗曚綅鏌ヨ閮ㄩ棬鍜屽崟浣嶉儴闂ㄤ俊鎭�
+    cmp(val) {
+      let compId = val;
+      getDeptAndDwDeptByComp(compId).then((res) => {
+        this.dwList = res.data;
+      });
+    },
+    // 鏍规嵁鍗曚綅閮ㄩ棬鏌ヨ鍗曚綅鍒嗙粍淇℃伅淇℃伅
+    dw(vals) {
+      let dwDeptId = vals;
+      getDwGroupingByDwDeptId(dwDeptId).then((res) => {
+        this.gropList = res.data;
+      });
+    },
+    handleSelectionChanges(selection) {
+      this.tjNums = selection.map((item) => item.tjNumber);
+    },
+    handleSelectionChange(selection) {
+      this.tableData2 = selection;
+      this.aids = selection.map((item) => item.aid);
+    },
+    clear() {
+      this.tableData2 = [];
+    },
+    /** 鎼滅储鎸夐挳鎿嶄綔 */
+    handleQuery() {
+      this.queryParams.page = 1;
+      this.getList();
+      this.queryParam.page = 1;
+      this.geticd();
+    },
+    /** 閲嶇疆鎸夐挳鎿嶄綔 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+      this.loading = true;
+    },
+    dateChangebirthday1(val) {
+      this.createTimeList = val;
+    },
+    tongji() {
+      this.title2 = "缁熻鍥捐〃";
+
+      let tjRulesStatisticsDto = {
+        aids: this.aids,
+        tjNums: this.tjNums,
+      };
+      console.log(tjRulesStatisticsDto);
+      if (
+        tjRulesStatisticsDto.aids.length === 0 ||
+        tjRulesStatisticsDto.tjNums.length === 0
+      ) {
+        this.$message.warning("璇烽�夋嫨浜哄憳鍜岀梾绉嶏紒");
+      } else {
+        this.open = true;
+        getStatist(tjRulesStatisticsDto).then((res) => {
+          this.rongjiList = res.data;
+
+          this.$nextTick(() => {
+            var chartDom = document.getElementById("main");
+            var myChart = echarts.init(chartDom);
+            var option;
+
+            option = {
+              title: {
+                text: "鐥呯缁熻",
+                left: "center",
+              },
+              tooltip: {
+                trigger: "item",
+                formatter: "{a} <br/>{b} : {c} ({d}%)",
+              },
+              legend: {
+                // type: 'scroll',
+                orient: "vertical",
+                right: 10,
+                top: 80,
+                bottom: 20,
+                data: this.rongjiList,
+              },
+              series: [
+                {
+                  name: "鐥呯鍚嶇О",
+                  type: "pie",
+                  radius: "55%",
+                  center: ["25%", "60%"],
+
+                  data: this.rongjiList,
+                  emphasis: {
+                    itemStyle: {
+                      shadowBlur: 10,
+                      shadowOffsetX: 0,
+                      shadowColor: "rgba(0, 0, 0, 0.5)",
+                    },
+                  },
+                },
+              ],
             };
-            this.resetForm("form");
-        },
-        idFn(value) {
-            this.data.dwId = value
-            Deptlist(value).then((response) => {
-                this.deptList = response.data;
-            });
-        },
-        idBm(value) {
-            this.data.deptId = value
-            console.log(this.data)
-            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() {
-            this.open = true;
-            this.title = "鍥㈡妫�鍑虹巼";
-        },
-        handleChange(selection) {
-            // this.ids = selection.map((item) => item.id);
-            this.single = selection.length !== 1;
-        },
-        handlecan() {
+            option && myChart.setOption(option);
+            let sizeFun = function () {
+              myChart.resize();
+            };
+            window.addEventListener("resize", sizeFun);
+          });
+          // let dataValue1 = [];
+          // this.dateAll = [];
+          // this.rongjiList.forEach((item) => {
+          //   console.log(item);
+          //   this.dateAll.push(item.bingzhong);
+          //   dataValue1.push(item.num);
+          // });
+          // let myChart = this.$echarts.init(document.getElementById("main"));
+          // myChart.setOption({
+          //   legend: {},
 
-        },
-
-
-        handlesetup() {
-            this.open1 = true;
-            this.title1 = "缁熻鍥捐缃�";
-        },
-        handleChange1(value, direction, movedKeys) {
-            console.log(value, direction, movedKeys);
-        },
-        submitFormS() {
-
-        }
+          //   tooltip: {},
+          //   xAxis: {
+          //     type: "category",
+          //     name: "鐥呯鍚嶇О",
+          //     data: this.dateAll,
+          //   },
+          //   yAxis: {
+          //     type:'value'
+          //   },
+          //   series: [
+          //     {
+          //       name: "浜烘暟",
+          //       type: "bar",
+          //       data: dataValue1,
+          //     },
+          //   ],
+          // });
+        });
+      }
     },
+  },
 };
 </script>
-  
-<style>
-.el-transfer-panel {
-    width: 360px;
-    height: 480px;
+
+<style lang="scss" scoped>
+.el-pagination {
+  margin-left: 47%;
 }
-
-.el-transfer-panel__body {
-    /* border: 1px solid red; */
-    height: 480px;
-}
-
-.el-transfer-panel__list.is-filterable {
-    height: 352px;
-}
-
-.el-button--primary.el-transfer__button {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-
-}
-
-.el-transfer__button:first-child {
-    width: 82px;
-    margin-bottom: 10px;
-}
-
-.el-button+.el-button {
-    margin-left: 0px;
+.tab3 {
+  width: 100%;
+  display: flex;
 }
 </style>
\ No newline at end of file

--
Gitblit v1.8.0