From c25207fcfbd425105fc9b7f75576617bf01a7fe8 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Tue, 14 Nov 2023 18:13:47 +0800
Subject: [PATCH] page

---
 package-lock.json                             |  86 +-
 package.json                                  |   3 +-
 .../单位体检人员名单导入模板.xlsx | Bin 0 -> 25088 bytes
 .../common/MedicalPackageAsbitem.vue          | 839 ++++++++++++++++++
 src/router/index.js                           |  13 +-
 src/views/Home.vue                            |   4 +-
 src/views/common-settings/medicalPackage.vue  | 633 +++++++++++++
 src/views/customerOrg/customerOrgGroup.vue    |   2 +-
 .../customerOrg/patientRegisterImport.vue     | 350 +++++++-
 src/views/doctorCheck/personnelBatch.vue      |   2 +
 10 files changed, 1877 insertions(+), 55 deletions(-)
 create mode 100644 public/files/单位体检人员名单导入模板.xlsx
 create mode 100644 src/components/common/MedicalPackageAsbitem.vue
 create mode 100644 src/views/common-settings/medicalPackage.vue

diff --git a/package-lock.json b/package-lock.json
index 366d2d5..7e6650a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,7 +20,8 @@
         "vue-meta": "^2.4.0",
         "vue-print-nb": "^1.7.5",
         "vue-router": "^3.5.1",
-        "vuex": "^3.6.2"
+        "vuex": "^3.6.2",
+        "xlsx": "^0.18.5"
       },
       "devDependencies": {
         "@babel/core": "^7.12.16",
@@ -3195,6 +3196,14 @@
         "node": ">= 10.0.0"
       }
     },
+    "node_modules/adler-32": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmmirror.com/adler-32/-/adler-32-1.3.1.tgz",
+      "integrity": "sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/ajv": {
       "version": "6.12.6",
       "resolved": "https://registry.npmmirror.com/ajv/-/ajv-6.12.6.tgz",
@@ -3888,6 +3897,18 @@
         "node": ">=4"
       }
     },
+    "node_modules/cfb": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmmirror.com/cfb/-/cfb-1.2.2.tgz",
+      "integrity": "sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==",
+      "dependencies": {
+        "adler-32": "~1.3.0",
+        "crc-32": "~1.2.0"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/chainsaw": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
@@ -4127,6 +4148,14 @@
         "node": ">=6"
       }
     },
+    "node_modules/codepage": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmmirror.com/codepage/-/codepage-1.15.0.tgz",
+      "integrity": "sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA==",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/color-convert": {
       "version": "1.9.3",
       "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-1.9.3.tgz",
@@ -6246,6 +6275,14 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/frac": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmmirror.com/frac/-/frac-1.1.2.tgz",
+      "integrity": "sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/fraction.js": {
       "version": "4.2.0",
       "resolved": "https://registry.npmmirror.com/fraction.js/-/fraction.js-4.2.0.tgz",
@@ -10092,6 +10129,17 @@
       "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
       "dev": true
     },
+    "node_modules/ssf": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmmirror.com/ssf/-/ssf-0.11.2.tgz",
+      "integrity": "sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==",
+      "dependencies": {
+        "frac": "~1.1.2"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/ssri": {
       "version": "8.0.1",
       "resolved": "https://registry.npmmirror.com/ssri/-/ssri-8.0.1.tgz",
@@ -11544,6 +11592,22 @@
       "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==",
       "dev": true
     },
+    "node_modules/wmf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/wmf/-/wmf-1.0.2.tgz",
+      "integrity": "sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/word": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmmirror.com/word/-/word-0.3.0.tgz",
+      "integrity": "sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/word-wrap": {
       "version": "1.2.3",
       "resolved": "https://registry.npmmirror.com/word-wrap/-/word-wrap-1.2.3.tgz",
@@ -11623,6 +11687,26 @@
         }
       }
     },
