From b9961a7c18bd8fe30bce6cf946110260ed650a61 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Fri, 3 May 2024 22:21:06 +0800
Subject: [PATCH] dj

---
 src/components/doctorCheck/CheckItemList.vue  |   8 +-
 .../patientRegister/PatientRegisterEdit.vue   | 107 ++++++++-------
 .../patientRegister/PatientRegisterItem.vue   |  41 +++---
 .../patientRegister/PatientRegisterList.vue   | 124 +++++++++---------
 vue.config.js                                 |   8 ++
 5 files changed, 159 insertions(+), 129 deletions(-)

diff --git a/src/components/doctorCheck/CheckItemList.vue b/src/components/doctorCheck/CheckItemList.vue
index b227ef6..36ec4d1 100644
--- a/src/components/doctorCheck/CheckItemList.vue
+++ b/src/components/doctorCheck/CheckItemList.vue
@@ -6,7 +6,7 @@
       <el-table-column prop="result" label="结果" min-width="200">
         <template slot-scope="scope">
           <div style="display: flex;">
-            <el-autocomplete style="width: 100%;font: 14px 'Microsoft YaHei';" type="textarea" v-model="scope.row.result" placeholder="请输入结果值"
+            <el-autocomplete style="width: 100%;" type="textarea" v-model="scope.row.result" placeholder="请输入结果值"
               :disabled="rowResultDisabled(scope.row)" :autosize="{ minRows: 1, maxRows: 10 }" :trigger-on-focus="false"
               :fetch-suggestions="querySearch" :data-lineModeFlag="scope.row.lineModeFlag"
               @input="madeTooltips(scope.$index); computeFun(scope.$index)" v-bind:class="scope.row.class">
@@ -47,7 +47,7 @@
             </div>
           </div>
           <div>录入结果：</div>
-          <el-input id="resultBox" style="width: 100%;" type="textarea" :autosize="{ minRows: 4, maxRows: 4 }"
+          <el-input id="resultBox" style="width: 100%;" class="commonFont" type="textarea" :autosize="{ minRows: 4, maxRows: 4 }"
             v-model="moreResult.result" />
         </div>
         <span slot="footer" class="dialog-footer">
@@ -661,6 +661,10 @@ export default {
   color: v-bind("tipsSuper.color") !important;
   font-family: "Microsoft YaHei";
 }
+
+::v-deep .commonFont .el-textarea__inner{
+  font-family: "Microsoft YaHei";
+}
 </style>
 
 
diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index 110f401..032c875 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -21,13 +21,19 @@
           <el-form ref="form" :model="form" label-width="80px" :rules="rules" size="medium">
             <el-row>
               <el-col :span="5">
-                <el-form-item label="单位名称" prop="customerOrgId">
+                <el-form-item label="单位名称" prop="customerOrgName">
+                  <el-input placeholder="请选择单位" v-model="form.customerOrgName" size="small" disabled>
+                    <el-button slot="append" icon="el-icon-search" @click="report.dialogCusOrgOCX = true"
+                      style="font-size: 20px;"></el-button>
+                  </el-input>
+                  <!--
                   <el-cascader v-model="form.customerOrgId" :options="patientRegister.customerOrgTreeAll"
                     :style="'width:' + Math.floor((window.pageWidth - 510) / 4.8) + 'px;'" filterable
                     popper-class="example" :show-all-levels="false" @change="changeCustomerOrgId"
                     :props="{ checkStrictly: true, expandTrigger: 'hover', ...customerOrg.treeprops, }"
                     :disabled="(form.completeFlag == '3' || isDoctor != '1') ? true : false" size="small">
                   </el-cascader>
+                  -->
                 </el-form-item>
               </el-col>
               <el-col :span="5">
