diff --git a/package.json b/package.json
index 4cec957..79fd394 100644
--- a/package.json
+++ b/package.json
@@ -1,67 +1,73 @@
 {
-  "name": "demo",
-  "version": "0.1.0",
-  "private": true,
-  "scripts": {
-    "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build",
-    "lint": "vue-cli-service lint"
-  },
-  "browser": {
-    "crypto": false
-  },
-  "dependencies": {
-    "axios": "^1.3.3",
-    "crypto-js": "^4.1.1",
-    "element-ui": "^2.15.13",
-    "exceljs": "^4.3.0",
-    "file-saver": "^2.0.5",
-    "moment": "^2.29.4",
-    "sortablejs": "^1.15.0",
-    "vue": "^2.6.14",
-    "vue-contextmenujs": "^1.4.9",
-    "vue-json-excel": "^0.3.0",
-    "vue-meta": "^2.4.0",
-    "vue-print-nb": "^1.7.5",
-    "vue-router": "^3.5.1",
-    "vuex": "^3.6.2",
-    "xlsx": "^0.18.5"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.12.16",
-    "@babel/eslint-parser": "^7.12.16",
-    "@vue/cli-plugin-babel": "~5.0.0",
-    "@vue/cli-plugin-eslint": "~5.0.0",
-    "@vue/cli-plugin-router": "~5.0.0",
-    "@vue/cli-plugin-vuex": "~5.0.0",
-    "@vue/cli-service": "~5.0.0",
-    "eslint": "^7.32.0",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-vue": "^8.0.3",
-    "prettier": "^2.4.1",
-    "sass": "^1.32.7",
-    "sass-loader": "^12.0.0",
-    "vue-template-compiler": "^2.6.14"
-  },
-  "eslintConfig": {
-    "root": true,
-    "env": {
-      "node": true
+    "name": "demo",
+    "version": "0.1.0",
+    "private": true,
+    "scripts": {
+        "serve": "vue-cli-service serve",
+        "build": "vue-cli-service build",
+        "lint": "vue-cli-service lint"
     },
-    "extends": [
-      "plugin:vue/essential",
-      "eslint:recommended",
-      "plugin:prettier/recommended"
-    ],
-    "parserOptions": {
-      "parser": "@babel/eslint-parser"
+    "browser": {
+        "crypto": false
     },
-    "rules": {}
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not dead"
-  ]
-}
+    "dependencies": {
+        "axios": "^1.3.3",
+        "crypto-js": "^4.1.1",
+        "echarts": "^5.4.3",
+        "element-ui": "^2.15.13",
+        "exceljs": "^4.3.0",
+        "file-saver": "^2.0.5",
+        "file-saver": "^2.0.5",
+        "html2canvas": "^1.4.1",
+        "moment": "^2.29.4",
+        "node-polyfill-webpack-plugin": "^2.0.1",
+        "sortablejs": "^1.15.0",
+        "vue": "^2.6.14",
+        "vue-contextmenujs": "^1.4.9",
+        "vue-json-excel": "^0.3.0",
+        "vue-meta": "^2.4.0",
+        "vue-print-nb": "^1.7.5",
+        "vue-router": "^3.5.1",
+        "vuex": "^3.6.2",
+        "xlsx": "^0.18.5",
+        "xlsx-style": "^0.8.13",
+        "print-js": "^1.6.0"
+    },
+    "devDependencies": {
+        "@babel/core": "^7.12.16",
+        "@babel/eslint-parser": "^7.12.16",
+        "@vue/cli-plugin-babel": "~5.0.0",
+        "@vue/cli-plugin-eslint": "~5.0.0",
+        "@vue/cli-plugin-router": "~5.0.0",
+        "@vue/cli-plugin-vuex": "~5.0.0",
+        "@vue/cli-service": "~5.0.0",
+        "eslint": "^7.32.0",
+        "eslint-config-prettier": "^8.3.0",
+        "eslint-plugin-prettier": "^4.0.0",
+        "eslint-plugin-vue": "^8.0.3",
+        "prettier": "^2.4.1",
+        "sass": "^1.32.7",
+        "sass-loader": "^12.0.0",
+        "vue-template-compiler": "^2.6.14"
+    },
+    "eslintConfig": {
+        "root": true,
+        "env": {
+            "node": true
+        },
+        "extends": [
+            "plugin:vue/essential",
+            "eslint:recommended",
+            "plugin:prettier/recommended"
+        ],
+        "parserOptions": {
+            "parser": "@babel/eslint-parser"
+        },
+        "rules": {}
+    },
+    "browserslist": [
+        "> 1%",
+        "last 2 versions",
+        "not dead"
+    ]
+}
\ No newline at end of file
diff --git a/src/components/workload/chartsBlock.vue b/src/components/workload/chartsBlock.vue
new file mode 100644
index 0000000..370287a
--- /dev/null
+++ b/src/components/workload/chartsBlock.vue
@@ -0,0 +1,79 @@
+<template>
+  <div ref="chartEl" style="height:100%" />
+</template>
+<script>
+import * as echarts from "echarts";
+export default {
+  data() {
+    return {
+      chart: null
+    }
+  },
+  watch: {
+    option: {
+      handler(newValue, oldValue) {
+        this.chart.setOption(newValue)
+      },
+      // 因为option是个对象，而我们对于echarts的配置项，要更改的数据往往不在一级属性里面
+      // 所以这里设置了deep:true，vue文档有说明
+      deep: true
+    }
+  },
+  mounted() {
+    this.chart = echarts.init(this.$refs.chartEl)
+
+    // 这里没有option,不在此初始化数据
+    // 添加窗口改变监听
+    this.chart._resize = this.throttle(() => {
+      this.chart.resize()
+    }, 200)
+
+    window.addEventListener('resize', this.chart._resize)
+  },
+  methods: {
+    // 去除props,添加methods
+    setOption(option) {
+      this.chart && this.chart.setOption(option,true)
+    },
+    // 节流函数,来自Lodash，这里可以自己写一个简单点的
+    // 如果有多个地方用到，也可以使用引入的方式
+    throttle(func, wait, options) {
+      let time, context, args
+      let previous = 0
+      if (!options) options = {}
+
+      const later = function() {
+        previous = options.leading === false ? 0 : new Date().getTime()
+        time = null
+        func.apply(context, args)
+        if (!time) context = args = null
+      }
+
+      const throttled = function() {
+        const now = new Date().getTime()
+        if (!previous && options.leading === false) previous = now
+        const remaining = wait - (now - previous)
+        context = this
+        args = arguments
+        if (remaining <= 0 || remaining > wait) {
+          if (time) {
+            clearTimeout(time)
+            time = null
+          }
+          previous = now
+          func.apply(context, args)
+          if (!time) context = args = null
+        } else if (!time && options.trailing !== false) {
+          time = setTimeout(later, remaining)
+        }
+      }
+      return throttled
+    }
+  },
+  beforeDestroy() {
+    // 移除窗口改变监听
+    window.removeEventListener('resize', this.chart._resize)
+  }
+}
+</script>
+
diff --git a/src/utlis/Export2Excel.js b/src/utlis/Export2Excel.js
new file mode 100644
index 0000000..cf15f8d
--- /dev/null
+++ b/src/utlis/Export2Excel.js
@@ -0,0 +1,184 @@
+/* eslint-disable */
+import { saveAs } from 'file-saver'
+import * as XLSX from 'xlsx'
+import * as XLSXStyle from "xlsx-style";
+
+
+function datenum(v, date1904) {
+    if (date1904) v += 1462;
+    var epoch = Date.parse(v);
+    return (epoch - new Date(Date.UTC(1899, 11, 30))) / (24 * 60 * 60 * 1000);
+}
+
+function sheet_from_array_of_arrays(data, opts) {
+    var ws = {};
+    var range = {
+        s: {
+            c: 10000000,
+            r: 10000000
+        },
+        e: {
+            c: 0,
+            r: 0
+        }
+    };
+    for (var R = 0; R != data.length; ++R) {
+        for (var C = 0; C != data[R].length; ++C) {
+            if (range.s.r > R) range.s.r = R;
+            if (range.s.c > C) range.s.c = C;
+            if (range.e.r < R) range.e.r = R;
+            if (range.e.c < C) range.e.c = C;
+            var cell = {
+                v: data[R][C]
+            };
+            if (cell.v == null) continue;
+            var cell_ref = XLSX.utils.encode_cell({
+                c: C,
+                r: R
+            });
+
+            if (typeof cell.v === 'number') cell.t = 'n';
+            else if (typeof cell.v === 'boolean') cell.t = 'b';
+            else if (cell.v instanceof Date) {
+                cell.t = 'n';
+                cell.z = XLSX.SSF._table[14];
+                cell.v = datenum(cell.v);
+            } else cell.t = 's';
+            ws[cell_ref] = cell;
+        }
+    }
+    if (range.s.c < 10000000) ws['!ref'] = XLSX.utils.encode_range(range);
+    return ws;
+}
+
+function Workbook() {
+    if (!(this instanceof Workbook)) return new Workbook();
+    this.SheetNames = [];
+    this.Sheets = {};
+}
+
+function s2ab(s) {
+    var buf = new ArrayBuffer(s.length);
+    var view = new Uint8Array(buf);
+    for (var i = 0; i != s.length; ++i) view[i] = s.charCodeAt(i) & 0xFF;
+    return buf;
+}
+
+
+export function export_json_to_excel({
+    multiHeader = [], // 第一行表头
+    multiHeader2 = [], // 第二行表头
+    data,
+    filename, //文件名
+    merges = [], // 合并
+    bookType = 'xlsx'
+} = {}) {
+    /* original data */
+    filename = filename || '列表';
+    data = [...data]
+    data.unshift(multiHeader2)
+    data.unshift(multiHeader)
+    console.log('data:', data)
+    var ws_name = "SheetJS";
+    var wb = new Workbook(),
+        ws = sheet_from_array_of_arrays(data);
+
+    if (merges.length > 0) {
+        if (!ws['!merges']) ws['!merges'] = [];
+        merges.forEach(item => {
+            ws['!merges'].push(XLSX.utils.decode_range(item))
+        })
+    }
+
+    /* add worksheet to workbook */
+    wb.SheetNames.push(ws_name);
+    wb.Sheets[ws_name] = ws;
+
+    var wbout = XLSXStyle.write(wb, {
+        bookType: bookType,
+        bookSST: false,
+        type: 'binary'
+    });
+
+    saveAs(new Blob([s2ab(wbout)], {
+        type: "application/octet-stream"
+    }), `${filename}.${bookType}`);
+}
+
+// 根据dom导出表格
+export function exportToExcel(idSelector, fileName, titleNum = 1) {
+    // 设置导出的内容是否只做解析，不进行格式转换     false：要解析， true:不解析
+    const xlsxParam = { raw: true }
+    let table = document.querySelector(idSelector).cloneNode(true);
+
+    // 因为element-ui的表格的fixed属性导致多出一个table，会下载重复内容，这里删除掉
+    if (table.querySelector('.el-table__fixed-right'))
+        table.removeChild(table.querySelector('.el-table__fixed-right'));
+    if (table.querySelector('.el-table__fixed'))
+        table.removeChild(table.querySelector('.el-table__fixed'));
+
+    const wb = XLSX.utils.table_to_book(table, xlsxParam)
+    let range = XLSX.utils.decode_range(wb.Sheets['Sheet1']['!ref']);
+    let cWidth = [];
+    for (let C = range.s.c; C < range.e.c; ++C) { //SHEET列
+        let len = 100; //默认列宽
+        let len_max = 400; //最大列宽
+        for (let R = range.s.r; R <= range.e.r; ++R) { //SHEET行
+            let cell = { c: C, r: R }; //二维 列行确定一个单元格
+            let cell_ref = XLSX.utils.encode_cell(cell); //单元格 A1、A2
+            if (wb.Sheets['Sheet1'][cell_ref]) {
+                // if (R == 0){
+                if (R < titleNum) {
+                    wb.Sheets['Sheet1'][cell_ref].s = { //设置第一行单元格的样式 style
+                        alignment: {
+                            horizontal: 'center',
+                            vertical: 'center',
+                        },
+                    };
+                } else {
+                    wb.Sheets['Sheet1'][cell_ref].s = {
+                        alignment: {
+                            horizontal: 'center',
+                            vertical: 'center',
+                        },
+                    };
+                }
+                //动态自适应：计算列宽
+                let va = JSON.parse(JSON.stringify(wb.Sheets['Sheet1'][cell_ref].v));
+                var card1 = JSON.parse(JSON.stringify(va)).match(/[\u4e00-\u9fa5]/g); //匹配中文
+                var card11 = "";
+                if (card1) {
+                    card11 = card1.join("")
+                }
+                var card2 = JSON.parse(JSON.stringify(va)).replace(/([^\u0000-\u00FF])/g, ""); //剔除中文
+                let st = 0;
+                if (card11) {
+                    // st += card11.length * 16  //中文字节码长度
+                    st += card11.length * 20 //中文字节码长度
+                }
+                if (card2) {
+                    // st += card2.length * 8  //非中文字节码长度
+                    st += card2.length * 10 //非中文字节码长度
+                }
+                if (st > len) {
+                    len = st;
+                }
+            }
+        }
+        if (len > len_max) { //最大宽度
+            len = len_max;
+        }
+
+        cWidth.push({ 'wpx': len }); //列宽
+    }
+    wb.Sheets['Sheet1']['!cols'] = cWidth
+    const wbout = XLSXStyle.write(wb, { bookType: 'xlsx', bookSST: false, type: 'binary' })
+    try {
+        saveAs(new Blob([s2ab(wbout)], { type: '' }), `${fileName}.xlsx`)
+    } catch (e) {
+        if (typeof console !== 'undefined') {
+            console.log(e, wbout)
+        }
+    }
+    return wbout
+}
\ No newline at end of file
diff --git a/src/views/fee-settings/DiagnosisTemplate.vue b/src/views/fee-settings/DiagnosisTemplate.vue
index 2ea5e39..e3c1f37 100644
--- a/src/views/fee-settings/DiagnosisTemplate.vue
+++ b/src/views/fee-settings/DiagnosisTemplate.vue
@@ -1,422 +1,788 @@
 <template>
-  <div class="box">
-    <div style="width: 95%">
-      <el-card>
-        <div class="publiccss">诊断模板</div>
-        <el-table
-          :data="tableData"
-          style="width: 100%; margin-top: 20px"
-          row-key="id"
-          class="el-table__body-wrapper tbody"
-          @row-click="rowick"
-          highlight-current-row
-        >
-          <el-table-column prop="id" label="编号" width="300">
-          </el-table-column>
-          <el-table-column prop="displayName" label="名称" width="">
-          </el-table-column>
-          <el-table-column prop="creatorName" label="创建者" width="">
-          </el-table-column>
-          <el-table-column prop="creationTime" label="创建时间" width="200">
-            <template slot-scope="scope">
-              {{ scope.row.creationTime | dateFormat }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="lastModifierName" label="修改者" width="">
-          </el-table-column>
-          <el-table-column
-            prop="lastModificationTime"
-            label="修改时间"
-            width="200"
+  <div>
+    <el-card>
+      <div slot="header">诊断模板</div>
+      <div style="display: flex">
+        <div>
+          <div
+            :style="
+              'width:' +
+              (window.pageWidth < 750 ? 595 : window.pageWidth - 45 - 110) +
+              'px;'
+            "
           >
-            <template slot-scope="scope">
-              {{ scope.row.lastModificationTime | dateFormat }}
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" width="">
-            <template>
-              <el-tag
-                class="move"
-                style="cursor: move; margin-left: 15px;background-color: rgb(245, 245, 245);border:none"
-                draggable="true"
-              >
-                <i
-                  class="el-icon-d-caret"
-                  style="width: 1rem; height: 1rem;color: rgb(113, 113, 113)"
-                ></i>
-              </el-tag>
-            </template>
-          </el-table-column>
-        </el-table>
-        <!--  -->
-        <span style="margin-top: 10px; padding: 5px; margin-left: 28.8%"
-          >项目类别</span
-        >
-        <el-select
-          v-model="values"
-          placeholder="请选择"
-          @change="ischangs"
-          style="margin-top: 5px"
-        >
-          <el-option
-            v-for="item in projectid"
-            :key="item.id"
-            :label="item.displayName"
-            :value="item.id"
-          >
-          </el-option>
-        </el-select>
-        <span style="margin-left: 10%; padding: 5px">搜索选择</span>
-        <el-select
-          value-key="id"
-          filterable
-          v-model="flitvalues"
-          placeholder="请选择"
-          style="margin-top: 5px"
-          @change="diagnosisitem"
-        >
-          <el-option
-            v-for="item in filetelists"
-            :key="item.id"
-            :label="item.displayName"
-            :value="item"
-          >
-          </el-option>
-        </el-select>
-        <div class="mainbox">
-          <div class="mainleftbox">
-            <div class="weixuan">未选项目</div>
-            <div
-              v-for="(item, index) in leftdata"
-              :key="index"
-              @click="clickPaixu(item, index)"
-              @dblclick="shuanji(item, index)"
-              :class="num === index ? 'activetext' : ''"
-              style=""
+            <el-table
+              :data="tableData"
+              row-key="id"
+              width="100%"
+              border
+              height="240px"
+              class="el-table__body-wrapper tbody"
+              border:stripe="true"
+              @row-click="rowick"
+              ref="info"
+              highlight-current-row
             >
-              <div>{{ item.displayName }}</div>
-            </div>
+              <el-table-column prop="id" label="编号" width="300">
+              </el-table-column>
+              <el-table-column prop="displayName" label="名称">
+              </el-table-column>
+              <el-table-column prop="creatorName" label="创建者">
+              </el-table-column>
+              <el-table-column prop="creationTime" label="创建时间" width="180">
+                <template slot-scope="scope">
+                  {{ scope.row.creationTime | dateFormat }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="lastModifierName" label="修改者">
+              </el-table-column>
+              <el-table-column
+                prop="lastModificationTime"
+                label="修改时间"
+                width="180"
+              >
+                <template slot-scope="scope">
+                  {{ scope.row.lastModificationTime | dateFormat }}
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" width="">
+                <template>
+                  <el-tag
+                    class="move"
+                    style="
+                      cursor: move;
+                      margin-left: 15px;
+                      background-color: rgb(245, 245, 245);
+                      border: none;
+                    "
+                    draggable="true"
+                  >
+                    <i
+                      class="el-icon-d-caret"
+                      style="
+                        width: 1rem;
+                        height: 1rem;
+                        color: rgb(113, 113, 113);
+                      "
+                    ></i>
+                  </el-tag>
+                </template>
+              </el-table-column>
+            </el-table>
           </div>
-          <div class="Selectbutton">
-            <div style="margin-top: 10px">
-              <el-button @click="addall"
-                >全添加<i class="el-icon-caret-right"></i
-                ><i class="el-icon-caret-right"></i
-              ></el-button>
-            </div>
-            <div style="margin-top: 10px">
-              <el-button @click="addobj" style="width: 111px"
-                >添加<i class="el-icon-caret-right"></i>
-              </el-button>
+          <div style="display: flex; margin-top: 5px">
+            <div
+              :style="
+                'width:' +
+                (window.pageWidth < 750
+                  ? 0
+                  : Math.round((window.pageWidth - 750) / 2)) +
+                'px;'
+              "
+            ></div>
+            <!--未选诊断模块-->
+            <div style="width: 235px">
+              <div>
+                <span style="padding-right: 5px">项目类别</span>
+                <el-cascader
+                  :options="dict.itemTypeTree"
+                  v-model="itemTypeIds"
+                  style="margin-left: 3px; width: 160px"
+                  :props="{
+                    checkStrictly: true,
+                    expandTrigger: 'hover',
+                    ...customerOrg.treeprops,
+                  }"
+                  :show-all-levels="false"
+                  clearable
+                  filterable
+                  @change="getAsbItemByItemType"
+                  size="small"
+                >
+                </el-cascader>
+              </div>
+              <div class="box">
+                <el-table
+                  :data="dict.asbItem"
+                  width="160"
+                  border
+                  :height="
+                    window.pageHeight < 600
+                      ? 165
+                      : window.pageHeight - 150 - 240 - 45
+                  "
+                  highlight-current-row
+                  @row-dblclick="dbClickChoosedAsb"
+                  @selection-change="handleSelectionChange"
+                  :row-class-name="handleRowClassName"
+                  @row-click="chooseAsbItem"
+                >
+                  <el-table-column prop="displayName" label="未选诊断" />
+                </el-table>
+              </div>
             </div>
-            <div style="margin-top: 10px">
-              <el-button @click="removeright" style="width: 111px"
-                >移去<i class="el-icon-caret-left"></i>
-              </el-button>
+
+            <!--中间操作按钮-->
+            <div style="display: block; margin: 40px 10px 0 10px">
+              <div>
+                <el-button
+                  class="btnClass"
+                  @click="addAbs(asbItemChoosed, 'choosed')"
+                  >添加 <i class="el-icon-arrow-right"></i
+                ></el-button>
+              </div>
+              <div>
+                <el-button
+                  class="btnClass"
+                  @click="addAbs(asbItemChoosed, 'all')"
+                  >全部添加</el-button
+                >
+              </div>
+              <div>
+                <el-button
+                  class="btnClass"
+                  @click="delAbs(patientRegisterAbsChoosed, 'choosed')"
+                  >移除 <i class="el-icon-arrow-left"></i
+                ></el-button>
+              </div>
+              <div>
+                <el-button
+                  class="btnClass"
+                  @click="delAbs(patientRegisterAbsChoosed, 'all')"
+                  >全部移除</el-button
+                >
+              </div>
             </div>
-            <div style="margin-top: 10px">
-              <el-button @click="allclear"
-                >全移去<i class="el-icon-caret-left"></i
-                ><i class="el-icon-caret-left"></i>
-              </el-button>
+
+            <!-- 已选诊断模块 -->
+            <div style="width: 235px">
+              <div>
+                <span style="padding-right: 5px">快速选择</span>
+                <el-select
+                  v-model="asbItemId"
+                  placeholder="快速选择诊断"
+                  size="small"
+                  filterable
+                  default-first-option
+                  :filter-method="filterMethod"
+                  clearable
+                  @clear="quickAsb = deepCopy(dict.asbItemQuick)"
+                  @change="quickChoosedAsb"
+                  ref="quickAsbOCX"
+                  style="margin-left: 3px; width: 160px"
+                >
+                  <el-option
+                    v-for="item in quickAsb"
+                    :key="item.id"
+                    :value="item.id"
+                    :label="item.displayName"
+                  />
+                </el-select>
+              </div>
+              <div class="box">
+                <el-table
+                  :data="sampleGroupAsbitems"
+                  width="160"
+                  border
+                  :height="
+                    window.pageHeight < 600
+                      ? 165
+                      : window.pageHeight - 150 - 240 - 45
+                  "
+                  @selection-change="selecteditems"
+                  highlight-current-row
+                  :row-class-name="handleRowClassName"
+                  @row-dblclick="removeAbs"
+                  @row-click="removeAsbItem"
+                >
+                  <el-table-column prop="displayName" label="已选诊断" />
+                </el-table>
+              </div>
             </div>
           </div>
-          <div class="mainleftbox">
-            <div class="weixuan">已选项目</div>
-            <div
-              v-for="(item, index) in rightdata"
-              :key="index"
-              @click="rightindex(item, index)"
-              @dblclick="rightdelite(item, index)"
-              :class="nums === index ? 'activetext' : ''"
+        </div>
+
+        <!-- 按钮区域 -->
+        <div style="margin-left: 10px">
+          <div>
+            <el-button @click="btnAdd" class="btnClass">新增</el-button>
+          </div>
+          <div>
+            <el-button @click="btnEdit" class="btnClass">编辑</el-button>
+          </div>
+          <div>
+            <el-button @click="btnDel" class="btnClass">删除</el-button>
+          </div>
+          <div>
+            <el-button @click="btnSetTop" class="btnClass">置顶</el-button>
+          </div>
+          <div>
+            <el-button @click="btnSetButtom" class="btnClass">置底</el-button>
+          </div>
+          <div>
+            <el-button :disabled="isshow" @click="btnSaveSort" class="btnClass"
+              >排序</el-button
             >
-              <div>{{ item.displayName }}</div>
-            </div>
+          </div>
+          <div style="margin-top: 100px">
+            <el-button @click="saveAsb" class="btnClass">确定项目</el-button>
           </div>
         </div>
-        <div class="confirmcancellation">
-          <el-button :disabled="isdislob" @click="Onsubmit">确定</el-button>
-          <el-button :disabled="isdislob">取消</el-button>
-        </div>
-      </el-card>
-      <el-dialog
-        :title="title == 1 ? '新增' : '编辑'"
-        :visible.sync="dialogVisible"
-        width="75%"
-        :close-on-click-modal="false"
-      >
-        <el-form ref="form" :model="form" label-width="100px" :rules="rules">
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="名称" prop="displayName">
-                <el-input
-                  ref="refinput"
-                  v-model="form.displayName"
-                  style="width: 100%"
-                  maxlength="1"
-                ></el-input> </el-form-item
-            ></el-col>
-          </el-row>
-        </el-form>
-        <span slot="footer" class="dialog-footer">
-          <el-button @click="dialogVisible = false">取 消</el-button>
-          <el-button type="primary" @click="onsbmint">确 定</el-button>
-        </span>
-      </el-dialog>
-    </div>
-    <!-- 按钮区域 -->
-    <div style="margin-left: 10px; margin-top: 3.5%">
-      <el-button type="" @click="add" class="commonbutton">新增</el-button>
-      <div style="margin-top: 10px">
-        <el-button type="" @click="edit" class="commonbutton">编辑</el-button>
-      </div>
-      <div style="margin-top: 10px">
-        <el-button type="" @click="delets" class="commonbutton">删除</el-button>
-      </div>
-      <div style="margin-top: 10px">
-        <el-button type="" @click="topping" class="commonbutton"
-          >置顶</el-button
-        >
       </div>
-      <div style="margin-top: 10px">
-        <el-button type="" @click="toppings" class="commonbutton"
-          >置底</el-button
-        >
-      </div>
-      <div style="margin-top: 10px">
-        <el-button type="" :disabled="isshow" @click="assertion" class="commonbutton"
-          >排序</el-button
-        >
-      </div>
-      <div style="margin-top: 10px">
-        <el-button type="" :disabled="isshow" @click="cancellation" class="commonbutton"
-          >取消</el-button
-        >
-      </div>
-    </div>
+    </el-card>
+    <!-- 新增弹框 -->
+    <el-dialog
+      :title="title == 1 ? '新增' : '修改'"
+      :visible.sync="dialogVisible"
+      width="520px"
+      :close-on-click-modal="false"
+      @close="closeDialog"
+    >
+      <el-form ref="form" :model="form" label-width="80px" :rules="rules">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="名称" prop="displayName">
+              <el-input
+                ref="refinput"
+                v-model="form.displayName"
+                style="width: 100%"
+              ></el-input> </el-form-item
+          ></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="创建者">
+              <el-input v-model="form.creatorName" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="创建时间">
+              <el-input :value="form.creationTime" disabled></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="修改者">
+              <el-input v-model="form.lastModifierName" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="修改时间">
+              <el-input :value="form.lastModificationTime" disabled></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="onSubmit">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
 import Sortable from "sortablejs";
-import { postapi, getapi, putapi, deletapi } from "@/api/api";
-import { projectlist } from "@/request/commonapi";
-import { examinationgender, diagsislist } from "@/request/systemapi";
+import {
+  groupinglist,
+  samplegroup,
+  samplegropid,
+  barcodeediting,
+  barcodedeleteid,
+  barcodedetopbottom,
+  barcodedraganddrop,
+  projectlist,
+  itemtypeid,
+  sampleasbitemid,
+  asbitmfilte,
+} from "@/request/commonapi";
+import { specimenlist, containerlist } from "@/request/systemapi";
+import { getapi, postapi, putapi, deletapi } from "@/api/api";
+import { mapState } from "vuex";
+import {
+  arrayExistObj,
+  tcdate,
+  arrayFilter,
+  arrayReduce,
+  deepCopy,
+  dddw,
+  objCopy,
+} from "../../utlis/proFunc";
+
 export default {
   data() {
     return {
-      num: 0,
-      rightdata: [], //右侧数据
-      leftdata: [], //左侧数据
-      projectid: [],
-      filetelists: [],
-      flitvalues: [],
-      values: "",
-      isshow: true,
-      isdislob: true,
+      itemTypeIds: [], //项目类别
+      asbItemId: "", //当前快速选到的给合项目ID
+      quickAsb: [], //过滤显示的诊断
       rules: {
         displayName: [
           { required: true, message: "请输入名称", trigger: "blur" },
         ],
-        itemTypeId: [
-          { required: true, message: "请选择项目类别", trigger: "blur" },
-        ],
-        suggestionName: [
-          { required: true, message: "请输入建议名称", trigger: "blur" },
-        ],
-        isIll: [{ required: true, message: "请选择是疾病", trigger: "blur" }],
-        isSummaryTemplate: [
-          { required: true, message: "请选择是总检模板", trigger: "blur" },
-        ],
-        forSexId: [
-          { required: true, message: "请选择适用性别", trigger: "blur" },
-        ],
-        diagnosisLevelId: [
-          { required: true, message: "请选择诊断级别", trigger: "blur" },
-        ],
       },
+      isdislob: true,
+      filetelists: [],
+      flitvalues: [],
+      checked: [],
+      tableHeight: window.innerHeight - 500, //表格动态高度
+      screenHeight: window.innerHeight, //内容区域高度
+      isshow: true,
+      form: {
+        displayName: "",
+      },
+      dialogVisible: false,
+      title: 1,
+      loading: false,
       pages: {
-        Filter: "",
         SkipCount: 0,
         MaxResultCount: 100,
         Sorting: "displayOrder desc",
       },
       tableData: [],
       initTableData: [],
-      dialogVisible: false,
-      title: 1,
-      form: {
-        displayName: "",
-        itemTypeId: "",
-        suggestionName: "",
-        isIll: "",
-        isSummaryTemplate: "",
-        forSexId: "",
-        diagnosisLevelId: "",
+      projectid: [],
+
+      sampleGroupAsbitems: [], //右侧数据
+      num: "",
+      nums: "",
+      values: "",
+      rightobj: {},
+      leftobj: {},
+      ischank: 1,
+      filete: {
+        Filter: "",
       },
-      isIll: [
-        {
-          value: "Y",
-          label: "是",
-        },
-        {
-          value: "N",
-          label: "否",
-        },
-      ], //是疾病
-      isSummaryTemplate: [
-        {
-          value: "Y",
-          label: "是",
-        },
-        {
-          value: "N",
-          label: "否",
-        },
-      ], //是总监模板
-
-      itemTypeId: [], //项目类别
-      forSexId: [], //性别
-      diagnosisLevelId: [], //诊断级别
+
       ary1: [],
       ary2: [],
-      nums: 0,
+      sdate: [],
       curRow: {},
-      diagonsisitemtype: [], //搜索选择
-      flitvalues: "",
     };
   },
   created() {
+    this.dictInit();
+
     this.getlist();
-    this.gitprojectcategory();
+    this.posjectlist();
   },
   mounted() {
     this.rowDrop();
-    this.getdiagnosisitem();
   },
+  watch: {
+    // 监听screenHeight从而改变table的高度
+    // screenHeight(val) {
+    //   this.screenHeight = val;
+    //   this.tableHeight = this.screenHeight - 220;
+    // },
+  },
+
+  computed: {
+    ...mapState(["window", "dict", "customerOrg"]),
+  },
+
   methods: {
-    diagnosisitem(v) {
-      this.rightdata.forEach((item) => {});
-      console.log(v);
-      this.rightdata.push({ displayName: v.displayName });
-    },
-    //获取搜索选择
-    getdiagnosisitem() {
-      getapi("/api/app/item").then((res) => {
-        this.filetelists = res.data.items;
-        console.log(res);
+    //初始数据
+    dictInit() {
+      //体检类别 树结构
+      getapi("/api/app/item-type/by-code-all").then((res) => {
+        if (res.code != -1) {
+          this.dict.itemTypeTree = res.data;
+          tcdate(this.dict.itemTypeTree);
+        }
       });
-    },
-    Onsubmit() {
-      let sampleGroupId = this.form.id;
-      console.log(this.form.id);
-      console.log(this.rightdata);
-      let sdate = [];
-      this.rightdata.forEach((element) => {
-        let sss = { sampleGroupId: sampleGroupId, asbitemId: element.id };
-        sdate.push(sss);
+
+      //获取所有诊断
+      postapi("/api/app/diagnosis/getlistinsuggestion").then((res) => {
+        if (res.code != -1) {
+          this.dict.asbItemAll = res.data;
+          this.dict.asbItemAll.forEach((e) => {
+            e.choosed = false;
+          });
+          this.dict.asbItem = deepCopy(this.dict.asbItemAll);
+          this.dict.asbItemQuick = deepCopy(res.data);
+          this.quickAsb = deepCopy(res.data);
+        }
       });
-      // this.leftdata.forEach((element) => {
-      //   let sss = { sampleGroupId: sampleGroupId, asbitemId: element.id };
-      //   sdate.push(sss);
-      // });
-      console.log(sdate);
-      if (sampleGroupId == undefined) {
-        this.$message.warning("请选择列表");
+    },
+
+    handleRowClassName({ row, rowIndex }) {
+      // highLightBg 为 'selected'的高亮
+      //console.log(rowIndex, row)
+      //return row.highLightBg == 'selected' ? 'high-light-bg' : '';
+      if (row.choosed) {
+        return "current-row";
       } else {
-        postapi("/api/app/item-template-detail/many", sdate).then((res) => {
-          this.$message.success("操作成功");
-          this.isdislob = true;
-        });
+        return "";
       }
     },
-    //q全移去
-    allclear() {
-      this.isdislob = false;
-      if (this.rightdata.length > 0) {
-        this.ary1 = this.rightdata;
-        this.ary2 = this.leftdata;
-        this.updatedate();
-        this.rightdata = [];
+
+    //项目类别过滤 诊断，未过滤已选择的诊断
+    getAsbItemByItemTypeAll() {
+      //console.log('getAsbItemByItemType', typeof this.itemTypeIds, this.itemTypeIds)
+      let lv = "";
+      if (typeof this.itemTypeIds === "object") {
+        lv = this.itemTypeIds[this.itemTypeIds.length - 1];
       }
-    },
-    //右移动
-    removeright() {
-      this.isdislob = false;
-      if (this.rightdata.length > 0) {
-        this.rightdata.splice(this.num, 1);
-        this.leftdata.push(this.leftobj);
-        this.isdislob = true;
-        this.updatedate();
+
+      if (lv) {
+        this.dict.asbItem = arrayFilter(this.dict.asbItemAll, "itemTypeId", lv);
+      } else {
+        this.dict.asbItem = deepCopy(this.dict.asbItemAll);
       }
+      //console.log('lv,this.dict.asbItem', lv, this.dict.asbItem)
+      this.dict.asbItemQuick = deepCopy(this.dict.asbItemAll);
     },
-    //左侧添加按钮
-    addobj() {
-      this.isdislob = false;
-      if (this.leftdata.length > 0) {
-        this.leftdata.splice(this.num, 1);
-        this.rightdata.push(this.rightobj);
+
+    //按项目类别显示诊断，并过滤已选择的诊断
+    getAsbItemByItemType() {
+      this.getAsbItemByItemTypeAll();
+      //刷新显示 未选诊断
+      arrayReduce(this.dict.asbItem, [...this.sampleGroupAsbitems], "id=id");
+      arrayReduce(
+        this.dict.asbItemQuick,
+        [...this.sampleGroupAsbitems],
+        "id=id"
+      );
+      this.quickAsb = deepCopy(this.dict.asbItemQuick);
+    },
+
+    //快速选择诊断时，调整可按拼间简码及简称查找
+    filterMethod(keyWords) {
+      //console.log('filterMethod',this.dict.asbItemQuick)
+      if (keyWords) {
+        this.quickAsb = [];
+        console.log(this.dict.asbItemQuick);
+        this.dict.asbItemQuick.forEach((item) => {
+          if (
+            item.displayName.toLowerCase().indexOf(keyWords.toLowerCase()) >
+              -1 ||
+            item.simpleCode.toLowerCase().indexOf(keyWords.toLowerCase()) > -1
+          ) {
+            this.quickAsb.push(item);
+          }
+        });
+      } else {
+        this.quickAsb = deepCopy(this.dict.asbItemQuick);
       }
     },
-    //全添加
-    addall() {
-      this.isdislob = false;
-      if (this.leftdata.length > 0) {
-        this.ary1 = this.leftdata;
-        this.ary2 = this.rightdata;
-        this.updatedate();
-        this.leftdata = [];
+
+    // 添加诊断
+    ///api/app/register-asbitem/many/3fa85f64-5717-4562-b3fc-2c963f66afa6'
+    async addAbs(asbItemChoosed, oprType) {
+      // console.log('this.customerOrgGroup',this.customerOrgGroup)
+      // console.log('asbItemChoosed', asbItemChoosed)
+      if (!this.form.id) {
+        this.$message.warning("请先选中条码分组");
+        return;
       }
+
+      let message = [];
+      let checked = true;
+      let lfind = -1;
+
+      //oprType 不传值时，兼容勾选方式
+      //勾选时不需要此操作  start
+      if (oprType && oprType == "all") {
+        asbItemChoosed = deepCopy(this.dict.asbItem);
+      } else if (oprType && oprType == "choosed") {
+        asbItemChoosed = [];
+        this.dict.asbItem.forEach((e) => {
+          if (e.choosed) {
+            asbItemChoosed.push(e);
+            e.choosed = false;
+          }
+        });
+      }
+      //勾选时不需要此操作  end
+
+      if (asbItemChoosed.length < 1) {
+        this.$message.warning("请选择要添加的诊断");
+        return;
+      }
+
+      // 去掉重复的项目
+      arrayReduce(asbItemChoosed, this.sampleGroupAsbitems, "id=id");
+      /*
+      for (let i = asbItemChoosed.length - 1; i > - 1; i--) {
+        if (this.customerOrgGroup.forSexId == 'A') break //未选性别时，无需判断诊断性别限制 
+        if (asbItemChoosed[i].forSexId == 'A' || asbItemChoosed[i].forSexId == 'U') continue
+        if (asbItemChoosed[i].forSexId != this.customerOrgGroup.forSexId) {
+          message.push(asbItemChoosed[i].displayName)   //.warning(`所选项目：${asbItemChoosed[i].displayName}，不适合当前人员性别`)
+          checked = false
+          asbItemChoosed.splice(i,1)
+        }
+      }
+      //console.log(222,checked)
+      if (!checked) this.$message.warning(`所选项目【${JSON.stringify(message)}】不适合当前人员性别`)
+      */
+
+      asbItemChoosed.forEach((e) => {
+        this.sampleGroupAsbitems.push(deepCopy(e));
+      });
+
+      //刷新
+      this.getAsbItemByItemType();
     },
-    //左侧双击事件
-    shuanji(item, index) {
-      this.isdislob = false;
-      console.log(item);
-      this.leftdata.splice(index, 1);
-      this.rightdata.push(item);
+
+    //双击选择诊断
+    dbClickChoosedAsb(row) {
+      this.addAbs([row]);
     },
-    clickPaixu(item, index) {
-      this.rightobj = item;
-      this.num = index;
-      console.log(this.num);
+    //快速选择诊断
+    quickChoosedAsb(v) {
+      //远程查询时，设置了 value-key 也不管用，只能取到value console.log('quickChoosedAsb',v)
+      let lfind = -1;
+      if (v) {
+        lfind = arrayExistObj(this.dict.asbItemQuick, "id", v);
+        if (lfind > -1) {
+          this.addAbs([this.dict.asbItemQuick[lfind]]);
+        }
+      }
+
+      this.$nextTick(() => {
+        this.$refs["quickAsbOCX"].blur(); //total  asbItemId
+        this.asbItemId = "";
+        this.quickAsb = deepCopy(this.dict.asbItemQuick);
+        this.$refs["quickAsbOCX"].focus(); //total  asbItemId
+      });
     },
-    //获取项目类别 3a0b0b10-719f-5824-6956-8cb70f204013
-    gitprojectcategory() {
-      getapi("/api/app/item-type/by-code-all").then((res) => {
-        this.projectid = res.data;
+
+    //选择 未选的诊断
+    chooseAsbItem(row) {
+      this.dict.asbItem.forEach((e, index) => {
+        e.index = index;
+        return e;
       });
+      // 按住了shift键
+      if (this.window.shift) {
+        //清除所有选择
+        this.dict.asbItem.forEach((e) => {
+          e.choosed = false;
+          return e;
+        });
+
+        if (this.startPoint == -1) {
+          this.dict.asbItem[row.index].choosed = true;
+          this.startPoint = row.index;
+          return;
+        }
+
+        if (this.startPoint > row.index) {
+          for (let i = row.index; i <= this.startPoint; i++) {
+            this.dict.asbItem[i].choosed = true;
+          }
+        } else if (this.startPoint <= row.index) {
+          for (let i = this.startPoint; i <= row.index; i++) {
+            this.dict.asbItem[i].choosed = true;
+          }
+        }
+        return;
+      }
+
+      // 按住了ctrl 键
+      if (this.window.ctrl) {
+        console.log("this.window.ctrl", this.window.ctrl, this.dict.asbItem);
+        this.dict.asbItem[row.index].choosed = true;
+        this.startPoint = row.index;
+        return;
+      }
+
+      // 未按住了ctrl 、shift 键
+      //清除所有选择
+      //console.log('清除所有选择')
+      this.dict.asbItem.forEach((e) => {
+        e.choosed = false;
+        return e;
+      });
+      this.dict.asbItem[row.index].choosed = true;
+      this.startPoint = row.index;
     },
-    //ary1 需要追加的数据  ary2目标数组
-    updatedate() {
-      this.ary1.forEach((item) => {
-        let iscz = false;
-        this.ary2.forEach((item2) => {
-          if (item2.id == item.id) {
-            iscz = true;
+
+    //删除 人员已选中的诊断
+    ///api/app/register-asbitem/many?RegisterAsbitemIds=3fa85f64-5717-4562-b3fc-2c963f66afa6
+    delAbs(absForDel, oprType) {
+      if (!this.form.id) {
+        this.$message.warning("请先选中单位分组");
+        return;
+      }
+
+      let lfind = -1;
+
+      //勾选时不需要此操作  start
+      if (oprType && oprType == "all") {
+        absForDel = deepCopy(this.sampleGroupAsbitems);
+      } else if (oprType && oprType == "choosed") {
+        absForDel = [];
+        this.sampleGroupAsbitems.forEach((e) => {
+          if (e.choosed) {
+            absForDel.push(deepCopy(e));
+            e.choosed = false;
           }
         });
-        if (!iscz) {
-          console.log(item.id);
-          this.ary2.push(item);
-          // this.allid.push({ id: item.id });
+      }
+      //勾选时不需要此操作  end
+
+      if (absForDel.length < 1) {
+        this.$message.warning("请选择要移除的诊断");
+        return;
+      }
+
+      for (let i = 0; i < absForDel.length; i++) {
+        lfind = arrayExistObj(this.sampleGroupAsbitems, "id", absForDel[i].id);
+        if (lfind > -1) this.sampleGroupAsbitems.splice(lfind, 1);
+
+        absForDel.splice(i, 1);
+        i--;
+        continue;
+      }
+
+      //刷新
+      this.getAsbItemByItemType();
+    },
+
+    //双击删除已选项目
+    removeAbs(row) {
+      this.delAbs([row]);
+    },
+
+    //选择 已选的诊断
+    removeAsbItem(row) {
+      this.sampleGroupAsbitems.forEach((e, index) => {
+        e.index = index;
+        return e;
+      });
+      // 按住了shift键
+      if (this.window.shift) {
+        //清除所有选择
+        this.sampleGroupAsbitems.forEach((e) => {
+          e.choosed = false;
+          return e;
+        });
+
+        if (this.PstartPoint == -1) {
+          this.sampleGroupAsbitems[row.index].choosed = true;
+          this.PstartPoint = row.index;
+          return;
         }
+
+        if (this.PstartPoint > row.index) {
+          for (let i = row.index; i <= this.PstartPoint; i++) {
+            this.sampleGroupAsbitems[i].choosed = true;
+          }
+        } else if (this.PstartPoint <= row.index) {
+          for (let i = this.PstartPoint; i <= row.index; i++) {
+            this.sampleGroupAsbitems[i].choosed = true;
+          }
+        }
+        return;
+      }
+
+      // 按住了ctrl 键
+      if (this.window.ctrl) {
+        console.log(
+          "this.window.ctrl",
+          this.window.ctrl,
+          this.sampleGroupAsbitems
+        );
+        this.sampleGroupAsbitems[row.index].choosed = true;
+        this.PstartPoint = row.index;
+        return;
+      }
+
+      // 未按住了ctrl 、shift 键
+      //清除所有选择
+      //console.log('清除所有选择')
+      this.sampleGroupAsbitems.forEach((e) => {
+        e.choosed = false;
+        return e;
       });
+      this.sampleGroupAsbitems[row.index].choosed = true;
+      this.PstartPoint = row.index;
     },
-    //项目类别选择
-    ischangs(v) {
+
+    selectchange(v) {
       console.log(v);
-      getapi(`/api/app/diagnosis/in-item-type/${v}`).then((res) => {
+      this.sampleGroupAsbitems.push({ displayName: v.displayName });
+      // console.log(v);
+    },
+    saveAsb() {
+      if (!this.form.id) {
+        this.$message.warning("请选择要操作的模板！");
+        return;
+      }
+      let details = [];
+      let diagnosisTemplateId = this.form.id;
+
+      this.sampleGroupAsbitems.forEach((e) => {
+        details.push({
+          diagnosisTemplateId,
+          diagnosisId: e.id,
+        });
+      });
+
+      let body = { diagnosisTemplateId, details };
+
+      postapi(
+        "/api/app/diagnosistemplatedetail/creatediagnosistemplatedetailmany",
+        body
+      ).then((res) => {
+        if (res.code != -1) {
+          this.$message.success("操作成功！");
+        }
+      });
+    },
+
+    //右侧勾选按钮
+    selecteditems(val) {
+      this.rightselctedata = val;
+      console.log(this.rightselctedata);
+    },
+
+    // 左侧未选
+    handleSelectionChange(val) {
+      // this.selecteddata = val;
+      this.unselecteddata = val;
+      console.log(this.unselecteddata);
+    },
+
+    clickPaixu(item, index) {
+      console.log(item);
+      this.rightobj = item;
+      // let arr = [];
+      // arr.push({ itemId: this.rightobj.id });
+      // this.allid.forEach((item) => {
+      //   if (item.id == arr[id]) {
+      //     return;
+      //   } else {
+      //     this.allid.push({ id: arr[id] });
+      //   }
+      // });
+      console.log(this.allid);
+      this.ischank = 2;
+      this.num = index;
+      this.isdislob = false;
+    },
+
+    // 获取项目类别接口
+    posjectlist() {
+      projectlist().then((res) => {
         console.log(res);
-        this.leftdata = res.data;
+        this.projectid = res.data;
       });
     },
-    //取消排序
+    handlechang(value, direction, movedkeys) {
+      console.log(value);
+      console.log(direction);
+      console.log(movedkeys);
+    },
+    //取消按钮
     cancellation() {
       this.$message.info("取消操作");
       this.isshow = true;
       this.getlist();
     },
     //确定排序
-    assertion() {
+    btnSaveSort() {
       const result = [];
       this.tableData.forEach((item, index) => {
         // index 从0开始的， 你的displayOrder从大到小排
@@ -428,12 +794,15 @@ export default {
           result.push({ id: item.id, displayOrder: currentDisplayOrder });
         }
       });
+      // console.log('btnSaveSort', result);
       putapi("/api/app/diagnosistemplate/updatesortmany", {
         itemList: result,
       }).then((res) => {
-        this.$message.success("操作成功");
-        this.isshow = true;
-        this.getlist();
+        if (res.code != -1) {
+          this.$message.success("操作成功");
+          this.isshow = true;
+          this.getlist();
+        }
       });
     },
     //初始化
@@ -444,6 +813,10 @@ export default {
         Sortable.create(tbody, {
           handle: ".move",
           animation: 300,
+          onChoose({ oldIndex }) {
+            _this.$refs["info"].setCurrentRow(_this.tableData[oldIndex]);
+            _this.rowick(_this.tableData[oldIndex]);
+          },
           // 指定父元素下可被拖拽的子元素
           // draggable: ".module-manager .el-table__row",
           onEnd({ newIndex, oldIndex }) {
@@ -463,7 +836,8 @@ export default {
         });
       });
     },
-    toppings() {
+    //置底
+    btnSetButtom() {
       this.form = { ...this.curRow };
       if (this.form.id == undefined) {
         this.$message.warning("请选择操作的数据");
@@ -473,12 +847,15 @@ export default {
             this.form.id
           }&SortType=${2}`
         ).then((res) => {
-          this.$message.success("操作成功");
-          this.getlist();
+          if (res.code != -1) {
+            this.getlist();
+            this.$message.success("操作成功");
+          }
         });
       }
     },
-    topping() {
+    //置顶
+    btnSetTop() {
       this.form = { ...this.curRow };
       if (this.form.id == undefined) {
         this.$message.warning("请选择操作的数据");
@@ -488,175 +865,208 @@ export default {
             this.form.id
           }&SortType=${1}`
         ).then((res) => {
-          this.$message.success("操作成功");
-          this.getlist();
+          if (res.code != -1) {
+            this.$message.success("操作成功");
+            this.getlist();
+          }
         });
       }
     },
     //删除
-    delets(row) {
+    btnDel() {
       this.form = { ...this.curRow };
       if (this.form.id == undefined) {
-        this.$message.warning("请选择删除的数据");
+        this.$message.warning("请选择操作的数据");
       } else {
-        this.$confirm("是否确认删除,是否继续?", "提示", {
+        this.$confirm("是否确认删除, 是否继续?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning",
-        })
-          .then(() => {
-            deletapi(`/api/app/diagnosis-template/${this.form.id}`).then(
-              (res) => {
-                if (res.code == 0) {
-                  this.$message.success("删除成功");
-                  this.getlist();
-                }
+        }).then(() => {
+          deletapi(`/api/app/diagnosis-template/${this.form.id}`).then(
+            (res) => {
+              console.log(res);
+              if (res.code == 0) {
+                this.$message.success("删除成功");
+                this.getlist();
               }
-            );
-          })
-          .catch(() => {
-            this.$message.info("已取消操作");
-          });
+            }
+          );
+        });
+        // barcodedeleteid(this.form.id).then((res) => {
+        //   console.log(res);
+        //   this.$message.success("删除成功");
+        //   this.getlist();
+        // });
       }
     },
     //编辑弹框
-    edit(row) {
+    btnEdit() {
       this.form = { ...this.curRow };
       if (this.form.id == undefined) {
         this.$message.warning("请选择操作的数据");
       } else {
-        //项目类别
-        projectlist().then((res) => {
-          this.itemTypeId = res.data.items;
-        });
-        //性别
-        examinationgender().then((res) => {
-          this.forSexId = res.data;
-        });
-        //诊断级别
-        diagsislist().then((res) => {
-          this.diagnosisLevelId = res.data.items;
-        });
-        this.title = 2;
-
         this.dialogVisible = true;
+        this.title = 2;
+        if (this.$refs.form !== undefined) {
+          this.$refs.form.resetFields();
+        }
+        // //获取标本类型id
+        // specimenlist(this.pages).then((res) => {
+        //   this.sampleTypeId = res.data.items;
+        // });
+        // // 获取标本容器Id
+        // containerlist(this.pages).then((res) => {
+        //   this.sampleContainerId = res.data.items;
+        // });
+        // samplegropid(this.form.id).then((res) => {
+        //   this.form = res.data;
+        // });
       }
     },
+
     //确定新增或者编辑
-    onsbmint() {
+    onSubmit() {
       this.$refs.form.validate((v) => {
         if (v) {
           if (this.title == 1) {
             postapi("/api/app/diagnosis-template", this.form).then((res) => {
-              this.$message.success("新增成功");
-              this.getlist();
-              this.dialogVisible = false;
+              if (res.code != -1) {
+                this.$message.success("新增成功");
+                // this.getlist();  改为局部刷新
+                this.form.id = res.data.id;
+                this.tableData.push(deepCopy(res.data));
+                this.dialogVisible = false;
+              }
             });
           } else if (this.title == 2) {
             putapi(
               `/api/app/diagnosis-template/${this.form.id}`,
               this.form
             ).then((res) => {
-              this.$message.success("修改成功");
-              this.getlist();
-              this.dialogVisible = false;
+              if (res.code != -1) {
+                this.$message.success("修改成功");
+                // this.getlist(); 改为局部刷新
+                this.dialogVisible = false;
+              }
             });
           }
         }
       });
-      // postapi('/api/app/diagnosis',this)
     },
+
+    closeDialog() {
+      if (!this.form.id) return;
+
+      let currentRow = {};
+      let lfind = arrayExistObj(this.tableData, "id", this.form.id);
+      if (lfind > -1) {
+        objCopy(this.form, this.tableData[lfind]);
+        currentRow = this.tableData[lfind];
+      } else {
+        currentRow = deepCopy(this.form);
+        lfind = this.tableData.length;
+        this.tableData.push(currentRow);
+      }
+
+      if (lfind > -1) {
+        this.$nextTick(() => {
+          this.$refs["info"].setCurrentRow(currentRow);
+          this.rowick(currentRow);
+        });
+      }
+    },
+
     //新增弹框
-    add() {
+    btnAdd() {
       this.dialogVisible = true;
       this.title = 1;
-      this.form = {};
+      this.form = this.$options.data().form;
       this.$nextTick(() => {
         this.$refs.refinput.focus();
       });
 
-      //项目类别
-      projectlist().then((res) => {
-        this.itemTypeId = res.data.items;
-      });
-      //性别
-      examinationgender().then((res) => {
-        this.forSexId = res.data;
-      });
-      //诊断级别
-      diagsislist().then((res) => {
-        this.diagnosisLevelId = res.data.items;
-      });
+      // //获取标本类型id
+      // specimenlist(this.pages).then((res) => {
+      //   this.sampleTypeId = res.data.items;
+      //   console.log(res);
+      // });
+      // // 获取标本容器Id
+      // containerlist(this.pages).then((res) => {
+      //   this.sampleContainerId = res.data.items;
+      //   console.log(res, "11111");
+      // });
     },
+
+    //点击条码分组记录
     rowick(row) {
-      getapi(`/api/app/diagnosis-template/${row.id}`).then((res) => {
-        this.curRow = { ...res.data };
-        // this.form = res.data;
-      });
-      getapi(`/api/app/diagnosis-template/${row.id}`).then((res) => {
-        console.log(res);
-        let dq = res.data;
-        if (dq.length > 0) {
-          this.rightdata = [];
-          dq.forEach((element) => {
-            let bb = { displayName: element.displayName, id: element.id };
-            this.rightdata.push(bb);
-          });
+      this.curRow = deepCopy(row);
+      this.form = deepCopy(row);
+
+      // samplegropid(row.id).then((res) => {
+      //   this.curRow = { ...res.data };
+      //   this.form = res.data;
+      // });
+
+      postapi(
+        "/api/app/diagnosistemplatedetail/getdiagnosistemplateindiagnosis",
+        {
+          diagnosisTemplateId: this.form.id,
         }
-      });
-      //诊断模板包含的诊断
-      getapi(
-        `/api/app/diagnosis-template-detail/diagnosis-template-in-diagnosis?DiagnosisTemplateId=${row.id}`
       ).then((res) => {
-        this.rightdata = res.data;
-        console.log(res, "诊断");
+        if (res.code != -1) {
+          this.sampleGroupAsbitems = res.data;
+          this.getAsbItemByItemType();
+        }
       });
-      console.log(row);
     },
+
     getlist() {
+      this.loading = true;
       getapi("/api/app/diagnosis-template/in-filter", this.pages).then(
         (res) => {
-          this.initTableData = [...res.data.items];
+          this.loading = false;
           this.tableData = res.data.items;
+          this.initTableData = [...res.data.items];
           console.log(res);
         }
       );
     },
+    //ary1 需要追加的数据  ary2目标数组
+    updatedate() {
+      this.ary1.forEach((item) => {
+        let iscz = false;
+        this.ary2.forEach((item2) => {
+          if (item2.id == item.id) {
+            iscz = true;
+          }
+        });
+        if (!iscz) {
+          console.log(item.id);
+          this.ary2.push(item);
+          // this.allid.push({ id: item.id });
+        }
+      });
+    },
   },
 };
 </script>
 <style scoped>
-::v-deep .el-table__header th {
-  /* font-size: px; */
-  background-color: rgb(245, 245, 245); /* 设置表头背景颜色 */
-  color: rgb(113, 113, 113); /* 设置表头文字颜色 */
-}
-.confirmcancellation {
-  margin-left: 45%;
-}
-.Selectbutton {
-  margin-left: 3%;
-}
-.activetext {
-  background: rgb(185, 203, 235);
-}
-.weixuan {
-  text-align: center;
-  line-height: 20px;
-  background: rgb(185, 203, 235);
-}
-.mainleftbox {
-  width: 200px;
-  height: 240px;
-  border: 1px solid #ccc;
-  margin-left: 6%;
-}
-.mainbox {
-  display: flex;
-  justify-content: center;
-  margin-top: 20px;
-}
+@import "../../assets/css/global_button.css";
+@import "../../assets/css/global_card.css";
+@import "../../assets/css/global_dialog.css";
+@import "../../assets/css/global_form.css";
+@import "../../assets/css/global_input.css";
+@import "../../assets/css/global_table.css";
+@import "../../assets/css/global.css";
+
 .box {
-  display: flex;
+  margin-top: 5px;
+  border: 1px solid #000;
+}
+
+.btnClass {
+  width: 100px;
+  margin-bottom: 5px;
 }
 </style>
diff --git a/src/views/fee-settings/ItemTemplate.vue b/src/views/fee-settings/ItemTemplate.vue
index 31fe915..8404981 100644
--- a/src/views/fee-settings/ItemTemplate.vue
+++ b/src/views/fee-settings/ItemTemplate.vue
@@ -1,616 +1,788 @@
 <template>
-  <div class="box">
-    <div style="width: 100%">
-      <el-card>
-        <div class="publiccss">项目模板</div>
-        <el-table
-          :data="tableData"
-          style="width: 100%; margin-top: 20px"
-          row-key="id"
-          class="el-table__body-wrapper tbody"
-          @row-click="rowclick"
-          highlight-current-row
-          height="300"
-        >
-          <el-table-column prop="id" label="编号" width="300">
-          </el-table-column>
-          <el-table-column prop="displayName" label="名称"> </el-table-column>
-          <el-table-column prop="creatorName" label="创建者" width="130">
-          </el-table-column>
-          <el-table-column prop="creationTime" label="创建时间" width="200">
-            <template slot-scope="scope">
-              {{ scope.row.creationTime | dateFormat }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="lastModifierName" label="修改者" width="">
-          </el-table-column>
-          <el-table-column
-            prop="lastModificationTime"
-            label="修改时间"
-            width="200"
+  <div>
+    <el-card>
+      <div slot="header">项目模板</div>
+      <div style="display: flex">
+        <div>
+          <div
+            :style="
+              'width:' +
+              (window.pageWidth < 750 ? 595 : window.pageWidth - 45 - 110) +
+              'px;'
+            "
           >
-            <template slot-scope="scope">
-              {{ scope.row.lastModificationTime | dateFormat }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="result" label="结果" width="">
-          </el-table-column>
-          <el-table-column label="操作" width="">
-            <template>
-              <el-tag
-                class="move"
-                style="cursor: move; margin-left: 15px;background-color: rgb(245, 245, 245);border:none"
-                draggable="true"
-              >
-                <i
-                  class="el-icon-d-caret"
-                  style="width: 1rem; height: 1rem;color: rgb(113, 113, 113)"
-                ></i>
-              </el-tag>
-            </template>
-          </el-table-column>
-        </el-table>
-        <!-- <comp-table
-          :tableData="tableData"
-          :tableHeader="tableHeader"
-          @clickevents="rowclick"
-          ref="singleTable"
-        >
-        </comp-table> -->
-        <div class="subjecttitle">
-          <span style="margin-top: 10px; padding: 5px; margin-left: %"
-            >项目类别</span
-          >
-          <el-select
-            v-model="values"
-            placeholder="请选择"
-            @change="ischangs"
-            style="margin-top: 5px"
-          >
-            <el-option
-              v-for="item in projectid"
-              :key="item.id"
-              :label="item.displayName"
-              :value="item.id"
-            >
-            </el-option>
-          </el-select>
-          <span style="margin-left: 10%; padding: 5px">搜索选择</span>
-          <el-select
-            filterable
-            v-model="flitvalues"
-            placeholder="请选择"
-            style="margin-top: 5px"
-          >
-            <el-option
-              v-for="item in filetelists"
-              :key="item.id"
-              :label="item.displayName"
-              :value="item.id"
-            >
-            </el-option>
-          </el-select>
-        </div>
-        <div class="mainbox">
-          <div class="mainleftbox">
-            <div class="weixuan">未选项目</div>
-            <div
-              v-for="(item, index) in leftdata"
-              :key="index"
-              @click="clickPaixu(item, index)"
-              @dblclick="shuanji(item, index)"
-              :class="num === index ? 'activetext' : ''"
-              style=""
+            <el-table
+              :data="tableData"
+              row-key="id"
+              width="100%"
+              border
+              height="240px"
+              class="el-table__body-wrapper tbody"
+              border:stripe="true"
+              @row-click="rowick"
+              ref="info"
+              highlight-current-row
             >
-              <div>{{ item.displayName }}</div>
-            </div>
+              <el-table-column prop="id" label="编号" width="300">
+              </el-table-column>
+              <el-table-column prop="displayName" label="名称">
+              </el-table-column>
+              <el-table-column prop="creatorName" label="创建者">
+              </el-table-column>
+              <el-table-column prop="creationTime" label="创建时间" width="180">
+                <template slot-scope="scope">
+                  {{ scope.row.creationTime | dateFormat }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="lastModifierName" label="修改者">
+              </el-table-column>
+              <el-table-column
+                prop="lastModificationTime"
+                label="修改时间"
+                width="180"
+              >
+                <template slot-scope="scope">
+                  {{ scope.row.lastModificationTime | dateFormat }}
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" width="">
+                <template>
+                  <el-tag
+                    class="move"
+                    style="
+                      cursor: move;
+                      margin-left: 15px;
+                      background-color: rgb(245, 245, 245);
+                      border: none;
+                    "
+                    draggable="true"
+                  >
+                    <i
+                      class="el-icon-d-caret"
+                      style="
+                        width: 1rem;
+                        height: 1rem;
+                        color: rgb(113, 113, 113);
+                      "
+                    ></i>
+                  </el-tag>
+                </template>
+              </el-table-column>
+            </el-table>
           </div>
-          <div class="Selectbutton">
-            <div style="margin-top: 10px">
-              <el-button @click="addall"
-                >全添加<i class="el-icon-caret-right"></i
-                ><i class="el-icon-caret-right"></i
-              ></el-button>
-            </div>
-            <div style="margin-top: 10px">
-              <el-button @click="addobj" style="width: 111px"
-                >添加<i class="el-icon-caret-right"></i>
-              </el-button>
-            </div>
-            <div style="margin-top: 10px">
-              <el-button @click="removeright" style="width: 111px"
-                >移去<i class="el-icon-caret-left"></i>
-              </el-button>
+          <div style="display: flex; margin-top: 5px">
+            <div
+              :style="
+                'width:' +
+                (window.pageWidth < 750
+                  ? 0
+                  : Math.round((window.pageWidth - 750) / 2)) +
+                'px;'
+              "
+            ></div>
+            <!--未选项目模块-->
+            <div style="width: 235px">
+              <div>
+                <span style="padding-right: 5px">项目类别</span>
+                <el-cascader
+                  :options="dict.itemTypeTree"
+                  v-model="itemTypeIds"
+                  style="margin-left: 3px; width: 160px"
+                  :props="{
+                    checkStrictly: true,
+                    expandTrigger: 'hover',
+                    ...customerOrg.treeprops,
+                  }"
+                  :show-all-levels="false"
+                  clearable
+                  filterable
+                  @change="getAsbItemByItemType"
+                  size="small"
+                >
+                </el-cascader>
+              </div>
+              <div class="box">
+                <el-table
+                  :data="dict.asbItem"
+                  width="160"
+                  border
+                  :height="
+                    window.pageHeight < 600
+                      ? 165
+                      : window.pageHeight - 150 - 240 - 45
+                  "
+                  highlight-current-row
+                  @row-dblclick="dbClickChoosedAsb"
+                  @selection-change="handleSelectionChange"
+                  :row-class-name="handleRowClassName"
+                  @row-click="chooseAsbItem"
+                >
+                  <el-table-column prop="displayName" label="未选项目" />
+                </el-table>
+              </div>
             </div>
-            <div style="margin-top: 10px">
-              <el-button @click="allclear"
-                >全移去<i class="el-icon-caret-left"></i
-                ><i class="el-icon-caret-left"></i>
-              </el-button>
+
+            <!--中间操作按钮-->
+            <div style="display: block; margin: 40px 10px 0 10px">
+              <div>
+                <el-button
+                  class="btnClass"
+                  @click="addAbs(asbItemChoosed, 'choosed')"
+                  >添加 <i class="el-icon-arrow-right"></i
+                ></el-button>
+              </div>
+              <div>
+                <el-button
+                  class="btnClass"
+                  @click="addAbs(asbItemChoosed, 'all')"
+                  >全部添加</el-button
+                >
+              </div>
+              <div>
+                <el-button
+                  class="btnClass"
+                  @click="delAbs(patientRegisterAbsChoosed, 'choosed')"
+                  >移除 <i class="el-icon-arrow-left"></i
+                ></el-button>
+              </div>
+              <div>
+                <el-button
+                  class="btnClass"
+                  @click="delAbs(patientRegisterAbsChoosed, 'all')"
+                  >全部移除</el-button
+                >
+              </div>
             </div>
-          </div>
-          <div class="mainleftbox">
-            <div class="weixuan">已选项目</div>
-            <div
-              v-for="(item, index) in rightdata"
-              :key="index"
-              @click="rightindex(item, index)"
-              @dblclick="rightdelite(item, index)"
-              :class="nums === index ? 'activetext' : ''"
-            >
-              <div>{{ item.displayName }}</div>
+
+            <!-- 已选项目模块 -->
+            <div style="width: 235px">
+              <div>
+                <span style="padding-right: 5px">快速选择</span>
+                <el-select
+                  v-model="asbItemId"
+                  placeholder="快速选择项目"
+                  size="small"
+                  filterable
+                  default-first-option
+                  :filter-method="filterMethod"
+                  clearable
+                  @clear="quickAsb = deepCopy(dict.asbItemQuick)"
+                  @change="quickChoosedAsb"
+                  ref="quickAsbOCX"
+                  style="margin-left: 3px; width: 160px"
+                >
+                  <el-option
+                    v-for="item in quickAsb"
+                    :key="item.id"
+                    :value="item.id"
+                    :label="item.displayName"
+                  />
+                </el-select>
+              </div>
+              <div class="box">
+                <el-table
+                  :data="sampleGroupAsbitems"
+                  width="160"
+                  border
+                  :height="
+                    window.pageHeight < 600
+                      ? 165
+                      : window.pageHeight - 150 - 240 - 45
+                  "
+                  @selection-change="selecteditems"
+                  highlight-current-row
+                  :row-class-name="handleRowClassName"
+                  @row-dblclick="removeAbs"
+                  @row-click="removeAsbItem"
+                >
+                  <el-table-column prop="displayName" label="已选项目" />
+                </el-table>
+              </div>
             </div>
           </div>
         </div>
-        <div class="confirmcancellation">
-          <el-button :disabled="isdislob" @click="Onsubmit">确定</el-button>
-          <el-button :disabled="isdislob">取消</el-button>
-        </div>
-      </el-card>
-      <!-- 弹框 -->
-      <el-dialog
-        :title="title == 1 ? '新增' : '编辑'"
-        :visible.sync="dialogVisible"
-        width="75%"
-        :close-on-click-modal="false"
-      >
-        <el-form ref="form" :model="form" label-width="80px" :rules="rules">
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="名称" prop="displayName">
-                <el-input
-                  ref="refinput"
-                  v-model="form.displayName"
-                  style="width: 80%"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-        <span slot="footer" class="dialog-footer">
-          <el-button @click="dialogVisible = false">取 消</el-button>
-          <el-button type="primary" @click="onsbmit">确 定</el-button>
-        </span>
-      </el-dialog>
-    </div>
-    <!-- 按钮区域 -->
-    <div style="margin-left: 10px; margin-top: 5%">
-      <div style="">
-        <!-- undate -->
-        <!-- <el-row>
-          <div class="el-form-item__content">
-            <el-upload
-              ref="upload"
-              accept=".xls,.xlsx"
-              action="#"
-              :auto-upload="false"
-              :multiple="false"
-              :file-list="fileList"
-              :before-upload="beforeUpload"
-              :http-request="uploadHttpRequest"
-              :on-remove="fileRemove"
-              :on-change="fileChange"
+
+        <!-- 按钮区域 -->
+        <div style="margin-left: 10px">
+          <div>
+            <el-button @click="btnAdd" class="btnClass">新增</el-button>
+          </div>
+          <div>
+            <el-button @click="btnEdit" class="btnClass">编辑</el-button>
+          </div>
+          <div>
+            <el-button @click="btnDel" class="btnClass">删除</el-button>
+          </div>
+          <div>
+            <el-button @click="btnSetTop" class="btnClass">置顶</el-button>
+          </div>
+          <div>
+            <el-button @click="btnSetButtom" class="btnClass">置底</el-button>
+          </div>
+          <div>
+            <el-button :disabled="isshow" @click="btnSaveSort" class="btnClass"
+              >排序</el-button
             >
-              <el-button size="small" type="primary">选择文件</el-button>
-            </el-upload>
           </div>
-        </el-row> -->
-        <!--  -->
-        <!-- <el-button type="primary" @click="exportexc">导出excel</el-button> -->
-      </div>
-      <div>
-        <!-- <el-button type="primary" @click="parseImportData(importData)"
-          >parse</el-button
-        > -->
-      </div>
-      <div>
-        <el-button type="" @click="add" class="commonbutton">新增</el-button>
-      </div>
-      <el-button
-        type=""
-        @click="editpopup"
-        style="margin-left: 0; margin-top: 10px"
-        class="commonbutton"
-        >编辑</el-button
-      >
-      <!-- <input type="file" accept=".xlsx" @change="onFileChange" /> -->
-      <div style="margin-top: 10px">
-        <el-button type="" @click="delets" class="commonbutton">删除</el-button>
-      </div>
-      <div style="margin-top: 10px">
-        <el-button type="" @click="topping" class="commonbutton"
-          >置顶</el-button
-        >
-      </div>
-      <div style="margin-top: 10px">
-        <el-button type="" @click="toppings" class="commonbutton"
-          >置底</el-button
-        >
-      </div>
-      <div style="margin-top: 10px">
-        <el-button type="" :disabled="isshow" @click="assertion"
-        class="commonbutton"
-          >排序</el-button
-        >
-      </div>
-      <div style="margin-top: 5px">
-        <el-button type="" :disabled="isshow" @click="cancellation"  class="commonbutton"
-          >取消</el-button
-        >
-      </div>
-    </div>
-    <!-- 选择文件之后的弹框 -->
-    <el-dialog title="提示" :visible.sync="filepopupdialogVisible" width="60%">
-      <!-- <el-table :data="importData" style="width: 100%"> </el-table> -->
-      <div v-for="(item, index) in importData" :key="index">
-        <el-checkbox v-model="item.a">备选项</el-checkbox>
-        {{ item }}
+          <div style="margin-top: 100px">
+            <el-button @click="saveAsb" class="btnClass">确定项目</el-button>
+          </div>
+        </div>
       </div>
+    </el-card>
+    <!-- 新增弹框 -->
+    <el-dialog
+      :title="title == 1 ? '新增' : '修改'"
+      :visible.sync="dialogVisible"
+      width="520px"
+      :close-on-click-modal="false"
+      @close="closeDialog"
+    >
+      <el-form ref="form" :model="form" label-width="80px" :rules="rules">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="名称" prop="displayName">
+              <el-input
+                ref="refinput"
+                v-model="form.displayName"
+                style="width: 100%"
+              ></el-input> </el-form-item
+          ></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="创建者">
+              <el-input v-model="form.creatorName" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="创建时间">
+              <el-input :value="form.creationTime" disabled></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="修改者">
+              <el-input v-model="form.lastModifierName" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="修改时间">
+              <el-input :value="form.lastModificationTime" disabled></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="filepopupdialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="filepopupdialogVisible = false"
-          >确 定</el-button
-        >
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="onSubmit">确 定</el-button>
       </span>
     </el-dialog>
-
-    <!--  -->
   </div>
 </template>
 <script>
-import ExcelJS from "exceljs";
-import { rowDrop } from "@/components/publicjs/public";
-import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { getporjectlists } from "@/request/commonapi";
-import compTable from "@/components/compTable.vue";
 import Sortable from "sortablejs";
+import {
+  groupinglist,
+  samplegroup,
+  samplegropid,
+  barcodeediting,
+  barcodedeleteid,
+  barcodedetopbottom,
+  barcodedraganddrop,
+  projectlist,
+  itemtypeid,
+  sampleasbitemid,
+  asbitmfilte,
+} from "@/request/commonapi";
+import { specimenlist, containerlist } from "@/request/systemapi";
+import { getapi, postapi, putapi, deletapi } from "@/api/api";
+import { mapState } from "vuex";
+import {
+  arrayExistObj,
+  tcdate,
+  arrayFilter,
+  arrayReduce,
+  deepCopy,
+  dddw,
+  objCopy,
+} from "../../utlis/proFunc";
+
 export default {
-  components: { compTable },
   data() {
     return {
-      filepopupdialogVisible: false,
-      ary1: [],
-      ary2: [],
-      nums: 0,
-      num: 0,
-      flitvalues: [], //搜索选择
-      filetelists: [], //项目类别
-      projectid: [],
-      values: "",
-      isshow: true,
+      itemTypeIds: [], //项目类别
+      asbItemId: "", //当前快速选到的给合项目ID
+      quickAsb: [], //过滤显示的项目
       rules: {
-        itemId: [{ required: true, message: "请选择项目", trigger: "change" }],
         displayName: [
           { required: true, message: "请输入名称", trigger: "blur" },
         ],
-        diagnosisId: [
-          { required: true, message: "请选择诊断编号", trigger: "change" },
-        ],
-        isNameIntoSummary: [
-          { required: true, message: "请选择小结名称", trigger: "change" },
-        ],
-        isResultIntoSummary: [
-          { required: true, message: "请选择进入小结", trigger: "change" },
-        ],
-        resultStatusId: [
-          { required: true, message: "请选择结果状态", trigger: "change" },
-        ],
-        simpleCode: [
-          { required: true, message: "请输入拼音简码", trigger: "change" },
-        ],
       },
+      isdislob: true,
+      filetelists: [],
+      flitvalues: [],
+      checked: [],
+      tableHeight: window.innerHeight - 500, //表格动态高度
+      screenHeight: window.innerHeight, //内容区域高度
+      isshow: true,
       form: {
         displayName: "",
       },
       dialogVisible: false,
       title: 1,
+      loading: false,
       pages: {
         SkipCount: 0,
         MaxResultCount: 100,
         Sorting: "displayOrder desc",
       },
-      itemId: [], //项目
-      diagnosisId: [], //诊断
-      resultStatusId: [], //结果状态
-      isNameIntoSummary: [
-        {
-          value: "N",
-          label: "否",
-        },
-        {
-          value: "Y",
-          label: "是",
-        },
-      ], // 小结名称
-      isResultIntoSummary: [
-        {
-          value: "N",
-          label: "否",
-        },
-        {
-          value: "Y",
-          label: "是",
-        },
-      ], //进入小结
       tableData: [],
       initTableData: [],
-      tableHeader: [
-        // 表头信息，可根据minWidth修改宽度
-        { prop: "id", label: "编号", minWidth: "150px" },
-        { prop: `creatorName`, label: "创建者" },
-        { prop: `creationTime`, label: "创建时间" },
-        { prop: `lastModifierName`, label: "修改者" },
-        { prop: `lastModificationTime`, label: "创建时间" },
-        { prop: "result", label: "结果" },
-        // { prop: "simpleCode", label: "拼音简码" },
-      ],
-
-      leftdata: [], //左边侧边栏数据
+      projectid: [],
+
+      sampleGroupAsbitems: [], //右侧数据
+      num: "",
+      nums: "",
+      values: "",
       rightobj: {},
-      rightdata: [], //右边侧边栏数据
-      isdislob: true,
-      flitvalues: [],
-      fileList: [],
-      importData: [],
+      leftobj: {},
+      ischank: 1,
+      filete: {
+        Filter: "",
+      },
+
+      ary1: [],
+      ary2: [],
+      sdate: [],
+      curRow: {},
     };
   },
   created() {
+    this.dictInit();
+
     this.getlist();
-    this.gitprojectcategory();
+    this.posjectlist();
   },
   mounted() {
     this.rowDrop();
-    // this.getdiagnosisitem();
   },
+  watch: {
+    // 监听screenHeight从而改变table的高度
+    // screenHeight(val) {
+    //   this.screenHeight = val;
+    //   this.tableHeight = this.screenHeight - 220;
+    // },
+  },
+
+  computed: {
+    ...mapState(["window", "dict", "customerOrg"]),
+  },
+
   methods: {
-    onFileChange(event) {
-      // 获取上传的文件
-      const file = event.target.files[0];
-      // 调用导入Excel文件的方法
-      this.importExcelFile(file);
-    },
-
-    importExcelFile(file) {
-      this.filepopupdialogVisible = true;
-      console.log("333");
-      // 创建一个工作簿
-      const workbook = new ExcelJS.Workbook();
-      // 读取Excel文件
-      const reader = new FileReader();
-      console.log(reader);
-      reader.onload = () => {
-        const buffer = reader.result;
-        const typedArray = new Uint8Array(buffer);
-        const blob = new Blob([typedArray], {
-          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-        });
+    //初始数据
+    dictInit() {
+      //体检类别 树结构
+      getapi("/api/app/item-type/by-code-all").then((res) => {
+        if (res.code != -1) {
+          this.dict.itemTypeTree = res.data;
+          tcdate(this.dict.itemTypeTree);
+        }
+      });
 
-        // 从Blob中读取Excel文件
-        workbook.xlsx.load(blob).then((workbook) => {
-          // 获取第一个工作表
-          const worksheet = workbook.getWorksheet(1);
-          // 处理Excel文件内容
-          worksheet.eachRow((row, rowNumber) => {
-            this.importData.push(row.values);
-            // console.log(`第${rowNumber}行的数据：${rowData}`);
+      //获取所有项目
+      getapi("/api/app/item/in-filter").then((res) => {
+        if (res.code != -1) {
+          this.dict.asbItemAll = res.data.items;
+          this.dict.asbItemAll.forEach((e) => {
+            e.choosed = false;
           });
-        });
-      };
-      reader.readAsArrayBuffer(file);
+          this.dict.asbItem = deepCopy(this.dict.asbItemAll);
+          this.dict.asbItemQuick = deepCopy(res.data.items);
+          this.quickAsb = deepCopy(res.data.items);
+        }
+      });
     },
 
-    parseImportData(importData) {
-      console.log("importData", importData.length, importData);
-      importData.forEach((item) => {
-        console.log(item);
+    handleRowClassName({ row, rowIndex }) {
+      // highLightBg 为 'selected'的高亮
+      //console.log(rowIndex, row)
+      //return row.highLightBg == 'selected' ? 'high-light-bg' : '';
+      if (row.choosed) {
+        return "current-row";
+      } else {
+        return "";
+      }
+    },
 
-        this.importData = item.splice(1).map((items) => {
-          return { id: items[0] };
-        });
-        // this.importData.push(item);
+    //项目类别过滤 项目，未过滤已选择的项目
+    getAsbItemByItemTypeAll() {
+      //console.log('getAsbItemByItemType', typeof this.itemTypeIds, this.itemTypeIds)
+      let lv = "";
+      if (typeof this.itemTypeIds === "object") {
+        lv = this.itemTypeIds[this.itemTypeIds.length - 1];
+      }
 
-        // item.forEach((item2) => {
-        //   item2.displayName = item2[0];
-        //   console.log(item2.displayName);
+      if (lv) {
+        this.dict.asbItem = arrayFilter(this.dict.asbItemAll, "itemTypeId", lv);
+      } else {
+        this.dict.asbItem = deepCopy(this.dict.asbItemAll);
+      }
+      //console.log('lv,this.dict.asbItem', lv, this.dict.asbItem)
+      this.dict.asbItemQuick = deepCopy(this.dict.asbItemAll);
+    },
 
-        // });
-        console.log(item, "item", item.length);
-      });
+    //按项目类别显示项目，并过滤已选择的项目
+    getAsbItemByItemType() {
+      this.getAsbItemByItemTypeAll();
+      //刷新显示 未选项目
+      arrayReduce(this.dict.asbItem, [...this.sampleGroupAsbitems], "id=id");
+      arrayReduce(
+        this.dict.asbItemQuick,
+        [...this.sampleGroupAsbitems],
+        "id=id"
+      );
+      this.quickAsb = deepCopy(this.dict.asbItemQuick);
     },
 
-    // 上传文件之前的钩子：判断上传文件格式、大小等，若返回false则停止上传
-    beforeUpload(file) {
-      console.log(file);
-      console.log("333");
-      console.log("2222");
-      //文件类型
-      const isType = file.type === "application/vnd.ms-excel";
-      const isTypeComputer =
-        file.type ===
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
-      const fileType = isType || isTypeComputer;
-      if (!fileType) {
-        this.$message.error("上传文件只能是xls/xlsx格式！");
+    //快速选择项目时，调整可按拼间简码及简称查找
+    filterMethod(keyWords) {
+      //console.log('filterMethod',this.dict.asbItemQuick)
+      if (keyWords) {
+        this.quickAsb = [];
+        console.log(this.dict.asbItemQuick);
+        this.dict.asbItemQuick.forEach((item) => {
+          if (
+            item.displayName.toLowerCase().indexOf(keyWords.toLowerCase()) >
+              -1 ||
+            item.simpleCode.toLowerCase().indexOf(keyWords.toLowerCase()) > -1
+          ) {
+            this.quickAsb.push(item);
+          }
+        });
+      } else {
+        this.quickAsb = deepCopy(this.dict.asbItemQuick);
       }
+    },
 
-      // 文件大小限制为10M
-      const fileLimit = file.size / 1024 / 1024 < 10;
-      if (!fileLimit) {
-        this.$message.error("上传文件大小不超过10M！");
+    // 添加项目
+    ///api/app/register-asbitem/many/3fa85f64-5717-4562-b3fc-2c963f66afa6'
+    async addAbs(asbItemChoosed, oprType) {
+      // console.log('this.customerOrgGroup',this.customerOrgGroup)
+      // console.log('asbItemChoosed', asbItemChoosed)
+      if (!this.form.id) {
+        this.$message.warning("请先选中条码分组");
+        return;
       }
-      return fileType && fileLimit;
-    },
-    uploadHttpRequest(param) {
-      const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
-      formData.append("file", param.file); //添加文件对象
-      formData.append("uploadType", this.rulesType);
-      const url = `${this.myBaseURL}/operation/ruleImport/importData`; //上传地址
-      axios
-        .post(url, formData)
-        .then((res) => {
-          const {
-            data: { code, mark },
-          } = res;
-          if (code === 0) {
-            param.onSuccess(); // 上传成功的文件显示绿色的对勾
-            this.uploadMark = mark;
-          }
-          return this.countData(this.uploadMark); //根据响应的 mark 值调用统计结果接口，返回一个promise以便进行链式调用
-        })
-        .then((res) => {
-          //链式调用，统计结果的响应
-          const {
-            data: { code, data },
-          } = res;
-          if (code === 0) {
-            console.log("统计结果", data);
+
+      let message = [];
+      let checked = true;
+      let lfind = -1;
+
+      //oprType 不传值时，兼容勾选方式
+      //勾选时不需要此操作  start
+      if (oprType && oprType == "all") {
+        asbItemChoosed = deepCopy(this.dict.asbItem);
+      } else if (oprType && oprType == "choosed") {
+        asbItemChoosed = [];
+        this.dict.asbItem.forEach((e) => {
+          if (e.choosed) {
+            asbItemChoosed.push(e);
+            e.choosed = false;
           }
-        })
-        .catch((err) => {
-          console.log("失败", err);
-          param.onError(); //上传失败的文件会从文件列表中删除
         });
-    },
-    // 统计结果
-    countFile(mark) {
-      return new Promise((resolve, reject) => {
-        axios
-          .get(`/operation/ruleImport/countData?mark=${mark}`)
-          .then((res) => {
-            resolve(res);
-          })
-          .catch((error) => {
-            reject(error);
-          });
+      }
+      //勾选时不需要此操作  end
+
+      if (asbItemChoosed.length < 1) {
+        this.$message.warning("请选择要添加的项目");
+        return;
+      }
+
+      // 去掉重复的项目
+      arrayReduce(asbItemChoosed, this.sampleGroupAsbitems, "id=id");
+      /*
+      for (let i = asbItemChoosed.length - 1; i > - 1; i--) {
+        if (this.customerOrgGroup.forSexId == 'A') break //未选性别时，无需判断项目性别限制 
+        if (asbItemChoosed[i].forSexId == 'A' || asbItemChoosed[i].forSexId == 'U') continue
+        if (asbItemChoosed[i].forSexId != this.customerOrgGroup.forSexId) {
+          message.push(asbItemChoosed[i].displayName)   //.warning(`所选项目：${asbItemChoosed[i].displayName}，不适合当前人员性别`)
+          checked = false
+          asbItemChoosed.splice(i,1)
+        }
+      }
+      //console.log(222,checked)
+      if (!checked) this.$message.warning(`所选项目【${JSON.stringify(message)}】不适合当前人员性别`)
+      */
+
+      asbItemChoosed.forEach((e) => {
+        this.sampleGroupAsbitems.push(deepCopy(e));
       });
+
+      //刷新
+      this.getAsbItemByItemType();
     },
-    // 点击上传：手动上传到服务器，此时会触发组件的http-request
-    submitUpload() {
-      this.$refs.upload.submit();
-    },
-    // 文件发生改变
-    fileChange(file, fileList) {
-      if (fileList.length > 0) {
-        this.fileList = [fileList[fileList.length - 1]]; // 展示最后一次选择的文件
-      }
+
+    //双击选择项目
+    dbClickChoosedAsb(row) {
+      this.addAbs([row]);
     },
-    // 移除选择的文件
-    fileRemove(file, fileList) {
-      if (fileList.length < 1) {
-        this.uploadDisabled = true; //未选择文件则禁用上传按钮
-        console.log(file);
+    //快速选择项目
+    quickChoosedAsb(v) {
+      //远程查询时，设置了 value-key 也不管用，只能取到value console.log('quickChoosedAsb',v)
+      let lfind = -1;
+      if (v) {
+        lfind = arrayExistObj(this.dict.asbItemQuick, "id", v);
+        if (lfind > -1) {
+          this.addAbs([this.dict.asbItemQuick[lfind]]);
+        }
       }
+
+      this.$nextTick(() => {
+        this.$refs["quickAsbOCX"].blur(); //total  asbItemId
+        this.asbItemId = "";
+        this.quickAsb = deepCopy(this.dict.asbItemQuick);
+        this.$refs["quickAsbOCX"].focus(); //total  asbItemId
+      });
     },
-    exportexc() {
-      // console.log('1');
-    },
-    // getdiagnosisitem() {
-    //   getapi("/api/app/item").then((res) => {
 
-    //     console.log(res);
-    //   });
-    // },
-    Onsubmit() {
-      let sampleGroupId = this.form.id;
-      console.log(this.form.id);
-      console.log(this.rightdata);
-      let sdate = [];
-      this.rightdata.forEach((element) => {
-        let sss = { sampleGroupId: sampleGroupId, asbitemId: element.id };
-        sdate.push(sss);
+    //选择 未选的项目
+    chooseAsbItem(row) {
+      this.dict.asbItem.forEach((e, index) => {
+        e.index = index;
+        return e;
       });
-      this.leftdata.forEach((element) => {
-        let sss = { sampleGroupId: sampleGroupId, asbitemId: element.id };
-        sdate.push(sss);
+      // 按住了shift键
+      if (this.window.shift) {
+        //清除所有选择
+        this.dict.asbItem.forEach((e) => {
+          e.choosed = false;
+          return e;
+        });
+
+        if (this.startPoint == -1) {
+          this.dict.asbItem[row.index].choosed = true;
+          this.startPoint = row.index;
+          return;
+        }
+
+        if (this.startPoint > row.index) {
+          for (let i = row.index; i <= this.startPoint; i++) {
+            this.dict.asbItem[i].choosed = true;
+          }
+        } else if (this.startPoint <= row.index) {
+          for (let i = this.startPoint; i <= row.index; i++) {
+            this.dict.asbItem[i].choosed = true;
+          }
+        }
+        return;
+      }
+
+      // 按住了ctrl 键
+      if (this.window.ctrl) {
+        console.log("this.window.ctrl", this.window.ctrl, this.dict.asbItem);
+        this.dict.asbItem[row.index].choosed = true;
+        this.startPoint = row.index;
+        return;
+      }
+
+      // 未按住了ctrl 、shift 键
+      //清除所有选择
+      //console.log('清除所有选择')
+      this.dict.asbItem.forEach((e) => {
+        e.choosed = false;
+        return e;
       });
-      console.log(sdate);
-      if (sampleGroupId == undefined) {
-        this.$message.warning("请选择列表");
-      } else {
-        postapi("/api/app/item-template-detail/many", sdate).then((res) => {
-          this.$message.success("操作成功");
-          this.isdislob = true;
+      this.dict.asbItem[row.index].choosed = true;
+      this.startPoint = row.index;
+    },
+
+    //删除 人员已选中的项目
+    ///api/app/register-asbitem/many?RegisterAsbitemIds=3fa85f64-5717-4562-b3fc-2c963f66afa6
+    delAbs(absForDel, oprType) {
+      if (!this.form.id) {
+        this.$message.warning("请先选中单位分组");
+        return;
+      }
+
+      let lfind = -1;
+
+      //勾选时不需要此操作  start
+      if (oprType && oprType == "all") {
+        absForDel = deepCopy(this.sampleGroupAsbitems);
+      } else if (oprType && oprType == "choosed") {
+        absForDel = [];
+        this.sampleGroupAsbitems.forEach((e) => {
+          if (e.choosed) {
+            absForDel.push(deepCopy(e));
+            e.choosed = false;
+          }
         });
       }
+      //勾选时不需要此操作  end
+
+      if (absForDel.length < 1) {
+        this.$message.warning("请选择要移除的项目");
+        return;
+      }
+
+      for (let i = 0; i < absForDel.length; i++) {
+        lfind = arrayExistObj(this.sampleGroupAsbitems, "id", absForDel[i].id);
+        if (lfind > -1) this.sampleGroupAsbitems.splice(lfind, 1);
+
+        absForDel.splice(i, 1);
+        i--;
+        continue;
+      }
+
+      //刷新
+      this.getAsbItemByItemType();
     },
-    //右侧点击选中
-    rightindex(item, index) {
-      this.nums = index;
-      this.leftobj = item;
-      console.log(this.leftobj);
+
+    //双击删除已选项目
+    removeAbs(row) {
+      this.delAbs([row]);
     },
-    //q全移去
-    allclear() {
-      this.isdislob = false;
-      if (this.rightdata.length > 0) {
-        this.ary1 = this.rightdata;
-        this.ary2 = this.leftdata;
-        this.updatedate();
-        this.rightdata = [];
+
+    //选择 已选的项目
+    removeAsbItem(row) {
+      this.sampleGroupAsbitems.forEach((e, index) => {
+        e.index = index;
+        return e;
+      });
+      // 按住了shift键
+      if (this.window.shift) {
+        //清除所有选择
+        this.sampleGroupAsbitems.forEach((e) => {
+          e.choosed = false;
+          return e;
+        });
+
+        if (this.PstartPoint == -1) {
+          this.sampleGroupAsbitems[row.index].choosed = true;
+          this.PstartPoint = row.index;
+          return;
+        }
+
+        if (this.PstartPoint > row.index) {
+          for (let i = row.index; i <= this.PstartPoint; i++) {
+            this.sampleGroupAsbitems[i].choosed = true;
+          }
+        } else if (this.PstartPoint <= row.index) {
+          for (let i = this.PstartPoint; i <= row.index; i++) {
+            this.sampleGroupAsbitems[i].choosed = true;
+          }
+        }
+        return;
       }
-    },
-    //右移动
-    removeright() {
-      if (this.rightdata.length > 0) {
-        this.rightdata.splice(this.num, 1);
-        this.leftdata.push(this.leftobj);
-        this.isdislob = true;
-        this.updatedate();
+
+      // 按住了ctrl 键
+      if (this.window.ctrl) {
+        console.log(
+          "this.window.ctrl",
+          this.window.ctrl,
+          this.sampleGroupAsbitems
+        );
+        this.sampleGroupAsbitems[row.index].choosed = true;
+        this.PstartPoint = row.index;
+        return;
       }
+
+      // 未按住了ctrl 、shift 键
+      //清除所有选择
+      //console.log('清除所有选择')
+      this.sampleGroupAsbitems.forEach((e) => {
+        e.choosed = false;
+        return e;
+      });
+      this.sampleGroupAsbitems[row.index].choosed = true;
+      this.PstartPoint = row.index;
     },
-    //左侧添加按钮
-    addobj() {
-      if (this.leftdata.length > 0) {
-        this.leftdata.splice(this.num, 1);
-        this.rightdata.push(this.rightobj);
-      }
+
+    selectchange(v) {
+      console.log(v);
+      this.sampleGroupAsbitems.push({ displayName: v.displayName });
+      // console.log(v);
     },
-    //全添加
-    addall() {
-      this.isdislob = false;
-      if (this.leftdata.length > 0) {
-        this.ary1 = this.leftdata;
-        this.ary2 = this.rightdata;
-        this.updatedate();
-        this.leftdata = [];
+    saveAsb() {
+      if (!this.form.id) {
+        this.$message.warning("请选择要操作的模板！");
+        return;
       }
+      let details = [];
+      let itemTemplateId = this.form.id;
+
+      this.sampleGroupAsbitems.forEach((e) => {
+        details.push({
+          itemTemplateId,
+          itemId: e.id,
+        });
+      });
+
+      let body = { itemTemplateId, details };
+
+      postapi(
+        "/api/app/itemtemplatedetail/createitemtemplatedetaimany",
+        body
+      ).then((res) => {
+        if (res.code != -1) {
+          this.$message.success("操作成功！");
+        }
+      });
     },
-    //左侧双击事件
-    shuanji(item, index) {
-      console.log(item);
-      this.leftdata.splice(index, 1);
-      this.rightdata.push(item);
+
+    //右侧勾选按钮
+    selecteditems(val) {
+      this.rightselctedata = val;
+      console.log(this.rightselctedata);
+    },
+
+    // 左侧未选
+    handleSelectionChange(val) {
+      // this.selecteddata = val;
+      this.unselecteddata = val;
+      console.log(this.unselecteddata);
     },
 
     clickPaixu(item, index) {
+      console.log(item);
       this.rightobj = item;
-
-      // this.ischank = 2;
+      // let arr = [];
+      // arr.push({ itemId: this.rightobj.id });
+      // this.allid.forEach((item) => {
+      //   if (item.id == arr[id]) {
+      //     return;
+      //   } else {
+      //     this.allid.push({ id: arr[id] });
+      //   }
+      // });
+      console.log(this.allid);
+      this.ischank = 2;
       this.num = index;
-      console.log(this.num);
+      this.isdislob = false;
     },
-    //项目类别选择框
-    ischangs(v) {
-      getapi(`/api/app/item/in-item-type/${v}`).then((res) => {
+
+    // 获取项目类别接口
+    posjectlist() {
+      projectlist().then((res) => {
         console.log(res);
-        this.leftdata = res.data;
+        this.projectid = res.data;
       });
-      console.log(v);
     },
-    //获取项目类别
-    gitprojectcategory() {
-      getapi("/api/app/item-type").then((res) => {
-        this.projectid = res.data.items;
-      });
+    handlechang(value, direction, movedkeys) {
+      console.log(value);
+      console.log(direction);
+      console.log(movedkeys);
     },
-    //取消排序
+    //取消按钮
     cancellation() {
       this.$message.info("取消操作");
       this.isshow = true;
       this.getlist();
     },
     //确定排序
-    assertion() {
+    btnSaveSort() {
       const result = [];
       this.tableData.forEach((item, index) => {
         // index 从0开始的， 你的displayOrder从大到小排
@@ -622,12 +794,15 @@ export default {
           result.push({ id: item.id, displayOrder: currentDisplayOrder });
         }
       });
+      // console.log('btnSaveSort', result);
       putapi("/api/app/itemtemplate/updatesortmany", {
         itemList: result,
       }).then((res) => {
-        this.$message.success("操作成功");
-        this.isshow = true;
-        this.getlist();
+        if (res.code != -1) {
+          this.$message.success("操作成功");
+          this.isshow = true;
+          this.getlist();
+        }
       });
     },
     //初始化
@@ -638,8 +813,14 @@ export default {
         Sortable.create(tbody, {
           handle: ".move",
           animation: 300,
-
+          onChoose({ oldIndex }) {
+            _this.$refs["info"].setCurrentRow(_this.tableData[oldIndex]);
+            _this.rowick(_this.tableData[oldIndex]);
+          },
+          // 指定父元素下可被拖拽的子元素
+          // draggable: ".module-manager .el-table__row",
           onEnd({ newIndex, oldIndex }) {
+            // console.log(arr);
             _this.isshow = false;
             const currRow = _this.tableData.splice(oldIndex, 1)[0];
             _this.tableData.splice(newIndex, 0, currRow);
@@ -655,7 +836,9 @@ export default {
         });
       });
     },
-    toppings() {
+    //置底
+    btnSetButtom() {
+      this.form = { ...this.curRow };
       if (this.form.id == undefined) {
         this.$message.warning("请选择操作的数据");
       } else {
@@ -664,12 +847,16 @@ export default {
             this.form.id
           }&SortType=${2}`
         ).then((res) => {
-          this.$message.success("操作成功");
-          this.getlist();
+          if (res.code != -1) {
+            this.getlist();
+            this.$message.success("操作成功");
+          }
         });
       }
     },
-    topping() {
+    //置顶
+    btnSetTop() {
+      this.form = { ...this.curRow };
       if (this.form.id == undefined) {
         this.$message.warning("请选择操作的数据");
       } else {
@@ -678,82 +865,165 @@ export default {
             this.form.id
           }&SortType=${1}`
         ).then((res) => {
-          this.$message.success("操作成功");
-          this.getlist();
+          if (res.code != -1) {
+            this.$message.success("操作成功");
+            this.getlist();
+          }
         });
       }
     },
     //删除
-    delets(row) {
+    btnDel() {
+      this.form = { ...this.curRow };
       if (this.form.id == undefined) {
-        this.$message.warning("请选择删除的数据");
+        this.$message.warning("请选择操作的数据");
       } else {
-        this.$confirm("是否确认删除,是否继续?", "提示", {
+        this.$confirm("是否确认删除, 是否继续?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning",
-        })
-          .then(() => {
-            deletapi(`/api/app/item-template/${this.form.id}`).then((res) => {
+        }).then(() => {
+          deletapi(`/api/app/item-template/${this.form.id}`).then((res) => {
+            console.log(res);
+            if (res.code == 0) {
               this.$message.success("删除成功");
               this.getlist();
-            });
-          })
-          .catch(() => {});
+            }
+          });
+        });
+        // barcodedeleteid(this.form.id).then((res) => {
+        //   console.log(res);
+        //   this.$message.success("删除成功");
+        //   this.getlist();
+        // });
       }
     },
     //编辑弹框
-    editpopup() {
+    btnEdit() {
+      this.form = { ...this.curRow };
       if (this.form.id == undefined) {
-        this.$message.warning("请点击选择操作的数据");
+        this.$message.warning("请选择操作的数据");
       } else {
         this.dialogVisible = true;
         this.title = 2;
-        // this.addtoedit();
-        getapi(`/api/app/item-template/${this.form.id}`).then((res) => {
-          this.form = res.data;
-          console.log(res);
-        });
+        if (this.$refs.form !== undefined) {
+          this.$refs.form.resetFields();
+        }
+        // //获取标本类型id
+        // specimenlist(this.pages).then((res) => {
+        //   this.sampleTypeId = res.data.items;
+        // });
+        // // 获取标本容器Id
+        // containerlist(this.pages).then((res) => {
+        //   this.sampleContainerId = res.data.items;
+        // });
+        // samplegropid(this.form.id).then((res) => {
+        //   this.form = res.data;
+        // });
       }
     },
+
     //确定新增或者编辑
-    onsbmit() {
+    onSubmit() {
       this.$refs.form.validate((v) => {
         if (v) {
           if (this.title == 1) {
-            postapi("/api/app/item-template/", this.form).then((res) => {
-              this.$message.success("新增成功");
-              this.getlist();
-              this.dialogVisible = false;
+            postapi("/api/app/item-template", this.form).then((res) => {
+              if (res.code != -1) {
+                this.$message.success("新增成功");
+                // this.getlist();  改为局部刷新
+                this.form.id = res.data.id;
+                this.tableData.push(deepCopy(res.data));
+                this.dialogVisible = false;
+              }
             });
           } else if (this.title == 2) {
             putapi(`/api/app/item-template/${this.form.id}`, this.form).then(
               (res) => {
-                this.$message.success("修改成功");
-                this.getlist();
-                this.dialogVisible = false;
+                if (res.code != -1) {
+                  this.$message.success("修改成功");
+                  // this.getlist(); 改为局部刷新
+                  this.dialogVisible = false;
+                }
               }
             );
           }
         }
       });
     },
-    rowclick(val) {
-      getapi(`/api/app/item-template/${val.id}`).then((res) => {
-        this.form = res.data;
-        console.log(res);
+
+    closeDialog() {
+      if (!this.form.id) return;
+
+      let currentRow = {};
+      let lfind = arrayExistObj(this.tableData, "id", this.form.id);
+      if (lfind > -1) {
+        objCopy(this.form, this.tableData[lfind]);
+        currentRow = this.tableData[lfind];
+      } else {
+        currentRow = deepCopy(this.form);
+        lfind = this.tableData.length;
+        this.tableData.push(currentRow);
+      }
+
+      if (lfind > -1) {
+        this.$nextTick(() => {
+          this.$refs["info"].setCurrentRow(currentRow);
+          this.rowick(currentRow);
+        });
+      }
+    },
+
+    //新增弹框
+    btnAdd() {
+      this.dialogVisible = true;
+      this.title = 1;
+      this.form = this.$options.data().form;
+      this.$nextTick(() => {
+        this.$refs.refinput.focus();
       });
-      getapi(`/api/app/item/in-item-type/${val.id}`).then((res) => {
-        let dq = res.data;
-        if (dq.length > 0) {
-          this.rightdata = [];
-          dq.forEach((element) => {
-            let bb = { displayName: element.displayName, id: element.id };
-            this.rightdata.push(bb);
-          });
+
+      // //获取标本类型id
+      // specimenlist(this.pages).then((res) => {
+      //   this.sampleTypeId = res.data.items;
+      //   console.log(res);
+      // });
+      // // 获取标本容器Id
+      // containerlist(this.pages).then((res) => {
+      //   this.sampleContainerId = res.data.items;
+      //   console.log(res, "11111");
+      // });
+    },
+
+    //点击条码分组记录
+    rowick(row) {
+      this.curRow = deepCopy(row);
+      this.form = deepCopy(row);
+
+      // samplegropid(row.id).then((res) => {
+      //   this.curRow = { ...res.data };
+      //   this.form = res.data;
+      // });
+
+      postapi("/api/app/itemtemplatedetail/getitemtemplateinitem", {
+        ItemTemplateId: this.form.id,
+      }).then((res) => {
+        if (res.code != -1) {
+          this.sampleGroupAsbitems = res.data;
+          this.getAsbItemByItemType();
         }
       });
     },
+
+    getlist() {
+      this.loading = true;
+      getapi("/api/app/item-template/in-filter", this.pages).then((res) => {
+        this.loading = false;
+        this.tableData = res.data.items;
+        this.initTableData = [...res.data.items];
+        console.log(res);
+      });
+    },
     //ary1 需要追加的数据  ary2目标数组
     updatedate() {
       this.ary1.forEach((item) => {
@@ -770,83 +1040,25 @@ export default {
         }
       });
     },
-    handleRowClick(Row) {
-      console.log(Row);
-      console.log("1");
-    },
-    // 新增或者编辑需要的类别
-    addtoedit() {
-      //项目
-      getporjectlists().then((res) => {
-        this.itemId = res.data.items;
-      });
-      // 诊断
-      postapi("/api/app/diagnosis/getlistinfilter").then((res) => {
-        this.diagnosisId = res.data.items;
-      });
-      //结果状态
-      getapi("/api/app/result-status").then((res) => {
-        this.resultStatusId = res.data.items;
-      });
-      getapi("/api/app/diagnosis/getlistinfilter").then((res) => {});
-    },
-    //新增弹框
-    add() {
-      //   this.addtoedit();
-      this.dialogVisible = true;
-      this.title = 1;
-      this.form = {};
-      this.$nextTick(() => {
-        this.$refs.refinput.focus();
-      });
-    },
-    getlist() {
-      getapi("/api/app/item-template/in-filter", this.pages).then((res) => {
-        console.log(res);
-        this.tableData = res.data.items;
-        this.initTableData = [...res.data.items];
-      });
-      let that = this;
-    },
   },
 };
 </script>
 <style scoped>
-::v-deep .el-table__header th {
-  /* font-size: px; */
-  background-color: rgb(245, 245, 245); /* 设置表头背景颜色 */
-  color: rgb(113, 113, 113); /* 设置表头文字颜色 */
-}
-.subjecttitle {
-  display: flex;
-  justify-content: center;
-}
-.confirmcancellation {
-  margin-left: 45%;
-}
-.Selectbutton {
-  margin-left: 3%;
-}
-.activetext {
-  background: rgb(185, 203, 235);
-}
-.mainbox {
-  display: flex;
-  justify-content: center;
-  margin-top: 20px;
-}
-.mainleftbox {
-  width: 200px;
-  height: 240px;
-  border: 1px solid #ccc;
-  margin-left: 6%;
-}
+@import "../../assets/css/global_button.css";
+@import "../../assets/css/global_card.css";
+@import "../../assets/css/global_dialog.css";
+@import "../../assets/css/global_form.css";
+@import "../../assets/css/global_input.css";
+@import "../../assets/css/global_table.css";
+@import "../../assets/css/global.css";
+
 .box {
-  display: flex;
+  margin-top: 5px;
+  border: 1px solid #000;
 }
-.weixuan {
-  text-align: center;
-  line-height: 20px;
-  background: rgb(185, 203, 235);
+
+.btnClass {
+  width: 100px;
+  margin-bottom: 5px;
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/src/views/workload/deskwork.vue b/src/views/workload/deskwork.vue
index 6fd4ce5..e5e940e 100644
--- a/src/views/workload/deskwork.vue
+++ b/src/views/workload/deskwork.vue
@@ -1,102 +1,509 @@
 <template>
-  <div class="box">
+  <div>
     <el-card>
-      <el-form :model="form">
-        <el-row>
-          <el-col :span="6">
-            <el-form-item label="登记员">
-              <el-select v-model="form.username" placeholder="请选择">
-                <el-option
-                  v-for="item in registrardata"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="登记日期">
-              <el-date-picker
-                v-model="form.registrationdate"
-                type="daterange"
-                range-separator="--"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
+      <div slot="header">科室工作量统计</div>
+      <div :style="'display: block;width:' + (window.pageWidth - 45) + 'px;'">
+        <div style="display: flex; flex-wrap: wrap; height: 35px">
+          <div class="query">
+            <span>医生：</span>
+            <el-select
+              v-model="username"
+              placeholder="请选择"
+              size="small"
+              multiple
+            >
+              <el-option
+                v-for="item in registrardata"
+                :key="item.id"
+                :label="item.surname"
+                :value="item.id"
               >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="3">
-            <el-button type="primary" size="">查询</el-button>
-          </el-col>
-        </el-row>
-        <!-- d登记标题 -->
-        <h3 class="tabtile">科室工作量统计</h3>
-      </el-form>
-      <div>
-        <el-table :data="tableData" style="width: 100%">
-          <el-table-column prop="time" label="时间" width="180">
-          </el-table-column>
-          <el-table-column
-            prop="physicalexamination"
-            label="体检科室"
-            width="180"
+              </el-option>
+            </el-select>
+          </div>
+          <div class="query">
+            <span>开始日期：</span>
+            <el-date-picker
+              type="date"
+              placeholder="选择开始日期"
+              size="small"
+              v-model="startDate"
+              value-format="yyyy-MM-dd"
+              editable
+            >
+            </el-date-picker>
+          </div>
+          <div class="query">
+            <span>结束日期：</span>
+            <el-date-picker
+              type="date"
+              placeholder="选择结束日期"
+              size="small"
+              v-model="endDate"
+              value-format="yyyy-MM-dd"
+              editable
+            >
+            </el-date-picker>
+          </div>
+          <div class="query">
+            <el-button size="small" @click="onSubmit">查询</el-button>
+          </div>
+          <div class="query">
+            <el-button size="small" @click="handleExport">导出excel</el-button>
+          </div>
+          <div class="query">
+            <el-button size="small" @click="onPrint">打印</el-button>
+          </div>
+          <div class="query">
+            <el-button size="small" @click="columnarChart">柱状图</el-button>
+          </div>
+          <div class="query">
+            <el-button size="small" @click="peiChart">饼图</el-button>
+          </div>
+        </div>
+        <div
+          style="
+            display: flex;
+            justify-content: space-between;
+            position: relative;
+            margin-top: 5px;
+          "
+          id="domTable"
+        >
+          <div style="width: 49%" ref="imageDom">
+            <!-- <h3 align="center">登记员工作量统计</h3>
+            - 53-18
+            <h5 align="right" style="margin-bottom: 5px;">
+              时间：<span>{{ startDate }}</span
+              >至<span>{{ endDate }}</span>
+            </h5> -->
+            <el-table
+              border
+              :span-method="objectSpanMethod"
+              :height="
+                flag
+                  ? window.pageHeight < 600
+                    ? 415
+                    : window.pageHeight - 185 - 10
+                  : ''
+              "
+              :data="tableData"
+              id="table"
+              ref="table"
+              style="width: 100%"
+              :header-cell-class-name="headerStyle"
+            >
+              <el-table-column label="医生工作量统计">
+                <el-table-column :label="'时间：' + startDate + '至' + endDate">
+                  <el-table-column
+                    prop="doctorName"
+                    label="医生"
+                  ></el-table-column>
+                  <el-table-column
+                    prop="asbitemName"
+                    label="组合项目"
+                  ></el-table-column>
+                  <el-table-column
+                    prop="checkCount"
+                    label="人数"
+                  ></el-table-column>
+                  <el-table-column prop="avgStandardPrice" label="标准价格">
+                  </el-table-column>
+                  <el-table-column prop="avgChargePrice" label="实际价格">
+                  </el-table-column>
+                  <el-table-column prop="sumStandardPrice" label="标准金额">
+                  </el-table-column>
+                  <el-table-column prop="sumChargePrice" label="实际金额">
+                  </el-table-column>
+                </el-table-column>
+              </el-table-column>
+            </el-table>
+          </div>
+          <div
+            :style="
+              'width: 49%;overflow: hidden;height:' +
+              (window.pageHeight < 600 ? 415 : window.pageHeight - 185 - 5) +
+              'px;'
+            "
           >
-          </el-table-column>
-          <el-table-column prop="asbitem" label="组合项目" width="180">
-          </el-table-column>
-          <el-table-column prop="persontime" label="人次"> </el-table-column>
-        </el-table>
-        <!-- 时间 <span style="margin-left: 20px">xxx</span>
-
-        至
-        <span style="margin-left: 20px">xxx</span>
-      </div>
-      <div>
-        <span>体检科室</span>xxx
-        <span>组合项目</span>xxx
-        <span>人次</span>xxx -->
+            <ChartBlock ref="chart2"></ChartBlock>
+          </div>
+        </div>
       </div>
     </el-card>
   </div>
 </template>
 <script>
+import { mapState, mapActions } from "vuex";
+import { getapi, postapi, putapi, deletapi } from "@/api/api";
+import ChartBlock from "../../components/workload/chartsBlock";
+import { exportToExcel } from "../../utlis/Export2Excel";
+import html2canvas from "html2canvas";
+import printJs from "print-js";
 export default {
+  components: {
+    ChartBlock,
+  },
   data() {
     return {
-      tableData: [
-        {
-          time: "2023-8-8",
-          physicalexamination: "内科",
-          asbitem: "脂肪代谢",
-          persontime: "3",
+      registrardata: [],
+      username: [],
+      startDate: "",
+      endDate: "",
+      tableData: [],
+      seriesData: [],
+      yAxisData: [],
+      flag: true,
+      arr1: [],
+      pieData: [],
+    };
+  },
+  created() {
+    this.getList();
+  },
+  mounted() {
+    this.getNowTime();
+  },
+  methods: {
+    peiChart() {
+      let option2 = {
+        title: {
+          text: "医生工作量统计",
+          left: "center",
         },
-      ],
-      form: {
-        username: "",
-        registrationdate: "",
-      },
-      registrardata: [
-        {
-          value: "1",
-          label: "张三",
+        tooltip: {
+          trigger: "item",
+          confine: true,
         },
-        {
-          value: "2",
-          label: "测试",
+        legend: {
+          data:this.yAxisData,
+          orient: "horizontal",
+          right: "3%",
+          top: "3%",
         },
-      ],
-    };
+        grid: {
+          show: false,
+          left: "0%",
+          right: "5%",
+          top: "8%",
+          bottom: "5%",
+          containLabel: true,
+        },
+        series: [
+           {
+            type: "pie",
+            label: {
+                show: true,
+                formatter: "{b} : {c}人 ({d}%)" // b代表名称，c代表对应值，d代表百分比
+            },
+            data: this.pieData
+        }
+        ],
+      };
+      this.$refs.chart2.setOption(option2);
+    },
+    columnarChart() {
+      let option2 = {
+        title: {
+          text: "医生工作量统计",
+          left: "center",
+        },
+        tooltip: {
+          trigger: "axis",
+          confine: true,
+        },
+        legend: {
+          type: "scroll",
+          orient: "horizontal",
+          right: "3%",
+          top: "3%",
+        },
+        grid: {
+          show: false,
+          left: "0%",
+          right: "5%",
+          top: "8%",
+          bottom: "5%",
+          containLabel: true,
+        },
+        xAxis: {
+          type: "value",
+          axisLabel: {
+            textStyle: {
+              fontSize: "14",
+            },
+          },
+          axisLine: {
+            show: true,
+          },
+        },
+        yAxis: {
+          type: "category",
+          data: this.yAxisData,
+          axisLabel: {
+            textStyle: {
+              fontSize: "14",
+            },
+          },
+        },
+        series: [
+          {
+            name: "人数",
+            type: "bar",
+            data: this.seriesData,
+          },
+        ],
+      };
+      this.$refs.chart2.setOption(option2);
+    },
+    headerStyle({ row, column, rowIndex, columnIndex }) {
+      if (rowIndex === 1) {
+        return "right-align";
+      }
+    },
+    summarizeRegisterCount(param) {
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = "合计";
+          return;
+        }
+
+        const values = data.map((item) => Number(item[column.property]));
+        if (index === 1) {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr);
+            if (!isNaN(value)) {
+              return prev + curr;
+            } else {
+              return prev;
+            }
+          }, 0);
+          sums[index] = "共" + sums[index] + "人";
+        } else {
+          sums[index] = "";
+        }
+      });
+
+      return sums;
+    },
+    onPrint() {
+      this.flag = false;
+      this.$nextTick(() => {
+        let width = this.$refs.imageDom.style.width;
+        let cloneDom = this.$refs.imageDom.cloneNode(true);
+        let imageDom = this.$refs.imageDom;
+        cloneDom.style.position = "absolute";
+        cloneDom.style.top = "0px";
+        cloneDom.style.zIndex = "-1";
+        cloneDom.style.width = width;
+        console.log(cloneDom);
+        imageDom.appendChild(cloneDom);
+        html2canvas(cloneDom).then((canvas) => {
+          // 转成图片，生成图片地址
+          const url = canvas.toDataURL("image/png");
+          printJs({
+            printable: url,
+            type: "image",
+            documentTitle: "", // 标题
+            style: "@page{size:auto;margin: 0cm 1cm 0cm 1cm;}", // 去除页眉页脚
+          });
+        });
+        cloneDom.style.display = "none";
+        this.flag = true;
+      });
+    },
+    onSubmit() {
+      let that = this;
+      if (this.startDate == "") {
+        return this.$message({
+          message: "请先选择开始日期",
+          type: "error",
+        });
+      }
+      if (this.endDate == "") {
+        return this.$message({
+          message: "请先选择结束日期",
+          type: "error",
+        });
+      }
+      postapi("/api/app/internalreport/getdoctorpersonnelworkloadreport", {
+        userIds: that.username,
+        startDate: that.startDate,
+        endDate: that.endDate,
+      }).then((res) => {
+        if (res.code != -1) {
+          // that.tableData = res.data;
+          that.computedTableData(res.data);
+        }
+      });
+    },
+    setdates(arr) {
+      var obj = {},
+        k,
+        arr1 = [];
+      this.arr1 = [];
+      for (var i = 0, len = arr.length; i < len; i++) {
+        k = arr[i].doctorName; //需要合并的字段
+        if (obj[k]) obj[k]++;
+        else obj[k] = 1;
+      }
+      //保存结果{el-'元素'，count-出现次数}
+      for (var o in obj) {
+        for (let i = 0; i < obj[o]; i++) {
+          if (i === 0) {
+            this.arr1.push(obj[o]);
+          } else {
+            this.arr1.push(0);
+          }
+        }
+      }
+    },
+
+    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+      if (columnIndex === 0) {
+        let _row = this.arr1[rowIndex];
+        let _col = this.arr1[rowIndex] > 0 ? 1 : 0;
+        return [_row, _col];
+      }
+    },
+    getList() {
+      getapi("/api/identity/users/getlist").then((res) => {
+        if (res.code != -1) {
+          this.registrardata = [...res.data.items];
+        }
+      });
+    },
+    getNowTime() {
+      var now = new Date();
+      var year = now.getFullYear(); // 得到年份
+      var month = now.getMonth(); // 得到月份
+      var date = now.getDate(); // 得到日期
+      month = month + 1;
+      month = month.toString().padStart(2, "0");
+      date = date.toString().padStart(2, "0");
+      var defaultDate = `${year}-${month}-${date}`;
+      this.startDate = defaultDate;
+      this.endDate = defaultDate;
+    },
+    ForwardRanking(data, p) {
+      for (var i = 0; i < data.length - 1; i++) {
+        for (var j = 0; j < data.length - 1 - i; j++) {
+          var dd = data[j][p].localeCompare(data[j + 1][p], "zh"); //1---前者往后移，-1===位置不变
+          if (dd > 0) {
+            var temp = data[j];
+            data[j] = data[j + 1];
+            data[j + 1] = temp;
+          }
+        }
+      }
+      this.tableData = data;
+      this.setdates(this.tableData);
+    },
+    computedTableData(tableData) {
+      const newData = [...tableData]; // 创建一个新的数组，避免修改原始数据
+      const totalRows = {
+        doctorName: "",
+        asbitemName: "合计",
+        checkCount: 0,
+        avgStandardPrice: 0,
+        avgChargePrice: 0,
+        sumStandardPrice: 0,
+        sumChargePrice: 0,
+      }; // 合计行的数据
+      let pies = {
+        name: "",
+        value: 0,
+      };
+      let obj = {};
+      for (let i = 0; i < tableData.length; i++) {
+        var item = tableData[i].doctorName;
+        obj[item] = obj[item] + 1 || 1;
+      }
+
+      Object.keys(obj).forEach((key) => {
+        let totalRow = JSON.parse(JSON.stringify(totalRows));
+        let pie = JSON.parse(JSON.stringify(pies));
+        tableData.forEach((item) => {
+          if (item.doctorName == key) {
+            totalRow.doctorName = item.doctorName;
+            pie.name = item.doctorName;
+            totalRow.checkCount += item.checkCount;
+            pie.value += item.checkCount;
+            totalRow.avgStandardPrice =
+              (totalRow.avgStandardPrice * 100000 +
+                item.avgStandardPrice * 100000) /
+              100000;
+            totalRow.avgChargePrice =
+              (totalRow.avgChargePrice * 100000 +
+                item.avgChargePrice * 100000) /
+              100000;
+            totalRow.sumStandardPrice =
+              (totalRow.sumStandardPrice * 100000 +
+                item.sumStandardPrice * 100000) /
+              100000;
+            totalRow.sumChargePrice =
+              (totalRow.sumChargePrice * 100000 +
+                item.sumChargePrice * 100000) /
+              100000;
+          }
+        });
+        newData.push(totalRow);
+        this.pieData.push(pie);
+        this.yAxisData.push(totalRow.doctorName);
+        this.seriesData.push(totalRow.checkCount);
+      });
+      this.ForwardRanking(newData, "doctorName");
+      this.columnarChart();
+    },
+    handleExport() {
+      exportToExcel("#table", "医生工作量统计");
+    },
+  },
+  computed: {
+    ...mapState(["window", "dict", "patientRegister", "report"]),
+  },
+  updated() {
+    this.$nextTick(() => {
+      this.$refs.table.doLayout();
+    });
   },
-  mounted() {},
-  methods: {},
 };
 </script>
 <style scoped>
-.tabtile {
-  text-align: center;
-  margin-top: 20px;
+@import "../../assets/css/global_button.css";
+@import "../../assets/css/global_card.css";
+@import "../../assets/css/global_input.css";
+@import "../../assets/css/global_table.css";
+@import "../../assets/css/global.css";
+
+.query {
+  margin-left: 10px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+:deep .right-align .cell {
+  text-align: right !important;
+}
+::v-deep .el-table__body-wrapper::-webkit-scrollbar {
+  width: 0px;
+  background: rgba(213, 215, 220, 0.3);
+  border: none;
+}
+::v-deep .el-table__body-wrapper::-webkit-scrollbar-track {
+  border: none;
+}
+::v-deep .el-table th.gutter {
+  display: none;
+  width: 0;
+}
+::v-deep .el-table colgroup col[name="gutter"] {
+  display: none;
+  width: 0;
+}
+::v-deep .el-table__body {
+  width: 100% !important;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/workload/directordoctor.vue b/src/views/workload/directordoctor.vue
index 16fe1a6..1a06e8d 100644
--- a/src/views/workload/directordoctor.vue
+++ b/src/views/workload/directordoctor.vue
@@ -1,91 +1,336 @@
 <template>
-  <div class="box">
+  <div>
     <el-card>
-      <el-form :model="form">
-        <el-row>
-          <el-col :span="6">
-            <el-form-item label="登记员">
-              <el-select v-model="form.username" placeholder="请选择">
-                <el-option
-                  v-for="item in registrardata"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="登记日期">
-              <el-date-picker
-                v-model="form.registrationdate"
-                type="daterange"
-                range-separator="--"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
+      <div slot="header">总检医生工作量统计</div>
+      <div :style="'display: block;width:' + (window.pageWidth - 45) + 'px;'">
+        <div style="display: flex; flex-wrap: wrap; height: 35px">
+          <div class="query">
+            <span>医生：</span>
+            <el-select
+              v-model="username"
+              placeholder="请选择"
+              size="small"
+              multiple
+            >
+              <el-option
+                v-for="item in registrardata"
+                :key="item.id"
+                :label="item.surname"
+                :value="item.id"
               >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <!-- d登记标题 -->
-        <h3 class="tabtile">总检医生工作量统计</h3>
-      </el-form>
-      <div>
-        <el-table :data="tableData" style="width: 100%">
-          <el-table-column prop="time" label="时间" width="180">
-          </el-table-column>
-          <el-table-column prop="chiefexaminer" label="总检医生" width="180">
-          </el-table-column>
-          <el-table-column prop="shareintotal" label="占总检人数百分比"> </el-table-column>
-        </el-table>
-        <!-- 时间<span style="margin-left: 20px">xxx</span>
-        至
-        <span style="margin-left: 20px">xxx</span>
-      </div>
-      <div>
-        总检医生<span style="margin-left: 20px">xxx</span> 人数<span>xxx</span>
-        <span style="margin-left: 20px">占总检人数百分比</span>
-        <span style="margin-left: 10px">xxx</span> -->
+              </el-option>
+            </el-select>
+          </div>
+          <div class="query">
+            <span>开始日期：</span>
+            <el-date-picker
+              type="date"
+              placeholder="选择开始日期"
+              size="small"
+              v-model="startDate"
+              value-format="yyyy-MM-dd"
+              editable
+            >
+            </el-date-picker>
+          </div>
+          <div class="query">
+            <span>结束日期：</span>
+            <el-date-picker
+              type="date"
+              placeholder="选择结束日期"
+              size="small"
+              v-model="endDate"
+              value-format="yyyy-MM-dd"
+              editable
+            >
+            </el-date-picker>
+          </div>
+          <div class="query">
+            <el-button size="small" @click="onSubmit">查询</el-button>
+          </div>
+          <div class="query">
+            <el-button size="small" @click="handleExport">导出excel</el-button>
+          </div>
+          <div class="query">
+            <el-button size="small" @click="onPrint">打印</el-button>
+          </div>
+        </div>
+        <div
+          style="
+            display: flex;
+            justify-content: space-between;
+            position: relative;
+            margin-top: 5px;
+          "
+          id="domTable"
+        >
+          <div style="width: 49%" ref="imageDom">
+            <!-- <h3 align="center">登记员工作量统计</h3>
+            - 53-18
+            <h5 align="right" style="margin-bottom: 5px;">
+              时间：<span>{{ startDate }}</span
+              >至<span>{{ endDate }}</span>
+            </h5> -->
+            <el-table
+              border
+              show-summary
+              :summary-method="summarizeRegisterCount"
+              :height="
+                flag
+                  ? window.pageHeight < 600
+                    ? 415
+                    : window.pageHeight - 185- 10
+                  : ''
+              "
+              :data="tableData"
+              id="table"
+              ref="table"
+              style="width: 100%"
+              :header-cell-class-name="headerStyle"
+            >
+              <el-table-column label="总检医生工作量统计">
+                <el-table-column :label="'时间：'+startDate+'至'+endDate">
+                  <el-table-column prop="sumCheckDoctorName" label="医生"></el-table-column>
+              <el-table-column prop="sumCheckCount" label="人数"></el-table-column>
+              <el-table-column prop="percentage" label="占总检总人数百分比">
+              </el-table-column>
+                </el-table-column>
+              </el-table-column>
+            </el-table>
+          </div>
+          <div
+            :style="
+              'width: 49%;overflow: hidden;height:' +
+              (window.pageHeight < 600 ? 415 : window.pageHeight - 185-5) +
+              'px;'
+            "
+          >
+            <ChartBlock ref="chart2"></ChartBlock>
+          </div>
+        </div>
       </div>
     </el-card>
   </div>
 </template>
 <script>
+import { mapState, mapActions } from "vuex";
+import { getapi, postapi, putapi, deletapi } from "@/api/api";
+import ChartBlock from "../../components/workload/chartsBlock";
+import { exportToExcel } from "../../utlis/Export2Excel";
+import html2canvas from "html2canvas";
+import printJs from "print-js";
 export default {
+  components: {
+    ChartBlock,
+  },
   data() {
     return {
-      tableData: [
-        {
-          time: "2023-8-9",
-          chiefexaminer: "医生",
-          shareintotal: "51%",
-        },
-      ],
-      form: {
-        username: "",
-        registrationdate: "",
+      registrardata: [],
+      username: [],
+      startDate: "",
+      endDate: "",
+      tableData: [],
+      seriesData: [],
+      yAxisData: [],
+      flag: true,
+    };
+  },
+  created() {
+    this.getList();
+  },
+  mounted() {
+    this.getNowTime();
+  },
+  methods: {
+     headerStyle({ row, column, rowIndex, columnIndex }) {
+        console.log(rowIndex)
+        if(rowIndex===1){
+          return 'right-align'
+        }
       },
-      registrardata: [
-        {
-          value: "1",
-          label: "张三",
-        },
+    summarizeRegisterCount(param){
+         const { columns, data } = param;
+        const sums = [];
+        columns.forEach((column, index) => {
+          if (index === 0) {
+            sums[index] = '合计';
+            return;
+          }
+
+           const values = data.map(item => Number(item[column.property]));
+          if (index===1) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0);
+            sums[index] = '共'+sums[index]+'人';
+          } else {
+            sums[index] = '';
+          }
+        });
+
+        return sums;
+    },
+    onPrint() {
+      this.flag = false;
+      this.$nextTick(() => {
+        let width = this.$refs.imageDom.style.width;
+        let cloneDom = this.$refs.imageDom.cloneNode(true);
+        let imageDom = this.$refs.imageDom;
+        cloneDom.style.position = "absolute";
+        cloneDom.style.top = "0px";
+        cloneDom.style.zIndex = "-1";
+        cloneDom.style.width = width;
+        console.log(cloneDom);
+        imageDom.appendChild(cloneDom);
+        html2canvas(cloneDom).then((canvas) => {
+          // 转成图片，生成图片地址
+          const url = canvas.toDataURL("image/png");
+          printJs({
+            printable: url,
+            type: "image",
+            documentTitle: "", // 标题
+            style: "@page{size:auto;margin: 0cm 1cm 0cm 1cm;}", // 去除页眉页脚
+          });
+        });
+        cloneDom.style.display = "none";
+        this.flag = true;
+      });
+    },
+    onSubmit() {
+      let that = this;
+      if (this.startDate == "") {
+        return this.$message({
+          message: "请先选择开始日期",
+          type: "error",
+        });
+      }
+      if (this.endDate == "") {
+        return this.$message({
+          message: "请先选择结束日期",
+          type: "error",
+        });
+      }
+      postapi(
+        "/api/app/internalreport/getsumcheckdoctorworkloadreport",
         {
-          value: "2",
-          label: "测试",
-        },
-      ],
-    };
+          userIds: that.username,
+          startDate: that.startDate,
+          endDate: that.endDate,
+        }
+      ).then((res) => {
+        if (res.code != -1) {
+          that.tableData = [...res.data];
+          this.yAxisData = [];
+          this.seriesData = [];
+          for (let i = 0; i < res.data.length; i++) {
+            this.yAxisData.push(res.data[i].sumCheckDoctorName);
+            this.seriesData.push(res.data[i].sumCheckCount);
+          }
+          let option2 = {
+            title: {
+              text: "总检医生工作量统计",
+              left: "center",
+            },
+            tooltip: {
+              trigger: "axis",
+              confine: true,
+            },
+            legend: {
+              type: "scroll",
+              orient: "horizontal", // 垂直
+              right: "3%", // 左对齐
+              top: "3%", // 位于顶部
+            },
+            grid: {
+              show: false,
+              left: "0%",
+              right: "5%",
+              top: "8%",
+              bottom: "2%",
+              containLabel: true,
+            },
+            xAxis: {
+              type: "value",
+              axisLabel: {
+                textStyle: {
+                  fontSize: "14",
+                },
+              },
+              axisLine: {
+                show: true,
+              },
+            },
+            yAxis: {
+              type: "category",
+              data: this.yAxisData,
+              axisLabel: {
+                textStyle: {
+                  fontSize: "14",
+                },
+              },
+            },
+            series: [
+              {
+                name: "人数",
+                type: "bar",
+                data: this.seriesData,
+              },
+            ],
+          };
+          this.$refs.chart2.setOption(option2);
+        }
+      });
+    },
+    getList() {
+      getapi("/api/identity/users/getlist").then((res) => {
+        if (res.code != -1) {
+          this.registrardata = [...res.data.items];
+        }
+      });
+    },
+    getNowTime() {
+      var now = new Date();
+      var year = now.getFullYear(); // 得到年份
+      var month = now.getMonth(); // 得到月份
+      var date = now.getDate(); // 得到日期
+      month = month + 1;
+      month = month.toString().padStart(2, "0");
+      date = date.toString().padStart(2, "0");
+      var defaultDate = `${year}-${month}-${date}`;
+      this.startDate = defaultDate;
+      this.endDate = defaultDate;
+    },
+    handleExport() {
+      exportToExcel("#table", "总检医生工作量统计");
+    },
+  },
+  computed: {
+    ...mapState(["window", "dict", "patientRegister", "report"]),
+  },
+  updated() {
+    this.$nextTick(() => {
+      this.$refs.table.doLayout();
+    });
   },
-  mounted() {},
-  methods: {},
 };
 </script>
 <style scoped>
-.tabtile {
-  text-align: center;
-  margin-top: 20px;
+@import "../../assets/css/global_button.css";
+@import "../../assets/css/global_card.css";
+@import "../../assets/css/global_input.css";
+@import "../../assets/css/global_table.css";
+@import "../../assets/css/global.css";
+
+.query {
+  margin-left: 10px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
 }
+:deep .right-align .cell{text-align: right !important;}
 </style>
\ No newline at end of file
diff --git a/src/views/workload/doctorstaionworkload.vue b/src/views/workload/doctorstaionworkload.vue
index 53c308a..0aeedf1 100644
--- a/src/views/workload/doctorstaionworkload.vue
+++ b/src/views/workload/doctorstaionworkload.vue
@@ -1,101 +1,509 @@
 <template>
-  <div class="box">
-    <el-card class="boxcard">
-      <el-form :model="form">
-        <el-row>
-          <el-col :span="4">
-            <el-form-item label="总检医生" label-width="80px">
-              <el-select v-model="form.username" placeholder="请选择">
-                <el-option
-                  v-for="item in registrardata"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="登记日期" label-width="80px">
-              <el-date-picker
-                v-model="form.registrationdate"
-                type="daterange"
-                range-separator="--"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
+  <div>
+    <el-card>
+      <div slot="header">医生工作量统计</div>
+      <div :style="'display: block;width:' + (window.pageWidth - 45) + 'px;'">
+        <div style="display: flex; flex-wrap: wrap; height: 35px">
+          <div class="query">
+            <span>医生：</span>
+            <el-select
+              v-model="username"
+              placeholder="请选择"
+              size="small"
+              multiple
+            >
+              <el-option
+                v-for="item in registrardata"
+                :key="item.id"
+                :label="item.surname"
+                :value="item.id"
               >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="3">
-            <el-button type="primary">查询</el-button>
-          </el-col>
-        </el-row>
-        <!-- d登记标题 -->
-        <h3 class="tabtile">医生工作量统计</h3>
-      </el-form>
-      <div>
-        <!-- 时间 <span style="margin-left: 20px">xxx</span>
-        至
-        <span style="margin-left: 20px">xxx</span> -->
-        <el-table :data="tableData" style="width: 100%">
-          <el-table-column prop="chiefexaminer" label="总检医生" width="180">
-          </el-table-column>
-          <el-table-column prop="numberofpeople" label="人数" width="180">
-          </el-table-column>
-          <el-table-column prop="generalinspection" label="占总检总人数">
-          </el-table-column>
-        </el-table>
-        <div class="subtotalquantity">
-          <span>小计</span>
+              </el-option>
+            </el-select>
+          </div>
+          <div class="query">
+            <span>开始日期：</span>
+            <el-date-picker
+              type="date"
+              placeholder="选择开始日期"
+              size="small"
+              v-model="startDate"
+              value-format="yyyy-MM-dd"
+              editable
+            >
+            </el-date-picker>
+          </div>
+          <div class="query">
+            <span>结束日期：</span>
+            <el-date-picker
+              type="date"
+              placeholder="选择结束日期"
+              size="small"
+              v-model="endDate"
+              value-format="yyyy-MM-dd"
+              editable
+            >
+            </el-date-picker>
+          </div>
+          <div class="query">
+            <el-button size="small" @click="onSubmit">查询</el-button>
+          </div>
+          <div class="query">
+            <el-button size="small" @click="handleExport">导出excel</el-button>
+          </div>
+          <div class="query">
+            <el-button size="small" @click="onPrint">打印</el-button>
+          </div>
+          <div class="query">
+            <el-button size="small" @click="columnarChart">柱状图</el-button>
+          </div>
+          <div class="query">
+            <el-button size="small" @click="peiChart">饼图</el-button>
+          </div>
+        </div>
+        <div
+          style="
+            display: flex;
+            justify-content: space-between;
+            position: relative;
+            margin-top: 5px;
+          "
+          id="domTable"
+        >
+          <div style="width: 49%" ref="imageDom">
+            <!-- <h3 align="center">登记员工作量统计</h3>
+            - 53-18
+            <h5 align="right" style="margin-bottom: 5px;">
+              时间：<span>{{ startDate }}</span
+              >至<span>{{ endDate }}</span>
+            </h5> -->
+            <el-table
+              border
+              :span-method="objectSpanMethod"
+              :height="
+                flag
+                  ? window.pageHeight < 600
+                    ? 415
+                    : window.pageHeight - 185 - 10
+                  : ''
+              "
+              :data="tableData"
+              id="table"
+              ref="table"
+              style="width: 100%"
+              :header-cell-class-name="headerStyle"
+            >
+              <el-table-column label="医生工作量统计">
+                <el-table-column :label="'时间：' + startDate + '至' + endDate">
+                  <el-table-column
+                    prop="doctorName"
+                    label="医生"
+                  ></el-table-column>
+                  <el-table-column
+                    prop="asbitemName"
+                    label="组合项目"
+                  ></el-table-column>
+                  <el-table-column
+                    prop="checkCount"
+                    label="人数"
+                  ></el-table-column>
+                  <el-table-column prop="avgStandardPrice" label="标准价格">
+                  </el-table-column>
+                  <el-table-column prop="avgChargePrice" label="实际价格">
+                  </el-table-column>
+                  <el-table-column prop="sumStandardPrice" label="标准金额">
+                  </el-table-column>
+                  <el-table-column prop="sumChargePrice" label="实际金额">
+                  </el-table-column>
+                </el-table-column>
+              </el-table-column>
+            </el-table>
+          </div>
+          <div
+            :style="
+              'width: 49%;overflow: hidden;height:' +
+              (window.pageHeight < 600 ? 415 : window.pageHeight - 185 - 5) +
+              'px;'
+            "
+          >
+            <ChartBlock ref="chart2"></ChartBlock>
+          </div>
         </div>
       </div>
     </el-card>
   </div>
 </template>
 <script>
+import { mapState, mapActions } from "vuex";
+import { getapi, postapi, putapi, deletapi } from "@/api/api";
+import ChartBlock from "../../components/workload/chartsBlock";
+import { exportToExcel } from "../../utlis/Export2Excel";
+import html2canvas from "html2canvas";
+import printJs from "print-js";
 export default {
+  components: {
+    ChartBlock,
+  },
   data() {
     return {
-      tableData: [
-        {
-          time: "203-8-9",
-          chiefexaminer: "测试",
-          numberofpeople: "85",
-          generalinspection: "13",
+      registrardata: [],
+      username: [],
+      startDate: "",
+      endDate: "",
+      tableData: [],
+      seriesData: [],
+      yAxisData: [],
+      flag: true,
+      arr1: [],
+      pieData: [],
+    };
+  },
+  created() {
+    this.getList();
+  },
+  mounted() {
+    this.getNowTime();
+  },
+  methods: {
+    peiChart() {
+      let option2 = {
+        title: {
+          text: "医生工作量统计",
+          left: "center",
         },
-      ],
-      form: {
-        username: "",
-        registrationdate: "",
-      },
-      registrardata: [
-        {
-          value: "1",
-          label: "张三",
+        tooltip: {
+          trigger: "item",
+          confine: true,
         },
-        {
-          value: "2",
-          label: "全部",
+        legend: {
+          data:this.yAxisData,
+          orient: "horizontal",
+          right: "3%",
+          top: "3%",
         },
-      ],
-    };
+        grid: {
+          show: false,
+          left: "0%",
+          right: "5%",
+          top: "8%",
+          bottom: "2%",
+          containLabel: true,
+        },
+        series: [
+           {
+            type: "pie",
+            label: {
+                show: true,
+                formatter: "{b} : {c}人 ({d}%)" // b代表名称，c代表对应值，d代表百分比
+            },
+            data: this.pieData
+        }
+        ],
+      };
+      this.$refs.chart2.setOption(option2);
+    },
+    columnarChart() {
+      let option2 = {
+        title: {
+          text: "医生工作量统计",
+          left: "center",
+        },
+        tooltip: {
+          trigger: "axis",
+          confine: true,
+        },
+        legend: {
+          type: "scroll",
+          orient: "horizontal",
+          right: "3%",
+          top: "3%",
+        },
+        grid: {
+          show: false,
+          left: "0%",
+          right: "5%",
+          top: "8%",
+          bottom: "2%",
+          containLabel: true,
+        },
+        xAxis: {
+          type: "value",
+          axisLabel: {
+            textStyle: {
+              fontSize: "14",
+            },
+          },
+          axisLine: {
+            show: true,
+          },
+        },
+        yAxis: {
+          type: "category",
+          data: this.yAxisData,
+          axisLabel: {
+            textStyle: {
+              fontSize: "14",
+            },
+          },
+        },
+        series: [
+          {
+            name: "人数",
+            type: "bar",
+            data: this.seriesData,
+          },
+        ],
+      };
+      this.$refs.chart2.setOption(option2);
+    },
+    headerStyle({ row, column, rowIndex, columnIndex }) {
+      if (rowIndex === 1) {
+        return "right-align";
+      }
+    },
+    summarizeRegisterCount(param) {
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = "合计";
+          return;
+        }
+
+        const values = data.map((item) => Number(item[column.property]));
+        if (index === 1) {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr);
+            if (!isNaN(value)) {
+              return prev + curr;
+            } else {
+              return prev;
+            }
+          }, 0);
+          sums[index] = "共" + sums[index] + "人";
+        } else {
+          sums[index] = "";
+        }
+      });
+
+      return sums;
+    },
+    onPrint() {
+      this.flag = false;
+      this.$nextTick(() => {
+        let width = this.$refs.imageDom.style.width;
+        let cloneDom = this.$refs.imageDom.cloneNode(true);
+        let imageDom = this.$refs.imageDom;
+        cloneDom.style.position = "absolute";
+        cloneDom.style.top = "0px";
+        cloneDom.style.zIndex = "-1";
+        cloneDom.style.width = width;
+        console.log(cloneDom);
+        imageDom.appendChild(cloneDom);
+        html2canvas(cloneDom).then((canvas) => {
+          // 转成图片，生成图片地址
+          const url = canvas.toDataURL("image/png");
+          printJs({
+            printable: url,
+            type: "image",
+            documentTitle: "", // 标题
+            style: "@page{size:auto;margin: 0cm 1cm 0cm 1cm;}", // 去除页眉页脚
+          });
+        });
+        cloneDom.style.display = "none";
+        this.flag = true;
+      });
+    },
+    onSubmit() {
+      let that = this;
+      if (this.startDate == "") {
+        return this.$message({
+          message: "请先选择开始日期",
+          type: "error",
+        });
+      }
+      if (this.endDate == "") {
+        return this.$message({
+          message: "请先选择结束日期",
+          type: "error",
+        });
+      }
+      postapi("/api/app/internalreport/getdoctorpersonnelworkloadreport", {
+        userIds: that.username,
+        startDate: that.startDate,
+        endDate: that.endDate,
+      }).then((res) => {
+        if (res.code != -1) {
+          // that.tableData = res.data;
+          that.computedTableData(res.data);
+        }
+      });
+    },
+    setdates(arr) {
+      var obj = {},
+        k,
+        arr1 = [];
+      this.arr1 = [];
+      for (var i = 0, len = arr.length; i < len; i++) {
+        k = arr[i].doctorName; //需要合并的字段
+        if (obj[k]) obj[k]++;
+        else obj[k] = 1;
+      }
+      //保存结果{el-'元素'，count-出现次数}
+      for (var o in obj) {
+        for (let i = 0; i < obj[o]; i++) {
+          if (i === 0) {
+            this.arr1.push(obj[o]);
+          } else {
+            this.arr1.push(0);
+          }
+        }
+      }
+    },
+
+    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+      if (columnIndex === 0) {
+        let _row = this.arr1[rowIndex];
+        let _col = this.arr1[rowIndex] > 0 ? 1 : 0;
+        return [_row, _col];
+      }
+    },
+    getList() {
+      getapi("/api/identity/users/getlist").then((res) => {
+        if (res.code != -1) {
+          this.registrardata = [...res.data.items];
+        }
+      });
+    },
+    getNowTime() {
+      var now = new Date();
+      var year = now.getFullYear(); // 得到年份
+      var month = now.getMonth(); // 得到月份
+      var date = now.getDate(); // 得到日期
+      month = month + 1;
+      month = month.toString().padStart(2, "0");
+      date = date.toString().padStart(2, "0");
+      var defaultDate = `${year}-${month}-${date}`;
+      this.startDate = defaultDate;
+      this.endDate = defaultDate;
+    },
+    ForwardRanking(data, p) {
+      for (var i = 0; i < data.length - 1; i++) {
+        for (var j = 0; j < data.length - 1 - i; j++) {
+          var dd = data[j][p].localeCompare(data[j + 1][p], "zh"); //1---前者往后移，-1===位置不变
+          if (dd > 0) {
+            var temp = data[j];
+            data[j] = data[j + 1];
+            data[j + 1] = temp;
+          }
+        }
+      }
+      this.tableData = data;
+      this.setdates(this.tableData);
+    },
+    computedTableData(tableData) {
+      const newData = [...tableData]; // 创建一个新的数组，避免修改原始数据
+      const totalRows = {
+        doctorName: "",
+        asbitemName: "合计",
+        checkCount: 0,
+        avgStandardPrice: 0,
+        avgChargePrice: 0,
+        sumStandardPrice: 0,
+        sumChargePrice: 0,
+      }; // 合计行的数据
+      let pies = {
+        name: "",
+        value: 0,
+      };
+      let obj = {};
+      for (let i = 0; i < tableData.length; i++) {
+        var item = tableData[i].doctorName;
+        obj[item] = obj[item] + 1 || 1;
+      }
+
+      Object.keys(obj).forEach((key) => {
+        let totalRow = JSON.parse(JSON.stringify(totalRows));
+        let pie = JSON.parse(JSON.stringify(pies));
+        tableData.forEach((item) => {
+          if (item.doctorName == key) {
+            totalRow.doctorName = item.doctorName;
+            pie.name = item.doctorName;
+            totalRow.checkCount += item.checkCount;
+            pie.value += item.checkCount;
+            totalRow.avgStandardPrice =
+              (totalRow.avgStandardPrice * 100000 +
+                item.avgStandardPrice * 100000) /
+              100000;
+            totalRow.avgChargePrice =
+              (totalRow.avgChargePrice * 100000 +
+                item.avgChargePrice * 100000) /
+              100000;
+            totalRow.sumStandardPrice =
+              (totalRow.sumStandardPrice * 100000 +
+                item.sumStandardPrice * 100000) /
+              100000;
+            totalRow.sumChargePrice =
+              (totalRow.sumChargePrice * 100000 +
+                item.sumChargePrice * 100000) /
+              100000;
+          }
+        });
+        newData.push(totalRow);
+        this.pieData.push(pie);
+        this.yAxisData.push(totalRow.doctorName);
+        this.seriesData.push(totalRow.checkCount);
+      });
+      this.ForwardRanking(newData, "doctorName");
+      this.columnarChart();
+    },
+    handleExport() {
+      exportToExcel("#table", "医生工作量统计");
+    },
+  },
+  computed: {
+    ...mapState(["window", "dict", "patientRegister", "report"]),
+  },
+  updated() {
+    this.$nextTick(() => {
+      this.$refs.table.doLayout();
+    });
   },
-  mounted() {},
-  methods: {},
 };
 </script>
 <style scoped>
-.subtotalquantity{
-  margin-top: 10px;
-  text-align: center;
+@import "../../assets/css/global_button.css";
+@import "../../assets/css/global_card.css";
+@import "../../assets/css/global_input.css";
+@import "../../assets/css/global_table.css";
+@import "../../assets/css/global.css";
+
+.query {
+  margin-left: 10px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+:deep .right-align .cell {
+  text-align: right !important;
+}
+::v-deep .el-table__body-wrapper::-webkit-scrollbar {
+  width: 0px;
+  background: rgba(213, 215, 220, 0.3);
+  border: none;
+}
+::v-deep .el-table__body-wrapper::-webkit-scrollbar-track {
+  border: none;
+}
+::v-deep .el-table th.gutter {
+  display: none;
+  width: 0;
 }
-.boxcard {
-  height: 800px;
+::v-deep .el-table colgroup col[name="gutter"] {
+  display: none;
+  width: 0;
 }
-.tabtile {
-  text-align: center;
-  margin-top: 20px;
+::v-deep .el-table__body {
+  width: 100% !important;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/workload/registrar.vue b/src/views/workload/registrar.vue
index b842997..b79298f 100644
--- a/src/views/workload/registrar.vue
+++ b/src/views/workload/registrar.vue
@@ -1,99 +1,338 @@
 <template>
-  <div class="box">
-    <el-card class="boxcard">
-      <el-form :model="form">
-        <el-row>
-          <el-col :span="4">
-            <el-form-item label="登记员">
-              <el-select v-model="form.username" placeholder="请选择">
-                <el-option
-                  v-for="item in registrardata"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="登记日期">
-              <el-date-picker
-                v-model="form.registrationdate"
-                type="daterange"
-                range-separator="--"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
+  <div>
+    <el-card>
+      <div slot="header">登记员工作量统计</div>
+      <div :style="'display: block;width:' + (window.pageWidth - 45) + 'px;'">
+        <div style="display: flex; flex-wrap: wrap; height: 35px">
+          <div class="query">
+            <span>登记员：</span>
+            <el-select
+              v-model="username"
+              placeholder="请选择"
+              size="small"
+              multiple
+            >
+              <el-option
+                v-for="item in registrardata"
+                :key="item.id"
+                :label="item.surname"
+                :value="item.id"
               >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="3">
-            <el-button type="primary">查询</el-button>
-          </el-col>
-        </el-row>
-        <!-- d登记标题 -->
-        <h3 class="tabtile">登记员工作量统计</h3>
-      </el-form>
-      <div>
-        <!-- 登记员<span style="margin-left: 20px">xxx</span>
-        人数
-        <span style="margin-left: 20px">xxx</span>
-        站登记总人数百分比
-        <span style="margin-left: 20px">xxx</span> -->
-        <el-table :data="tableData" style="width: 100%">
-          <el-table-column prop="registrar" label="登记员" width="180">
-          </el-table-column>
-          <el-table-column
-            prop="totalofpeople"
-            label="站登记总人数百分比"
-            width="180"
+              </el-option>
+            </el-select>
+          </div>
+          <div class="query">
+            <span>开始日期：</span>
+            <el-date-picker
+              type="date"
+              placeholder="选择开始日期"
+              size="small"
+              v-model="startDate"
+              value-format="yyyy-MM-dd"
+              editable
+            >
+            </el-date-picker>
+          </div>
+          <div class="query">
+            <span>结束日期：</span>
+            <el-date-picker
+              type="date"
+              placeholder="选择结束日期"
+              size="small"
+              v-model="endDate"
+              value-format="yyyy-MM-dd"
+              editable
+            >
+            </el-date-picker>
+          </div>
+          <div class="query">
+            <el-button size="small" @click="onSubmit">查询</el-button>
+          </div>
+          <div class="query">
+            <el-button size="small" @click="handleExport">导出excel</el-button>
+          </div>
+          <div class="query">
+            <el-button size="small" @click="onPrint">打印</el-button>
+          </div>
+        </div>
+        <div
+          style="
+            display: flex;
+            justify-content: space-between;
+            position: relative;
+            margin-top: 5px;
+          "
+          id="domTable"
+        >
+          <div style="width: 49%" ref="imageDom">
+            <!-- <h3 align="center">登记员工作量统计</h3>
+            - 53-18
+            <h5 align="right" style="margin-bottom: 5px;">
+              时间：<span>{{ startDate }}</span
+              >至<span>{{ endDate }}</span>
+            </h5> -->
+            <el-table
+              border
+              show-summary
+              :summary-method="summarizeRegisterCount"
+              :height="
+                flag
+                  ? window.pageHeight < 600
+                    ? 415
+                    : window.pageHeight - 185- 10
+                  : ''
+              "
+              :data="tableData"
+              id="table"
+              ref="table"
+              style="width: 100%"
+              :header-cell-class-name="headerStyle"
+            >
+              <el-table-column label="登记员工作量统计">
+                <el-table-column :label="'时间：'+startDate+'至'+endDate">
+                  <el-table-column prop="personnelName" label="登记员"></el-table-column>
+              <el-table-column prop="registerCount" label="人数"></el-table-column>
+              <el-table-column prop="percentage" label="占登记总人数百分比">
+              </el-table-column>
+                </el-table-column>
+              </el-table-column>
+            </el-table>
+          </div>
+          <div
+            :style="
+              'width: 49%;overflow: hidden;height:' +
+              (window.pageHeight < 600 ? 415 : window.pageHeight - 185-5) +
+              'px;'
+            "
           >
-          </el-table-column>
-          <el-table-column prop="numberofpeople" label="人数">
-          </el-table-column>
-        </el-table>
+            <ChartBlock ref="chart2"></ChartBlock>
+          </div>
+        </div>
       </div>
     </el-card>
   </div>
 </template>
 <script>
+import { mapState, mapActions } from "vuex";
+import { getapi, postapi, putapi, deletapi } from "@/api/api";
+import ChartBlock from "../../components/workload/chartsBlock";
+import { exportToExcel } from "../../utlis/Export2Excel";
+import html2canvas from "html2canvas";
+import printJs from "print-js";
 export default {
+  components: {
+    ChartBlock,
+  },
   data() {
     return {
-      tableData: [
-        {
-          registrar: "张三",
-          totalofpeople: "33%",
-          numberofpeople: "10",
-        },
-      ],
-      form: {
-        username: "",
-        registrationdate: "",
+      registrardata: [],
+      username: [],
+      startDate: "",
+      endDate: "",
+      tableData: [],
+      seriesData: [],
+      yAxisData: [],
+      flag: true,
+    };
+  },
+  created() {
+    this.getList();
+  },
+  mounted() {
+    this.getNowTime();
+  },
+  methods: {
+     headerStyle({ row, column, rowIndex, columnIndex }) {
+        console.log(rowIndex)
+        if(rowIndex===1){
+          return 'right-align'
+        }
       },
-      registrardata: [
-        {
-          value: "1",
-          label: "张三",
-        },
+    summarizeRegisterCount(param){
+         const { columns, data } = param;
+        const sums = [];
+        columns.forEach((column, index) => {
+          if (index === 0) {
+            sums[index] = '合计';
+            return;
+          }
+
+           const values = data.map(item => Number(item[column.property]));
+          if (index===1) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0);
+            sums[index] = '共'+sums[index]+'人';
+          } else {
+            sums[index] = '';
+          }
+        });
+
+        return sums;
+    },
+    onPrint() {
+      this.flag = false;
+      this.$nextTick(() => {
+        let width = this.$refs.imageDom.style.width;
+        let cloneDom = this.$refs.imageDom.cloneNode(true);
+        let imageDom = this.$refs.imageDom;
+        cloneDom.style.position = "absolute";
+        cloneDom.style.top = "0px";
+        cloneDom.style.zIndex = "-1";
+        cloneDom.style.width = width;
+        console.log(cloneDom);
+        imageDom.appendChild(cloneDom);
+        html2canvas(cloneDom).then((canvas) => {
+          // 转成图片，生成图片地址
+          const url = canvas.toDataURL("image/png");
+          printJs({
+            printable: url,
+            type: "image",
+            documentTitle: "", // 标题
+            style: "@page{size:auto;margin: 0cm 1cm 0cm 1cm;}", // 去除页眉页脚
+          });
+        });
+        cloneDom.style.display = "none";
+        this.flag = true;
+      });
+    },
+    onSubmit() {
+      let that = this;
+      if (this.startDate == "") {
+        return this.$message({
+          message: "请先选择开始日期",
+          type: "error",
+        });
+      }
+      if (this.endDate == "") {
+        return this.$message({
+          message: "请先选择结束日期",
+          type: "error",
+        });
+      }
+      postapi(
+        "/api/app/internalreport/getregistrationpersonnelworkloadreport",
         {
-          value: "2",
-          label: "测试",
-        },
-      ],
-    };
+          userIds: that.username,
+          startDate: that.startDate,
+          endDate: that.endDate,
+        }
+      ).then((res) => {
+        if (res.code != -1) {
+          that.tableData = [...res.data];
+          this.yAxisData = [];
+          this.seriesData = [];
+          for (let i = 0; i < res.data.length; i++) {
+            this.yAxisData.push(res.data[i].personnelName);
+            this.seriesData.push(res.data[i].registerCount);
+          }
+          let option2 = {
+            title: {
+              text: "登记员工作量统计",
+              left: "center",
+            },
+            tooltip: {
+              trigger: "axis",
+              confine: true,
+            },
+            legend: {
+              type: "scroll",
+              orient: "horizontal", // 垂直
+              right: "3%", // 左对齐
+              top: "3%", // 位于顶部
+            },
+            grid: {
+              show: false,
+              left: "0%",
+              right: "5%",
+              top: "8%",
+              bottom: "2%",
+              containLabel: true,
+            },
+            xAxis: {
+              type: "value",
+              axisLabel: {
+                textStyle: {
+                  fontSize: "14",
+                },
+              },
+              axisLine: {
+                show: true,
+              },
+            },
+            yAxis: {
+              type: "category",
+              data: this.yAxisData,
+              axisLabel: {
+                textStyle: {
+                  fontSize: "14",
+                },
+              },
+            },
+            series: [
+              {
+                name: "人数",
+                type: "bar",
+                data: this.seriesData,
+              },
+            ],
+          };
+          this.$refs.chart2.setOption(option2);
+        }
+      });
+    },
+    getList() {
+      getapi("/api/identity/users/getlist").then((res) => {
+        if (res.code != -1) {
+          this.registrardata = [...res.data.items];
+        }
+      });
+    },
+    getNowTime() {
+      var now = new Date();
+      var year = now.getFullYear(); // 得到年份
+      var month = now.getMonth(); // 得到月份
+      var date = now.getDate(); // 得到日期
+      month = month + 1;
+      month = month.toString().padStart(2, "0");
+      date = date.toString().padStart(2, "0");
+      var defaultDate = `${year}-${month}-${date}`;
+      this.startDate = defaultDate;
+      this.endDate = defaultDate;
+    },
+    handleExport() {
+      exportToExcel("#table", "登记员工作量统计");
+    },
+  },
+  computed: {
+    ...mapState(["window", "dict", "patientRegister", "report"]),
+  },
+  updated() {
+    this.$nextTick(() => {
+      this.$refs.table.doLayout();
+    });
   },
-  mounted() {},
-  methods: {},
 };
 </script>
 <style scoped>
-.boxcard{
-  height: 800px;
+@import "../../assets/css/global_button.css";
+@import "../../assets/css/global_card.css";
+@import "../../assets/css/global_input.css";
+@import "../../assets/css/global_table.css";
+@import "../../assets/css/global.css";
+
+.query {
+  margin-left: 10px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
 }
-.tabtile {
-  text-align: center;
-  margin-top: 20px;
+:deep .right-align .cell{
+  text-align: right !important;
 }
 </style>
\ No newline at end of file
diff --git a/vue.config.js b/vue.config.js
index 0e56182..211844c 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,30 +1,45 @@
 const { defineConfig } = require("@vue/cli-service");
+const NodePolyfillPlugin = require("node-polyfill-webpack-plugin")
 module.exports = defineConfig({
-  transpileDependencies: true,
-  lintOnSave: false,
-  devServer: {
-    port: "8080",
-    proxy: {
-      "/api": {
-        target: "http://192.168.1.108:44358",
-        changeorigin: true, // 在本会创建一个虚拟服务满，然后发送清求的数，并同时接收济求的数，这样服务端和服务减进行数据的交互就不会有域问题
-        rewite: (path) => path.replace(/^\/api/, ""),
-        // pathRewrite: {
-        //   "^/api": ''
-        // }
-      },
+    transpileDependencies: true,
+    lintOnSave: false,
+    configureWebpack: {
+        plugins: [
+            new NodePolyfillPlugin()
+        ],
+        resolve: {
+            fallback: {
+                fs: false,
+                crypto: false
+            }
+        },
+        externals: {
+            './cptable': 'var cptable',
+        },
     },
-  },
-  // pages: {
-  //   index: {
-  //     entry: 'src/main.js',
-  //     template: 'src/App.vue',
-  //     filname: 'index.html'
-  //   },
-  //   about: {
-  //     entry: 'src/main.js',
-  //     template: 'src/App.vue',
-  //     filname: 'about.html'
-  //   },
-  // }
-});
+    devServer: {
+        port: "8080",
+        proxy: {
+            "/api": {
+                target: "http://192.168.1.108:44358",
+                changeorigin: true, // 在本会创建一个虚拟服务满，然后发送清求的数，并同时接收济求的数，这样服务端和服务减进行数据的交互就不会有域问题
+                rewite: (path) => path.replace(/^\/api/, ""),
+                // pathRewrite: {
+                //   "^/api": ''
+                // }
+            },
+        },
+    }
+    // pages: {
+    //   index: {
+    //     entry: 'src/main.js',
+    //     template: 'src/App.vue',
+    //     filname: 'index.html'
+    //   },
+    //   about: {
+    //     entry: 'src/main.js',
+    //     template: 'src/App.vue',
+    //     filname: 'about.html'
+    //   },
+    // }
+});
\ No newline at end of file