+    "node_modules/xlsx": {
+      "version": "0.18.5",
+      "resolved": "https://registry.npmmirror.com/xlsx/-/xlsx-0.18.5.tgz",
+      "integrity": "sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==",
+      "dependencies": {
+        "adler-32": "~1.3.0",
+        "cfb": "~1.2.1",
+        "codepage": "~1.15.0",
+        "crc-32": "~1.2.1",
+        "ssf": "~0.11.2",
+        "wmf": "~1.0.1",
+        "word": "~0.3.0"
+      },
+      "bin": {
+        "xlsx": "bin/xlsx.njs"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/xmlchars": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
diff --git a/package.json b/package.json
index ef82d45..feba225 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,8 @@
     "vue-meta": "^2.4.0",
     "vue-print-nb": "^1.7.5",
     "vue-router": "^3.5.1",
-    "vuex": "^3.6.2"
+    "vuex": "^3.6.2",
+    "xlsx": "^0.18.5"
   },
   "devDependencies": {
     "@babel/core": "^7.12.16",
diff --git a/public/files/单位体检人员名单导入模板.xlsx b/public/files/单位体检人员名单导入模板.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..f2e9c4e8de4d99e4070ef0cd73c0123a395c98fe
GIT binary patch
literal 25088
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

literal 0
HcmV?d00001

diff --git a/src/components/common/MedicalPackageAsbitem.vue b/src/components/common/MedicalPackageAsbitem.vue
new file mode 100644
index 0000000..e0092b9
--- /dev/null
+++ b/src/components/common/MedicalPackageAsbitem.vue
@@ -0,0 +1,839 @@
+<template>
+  <div style="display: flex;">
+    <div :style="'display: flex;width:' + (window.pageWidth - 45 - 110) + 'px;'">
+      <!--未选组合项目-->
+      <div style="display: block; width:230px;">
+        <div>
+          <span>项目类别</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" border size="small"  highlight-current-row
+            :height="window.pageHeight < 635 ? 200:(window.pageHeight - 110 - 325)"
+            @row-dblclick="dbClickChoosedAsb" row-key="id"
+            @selection-change="handleSelectionChange" :row-class-name="handleRowClassName" 
+            @row-click="chooseAsbItem">
+            <!--
+            <el-table-column type="selection" align="center" ></el-table-column>
+            -->
+            <el-table-column type="index" align="center" min-width="40"/>
+            <el-table-column
+              label="未选组合项目" min-width="170"
+              prop="displayName" align="center"
+            ></el-table-column>
+          </el-table>
+        </div>
+      </div>
+
+      <!--中间操作按钮-->
+      <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="'display: block; width:' + (window.pageWidth - 230 - 120 - 45 - 110) + 'px;'">
+        <div style="height:32px;">
+          <span>快速选择</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="medicalPackageAsbitems" border size="small"
+            @selection-change="selecteditems" highlight-current-row 
+            :height="window.pageHeight < 635 ? 200:(window.pageHeight - 110 - 325)"
+            :summary-method="getSummaries" show-summary           
+            :row-class-name="handleRowClassName" @row-dblclick="removeAbs" 
+            @row-click="removeAsbItem" ref="tablemedicalPackageAsbitems">
+            <!--
+            <el-table-column type="selection"></el-table-column>
+            -->
+            <el-table-column type="index" min-width="40" align="center"/>
+            <el-table-column
+              label="已选组合项目"
+              min-width="120"
+              prop="displayName"
+            ></el-table-column>
+            <el-table-column label="标准价格" prop="price" min-width="60" align="center"/>
+            <el-table-column label="折扣" min-width="60" align="center">
+              <template slot-scope="scope">
+                <el-input
+                  @input="changeDiscount(scope.$index)"
+                  type="number" size="small"
+                  v-model="scope.row.discount"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column label="应收价格" prop="customerOrgGroupDetailPrice" min-width="60" align="center">
+              <template slot-scope="scope">
+                <el-input
+                  @input="changePrices(scope.$index)"
+                  type="number" size="small"
+                  v-model="scope.row.customerOrgGroupDetailPrice"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column label="数量" prop="customerOrgGroupDetailAmount" min-width="40" align="center">
+              <template slot-scope="scope">
+                <el-input
+                  @input="changePrices(scope.$index)"
+                  type="number" size="small" 
+                  v-model="scope.row.customerOrgGroupDetailAmount" 
+                />
+              </template>
+            </el-table-column>
+            <el-table-column label="标准金额" prop="asbitemMoney" min-width="60" align="center">
+            </el-table-column>
+            <el-table-column label="应收金额" prop="customerOrgGroupDetailMoney" min-width="60" align="center">
+            </el-table-column>
+          </el-table>
+        </div>
+      </div>
+    </div>
+    <!--批量操作按钮（复制套餐与分组）-->
+    <div style="display: block;margin-left: 10px;">
+      <div style="margin-top: 50px;">
+        <el-button class="btnClass" @click="btnCopyMedicalPackage">复制套餐</el-button>
+      </div>
+      <div>
+        <el-button class="btnClass" @click="btnSave">保存</el-button>
+      </div>
+    </div>
+    
+    <!--复制套餐-->
+    <el-dialog title="体检套餐" :visible.sync="medicalPackageVisble" width="600px" height="400"
+      :show-close="false" :close-on-click-modal="false" :append-to-body="true">
+      <el-table :data="dict.medicalPackage" border height="350" row-key="id" size="small"
+        highlight-current-row @row-click="packageRowClick" @row-dblclick="rowDblclick" ref="patientList" >
+        
+        <!-- "displayName": "健康体检套餐",
+        "price": 20.00,
+        "forSexId": "0",
+        "isActive": "Y",
+        "remark": "2",
+        "displayOrder": 1,
+        "simpleCode": "JKTJTC",
+        "creatorName": "admin",
+        "lastModifierName": "users",
+        "lastModificationTime": "2023-08-04T16:34:02.94408",
+        "lastModifierId": "3a0ca83b-3116-da05-3916-dfd4c0c548cb",
+        "creationTime": "2023-07-10T19:53:30.210553",
+        "creatorId": "3a0c4180-107c-0c89-b25b-0bd34666dcec",
+        "id": "3a0c51d3-2345-38df-ba0b-1862a3c3606f" -->
+        <el-table-column type="index" width="50" />
+        <el-table-column prop="displayName" label="套餐名称" width="180"/>
+        <el-table-column prop="price" label="价格" width="80"/>
+        <el-table-column prop="forSexId" label="适用性别" width="80">
+          <template slot-scope="scope">
+            <div>
+              {{ dddw(dict.forSex, "id", scope.row.forSexId, "displayName") }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="remark" label="备注" width="100"/>
+        <el-table-column prop="creatorName" label="创建人员" width="80"/>
+        <el-table-column prop="creationTime" label="创建日期" width="100">
+          <template slot-scope="scope">
+            <div v-if="scope.row.creationTime">
+              {{ moment(scope.row.creationTime).format("yyyy-MM-DD") }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="lastModifierName" label="修改人员" width="80"/>
+        <el-table-column prop="lastModificationTime" label="修改日期" width="100">
+          <template slot-scope="scope">
+            <div v-if="scope.row.lastModificationTime">
+              {{ moment(scope.row.lastModificationTime).format("yyyy-MM-DD") }}
+            </div>
+          </template>
+        </el-table-column>        
+      </el-table>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="medicalPackageVisble = false" style="width:90px;">取消</el-button>
+        <el-button type="primary" @click="copyMedicalPackage" style="width:90px;">确定</el-button>
+      </span>
+    </el-dialog>
+
+    
+  </div>
+</template>
+<script>
+import moment from 'moment';
+import { mapState } from "vuex";
+import { getapi, postapi, putapi } from "@/api/api";
+import { arrayExistObj, tcdate, arrayFilter, arrayReduce, deepCopy,dddw } from "../../utlis/proFunc";
+
+
+export default {
+  props:['formData','refreshMoney'],
+  data() {
+    return {
+      packagePrice:0,               //分组总价
+      medicalPackageAsbitems:[], //分组包含组合项目
+      itemTypeIds:[], //项目类别
+      asbItemId:'',   //当前快速选到的给合项目ID
+      quickAsb:[],    //过滤显示的组合项目
+
+      asbItemChoosed: [], //勾选的  未选组合项目
+      startPoint:-1,
+      PstartPoint:-1,
+
+      medicalPackageVisble:false, //复制套餐
+      curPackageId:'',  //当前选中套餐ID
+      packageAsbitems:[], //套餐中包含的组合项目
+
+  
+      selecteddata: [], //已选数据
+      unselecteddata: [], //未选数据      
+      rightselctedata: [], //右侧已选
+      options: [],
+      value: "",
+      dialogVisible: false,
+      copyGroupdialogVisible: false,
+      packagelist: [],
+      tabledata: [],
+      temporaryselection: [], //已选组合项目table
+      copegroupdata: [], //复制分组
+      addrulst: [], //添加保存的Id
+      price: "", //价格
+      title: 1,
+    };
+  },
+  computed: {
+    ...mapState(["window","dict","customerOrg"]),
+  },
+
+  created() {
+    this.dictInit()
+  },
+  
+  updated () {
+    this.refreshTable('tablemedicalPackageAsbitems')
+  },
+  methods: {
+    moment,dddw,deepCopy,
+    //表格强制刷新
+    refreshTable(tableRef){
+      this.$nextTick(() => {
+        this.$refs[tableRef].doLayout()
+      })
+    },
+
+    //初始数据
+    dictInit(){
+      //体检类别 树结构
+      getapi("/api/app/item-type/by-code-all").then((res) => {
+        if (res.code != -1) {
+          this.dict.itemTypeTree = res.data;
+          tcdate(this.dict.itemTypeTree);
+        }
+      });
+
+      //获取所有组合项目
+      getapi("/api/app/asbitem/in-filter?Filter").then((res) => {
+        if (res.code != -1) {
+          this.dict.asbItemAll = res.data.items;
+          this.dict.asbItemAll.forEach(e => {
+            e.choosed = false
+          })
+          this.dict.asbItem = deepCopy(this.dict.asbItemAll);
+          this.dict.asbItemQuick = deepCopy(res.data.items);
+          this.quickAsb = deepCopy(res.data.items);
+        }
+      });
+
+      //套餐
+      getapi("/api/app/medical-package/in-filter").then((res) => {
+        if (res.code != -1) {
+          this.dict.medicalPackage = res.data.items;
+        }
+      });
+
+    },
+
+    handleRowClassName({ row, rowIndex }) {
+      // highLightBg 为 'selected'的高亮 
+      //console.log(rowIndex, row)
+      //return row.highLightBg == 'selected' ? 'high-light-bg' : '';
+      if (row.choosed) {
+        return 'current-row';
+      } else {
+        return '';
+      }
+
+    },
+
+    //项目类别过滤 组合项目，未过滤已选择的组合项目
+    getAsbItemByItemTypeAll() {
+      //console.log('getAsbItemByItemType', typeof this.itemTypeIds, this.itemTypeIds)
+      let lv = "";
+      if (typeof this.itemTypeIds === "object") {
+        lv = this.itemTypeIds[this.itemTypeIds.length - 1];
+      }
+
+      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);
+
+    },
+
+    //按项目类别显示组合项目，并过滤已选择的组合项目
+    getAsbItemByItemType() {
+      this.getAsbItemByItemTypeAll()
+      //刷新显示 未选组合项目
+      arrayReduce(this.dict.asbItem, [...this.medicalPackageAsbitems], "id=asbitemId");
+      arrayReduce(this.dict.asbItemQuick, [...this.medicalPackageAsbitems], "id=asbitemId");
+    },
+
+    //快速选择组合项目时，调整可按拼间简码及简称查找
+    filterMethod(keyWords) {
+      //console.log('filterMethod',this.dict.asbItemQuick)  
+      if (keyWords) {
+        this.quickAsb = [];
+        this.dict.asbItemQuick.forEach(item => {
+          if (item.displayName.toLowerCase().indexOf(keyWords.toLowerCase()) > - 1
+            || item.simpleCode.toLowerCase().indexOf(keyWords.toLowerCase()) > - 1
+            || item.shortName.toLowerCase().indexOf(keyWords.toLowerCase()) > - 1) {
+            this.quickAsb.push(item);
+          }
+        });
+      } else {
+        this.quickAsb = deepCopy(this.dict.asbItemQuick);
+      }
+    },
+
+    // 添加组合项目
+    ///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.formData.id){
+        this.$message.warning("请先选中单位分组")
+        return
+      }
+      if(this.formData.isComplete && this.formData.isComplete.toUpperCase() == 'Y'){
+        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
+      }
+
+      //性别、年龄判断 
+      // "displayName": "身高体重",
+      //   "shortName": "哈f哈",
+      //   "forSexId": "F",
+      //   "itemTypeId": "3a0b16de-75b9-c910-c61b-844709a88940",
+      //   "price": 0,
+      
+      // for (let i = 0; i < asbItemChoosed.length; i++) {
+      //   if (this.formData.forSexId == 'A') break //未选性别时，无需判断组合项目性别限制
+      //   if (asbItemChoosed[i].forSexId == 'A' || asbItemChoosed[i].forSexId == 'U') continue
+      //   if (asbItemChoosed[i].forSexId != this.formData.sexId) {
+      //     this.$message.warning(`所选项目：${asbItemChoosed[i].displayName}，不适合当前人员性别`)
+      //     checked = false
+      //     break
+      //   }
+      // }
+      // //console.log(222,checked)
+      // if (!checked) return
+
+      // 去掉重复的项目
+      arrayReduce(asbItemChoosed, this.medicalPackageAsbitems, "id=asbitemId")
+
+      for (let i = asbItemChoosed.length - 1; i > - 1; i--) {
+        if (this.formData.forSexId == 'A') break //未选性别时，无需判断组合项目性别限制 
+        if (asbItemChoosed[i].forSexId == 'A' || asbItemChoosed[i].forSexId == 'U') continue
+        if (asbItemChoosed[i].forSexId != this.formData.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)}】不适合当前人员性别`)
+
+      for (let i = 0; i < asbItemChoosed.length; i++) {
+        let pojo = {
+          asbitemId: asbItemChoosed[i].id,
+          displayName:asbItemChoosed[i].displayName,
+          discount:100,
+          customerOrgGroupDetailAmount:1,
+          price:asbItemChoosed[i].price,
+          customerOrgGroupDetailPrice:asbItemChoosed[i].price,
+          customerOrgGroupDetailMoney: asbItemChoosed[i].price,
+          asbitemMoney: asbItemChoosed[i].price,
+        }
+        
+
+        this.medicalPackageAsbitems.push(pojo)
+        //this.medicalPackageAsbitems.push({ ...pojo, asbitemName: asbItemChoosed[i].displayName })
+        
+        lfind = arrayExistObj(this.dict.asbItem, 'id', asbItemChoosed[i].id)
+        if (lfind > -1) this.dict.asbItem.splice(lfind, 1)
+
+        lfind = arrayExistObj(this.dict.asbItemQuick, 'id', asbItemChoosed[i].id)
+        if (lfind > -1) this.dict.asbItemQuick.splice(lfind, 1)
+
+      }
+
+      
+    },
+
+    //双击选择组合项目
+    dbClickChoosedAsb(row) {
+      this.addAbs([row]);
+    },
+    //快速选择组合项目
+    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       
+      });
+
+    },
+
+    //选择 未选的组合项目
+    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;   
+
+    },
+
+    //删除 人员已选中的组合项目
+    ///api/app/register-asbitem/many?RegisterAsbitemIds=3fa85f64-5717-4562-b3fc-2c963f66afa6
+    delAbs(absForDel,oprType) {
+      if(!this.formData.id){
+        this.$message.warning("请先选中单位分组")
+        return
+      }
+      if(this.formData.isComplete && this.formData.isComplete.toUpperCase() == 'Y'){
+        this.$message.warning("体检次数已完成，不允许操作")
+        return
+      }
+
+
+      let lfind = -1
+
+      //勾选时不需要此操作  start
+      if(oprType && oprType == 'all'){
+        absForDel = deepCopy(this.medicalPackageAsbitems)
+      }else if(oprType && oprType == 'choosed'){
+        absForDel = [] 
+        this.medicalPackageAsbitems.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.medicalPackageAsbitems, 'asbitemId', absForDel[i].asbitemId)
+        if (lfind > -1) this.medicalPackageAsbitems.splice(lfind, 1)
+
+        absForDel.splice(i, 1)
+        i--
+        continue
+        
+      }
+
+      //刷新
+      this.getAsbItemByItemType()     
+
+    },
+
+    //双击删除已选项目
+    removeAbs(row) {
+      this.delAbs([row]);
+    },
+
+    //选择 已选的组合项目
+    removeAsbItem(row){
+      this.medicalPackageAsbitems.forEach((e,index) => {
+        e.index = index; 
+        return e
+      });
+      // 按住了shift键
+      if (this.window.shift) {         
+        //清除所有选择
+        this.medicalPackageAsbitems.forEach(e => {
+          e.choosed = false;  
+          return e
+        });
+
+        if (this.PstartPoint == - 1) {
+          this.medicalPackageAsbitems[row.index].choosed = true;
+          this.PstartPoint = row.index;
+          return
+        }
+
+        if (this.PstartPoint > row.index) {
+          for (let i = row.index; i <= this.PstartPoint; i++) {
+            this.medicalPackageAsbitems[i].choosed = true
+          }
+        } else if (this.PstartPoint <= row.index) {
+          for (let i = this.PstartPoint; i <= row.index; i++) {
+            this.medicalPackageAsbitems[i].choosed = true
+          }
+        }
+        return
+      }
+
+      // 按住了ctrl 键
+      if (this.window.ctrl) {   
+        console.log('this.window.ctrl',this.window.ctrl,this.medicalPackageAsbitems)      
+        this.medicalPackageAsbitems[row.index].choosed = true;
+        this.PstartPoint = row.index;
+        return        
+      }
+
+      // 未按住了ctrl 、shift 键
+      //清除所有选择
+      //console.log('清除所有选择')
+      this.medicalPackageAsbitems.forEach(e => {
+        e.choosed = false;  
+        return e
+      });
+      this.medicalPackageAsbitems[row.index].choosed = true;
+      this.PstartPoint = row.index;   
+
+    },
+
+    changeDiscount(index){
+
+      this.medicalPackageAsbitems[index].customerOrgGroupDetailPrice = 
+      (this.medicalPackageAsbitems[index].discount *  this.medicalPackageAsbitems[index].price/100).toFixed(2)
+      
+
+      this.medicalPackageAsbitems[index].customerOrgGroupDetailMoney = 
+      (this.medicalPackageAsbitems[index].customerOrgGroupDetailPrice * this.medicalPackageAsbitems[index].customerOrgGroupDetailAmount).toFixed(2)
+
+      //this.getSummaries()
+      
+    },
+
+    //修改价格或数量
+    changePrices(index){
+      this.medicalPackageAsbitems[index].customerOrgGroupDetailMoney = 
+      (this.medicalPackageAsbitems[index].customerOrgGroupDetailPrice * this.medicalPackageAsbitems[index].customerOrgGroupDetailAmount).toFixed(2)
+
+      this.medicalPackageAsbitems[index].asbitemMoney = 
+      (this.medicalPackageAsbitems[index].price * this.medicalPackageAsbitems[index].customerOrgGroupDetailAmount).toFixed(2)
+
+      this.medicalPackageAsbitems[index].discount = (this.medicalPackageAsbitems[index].customerOrgGroupDetailPrice * 100 / this.medicalPackageAsbitems[index].price).toFixed(2)
+      //this.getSummaries()
+    },
+    
+
+    //合计
+    getSummaries(param) {
+      console.log('getSummaries param',param)
+      // if(!param){
+      //   param = {
+      //     columns:[{}, {}, {}, {}, {}, {}, {property: 'asbitemMoney'},{property: 'customerOrgGroupDetailMoney'}],
+      //     data:this.medicalPackageAsbitems
+      //   }
+      // }
+     
+      const { columns, data } = param;
+      const sumCol = [6, 7]  //需合计的列
+      const sums = [];
+      columns.forEach((column, index) => {
+        //console.log('column, index,data',column, index,data)
+        //显示合计列
+        if (index === 1) {
+          sums[index] = '合计';
+          return;
+        }
+
+        //不合计的列
+        if (sumCol.indexOf(index) == -1) {
+          sums[index] = '';
+          return;
+        }
+
+        sums[index] = 0
+        data.forEach(e => {
+          if (!isNaN(e[column.property])) sums[index] += Number(e[column.property])// * e['amount']
+        })
+        sums[index] = sums[index].toFixed(2) //+ ' 元';
+
+      });
+      this.packagePrice = sums[7];
+      // console.log('getSummaries',sums)
+      // if (!this.totalFoucs) this.total = sums[5];
+      // if (!this.discountFoucs) this.discount = Number(this.total * 100 / this.totalStand).toFixed(2);
+      return sums;
+    },
+    
+
+    //复制套餐
+    btnCopyMedicalPackage(){
+      if(!this.formData.id){
+        this.$message.warning("请先选中单位分组")
+        return
+      }      
+      if(this.formData.isComplete && this.formData.isComplete.toUpperCase() == 'Y'){
+        this.$message.warning("体检次数已完成，不允许操作")
+        return
+      }
+      this.medicalPackageVisble = true
+    },
+
+    //选中套餐
+    async packageRowClick(row){
+      this.curPackageId = row.id
+      this.packageAsbitems = []
+      try {
+        let res = await getapi(`/api/app/medical-package-detail/medical-package-in-asbitem?MedicalPackageId=${row.id}`)
+        this.packageAsbitems = res.data
+      } catch (error) {
+        console.log(error)
+      }         
+    },
+
+    //双击选套餐，并确认复制
+    async rowDblclick(row){
+      await this.packageRowClick(row)
+      this.copyMedicalPackage()
+    },
+
+    //复制套餐(确认选中套餐)
+    copyMedicalPackage(){
+      if(!this.curPackageId){
+        this.$message.warning("请先选择要复制的套餐！")
+        return
+      }
+      console.log('this.packageAsbitems',this.packageAsbitems)
+      this.addAbs(deepCopy(this.packageAsbitems))
+      this.medicalPackageVisble = false
+    },
+
+    
+
+
+
+    //保存按钮
+    btnSave() {
+      if(!this.formData.id){
+        this.$message.warning("请先选中单位分组")
+        return
+      }      
+      if(this.formData.isComplete && this.formData.isComplete.toUpperCase() == 'Y'){
+        this.$message.warning("体检次数已完成，不允许操作")
+        return
+      }
+      let body = {
+        customerOrgGroupId:this.formData.id,
+        details:[]
+      }
+      // {
+      //   "customerOrgGroupId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
+      //   "details": [
+      //     {
+      //       "customerOrgGroupId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
+      //       "asbitemId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
+      //       "price": 0,
+      //       "amount": 0
+      //     }
+      //   ]
+      // }
+      this.medicalPackageAsbitems.forEach(e =>{
+        body.details.push({
+          customerOrgGroupId:this.formData.id,
+          asbitemId:e.asbitemId,
+          price:e.customerOrgGroupDetailPrice,
+          amount:e.customerOrgGroupDetailAmount
+        })
+      })
+      
+      let group = deepCopy(this.customerOrgGroup);
+      postapi('/api/app/customerorggroupdetail/createcustomerorggroupdetailmany',body
+       ).then(res => {
+        if(res.code != -1){
+          delete group.id;
+          delete group.customerOrgId;
+          delete group.isComplete; 
+          group.price = this.packagePrice
+          // console.log('this.customerOrgGroup',this.customerOrgGroup)
+          // console.log('group',group)
+          return putapi(`/api/app/customer-org-group/${this.formData.id}`, group)
+        }
+      }).then(res =>{
+        if(res.code != -1){
+          this.$message.success("操作成功");
+          group.id = this.formData.id
+          this.refreshMoney(group)
+        }
+      })
+   
+    },
+
+   
+    //右侧勾选按钮
+    selecteditems(val) {
+      this.rightselctedata = val;
+      console.log(this.rightselctedata);
+    },
+
+  
+    // 左侧未选
+    handleSelectionChange(val) {
+      // this.selecteddata = val;
+      this.unselecteddata = val;
+      console.log(this.unselecteddata);
+    },
+   
+
+    //获取当前列列表数据
+    getmedicalPackageAsbitems(customerOrgGroupId) {
+      if(customerOrgGroupId){
+        getapi(
+          `/api/app/customerorggroupdetail/getcustomerorggroupdetailinasbitem?CustomerOrgGroupId=${customerOrgGroupId}`
+        ).then((res) => {    
+          if(res.code != -1){
+            this.medicalPackageAsbitems = res.data;
+            this.getAsbItemByItemType()
+          }           
+        });
+      }else{
+        this.medicalPackageAsbitems = []
+        this.getAsbItemByItemType()
+      }  
+    },
+    
+  },
+
+  //监听事件
+  watch: {
+    //
+    "formData.id"(newVal, oldVal) {
+      console.log("formData.id ",newVal,oldVal);
+      if (newVal != oldVal) {
+        this.getmedicalPackageAsbitems(newVal);
+      }
+    },
+  },
+};
+</script>
+<style scoped>
+
+.box {  
+  margin-top: 5px;
+  border: 1px solid #000;
+}
+
+.btnClass {
+  width:100px;
+  margin-bottom: 5px
+}
+
+</style>
diff --git a/src/router/index.js b/src/router/index.js
index f675974..da3198e 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -193,6 +193,7 @@ const routes = [{
             },
             {
                 path: "/sample-group",
+                name:'条码分组',
                 component: () =>
                     import ("../views/common-settings/SampleGroup.vue"),
             },
@@ -240,12 +241,14 @@ const routes = [{
                 path: "/item-template",
                 component: () =>
                     import ("../views/fee-settings/ItemTemplate.vue"),
-            },
+            },            
             {
-                path: "/medical-package",
-                component: () =>
-                    import ("../views/fee-settings/MedicalPackage.vue"),
+                path: "/medicalPackage",  // medical-package
+                name:"套餐设置",    
+                component: () => 
+                    import ("../views/common-settings/medicalPackage.vue"),  //../views/fee-settings/MedicalPackage.vue
             },
+
             {
                 path: "/sex-hormone-reference-range",
                 component: () =>
@@ -290,7 +293,7 @@ const routes = [{
                 path: "/personnelBatch",
                 name: "人员批量登记",
                 component: () =>
-                    import ("../views/doctorCheck/personnelBatch.vue"),
+                    import ("../views/customerOrg/patientRegisterImport.vue"),  //../views/doctorCheck/personnelBatch.vue
             },
             {
                 path: "/patientRegisterRecover",
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 32d335f..bbc582f 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -270,8 +270,8 @@
                 <el-dropdown-item command="item-template" class="dropdownmain"
                   >项目模板</el-dropdown-item
                 >
-                <el-dropdown-item command="medical-package" class="dropdownmain"
-                  >套餐</el-dropdown-item
+                <el-dropdown-item command="medicalPackage" class="dropdownmain"
+                  >套餐设置</el-dropdown-item
                 >
                 <el-dropdown-item command="sys-parm-type" class="dropdownmain"
                   >系统参数</el-dropdown-item
diff --git a/src/views/common-settings/medicalPackage.vue b/src/views/common-settings/medicalPackage.vue
new file mode 100644
index 0000000..ebafca3
--- /dev/null
+++ b/src/views/common-settings/medicalPackage.vue
@@ -0,0 +1,633 @@
+<template>
+  <div>
+    <el-card>
+      <div slot="header">套餐设置</div>
+      <!--套餐信息-->
+      <div style="display: flex;">
+        <div :style="'display: block;width:' + (window.pageWidth - 45 - 110) + 'px;'">         
+          <div>
+            <el-table
+              :data="medicalPackages" ref="medicalPackages"
+              row-key="id"
+              border
+              height="240px"
+              size="small" 
+              highlight-current-row :row-class-name="handleRowClassName" 
+              @row-click="rowClick"
+            >
+              <el-table-column
+                type="index"
+                label="序号"
+                min-width="50"
+                align="center"
+              />
+              <el-table-column prop="displayName" label="名称" min-width="150" />
+              <el-table-column
+                prop="price"
+                label="价格"
+                min-width="60"
+                align="center"
+              />              
+              <el-table-column
+                prop="forSexId"
+                label="适用性别"
+                min-width="60"
+                align="center"
+              >
+                <template slot-scope="scope">
+                  {{ dddw(dict.forSex, "id", scope.row.forSexId, "displayName") }}
+                </template>
+              </el-table-column>
+              <!--
+              <el-table-column
+                prop="maritalStatusId"
+                label="适用婚姻状况"
+                min-width="80"
+                align="center"
+              >
+                <template slot-scope="scope">
+                  {{
+                    dddw(
+                      dict.forMaritalStatus,
+                      "id",
+                      scope.row.maritalStatusId,
+                      "displayName"
+                    )
+                  }}
+                </template>
+              </el-table-column>
+               -->
+              <el-table-column
+                prop="isActive"
+                label="启用"
+                min-width="60"
+                align="center"
+              >
+                <template slot-scope="scope">
+                  {{ scope.row.isActive == 'Y' ? '是':'否' }}
+                </template>
+              </el-table-column>
+             
+              <el-table-column
+                prop="creatorName"
+                label="创建者"
+                min-width="60"
+                align="center"
+              />
+              <el-table-column label="创建时间" min-width="150" align="center">
+                <template slot-scope="scope">
+                  {{
+                    scope.row.creationTime
+                      ? moment(scope.row.creationTime).format("yyyy-MM-DD HH:mm:ss")
+                      : ""
+                  }}
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" width="40">
+                <template>
+                  <el-tag
+                    class="move"
+                    style="cursor: move;"
+                    draggable="true"
+                  >
+                    <i class="el-icon-d-caret" style="font-size:14px;"></i>
+                  </el-tag>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </div>
+        <!--按钮-->
+        <div style="display: block;margin-left: 10px;">
+          <div>      
+            <el-button class="btnClass"  @click="btnAdd">新增</el-button>
+          </div>
+          <div>
+            <el-button class="btnClass" @click="btnEdit" >编辑</el-button> 
+          </div>
+          <div>        
+            <el-button class="btnClass" @click="btnDel" >删除</el-button> 
+          </div>
+          <div>         
+            <el-button class="btnClass" @click="btnSetTop" >置顶</el-button> 
+          </div>
+          <div>         
+            <el-button class="btnClass" @click="btnSetBottom" >置低</el-button>
+          </div>
+          <div>
+            <el-button class="btnClass" @click="btnSort" :disabled="!isDrag" >保存排序</el-button>
+          </div>
+        </div>
+      </div>
+
+      <!--套餐项目信息--> 
+      <div>
+        <MedicalPackageAsbitem :formData="form" :refreshMoney="refreshMoney"/>
+      </div>
+  
+    </el-card>    
+
+    <!-- 新增或者编辑弹框 -->
+    <el-dialog
+      :title="form.id ? '编辑' : '新增'"
+      :close-on-click-modal="false"
+      :visible.sync="dialogVisible"
+      width="800px"
+    >
+      <el-form :model="form" label-width="80px" :rules="rules" ref="form">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item prop="displayName" label="套餐名称">
+              <el-input v-model="form.displayName" size="small" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">            
+            <el-form-item label="金额">
+              <el-input v-model="form.price" type="number" size="small" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="适用性别">
+              <el-select v-model="form.forSexId" placeholder="请选择" size="small" >
+                <el-option
+                  v-for="item in dict.forSex"
+                  :key="item.id"
+                  :label="item.displayName"
+                  :value="item.id"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <!--
+          <el-col :span="8">            
+            <el-form-item label="婚姻状况">
+              <el-select
+                v-model="form.maritalStatusId"
+                placeholder="请选择"
+                style="width: 100%" size="small" >
+                <el-option
+                  v-for="item in dict.forMaritalStatus"
+                  :key="item.id"
+                  :label="item.displayName"
+                  :value="item.id"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          -->
+          <el-col :span="8">
+            <el-form-item label="启用" prop="isActive">
+              <el-radio v-model="form.isActive" label="Y">是</el-radio>
+              <el-radio v-model="form.isActive" label="N">否</el-radio>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="备注">
+              <el-input v-model="form.remark" size="small" />
+            </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="success" @click="computePrice">同比折算套餐项目价格</el-button>
+        <el-button type="primary" @click="onSubmit('form')">确定</el-button>
+      </span>
+    </el-dialog>
+    <!--  -->
+  </div>
+</template>
+<script>
+import moment from "moment";
+import Sortable from "sortablejs";
+import { getapi, postapi, putapi, deletapi } from "@/api/api";
+import { mapState } from "vuex";
+import { dddw, deepCopy, objCopy, arrayExistObj } from "../../utlis/proFunc";
+
+import MedicalPackageAsbitem from "../../components/common/MedicalPackageAsbitem.vue";
+
+export default {
+  components: {
+    MedicalPackageAsbitem,
+  },
+  data() {
+    return {
+      medicalPackages: [{id:''}], //套餐
+      medicalPackageId: "", //当前选中的体检单位id
+      customerOrgRegisterList: [], //体检次数列表
+      customerOrgRegister: {}, //体检次数
+
+      isDrag: false,
+      form: {
+        //体检单位套餐
+        medicalPackageId:'',   //复制套餐时用到(预留查历次套餐)
+        isComplete:'N',     //体检次数是否完成，如完成不允许调整套餐项目
+        id: "",
+        displayName: "",
+        price: 0,
+        forSexId: "A",
+        maritalStatusId: "A",
+        isActive:'Y',
+        remark: "",        
+      },
+      formInit: {},
+      rules: {
+        displayName: [
+          { required: true, message: "请填写套餐名称", trigger: "blur" },
+        ],
+      },
+
+      dialogVisible: false,      
+    
+    };
+  },
+  computed: {
+    ...mapState(["personnelUnit", "window", "dict"]),
+  },
+  created() {
+    this.rowDrop();
+    this.formInit = deepCopy(this.form);
+  },
+  mounted() {
+    //获取初始数据（单位、适用性别）
+    this.dictInit();
+  },
+  methods: {
+    moment,
+    dddw,deepCopy,
+
+    //刷新套餐价格（供子组件调用）
+    refreshMoney(formData){
+      //console.log('this is parent')
+      let lfind = arrayExistObj(this.medicalPackages,'id',formData.id)
+      if(lfind > -1) this.medicalPackages[lfind].price = formData.price
+    },
+    
+    //确定排序
+    btnSort() {
+      const result = [];
+      this.medicalPackages.forEach((item, index) => {        
+        result.push({ id: item.id, displayOrder: index });       
+      });
+      putapi("/api/app/medicalpackage/updatesortmany", {
+        itemList: result,
+      }).then((res) => {
+        this.$message.success("操作成功");
+        this.isDrag = false;
+      });
+    },
+
+    //初始化Sortable组件
+    rowDrop() {
+      this.$nextTick(() => {
+        const el = document.querySelector(".el-table__body-wrapper tbody");
+        //console.log('el0',el)
+        const that = this;
+        Sortable.create(el, {
+          handle: ".move",
+          animation: 300,
+          //拖拽结束
+          onEnd({ newIndex, oldIndex }) {            
+            that.isDrag = true;
+            const currRow = that.medicalPackages.splice(oldIndex, 1)[0];
+            that.medicalPackages.splice(newIndex, 0, currRow);  
+            console.log('el',el)         
+          },
+        });
+      });
+    },
+
+
+    //置底
+    btnSetBottom() {
+      if (!this.form.id) {
+        this.$message.warning("请选择操作的数据");
+        return
+      } 
+      let lfind = arrayExistObj(this.medicalPackages,'id',this.form.id)
+      let currentRow = {}
+
+      putapi(
+        `/api/app/medicalpackage/updatemanysort?id=${this.form.id}&SortType=2`
+      ).then((res) => {
+        this.$message.success("操作成功");
+        currentRow = this.medicalPackages.splice(lfind,1)[0]  //删除并赋值
+        this.medicalPackages.push(currentRow)
+        this.$refs['medicalPackages'].setCurrentRow(currentRow); 
+      });
+      
+    },
+
+    //置顶
+    btnSetTop() {
+      if (!this.form.id) {
+        this.$message.warning("请选择操作的数据");
+        return
+      }
+
+      let lfind = arrayExistObj(this.medicalPackages,'id',this.form.id)
+      let currentRow = {}
+      
+      putapi(
+        `/api/app/medicalpackage/updatemanysort?id=${this.form.id}&SortType=1`
+      ).then((res) => {
+        this.$message.success("操作成功");
+        currentRow = this.medicalPackages.splice(lfind,1)[0]
+        this.medicalPackages.unshift(currentRow)
+        this.$refs['medicalPackages'].setCurrentRow(currentRow); 
+      });
+      
+    },
+
+    //选中颜色
+    handleRowClassName({ row, rowIndex }) {
+      // highLightBg 为 'selected'的高亮 
+      //console.log(rowIndex, row)
+      //return row.highLightBg == 'selected' ? 'high-light-bg' : '';
+      if (row.choosed) {
+        return 'current-row';
+      } else {
+        return '';
+      }
+
+    },
+
+    //获取初始数据
+    dictInit() {      
+
+      //获取适用性别
+      getapi("/api/app/for-sex").then((res) => {
+        if (res.code != -1) {
+          this.dict.forSex = res.data;
+        }
+      });
+      this.getPackages()
+    },
+
+    getPackages(){
+      // /api/app/medical-package/in-filter?MaxResultCount=1000
+      getapi("/api/app/medical-package/in-filter?MaxResultCount=1000").then(res => {
+        if(res.code != -1){          
+          this.medicalPackages = res.data.items          
+        }
+      })
+    },
+
+  
+
+    //选择单位
+    changeCustomerOrg(v) {
+      getapi(
+        `/api/app/customerorgregister/getlistinmedicalPackageId?medicalPackageId=${v}`
+      ).then((res) => {
+        if (res.code != -1) {
+          this.customerOrgRegisterList = res.data;
+          if (res.data.length > 0) {
+            this.customerOrgRegister = res.data[res.data.length - 1];
+            this.getCustomerOrgGroup(this.customerOrgRegister.id);
+          } else {
+            this.customerOrgRegister = {};
+            this.medicalPackages = [];    
+            this.isDrag = false        
+          }
+          objCopy(this.formInit,this.form)
+        }
+      });
+    },
+
+    //选择体检次数
+    changeTimes(v) {
+      this.getCustomerOrgGroup(v.id);
+    },
+
+    
+    //点击套餐
+    rowClick(row) {     
+      objCopy(row, this.form);
+    },
+
+    //新增弹框
+    btnAdd() {
+      if (!this.customerOrgRegister.id) {
+        this.$message.warning("请选择体检次数");
+        return;
+      }
+      if(this.customerOrgRegister.isComplete.toUpperCase() == 'Y'){
+        this.$message.warning("该单位体检次数已完成，不允许新增套餐");
+        return;
+      }
+      
+      if (this.customerOrgRegister.isComplete.toUpperCase() == "Y") {
+        this.$message.warning("该单位的该次体检次数已完成，不能再添加套餐！");
+        return;
+      }
+
+      this.form = deepCopy(this.formInit);
+      this.form.customerOrgRegisterId = this.customerOrgRegister.id;
+      this.form.medicalPackageId = this.medicalPackageId;
+      this.dialogVisible = true;
+    },
+
+    //编辑弹框
+    btnEdit() {
+      if (!this.form.id) {
+        this.$message.warning("请选择需要操作的数据");
+        return;
+      }      
+      this.dialogVisible = true;
+    },
+
+    //删除
+    btnDel() {
+      if (!this.form.id) {
+        this.$message.warning("请选择需要操作的数据");
+        return;
+      }
+      if(this.customerOrgRegister.isComplete.toUpperCase() == 'Y'){
+        this.$message.warning("该单位体检次数已完成，不允许删除套餐");
+        return;
+      }
+
+      this.$confirm("此操作将永久删除该记录, 是否继续?", "提示", {
+        confirmButtonText: "是",
+        cancelButtonText: "  否  ",
+        type: "warning",
+      })
+        .then(() => {
+          return deletapi(`/api/app/customer-org-group/${this.form.id}`);
+        })
+        .then((res) => {
+          if (res.code != -1) {
+            this.$message.success("删除成功");
+            let lfind = arrayExistObj(
+              this.medicalPackages,
+              "id",
+              this.form.id
+            );
+            if (lfind > -1) this.medicalPackages.splice(lfind, 1);
+            objCopy(this.formInit,this.form)
+            this.isDrag = false
+          }
+        })
+        .catch((err) => {
+          if (err == "cancel") {
+            this.$message.info("已取消删除");
+          }
+        });
+    },
+
+    onSubmit(formName) {
+      this.$refs[formName].validate((valid, fields) => {
+        if (!valid) {
+          this.$message.warning(fields[Object.keys(fields)[0]][0].message);
+          return false;
+        }
+
+        if (!this.form.customerOrgRegisterId) {
+          this.$message.warning("请选择单位体检次数！");
+          return false;
+        }
+
+        let body = deepCopy(this.form);
+        delete body.id;
+        delete body.medicalPackageId;
+        delete body.isComplete; 
+
+        if (this.form.id) {
+          //编辑
+          putapi(`/api/app/customer-org-group/${this.form.id}`, body).then(
+            (res) => {
+              if (res.code != -1) {
+                this.$message.success("操作成功！");
+                let lfind = arrayExistObj(
+                  this.medicalPackages,
+                  "id",
+                  this.form.id
+                );
+                if (lfind > -1)
+                  objCopy(this.form, this.medicalPackages[lfind]);
+                this.dialogVisible = false;
+              }
+            }
+          );
+        } else {
+          //新增
+          postapi(
+            "/api/customerorggroup/createcustomerorggroupincustomerorgregister",
+            body
+          ).then((res) => {
+            if (res.code != -1) {
+              this.$message.success("操作成功！");
+              this.form.id = res.data.id;
+              this.medicalPackages.push(deepCopy(res.data));
+              this.$refs['medicalPackages'].setCurrentRow(this.medicalPackages[this.medicalPackages.length - 1]);              
+              this.dialogVisible = false;
+            }
+          });
+        }
+      });
+    },
+
+    computePrice(){
+      if(!this.form.id){
+        this.$message.warning("尚未保存信息，不可执行此操作！")
+        return
+      }
+      let customerOrgGroupId = this.form.id
+      let customerOrgGroupAsbitems = [] //套餐包含的套餐
+
+
+      getapi(`/api/app/customerorggroupdetail/getcustomerorggroupdetailinasbitem?CustomerOrgGroupId=${customerOrgGroupId}
+      `).then(res => {
+        if(res.code != -1){
+          customerOrgGroupAsbitems = res.data;
+
+          if(customerOrgGroupAsbitems.length < 1){
+            this.$message.warning("当前套餐尚未设置组合项目，不可执行此操作！")
+          }else{
+            let body = {
+              customerOrgGroupId,
+              details:this.madeNewGroupAsbitems(customerOrgGroupAsbitems,this.form.price)
+            }
+            console.log('body',body)
+            return postapi('/api/app/customerorggroupdetail/createcustomerorggroupdetailmany',body)
+          }
+        }
+      }).then(res =>{
+        if(res.code != -1){
+          //this.$message.success("操作成功");
+          //触发套餐明细刷新
+          this.form.id = ''
+          //要做延时处理，否则不会触发监听
+          setTimeout(() => { 
+            this.form.id = customerOrgGroupId;
+            this.onSubmit('form')
+          }, 100)
+          
+        }
+      })      
+
+    },
+
+    madeNewGroupAsbitems(oldGroupAsbitems,newTotal){
+      newTotal = Number(newTotal).toFixed(2)
+      let newGroupAsbitems = []
+      let oldTotal = Number(0)
+      oldGroupAsbitems.forEach(e =>{
+        oldTotal += Number(e.asbitemMoney) //customerOrgGroupDetailMoney
+      })
+      oldTotal = Number(oldTotal).toFixed(2)
+
+      let discount = 0
+      if(oldTotal != 0) discount = (newTotal * 100 /oldTotal).toFixed(2)
+
+      oldTotal = Number(0)
+      oldGroupAsbitems.forEach(e =>{
+        e.customerOrgGroupDetailPrice = (e.price * discount/100).toFixed(2)
+        e.customerOrgGroupDetailMoney = (e.customerOrgGroupDetailPrice * e.customerOrgGroupDetailAmount).toFixed(2)
+        oldTotal += Number(e.customerOrgGroupDetailMoney)
+      })
+      oldTotal = Number(oldTotal).toFixed(2)
+
+      //console.log('discount,oldTotal',discount,oldTotal)
+
+      let didTotal = Number(newTotal - oldTotal).toFixed(2)
+      if(didTotal != 0){
+        for(let i = 0;i<oldGroupAsbitems.length;i++){
+          if(oldGroupAsbitems[i].customerOrgGroupDetailAmount == 1){
+            oldGroupAsbitems[i].customerOrgGroupDetailPrice = (Number(oldGroupAsbitems[i].customerOrgGroupDetailPrice) + Number(didTotal)).toFixed(2)
+            break
+          }
+        }
+      }
+
+      oldGroupAsbitems.forEach(e =>{
+        newGroupAsbitems.push({
+          customerOrgGroupId:e.customerOrgGroupId,
+          asbitemId:e.asbitemId,
+          price:e.customerOrgGroupDetailPrice,
+          amount:e.customerOrgGroupDetailAmount
+        })       
+      })
+
+      return newGroupAsbitems
+    },
+
+  },
+};
+</script>
+<style scoped>
+@import "../../assets/css/global_button.css";
+@import "../../assets/css/global_dialog.css";
+@import "../../assets/css/global_table.css";
+@import "../../assets/css/global_form.css";
+@import "../../assets/css/global_input.css";
+@import "../../assets/css/global.css";
+
+.btnClass {
+  width:100px;
+  margin-bottom: 5px
+}
+</style>
\ No newline at end of file
diff --git a/src/views/customerOrg/customerOrgGroup.vue b/src/views/customerOrg/customerOrgGroup.vue
index fe63335..9c3fcf2 100644
--- a/src/views/customerOrg/customerOrgGroup.vue
+++ b/src/views/customerOrg/customerOrgGroup.vue
@@ -382,7 +382,7 @@ export default {
       ).then((res) => {
         this.$message.success("操作成功");
         currentRow = this.customerOrgGroups.splice(lfind,1)[0]  //删除并赋值
-        this.customerOrgGroups.unshift(currentRow)
+        this.customerOrgGroups.push(currentRow)
         this.$refs['customerOrgGroups'].setCurrentRow(currentRow); 
       });
       
diff --git a/src/views/customerOrg/patientRegisterImport.vue b/src/views/customerOrg/patientRegisterImport.vue
index 1c2413b..56df387 100644
--- a/src/views/customerOrg/patientRegisterImport.vue
+++ b/src/views/customerOrg/patientRegisterImport.vue
@@ -1,26 +1,75 @@
 <template>
   <div>
-    <div>123</div>
-    <el-dialog title="选择文件" :visible.sync="dialogGroup[0]" width="400" height="800" :show-close="false"
+    <el-card>
+      <div slot="header">批量预登记</div>
+      <div style="display: flex;margin-bottom: 10px;">
+        <div>
+          <a :underline="false" href="/files/单位体检人员名单导入模板.xlsx"><el-button class="btnClass">下载导入模版</el-button></a>
+        </div>
+        <div>
+          <el-button class="btnClass" @click="seq = 0">导入</el-button>
+        </div>
+      </div>
+      <div>
+        <el-table :data="tableData" border 
+          :height="window.pageHeight < 600 ? 405 : (window.pageHeight - 195)"
+          highlight-current-row size="small" >
+          <el-table-column type="index" label="序号" width="40" align="center"/>
+        </el-table>
+      </div>
+    </el-card>
+
+    <el-dialog title="请选择导入方式" :visible.sync="dialogGroup.mode" width="600px" :show-close="false"
       :append-to-body="true" :close-on-click-modal="false">
+      <div style="height:300px;margin-left: 200px;">
+        <br/><el-radio v-model="mode" label="10">从Excle导入</el-radio>
+        <br/><br/>
+        <el-radio v-model="mode" label="20">从以往体检资料中导入</el-radio>
+      </div>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="btnNext">下一步</el-button>
+        <el-button type="primary" @click="btnFirst">下一步</el-button>
         <el-button @click="seq = -1">关闭</el-button>
       </span>      
     </el-dialog> 
-    <el-dialog title="选择文件" :visible.sync="dialogGroup[1]" width="400" height="800" :show-close="false"
+
+    <el-dialog title="导入EXCEL注意事项" :visible.sync="dialogGroup.fileReadme" width="600px" :show-close="false"
       :append-to-body="true" :close-on-click-modal="false">
+      <div style="height:300px;padding: 0 50px; ">
+        <br/>导入Excel时，Excel的格式必须符合一定规范，该格式的模板文件放在程序的执行目录下，文件名为："单位体检人员名单导入模板.xls"        
+        <br/>注意事项如下:
+        <br/>
+        <div style="margin-left: 28px;">1:姓名不能为空，其余数据可根据实际情况选择是否填写。
+          <br/>2:部门、单位分组、性别、婚姻状况、人员类别、体检类别、民族必须与本软件系统中的名称完全一致。
+          <br/>3:年龄和出生日期可以只填一栏，系统将自动对年龄和出生日期进行相互转换。
+          <br/>4:Excel的实际列数不能超过20列。
+        </div>
+      </div>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="btnPre">上一步</el-button>
-        <el-button type="primary" @click="btnNext">上一步</el-button>
+        <el-button type="primary" @click="seq--">上一步</el-button>
+        <el-button type="primary" @click="seq++">下一步</el-button>
         <el-button @click="seq = -1">关闭</el-button>
       </span>      
-    </el-dialog>   
+    </el-dialog>  
+
+    <el-dialog title="选择文件" :visible.sync="dialogGroup.fileChoose" width="600px" :show-close="false"
+      :append-to-body="true" :close-on-click-modal="false">
+      <div style="height:300px;padding: 0 50px; ">
+        <div><input type="file" accept=".xlsx,.xls" @change="changeFileChoose" /></div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="seq--">上一步</el-button>
+        <el-button type="primary" @click="seq++">下一步</el-button>
+        <el-button @click="seq = -1">关闭</el-button>
+      </span>
+    </el-dialog> 
+     
   </div>
 </template>
 <script>
 import { mapState, mapActions } from "vuex";
 import ExcelJS from "exceljs";
+import { read,readFile, utils } from "xlsx";
+
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
 
 
@@ -30,10 +79,56 @@ export default {
   },
   data() {
     return {      
-      dialogGroup:[true,false,false],
+      dialogGroup:{
+        mode:true,  //选模式 10 开始 文件导入，20开始 从数据库中导入
+        fileReadme:false,
+        fileChoose:false,
+        fileDataChoose:false,
+        fileDataOption:false,        
+      },
       seq: 0,          //当前显示窗口
-      excelCol: [],    //excel数据列名
+      mode: '10',      //模式 10 开始 文件导入，20开始 从数据库中导入
+      excelCols: [{label:'',val:''}],    //excel数据列名
       excelData: [],   //excel表格数据
+
+      dataCols:[
+        {label:'不设置',val:'noSet'},
+        {label:'工卡号',val:'noSet'},
+        {label:'部门',val:'noSet'},
+        {label:'姓名',val:'noSet'},
+        {label:'性别',val:'noSet'},
+        {label:'不设置',val:'noSet'},
+        {label:'工卡号',val:'noSet'},
+        {label:'部门',val:'noSet'},
+        {label:'姓名',val:'noSet'},
+        {label:'性别',val:'noSet'},
+        {label:'年龄',val:'noSet'},
+        {label:'出生日期',val:'noSet'},
+        {label:'婚姻状况',val:'noSet'},
+        {label:'民族',val:'noSet'},
+        {label:'身份证号',val:'noSet'},
+        {label:'电话',val:'noSet'},
+        {label:'手机',val:'noSet'},
+        {label:'电子邮件',val:'noSet'},
+        {label:'邮编',val:'noSet'},
+        {label:'地址',val:'noSet'},
+        {label:'人员类别',val:'noSet'},
+        {label:'体检类别',val:'noSet'},
+        {label:'支付方式',val:'noSet'},
+      ],
+
+
+      tableData:[],
+
+      workBook:null, //EXCEL 工作薄
+      sheetNames:[], //EXCEL 工作薄中的表单
+      readDataOpts:{
+        sheetNameChoosed:'',   //当前选中的表格
+        titleRow:1,   //标题行
+        dataRow:2,    //读取开始数据行
+      }
+      
+
     };
   },
 
@@ -52,11 +147,10 @@ export default {
   },
 
   methods: {
-    //上一步
-    btnPre() {
-      if(this.seq == 0) return;
-      this.seq--;
-      this.setDialogDisp();
+
+    //第一次点下一步
+    btnFirst() {
+      this.seq = parseInt(this.mode)
     },
 
     //下一步
@@ -66,6 +160,61 @@ export default {
       this.setDialogDisp();
     },
 
+    btnImport(seq){
+      let keys = Object.keys(this.dialogGroup)
+
+      if(seq == 9){
+        this.workBook = null
+        this.sheetNameChoosed = ''
+        seq =0
+      }
+      if(seq == 19) seq =0
+
+      // console.log('keys',keys)
+      switch (seq) {
+        case -1:
+          //关闭所有弹窗
+          keys.forEach(e =>{
+            this.dialogGroup[e] = false
+          })
+          break;      
+        case 0:
+          //关闭所有弹窗
+          keys.forEach(e =>{
+            if(e == 'mode'){
+              this.dialogGroup[e] = true
+            }else{
+              this.dialogGroup[e] = false
+            }            
+          })          
+          break;
+        case 10:
+          //关闭所有弹窗
+          keys.forEach(e =>{
+            if(e == 'fileReadme'){
+              this.dialogGroup[e] = true
+            }else{
+              this.dialogGroup[e] = false
+            }            
+          })          
+          break;
+        case 11:
+          //关闭所有弹窗
+          keys.forEach(e =>{
+            if(e == 'fileChoose'){
+              this.dialogGroup[e] = true
+            }else{
+              this.dialogGroup[e] = false
+            }            
+          })          
+          break;
+        default:
+          
+          break;
+      }
+      
+    },
+
     //显示数据
     setDialogDisp(){
       this.dialogGroup.forEach((item,index) =>{
@@ -78,71 +227,182 @@ export default {
       });
     },
 
-    onFileChange(event) {
-      // 获取上传的文件
-      const file = event.target.files[0];
-
+    changeFileChoose(e) {
+      // 获取选择的文件
+      let file = e.target.files[0];
       // 调用导入Excel文件的方法
-      this.importExcelFile(file);
+      console.log('file',file,file.type)
+      this.readFile(file);
+    },
+
+    //sheetjs 读取文件
+    readFile(file){
+      const reader = new FileReader();
+      reader.readAsBinaryString(file);
+      // reader.readAsArrayBuffer(file);
+      reader.onload = (e) => {
+        let data = e.target.result;
+        // let typedArray = new Uint8Array(data);
+        // var workBook = read(typedArray,{type:'array'})
+        this.workBook = read(data,{type:'binary',cellDates:true})
+        // var workBook = readFile(file); //后端读法
+        this.sheetNames = []
+        this.workBook.SheetNames.forEach(e =>{
+          this.sheetNames.push({sheetName:e})
+        })
+        this.sheetNames = this.workBook.SheetNames
+        console.log('workBook',workBook)
+        var sheet_name_list = workBook.SheetNames;
+        sheet_name_list.forEach(function(e,index) {
+          var worksheet = workBook.Sheets[e];
+          console.log(e,index,worksheet)
+          let jsonData = utils.sheet_to_json(worksheet,{header:1}) //raw:false,range:1 从第几行开始读取
+          console.log('jsonData',jsonData)
+          utils.sheet_to_formulae()
+          /* DO SOMETHING WITH worksheet HERE */
+        });
+      }
     },
 
+    //读取数据
+    readData(){
+      if(!this.workBook || !this.readDataOpts.sheetNameChoosed){
+        this.$message.warning("请选择文件及要导入的表格")
+        return
+      }
+
+      if(this.readDataOpts.titleRow <= 0){
+        this.$message.warning("标题行不能小于1")
+        return
+      }
+      if(this.readDataOpts.dataRowRow <= 0){
+        this.$message.warning("数据行不能小于2")
+        return
+      }
+
+      let worksheet = this.workBook.Sheets[this.readDataOpts.sheetNameChoosed];   
+      let temp 
+      
+      // = utils.sheet_to_json(worksheet,{header:1}) //raw:false,range:1 从第几行开始读取
+
+
+    },
+
+
+    
+    
+    //导入ExcelFile 的数据
     importExcelFile(file) {
-      this.filepopupdialogVisible = true;
 
-      console.log("333");
       // 创建一个工作簿
       const workbook = new ExcelJS.Workbook();
+
+      console.log('workbook',workbook)
       // 读取Excel文件
       const reader = new FileReader();
-      console.log(reader);
+
       reader.onload = () => {
         const buffer = reader.result;
         const typedArray = new Uint8Array(buffer);
+
+        //application/vnd.ms-excel
         const blob = new Blob([typedArray], {
-          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+          //type  xlsx:application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, xls:application/vnd.ms-excel
+          type: file.type, 
         });
 
         // 从Blob中读取Excel文件
-        workbook.xlsx.load(blob).then((workbook) => {
+        workbook.xlsx.load(blob).then((wb) => {
+          console.log('wb',wb);
           // 获取第一个工作表
-          const worksheet = workbook.getWorksheet(1);
+          const worksheet = wb.getWorksheet(1);          
+          console.log('worksheet',worksheet);
           // 处理Excel文件内容
           worksheet.eachRow((row, rowNumber) => {
-            // const rowData = row.values;
-            // this.rowData = row.values;
-
-            // console.log(this.rowData,'rowdata');
-            // console.log(rowData);
-            //console.log('row,rowNumber',row,rowNumber);
-            this.importData.push(row.values);
+            console.log(row.values);
+            this.excelData.push(row.values);
 
-            // console.log(`第${rowNumber}行的数据：${rowData}`);
+            // console.log(`第${row.rowNumber}行的数据：${row.rowData}`);
           });
         });
       };
       reader.readAsArrayBuffer(file);
     },
 
-    parseImportData(importData) {
-      console.log("importData", importData.length, importData);
-      importData.forEach((item) => {
-        item.forEach((item2) => {
-          // this.$set(item2[0], "name", true);
-          item2[0]['names'] = true
-          console.log(item2);
-          // console.log(item2);
-        });
-        // console.log(item,'item',item.length);
+    
+
+    //导入后数据分析
+    parseexcelData(startRow) {
+      if (!this.excelData || this.excelData.length == 0) return;
+      let cols = [];
+      let record = {};
+      this.excelData.forEach((item, index) => {
+        console.log(index, item);
+        if (index == startRow - 2) {
+          item.forEach((e, i) => {
+            console.log("e", i, e);
+            if (i > 0) {
+              if (e) {
+                this.tableDataCol.push({ excelCol: e, apiCol: "", label: e });
+                cols.push(e);
+              } else {
+                this.tableDataCol.push({
+                  excelCol: `第${Number(i) + 1}列`,
+                  apiCol: "",
+                  lebel: `第${Number(i) + 1}列`,
+                });
+                cols.push(`第${Number(i) + 1}列`);
+              }
+            }
+          });
+        } else if (index > startRow - 2) {
+          for (let i = 0; i < item.length; i++) {
+            if (i > 0) {
+              console.log("cols[i]", i, cols[i - 1]);
+              if (item[i]) {
+                record[cols[i - 1]] = item[i];
+              } else {
+                record[cols[i - 1]] = null;
+              }
+            }
+          }
+          this.tableData.push({ ...record });
+        }
       });
+
+      // console.log("tableDataCol", this.tableDataCol);
+      // console.log("tableData", this.tableData);
     },
+    
+
+  },
 
+  watch: {
+    "seq":{
+      immediate: true, // 立即执行
+      // deep: true, // 深度监听复杂类型内变化
+      handler(newVal,oldVal){
+        console.log('watch:seq:',newVal,oldVal)
+        if(newVal != oldVal){
+          this.btnImport(newVal);                 
+        }
+      }
+    },
   },
 
 
 };
 </script>
 <style scoped>
-.box {
-  display: flex;
+@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';
+
+.btnClass{
+  margin-right: 10px;
 }
 </style>
diff --git a/src/views/doctorCheck/personnelBatch.vue b/src/views/doctorCheck/personnelBatch.vue
index 9f172fa..da37905 100644
--- a/src/views/doctorCheck/personnelBatch.vue
+++ b/src/views/doctorCheck/personnelBatch.vue
@@ -470,6 +470,7 @@ export default {
     handleCurrentChange(val) {
       this.currentRow = val;
     },
+
     onFileChange(event) {
       // 获取上传的文件
       const file = event.target.files[0];
@@ -477,6 +478,7 @@ export default {
       this.importExcelFile(file);
       this.parseImportData();
     },
+    
     importExcelFile(file) {
       this.filepopupdialogVisible = true;
       console.log("333");