@@ -562,6 +568,8 @@ export default {
         patientId: "00000000-0000-0000-0000-000000000000", //档案号ID 选择了档案就传档案号，未选就传00000-0000...
         patientNo: "", //档案号
         customerOrgId: ["00000000-0000-0000-0000-000000000001"], //单位编号 默认个人 
+        customerOrgParentId: "",
+        customerOrgName: "",
         customerOrgRegisterId: "00000000-0000-0000-0000-000000000001", //默认单位体检次数
         customerOrgGroupId: null, //分组
         medicalPackageId: null, //套餐
@@ -722,7 +730,7 @@ export default {
     dddw, moment, checkPagePriv,
 
     btnTest() {
-      console.log('form', this.form)
+      // console.log('form', this.form)
     },
     //数据初始化
     dictInit() {
@@ -827,7 +835,7 @@ export default {
       //   }
       // });
 
-      // console.log("dict", this.dict);
+      // // console.log("dict", this.dict);
     },
 
 
@@ -843,13 +851,14 @@ export default {
 
       } else {
         // let res = await getapi(`/api/app/patient-register/${patientRegisterId}`)
-        let res = await postapi(`/api/app/patientregister/getinfoorpatient?PatientRegisterId=${patientRegisterId}`)
+        let res = await postapi('/api/app/patientregister/getinfoorpatient', { patientRegisterId })
         // this.form = res.data  这种方式，会造成 checkbox 值变化不响应，故取消
         objCopy(res.data, this.form)
       }
       this.initBox();
       this.getPeoplePhoto(this.form.photo)
-      this.dataTransOpts.refresh.register_check_asbitem.D++ //触发所选组合项目刷新  
+
+      // this.dataTransOpts.refresh.register_check_asbitem.D++ //触发所选组合项目刷新  
 
       // 单位/个人 的分组与套餐处理
       this.changeCustomerOrgId(this.form.customerOrgId)
@@ -859,7 +868,7 @@ export default {
 
     //快速选择组合项目时，调整可按拼间简码及简称查找
     filterMethod(keyWords) {
-      //console.log('filterMethod',this.asbItemQuick)  
+      //// console.log('filterMethod',this.asbItemQuick)  
       if (keyWords) {
         this.nation = [];
         this.dict.nation.forEach(item => {
@@ -875,7 +884,7 @@ export default {
 
     //选择单位
     async changeCustomerOrgId(v) {
-      // console.log('changeCustomerOrgId',v)
+      // // console.log('changeCustomerOrgId',v)
       let customerOrgId = ""
       if (Array.isArray(v) && v.length > 0) {
         customerOrgId = v[v.length - 1]
@@ -928,7 +937,7 @@ export default {
           let res = await getapi(`/api/app/customer-org/parent/${customerOrgId}`)
           if (res.code != -1) customerOrgParentId = res.data
         } catch (error) {
-          console.log('获取顶级单位ID出错：', error)
+          // console.log('获取顶级单位ID出错：', error)
         }
       } else if (customerOrgId.length > 0) {
         customerOrgParentId = customerOrgId[0]
@@ -942,7 +951,7 @@ export default {
       getapi(`/api/app/customerorgregister/getlistincustomerorgid?CustomerOrgId=${customerOrgParentId}`)
         .then(res => {
           if (res.code > - 1) {
-            console.log('获取单位体检次数', this.form.customerOrgRegisterId, res.data)
+            // console.log('获取单位体检次数', this.form.customerOrgRegisterId, res.data)
             this.customerOrgRegisterList = res.data
             if (!this.form.customerOrgRegisterId) {
               let customerOrgRegisterList = arrayFilter(res.data, 'isComplete', 'N')  //不显示已完成的体检次数
@@ -967,7 +976,7 @@ export default {
         return
       }
       this.$peisAPI.peopleIcCard().then(res => {
-        console.log('peopleIcCard', res)
+        // console.log('peopleIcCard', res)
         let lres = JSON.parse(res)
         if (lres.code >= -1) {
           let idNos = parsIcCardtoLocal(lres.data, this.dict.sex, this.dict.nation)
@@ -1125,7 +1134,7 @@ export default {
       //编辑的时候不查重
       if (this.form.id || !param) return;
 
-      //console.log(`/api/app/patient/in-filter?Filter=${param}`)
+      //// console.log(`/api/app/patient/in-filter?Filter=${param}`)
       let body = {
         filter: param,
         maxResultCount: 500
@@ -1133,7 +1142,7 @@ export default {
 
       postapi('/api/app/patient/getlistinfilter', body).then((res) => {
         if (res.code > -1) {
-          console.log("查重 ", res); //有数据才显示
+          // console.log("查重 ", res); //有数据才显示
           if (res.data && res.data.length > 0) {
             this.patientList = res.data;
             this.dialogVisible = true;
@@ -1224,7 +1233,7 @@ export default {
       } else {
         this.form[type] = 'N';
       }
-      console.log('Box-type', this.form[type + 'Box'], this.form[type])
+      // console.log('Box-type', this.form[type + 'Box'], this.form[type])
     },
 
     initBox() {
@@ -1261,8 +1270,8 @@ export default {
     madePrBody() {
       //赋值
       let body = deepCopy(this.form);
-      // console.log('this.form',this.form)
-      // console.log('body',body)
+      // // console.log('this.form',this.form)
+      // // console.log('body',body)
       if (this.form.birthDate) {
         try {
           body.birthDate = moment(body.birthDate).format("yyyy-MM-DD")
@@ -1279,7 +1288,7 @@ export default {
       } else {
         body.age = Number(body.age)
       }
-      // console.log('body',body)
+      // // console.log('body',body)
       // Invalid date
 
       delete body.registerManType;
@@ -1308,7 +1317,7 @@ export default {
       }
 
       //日期转换 日期控件增加格式
-      // console.log("body.birthDate", body.birthDate);
+      // // console.log("body.birthDate", body.birthDate);
       // if (body.birthDate) {
       //   body.birthDate = moment(new Date(body.birthDate)).format(
       //     "yyyy-MM-DD"
@@ -1320,7 +1329,7 @@ export default {
     //提交
     btnSubmit(formName, msgTip) {
       this.$refs[formName].validate((valid, fields) => {
-        console.log('fields', fields)
+        // console.log('fields', fields)
         if (!valid) {
           this.$message.warning({ showClose: true, message: fields[Object.keys(fields)[0]][0].message });
           return false
@@ -1347,7 +1356,7 @@ export default {
         } else {
           delete body.id;
         }
-        // console.log(`/api/patientregister/createreturninfo`, body);
+        // // console.log(`/api/patientregister/createreturninfo`, body);
         postapi(`/api/PatientRegister/CreatePatientRegister`, body)
           .then(res => {
             if (res.code == 1) {
@@ -1419,7 +1428,7 @@ export default {
         e.isCharge = 'N'
         e.isLock = 'N'
       });
-      // console.log('this.patientRegister.patientRegisterAbs',this.patientRegister.patientRegisterAbs)
+      // // console.log('this.patientRegister.patientRegisterAbs',this.patientRegister.patientRegisterAbs)
       this.$message.info({ showClose: true, message: "操作成功，请记得点保存" });
 
     },
@@ -1429,7 +1438,7 @@ export default {
       deletapi(
         `/api/app/customer-org/${this.customerOrg.customerOrgRd.id}`
       ).then((res) => {
-        console.log("删除 操作成功");
+        // console.log("删除 操作成功");
         this.setData({ key: "customerOrg.customerOrgRd", value: { id: "" } });
         this.getCustomerOrgTree();
       });
@@ -1456,7 +1465,7 @@ export default {
       }
       this.$peisAPI.photoGrah()
         .then(res => {
-          console.log('this.$peisAPI.photoGrah 原始返回结果', res)
+          // console.log('this.$peisAPI.photoGrah 原始返回结果', res)
           let lres = JSON.parse(res)
           if (lres.code > -1) {
             let uploadPhoto = {
@@ -1475,17 +1484,17 @@ export default {
               patientRegisterId: this.form.id,
               photo: res.data,
             };
-            console.log(body);
+            // console.log(body);
             return postapi(`/api/app/patient-register/update-photo`, body);
           }
         }).then(res => {
           if (res && res.code > -1) {
-            //console.log('拍照',res.data)
+            //// console.log('拍照',res.data)
             this.patientRegister.patientRegisterRd.photo = res.data.photo
-            console.log("操作成功");
+            // console.log("操作成功");
           }
         }).catch(err => {
-          console.log('this.$peisAPI.photoGrah', err)
+          // console.log('this.$peisAPI.photoGrah', err)
           this.$message.error({ showClose: true, message: `照片操作错误 ${err}` })
         })
     },
@@ -1526,7 +1535,7 @@ export default {
           .then((res) => {
             if (res.code != -1) {
               toOutShell.ReportTable = res.data;
-              console.log('JSON.stringify(toOutShell)', JSON.stringify(toOutShell));
+              // console.log('JSON.stringify(toOutShell)', JSON.stringify(toOutShell));
               return this.$peisAPI.printPre(JSON.stringify(toOutShell));
             }
           })
@@ -1536,13 +1545,13 @@ export default {
         */
         this.$peisAPI.printPre(JSON.stringify(toOutShell))
           .then(res => {
-            console.log('this.$peisAPI.printPre', res)
+            // console.log('this.$peisAPI.printPre', res)
             if (JSON.parse(res).code < 0) {
               this.$message.warning({ showClose: true, message: JSON.parse(res).message });
             }
           })
           .catch((err) => {
-            console.log('打印指引单错误', err)
+            // console.log('打印指引单错误', err)
             this.$message.warning({ showClose: true, message: `${err}` });
           });
       } else {
@@ -1551,7 +1560,7 @@ export default {
         //   .then((res) => {
         //     if (res.code != -1) {
         //       toOutShell.ReportTable = res.data;
-        //       console.log('JSON.stringify(toOutShell)', JSON.stringify(toOutShell));
+        //       // console.log('JSON.stringify(toOutShell)', JSON.stringify(toOutShell));
         //       return this.$peisAPI.print(JSON.stringify(toOutShell));
         //     }
         //   })
@@ -1598,7 +1607,7 @@ export default {
 
       try {
         res = await postapi(`/api/app/lisrequest/setlisrequest?PatientRegisterId=${this.form.id}`);
-        console.log(`/api/app/lisrequest/setlisrequest?PatientRegisterId=${this.form.id}`, res)
+        // console.log(`/api/app/lisrequest/setlisrequest?PatientRegisterId=${this.form.id}`, res)
       } catch (error) {
         return;
       }
@@ -1655,26 +1664,26 @@ export default {
           { Name: 'hisLog', Value: 'pic/hisLog.jpg' },
         ],
       };
-      console.log('this.$peisAPI.print', toOutShell)
+      // console.log('this.$peisAPI.print', toOutShell)
       if (isPreview) {
         this.$peisAPI.printPre(JSON.stringify(toOutShell))
           .then(res => {
             let lres = JSON.parse(res)
-            console.log('this.$peisAPI.printPre', lres)
+            // console.log('this.$peisAPI.printPre', lres)
             if (lres.code < 0) {
-              console.log('打印检验条码错误', lres.message)
+              // console.log('打印检验条码错误', lres.message)
               this.$message.warning({ showClose: true, message: lres.message });
             }
           })
           .catch((err) => {
-            console.log('打印检验条码错误', err)
+            // console.log('打印检验条码错误', err)
             this.$message.warning({ showClose: true, message: `${err}` });
           });
       } else {
         this.$peisAPI.print(JSON.stringify(toOutShell))
           .then(res => {
             let lres = JSON.parse(res)
-            console.log('打印检验条码', lres)
+            // console.log('打印检验条码', lres)
             if (res && lres.code > -1) {
               return postapi('/api/app/lisrequest/updatelisrequestisprint', { operateType: 1, patientRegisterId: this.form.id })
             } else {
@@ -1811,10 +1820,10 @@ export default {
     triggerHeadSave() {
       //id不为空则编辑 api/patientregister/updatepatientregister
       let body = this.madePrBody()
-      // console.log(`/api/patientregister/updatepatientregister?PatientRegisterId=${this.form.id}`, body);
+      // // console.log(`/api/patientregister/updatepatientregister?PatientRegisterId=${this.form.id}`, body);
       postapi(`/api/patientregister/updatepatientregister?PatientRegisterId=${this.form.id}`, body).then((res) => {
         if (res.code != -1) {
-          console.log("操作成功");
+          // console.log("操作成功");
           //一般读身份证照片时，会出现这种情况
           if (this.patientRegister.photo && this.patientRegister.photo.indexOf("data:image") > -1) savePeoplePhoto(this.form.id, this.patientRegister.photo);
           objCopy(this.form, this.patientRegister.patientRegisterRd);
@@ -1827,7 +1836,7 @@ export default {
 
     // 新增保存基本信息产生新的ID，等明细保存后，再更新表单form.id
     refreshFormId() {
-      console.log('refreshFormId', this.prAsbOpraOpts.formId)
+      // console.log('refreshFormId', this.prAsbOpraOpts.formId)
       this.form.id = this.prAsbOpraOpts.formId
       this.prAsbOpraOpts.formId = '' //清空
 
@@ -1846,14 +1855,14 @@ export default {
     enterToTab() {
       this.$nextTick(() => {
         let inputs = document.querySelectorAll("form input"); //用数组可以读取多个标签的元素  //.inline-input
-        //console.log('inputs',inputs);
+        //// console.log('inputs',inputs);
         // 为每个输入框添加键盘事件监听器
         inputs.forEach((input, i) => {
 
           input.addEventListener('keydown', (event) => {
 
             // 如果按下的是回车键
-            // console.log('data-ismultiline',input.getAttribute('data-ismultiline'));
+            // // console.log('data-ismultiline',input.getAttribute('data-ismultiline'));
 
             if (event.keyCode === 13) {
               // 阻止回车键的默认行为（换行）
@@ -1880,14 +1889,14 @@ export default {
     "dataTransOpts.refresh.patient_register.S": {
       // immediate: true,
       async handler(newVal, oldVal) {
-        console.log(`watch 人员登记 newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.dataTransOpts.tableS.patient_register.id}`);
+        // console.log(`watch 人员登记 newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.dataTransOpts.tableS.patient_register.id}`);
         if (newVal != oldVal) await this.initFormData(this.dataTransOpts.tableS.patient_register.id)
       }
     },
 
     //拍照触发
     // "form.photo"(newVal, oldVal) {
-    //   //console.log('patientRegister.patientRegisterRd.id newVal：',newVal,' oldVal：',oldVal)
+    //   //// console.log('patientRegister.patientRegisterRd.id newVal：',newVal,' oldVal：',oldVal)
     //   if (newVal != oldVal) {
     //     this.getPeoplePhoto(newVal)
     //   }
@@ -1898,7 +1907,7 @@ export default {
     //   // immediate:true,
     //   // // deep:true,
     //   handler(newVal, oldVal) {
-    //     //console.log('patientRegister.patientRegisterRd.id newVal：',newVal,' oldVal：',oldVal)
+    //     //// console.log('patientRegister.patientRegisterRd.id newVal：',newVal,' oldVal：',oldVal)
     //     if (newVal != oldVal) {
     //       this.changeCustomerOrgId(newVal)
     //     }
@@ -1908,12 +1917,12 @@ export default {
     // 从体检人员登记列表 点登记，触发
     // 清空查询条件
     "dataTransOpts.plus.clearPatientRegisterQuery": {
-      immediate: true,
+      // immediate: true,
       handler(newVal, oldVal) {
-        console.log('从体检人员登记列表 点登记，触发', newVal, oldVal)
+        // console.log('从体检人员登记列表 点登记，触发', newVal, oldVal)
         if (newVal != oldVal) {
           this.preCustomerOrgId = this.patientRegister.query.customerOrgId
-          console.log('this.preCustomerOrgId', this.preCustomerOrgId)
+          // console.log('this.preCustomerOrgId', this.preCustomerOrgId)
         }
       }
     },
@@ -1922,6 +1931,10 @@ export default {
 };
 </script>
 <style scoped>
+::v-deep .el-icon-search:before {
+  color: #00F;
+}
+
 .btn {
   margin-top: 5px;
 }
diff --git a/src/components/patientRegister/PatientRegisterItem.vue b/src/components/patientRegister/PatientRegisterItem.vue
index 694cbd4..3cc183e 100644
--- a/src/components/patientRegister/PatientRegisterItem.vue
+++ b/src/components/patientRegister/PatientRegisterItem.vue
@@ -184,7 +184,7 @@ import moment from 'moment';
 import { mapState, mapActions } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import { getPagePriv, checkPagePriv, arrayFilter, arrayReduce, arrayExistObj, dddw, deepCopy, tcdate } from "../../utlis/proFunc";
-import proApi from "../../utlis/proApi";
+
 
 export default {
   props: ["prForm", "prAsbOpraOpts", "triggerHeadSave", "refreshFormId"],
@@ -253,7 +253,8 @@ export default {
     })
   },
   mounted() {
-    // this.getPrAsb(this.dataTransOpts.tableS.patient_register.id)
+    console.log('getPrAsb mounted')
+    this.getPrAsb(this.dataTransOpts.tableS.patient_register.id)
   },
 
   methods: {
@@ -306,7 +307,7 @@ export default {
     },
 
     // 获取人员组合项目信息
-    async getPrAsb(id) {
+    getPrAsb(id) {
       // debugger
       // 清空待删除、分组、套餐
       console.log('getPrAsb(id)', `getPrAsb(${id})`)
@@ -315,26 +316,34 @@ export default {
       this.packageAsbs = []
       if (!id) {
         this.dataTransOpts.tableM.register_check_asbitem = []
+        this.refreshAsbitem()
       } else {
-        let result = await proApi.getPrAsb(id)
-        this.dataTransOpts.tableM.register_check_asbitem = result.data
+        getapi(`/api/app/registerasbitem/getlistinpatientregisterid?PatientRegisterId=${id}`).then(res => {
+          if (res.code > -1) {
+            this.dataTransOpts.tableM.register_check_asbitem = deepCopy(res.data)
+            this.refreshAsbitem()
+          }
+        })
       }
-      this.refreshAsbitem()
+
     },
 
     // 复制新增 拷贝明细项目
-    async copyNew() {
+    copyNew() {
       if (this.oldFormId) {
-        let result = await proApi.getPrAsb(this.oldFormId)
-        this.dataTransOpts.tableM.register_check_asbitem = result.data
-        this.dataTransOpts.tableM.register_check_asbitem.forEach(e => {
-          e.id = '';
-          e.patientRegisterId = '';
-          e.isCharge = 'N';
-          e.checkCompleteFlag = '0'
-          e.isLock = 'N'
+        getapi(`/api/app/registerasbitem/getlistinpatientregisterid?PatientRegisterId=${this.oldFormId}`).then(res => {
+          if (res.code > -1) {
+            this.dataTransOpts.tableM.register_check_asbitem = deepCopy(res.data)
+            this.dataTransOpts.tableM.register_check_asbitem.forEach(e => {
+              e.id = '';
+              e.patientRegisterId = '';
+              e.isCharge = 'N';
+              e.checkCompleteFlag = '0'
+              e.isLock = 'N'
+            })
+            this.refreshAsbitem()
+          }
         })
-        this.refreshAsbitem()
       }
     },
 
diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index e694f19..e964766 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -22,7 +22,8 @@
                 </div>
                 <div v-else-if="dropCol[index].prop == 'completeFlag'"
                   :style="`color: ${setColor(scope.row.isAudit, scope.row.completeFlag)}`">
-                  {{ scope.row.isAudit == 'Y' ? "已审核" : dddw(dict.completeFlag, "id", scope.row.completeFlag, "displayName") }}
+                  {{ scope.row.isAudit == 'Y' ? "已审核" : dddw(dict.completeFlag, "id", scope.row.completeFlag,
+                    "displayName") }}
                 </div>
                 <div v-else-if="dropCol[index].prop == 'guidePrintTimes'">
                   <i class="el-icon-printer" v-if="scope.row.guidePrintTimes > 0" style="font-size: 20px; color: green" />
@@ -366,7 +367,7 @@ export default {
     // 扩展定义表格行样式
     handleRowClassName({ row, rowIndex }) {
       // highLightBg 为 'selected'的高亮
-      //console.log(rowIndex, row)
+      //// console.log(rowIndex, row)
       //return row.highLightBg == 'selected' ? 'high-light-bg' : '';
       if (row.choosed) {
         return "current-row";
@@ -451,7 +452,7 @@ export default {
           .then((res) => {
             if (res.code != -1) {
               toOutShell.ReportTable = res.data;
-              console.log(
+              // console.log(
                 "JSON.stringify(toOutShell)",
                 JSON.stringify(toOutShell)
               );
@@ -459,13 +460,13 @@ export default {
             }
           })
           .then(res => {
-            console.log('this.$peisAPI.printPre', res)
+            // console.log('this.$peisAPI.printPre', res)
             if (JSON.parse(res).code < 0) {
               this.$message.warning(JSON.parse(res).message);
             }
           })
           .catch((err) => {
-            console.log('打印指引单', err)
+            // console.log('打印指引单', err)
             this.$message.warning({ showClose: true, message: err });
           });
         */
@@ -477,7 +478,7 @@ export default {
             }
           })
           .catch((err) => {
-            console.log('打印指引单', err)
+            // console.log('打印指引单', err)
             this.$message.warning({ showClose: true, message: `${err}` });
           });
 
@@ -493,7 +494,7 @@ export default {
             if (resPrintData.code == -1) continue
             toOutShell.ReportTable = resPrintData.data
             resPeisAPI = await this.$peisAPI.print(JSON.stringify(toOutShell));
-            console.log('壳返回结果', resPeisAPI)
+            // console.log('壳返回结果', resPeisAPI)
             if (JSON.parse(resPeisAPI).code < 0) continue
             resPrintTimes = await postapi("/api/app/patientregister/updatepatientregisterguideprinttimesmany", [this.multipleSelection[i].id]);
             if (resPrintTimes.code == -1) continue
@@ -522,7 +523,7 @@ export default {
             }
 
           } catch (error) {
-            console.log('打印指引单', error)
+            // console.log('打印指引单', error)
             this.$message.warning({ showClose: true, message: `${error}` });
           }
 
@@ -537,7 +538,7 @@ export default {
 
     handleSelectionChange(rows) {
       //this.multipleSelection = rows;
-      //console.log('this.multipleSelection',this.multipleSelection)
+      //// console.log('this.multipleSelection',this.multipleSelection)
 
       rows.forEach((item) => {
         item.highLightBg = "selected";
@@ -560,7 +561,7 @@ export default {
     },
 
     //点击体检次数行
-    rowClick(row) {  
+    rowClick(row) {
       // 按住了shift键
       if (this.window.shift) {
         //清除所有选择
@@ -591,20 +592,20 @@ export default {
       } else {
         // 未按住了ctrl 、shift 键
         //清除所有选择
-        console.log("清除所有选择");
+        // console.log("清除所有选择");
         this.tableData.forEach((e, index) => {
           e.choosed = false;
           e.index = index;
         });
-        console.log(this.tableData, row.index);
-        console.log(this.tableData[row.index].choosed);
+        // console.log(this.tableData, row.index);
+        // console.log(this.tableData[row.index].choosed);
 
         this.tableData[row.index].choosed = true;
         this.startPoint = row.index;
       }
 
       //选中了多个点编辑时，排序最前的作为当前选中的
-      console.log('row.index <= this.startPoint', row.index, this.startPoint)
+      // console.log('row.index <= this.startPoint', row.index, this.startPoint)
       let lfind = -1
       for (let i = 0; i < this.tableData.length; i++) {
         if (this.tableData[i].choosed) {
@@ -620,7 +621,7 @@ export default {
         this.dataTransOpts.refresh.register_check_asbitem.M++ //触发所选组合项目刷新       
       }
     },
-    
+
     //体检次数 相关操作
     btnAdd() {
       if (!this.peisid || this.peisid == 'null') {
@@ -653,7 +654,7 @@ export default {
 
     //刷新或添加列表数据
     refreshRegister(patientRegister) {
-      console.log('编辑/新增的 form :', patientRegister)
+      // console.log('编辑/新增的 form :', patientRegister)
     },
 
     //批量正式登记
@@ -678,7 +679,7 @@ export default {
       postapi('/api/app/patientregister/updatepatientregistercompleteflagormedicalstartdate', body)
         .then(res => {
           if (res.code != -1) {
-            console.log('操作成功！')
+            // console.log('操作成功！')
             patientRegisterIds.forEach(e => {
               let lfind = arrayExistObj(this.tableData, 'id', e)
               if (lfind > -1) this.tableData[lfind].completeFlag = completeFlag
@@ -697,7 +698,7 @@ export default {
         this.$message.warning({ showClose: true, message: "请选择要操作的记录" });
         return;
       }
-      //console.log(this.patientRegister.patientRegisterRd,this.tableData)
+      //// console.log(this.patientRegister.patientRegisterRd,this.tableData)
 
       // 触发数据刷新
       this.dataTransOpts.refresh.patient_register.S++  //触发人员信息刷新(会同时刷新组合项目)
@@ -717,7 +718,7 @@ export default {
       if (!id) return
       this.dataTransOpts.tableS.patient_register.id = id
 
-      let res = await postapi(`/api/app/patientregister/getinfoorpatient?PatientRegisterId=${this.dataTransOpts.tableS.patient_register.id}`)
+      let res = await postapi('/api/app/patientregister/getinfoorpatient', { patientRegisterId: this.dataTransOpts.tableS.patient_register.id })
       if (res.code != 1) return
       let currentRow = res.data
 
@@ -778,14 +779,14 @@ export default {
         type: "warning",
       })
         .then(() => {
-          //console.log('{patientRegisterIds}',{patientRegisterIds})
-          return postapi(`/api/app/patient-register/delete-many`, {
+          //// console.log('{patientRegisterIds}',{patientRegisterIds})
+          return postapi(`/ api / app / patient - register / delete -many`, {
             patientRegisterIds,
           });
         })
         .then((res) => {
           if (res.code != -1) {
-            console.log("操作成功");
+            // console.log("操作成功");
             this.dataTransOpts.tableS.patient_register.id = ''
             setTimeout(() => {
               this.dataTransOpts.refresh.register_check_asbitem.M++
@@ -827,14 +828,14 @@ export default {
     async getPrList() {
 
       if (this.loadOpts.skipCount != 0 && this.loadOpts.skipCount * this.loadOpts.maxResultCount >= this.loadOpts.totalCount) return
-      console.log('getPrList', this.loadOpts)
+      // console.log('getPrList', this.loadOpts)
 
       let body = {
         skipCount: this.loadOpts.skipCount,
         maxResultCount: this.loadOpts.maxResultCount
       };
 
-      console.log(`this.patientRegister.query`, this.patientRegister.query);
+      // console.log(`this.patientRegister.query`, this.patientRegister.query);
       if (this.patientRegister.query.customerOrgFlag) {
         // if (this.patientRegister.query.CustomerOrgParentId) {
         //   body.customerOrgId = this.patientRegister.query.CustomerOrgParentId;
@@ -891,7 +892,7 @@ export default {
           patientRegisterNo: this.patientRegister.query.patientRegisterNo,
         };
 
-      console.log("/api/app/patientregister/getlistinfilter", body);
+      // console.log("/api/app/patientregister/getlistinfilter", body);
 
       postapi("/api/app/patientregister/getlistinfilter", body)
         .then(res => {
@@ -924,13 +925,13 @@ export default {
     //滚动加载数据 
     scrollFull() {
       this.dom = this.$refs['info'].bodyWrapper
-      console.log('this.dom', this.dom)
+      // console.log('this.dom', this.dom)
 
       this.dom.addEventListener('scroll', async () => {
-        // console.log('scrollTop',this.dom.scrollTop,'clientHeight',this.dom.clientHeight,'scrollHeight',this.dom.scrollHeight);
+        // // console.log('scrollTop',this.dom.scrollTop,'clientHeight',this.dom.clientHeight,'scrollHeight',this.dom.scrollHeight);
         if (this.dom.scrollTop + this.dom.clientHeight + 20 > this.dom.scrollHeight && !this.lazyLoading) {
           // 获取到的不是全部数据 当滚动到底部 
-          console.log('scrollTop', this.dom.scrollTop, 'clientHeight', this.dom.clientHeight, 'scrollHeight', this.dom.scrollHeight);
+          // console.log('scrollTop', this.dom.scrollTop, 'clientHeight', this.dom.clientHeight, 'scrollHeight', this.dom.scrollHeight);
           if ((Number(this.loadOpts.skipCount) + 1) * Number(this.loadOpts.maxResultCount) >= Number(this.loadOpts.totalCount)) {
             this.lazyLoading = false
           } else {
@@ -946,10 +947,10 @@ export default {
     onCellRightClick(row, column) {
       this.rClickRow = { ...row }; //右击的行记录
       this.rClickColumn = { ...column }; //右击的列（预留）
-      console.log(row, column.property);
+      // console.log(row, column.property);
     },
     onContextmenu(event) {
-      //console.log('onContextmenu',event);
+      //// console.log('onContextmenu',event);
       if (!this.rClickRow) return false;
       let row = { ...this.rClickRow };
       let items = [] //菜单项
@@ -1061,13 +1062,8 @@ export default {
       }
 
       try {
-        res = await postapi(
-          `/api/app/lisrequest/setlisrequest?PatientRegisterId=${prId}`
-        );
-        console.log(
-          `/api/app/lisrequest/setlisrequest?PatientRegisterId=${prId}`,
-          res
-        );
+        res = await postapi(`/ api / app / lisrequest / setlisrequest ? PatientRegisterId = ${ prId }`);
+        // console.log(`/ api / app / lisrequest / setlisrequest ? PatientRegisterId = ${ prId }`,res);
       } catch (error) {
         return;
       }
@@ -1121,16 +1117,16 @@ export default {
         BusinessCode: prId
       };
 
-      console.log('this.$peisAPI.print', toOutShell)
+      // console.log('this.$peisAPI.print', toOutShell)
       if (isPreview) {
         /*
         postapi(
-          `/api/app/printreport/getlisrequestreport?PatientRegisterId=${prId}`
+          `/ api / app / printreport / getlisrequestreport ? PatientRegisterId = ${ prId }`
         )
           .then((res) => {
             if (res.code != -1) {
               toOutShell.ReportTable = { lisRequest: res.data };
-              console.log(
+              // console.log(
                 "JSON.stringify(toOutShell)",
                 JSON.stringify(toOutShell)
               );
@@ -1143,25 +1139,25 @@ export default {
         */
         this.$peisAPI.printPre(JSON.stringify(toOutShell))
           .then(res => {
-            console.log('this.$peisAPI.printPre', res)
+            // console.log('this.$peisAPI.printPre', res)
             if (JSON.parse(res).code < 0) {
               this.$message.warning({ showClose: true, message: JSON.parse(res).message });
             }
           })
           .catch((err) => {
-            console.log('打印检验条码错误', err)
-            this.$message.warning({ showClose: true, message: `${err}` });
+            // console.log('打印检验条码错误', err)
+            this.$message.warning({ showClose: true, message: `${ err }` });
           });
 
       } else {
         /*
         postapi(
-          `/api/app/printreport/getlisrequestreport?PatientRegisterId=${prId}`
+          `/ api / app / printreport / getlisrequestreport ? PatientRegisterId = ${ prId }`
         )
           .then((res) => {
             if (res.code != -1) {
               toOutShell.ReportTable = { lisRequest: res.data };
-              console.log(
+              // console.log(
                 "JSON.stringify(toOutShell)",
                 JSON.stringify(toOutShell)
               );
@@ -1169,7 +1165,7 @@ export default {
             }
           })
           .then((res) => {
-            //console.log("res", res);
+            //// console.log("res", res);
             if (JSON.parse(res).code >= 0) {
               //更新打印状态  /api/app/lisrequest/updatelisrequestisprint
               // {
@@ -1200,12 +1196,12 @@ export default {
           })
           .then(res => {
             if (res && res.code < 0) {
-              this.$message.error({ showClose: true, message: `${res.message}` });
+              this.$message.error({ showClose: true, message: `${ res.message }` });
             }
           })
           .catch((err) => {
-            console.log('打印检验条码错误', err)
-            this.$message.error({ showClose: true, message: `${err}` });
+            // console.log('打印检验条码错误', err)
+            this.$message.error({ showClose: true, message: `${ err }` });
           });
       }
     },
@@ -1234,12 +1230,12 @@ export default {
       if (isPreview) {
         /*
         postapi(
-          `/api/app/printreport/getpacsnoreport?PatientRegisterId=${prId}`
+          `/ api / app / printreport / getpacsnoreport ? PatientRegisterId = ${ prId }`
         )
           .then((res) => {
             if (res.code != -1) {
               toOutShell.ReportTable = { lisRequest: res.data };
-              console.log(
+              // console.log(
                 "JSON.stringify(toOutShell)",
                 JSON.stringify(toOutShell)
               );
@@ -1257,18 +1253,18 @@ export default {
             }
           })
           .catch((err) => {
-            console.log('打印pacs条码错误', err)
-            this.$message.warning({ showClose: true, message: `${err}` });
+            // console.log('打印pacs条码错误', err)
+            this.$message.warning({ showClose: true, message: `${ err }` });
           });
       } else {
         /*
         postapi(
-          `/api/app/printreport/getpacsnoreport?PatientRegisterId=${prId}`
+          `/ api / app / printreport / getpacsnoreport ? PatientRegisterId = ${ prId }`
         )
           .then((res) => {
             if (res.code != -1) {
               toOutShell.ReportTable = { lisRequest: res.data };
-              console.log(
+              // console.log(
                 "JSON.stringify(toOutShell)",
                 JSON.stringify(toOutShell)
               );
@@ -1306,12 +1302,12 @@ export default {
           })
           .then(res => {
             if (res && res.code < 0) {
-              this.$message.error({ showClose: true, message: `${res.message}` });
+              this.$message.error({ showClose: true, message: `${ res.message }` });
             }
           })
           .catch((err) => {
-            console.log('打印pacs条码错误', err)
-            this.$message.error({ showClose: true, message: `${err}` });
+            // console.log('打印pacs条码错误', err)
+            this.$message.error({ showClose: true, message: `${ err }` });
           });
       }
     },
@@ -1324,7 +1320,7 @@ export default {
         delay: 0,
         // 元素被选中
         onChoose: function (/**Event*/ evt) {
-          //console.log('onChoose',evt,evt.oldIndex)
+          //// console.log('onChoose',evt,evt.oldIndex)
           evt.oldIndex; // element index within parent
         },
 
@@ -1335,7 +1331,7 @@ export default {
 
         // 开始拖拽的时候
         onStart: function (/**Event*/ evt) {
-          //console.log('onStart',evt,evt.oldIndex)
+          //// console.log('onStart',evt,evt.oldIndex)
           evt.oldIndex; // element index within parent
         },
         onEnd: (evt) => {
@@ -1344,7 +1340,7 @@ export default {
             dropCol.splice(evt.oldIndex, 1);
             dropCol.splice(evt.newIndex, 0, oldItem);
           }
-          //console.log(this.headerCols, oldItem, dropCol);
+          //// console.log(this.headerCols, oldItem, dropCol);
         },
       });
       return dropCol;
@@ -1357,7 +1353,7 @@ export default {
       this.$nextTick(() => {
         let refsTable = this.$refs[elId]  //.cloneNode(true) true
         let table = document.getElementById(elId)
-        console.log('table,refsTable', table, refsTable)
+        // console.log('table,refsTable', table, refsTable)
 
         let tableData = table.innerHTML
         let fileName = moment(new Date()).format('yyyyMMDDHHmmss')
@@ -1398,7 +1394,7 @@ export default {
       // immediate: true, // 立即执行
       // deep: true, // 深度监听复杂类型内变化
       handler(newVal, oldVal) {
-        //console.log('watch:patientRegister.query.customerOrgId:',newVal,oldVal)
+        //// console.log('watch:patientRegister.query.customerOrgId:',newVal,oldVal)
         // 单位变化时，清除当前列表信息
         if (newVal && newVal != oldVal) {
           this.tableData = []
@@ -1418,7 +1414,7 @@ export default {
     //新增后，触发赋值
     // "patientRegister.patientRegisterRd.id"(newVal, oldVal) {
     //   if (newVal != oldVal) {
-    //     //console.log('patientRegister.patientRegisterRd.customerOrgId',this.patientRegister.patientRegisterRd.customerOrgId)
+    //     //// console.log('patientRegister.patientRegisterRd.customerOrgId',this.patientRegister.patientRegisterRd.customerOrgId)
     //     objCopy(this.patientRegister.patientRegisterRd, this.form);
     //   }
     // },
diff --git a/vue.config.js b/vue.config.js
index 211844c..d787cc9 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -29,6 +29,14 @@ module.exports = defineConfig({
                 // }
             },
         },
+    },
+    terser: {
+        terserOptions: {
+            compress: {
+                drop_console: true,
+                drop_debugger: true
+            }
+        }
     }
     // pages: {
     //   index: {