From 1f4fbf6015f387460a6633cdda7e831a1e84c810 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Tue, 5 Sep 2023 13:21:44 +0800
Subject: [PATCH 1/3] update

---
 public/electron/latest.yml                    |   8 -
 .../patientRegister/PatientRegisterEdit.vue   | 230 ++++++++++--------
 .../patientRegister/PatientRegisterItem.vue   |  30 ++-
 3 files changed, 153 insertions(+), 115 deletions(-)
 delete mode 100644 public/electron/latest.yml

diff --git a/public/electron/latest.yml b/public/electron/latest.yml
deleted file mode 100644
index 39eba35..0000000
--- a/public/electron/latest.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-version: 1.0.6
-files:
-  - url: example-001 Setup 1.0.6.exe
-    sha512: PfambE0KJ9BKAPuXEDNGZz6z6Tbz2/BY66SyhvvZa9DJwhKYzQbgo0x/580pMJzyMv/hwYM9eWpdkOiZ71IgQQ==
-    size: 124064042
-path: example-001 Setup 1.0.6.exe
-sha512: PfambE0KJ9BKAPuXEDNGZz6z6Tbz2/BY66SyhvvZa9DJwhKYzQbgo0x/580pMJzyMv/hwYM9eWpdkOiZ71IgQQ==
-releaseDate: '2023-07-08T09:33:10.244Z'
diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index 3b757bc..bd2df5f 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -31,7 +31,8 @@
               </el-col>
               <el-col :span="3">
                 <el-form-item label="性别" prop="sexId" label-width="50px">
-                  <el-select v-model="form.sexId" placeholder="请选择" >
+                  <el-select v-model="form.sexId" placeholder="请选择"
+                    :style="'width:' + Math.floor((window.pageWidth - 650) / 8) + 'px;'">
                     <el-option v-for="item in dict.sex" :key="item.id" :label="item.displayName" :value="item.id">
                     </el-option>
                   </el-select>
@@ -61,15 +62,24 @@
                   <el-input type="date" v-model="form.birthDate" @blur="changeBirthDate" />
                 </el-form-item>
               </el-col>
-              <el-col :span="5">
+              <el-col :span="3">
                 <el-form-item label="年龄" prop="age">
                   <el-input v-model="form.age"></el-input>
                 </el-form-item>
               </el-col>
+              <el-col :span="3">
+                <el-form-item label="婚姻" prop="maritalStatusId" label-width="50px">
+                  <el-select v-model="form.maritalStatusId" placeholder="请选择"
+                    :style="'width:' + Math.floor((window.pageWidth - 650) / 8) + 'px;'">
+                    <el-option v-for="item in dict.maritalStatus" :key="item.id" :label="item.displayName"
+                      :value="item.id">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
               <el-col :span="3" />
             </el-row>
             <el-row>
-              
               <el-col :span="5">
                 <el-form-item label="手机号" prop="mobileTelephone">
                   <el-input v-model="form.mobileTelephone"></el-input>
@@ -80,62 +90,31 @@
                   <el-input v-model="form.telephone"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="5">
-                <el-form-item label="婚姻状况" prop="maritalStatusId">
-                  <el-select v-model="form.maritalStatusId" placeholder="请选择"
-                    :style="'width:' + Math.floor((window.pageWidth - 530) / 4.8) + 'px;'">
-                    <el-option v-for="item in dict.maritalStatus" :key="item.id" :label="item.displayName"
-                      :value="item.id">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="4" />
-            </el-row>
-            <el-row>
-              <el-col :span="10">
-                <el-form-item label="地址" prop="address">
-                  <el-input v-model="form.address"></el-input>
-                </el-form-item>
-              </el-col>
               <el-col :span="5">
                 <el-form-item label="邮箱" prop="email">
                   <el-input v-model="form.email"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="5">
-                <el-form-item label="邮政编码" prop="postalCode">
+              <el-col :span="3">
+                <el-form-item label="邮编" prop="postalCode">
                   <el-input v-model="form.postalCode"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="4" />
-            </el-row>
-            <el-row>
-              <el-col :span="5">
-                <el-form-item label="民族" prop="nationId">
-                  <el-select v-model="form.nationId" placeholder="请选择" filterable clearable
-                    :style="'width:' + Math.floor((window.pageWidth - 530) / 4.8) + 'px;'">
-                    <el-option v-for="item in dict.nation" :key="item.nationId" :label="item.displayName"
-                      :value="item.nationId" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="5">
-                <el-form-item label="籍贯" prop="birthPlaceId">
+              <el-col :span="3">
+                <el-form-item label="籍贯" prop="birthPlaceId" label-width="50px">
                   <el-select v-model="form.birthPlaceId" placeholder="请选择" filterable clearable
-                    :style="'width:' + Math.floor((window.pageWidth - 530) / 4.8) + 'px;'">
+                    :style="'width:' + Math.floor((window.pageWidth - 650) / 8) + 'px;'">
                     <el-option v-for="item in dict.birthPlace" :key="item.id" :label="item.displayName"
                       :value="item.id" />
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="5">
-                <el-form-item label="体检类别" prop="medicalTypeId">
-                  <el-select v-model="form.medicalTypeId" placeholder="请选择" filterable clearable
-                    :style="'width:' + Math.floor((window.pageWidth - 530) / 4.8) + 'px;'">
-                    <el-option v-for="item in dict.medicalType" :key="item.id" :label="item.displayName"
-                      :value="item.id" />
-                  </el-select>
+              <el-col :span="3" />
+            </el-row>
+            <el-row>
+              <el-col :span="10">
+                <el-form-item label="地址" prop="address">
+                  <el-input v-model="form.address"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="5">
@@ -147,18 +126,36 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="4">
+              <el-col :span="3">
                 <el-form-item label="性激素期" prop="sexHormoneTermId">
-                  <el-select v-model="form.sexHormoneTermId" placeholder="请选择" filterable clearable
-                    :style="'width:' + Math.floor((window.pageWidth - 630) / 6) + 'px;'">
+                  <el-select v-model="form.sexHormoneTermId" placeholder="请选择" filterable clearable>
                     <el-option v-for="item in dict.sexHormoneTerm" :key="item.id" :label="item.displayName"
                       :value="item.id">
                     </el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
+              <el-col :span="3">
+                <el-form-item label="民族" prop="nationId" label-width="50px">
+                  <el-select v-model="form.nationId" placeholder="请选择" filterable clearable
+                    :style="'width:' + Math.floor((window.pageWidth - 650) / 8) + 'px;'">
+                    <el-option v-for="item in dict.nation" :key="item.nationId" :label="item.displayName"
+                      :value="item.nationId" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="3" />
             </el-row>
             <el-row>
+              <el-col :span="5">
+                <el-form-item label="体检类别" prop="medicalTypeId">
+                  <el-select v-model="form.medicalTypeId" placeholder="请选择" filterable clearable
+                    :style="'width:' + Math.floor((window.pageWidth - 530) / 4.8) + 'px;'">
+                    <el-option v-for="item in dict.medicalType" :key="item.id" :label="item.displayName"
+                      :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
               <el-col :span="5">
                 <el-form-item label="工卡号" prop="jobCardNo">
                   <el-input v-model="form.jobCardNo"></el-input>
@@ -169,51 +166,65 @@
                   <el-input v-model="form.medicalCardNo"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="5">
+              <el-col :span="3">
                 <el-form-item label="职务" prop="jobPost">
                   <el-input v-model="form.jobPost"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="5">
-                <el-form-item label="职称" prop="jobTitle">
-                  <el-input v-model="form.jobTitle"></el-input>
+              <el-col :span="3">
+                <el-form-item label="职称" prop="jobTitle" label-width="50px">
+                  <el-input v-model="form.jobTitle"
+                    :style="'width:' + Math.floor((window.pageWidth - 650) / 8) + 'px;'" />
                 </el-form-item>
               </el-col>
-              <el-col :span="4">
+              <el-col :span="3">
                 <el-form-item label="介绍人" prop="salesman">
                   <el-input v-model="form.salesman"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
+              <el-col :span="5">
+                <el-form-item label="体检中心" prop="organizationUnitId">
+                  <el-select v-model="form.organizationUnitId" placeholder="请选择" filterable
+                    :style="'width:' + Math.floor((window.pageWidth - 530) / 4.8) + 'px;'">
+                    <el-option v-for="item in dict.organization" :key="item.id" :label="item.displayName"
+                      :value="item.id">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
               <el-col :span="5">
                 <el-form-item label="是否VIP" prop="isVip">
                   <el-radio v-model="form.isVip" label="Y">是</el-radio>
                   <el-radio v-model="form.isVip" label="N">否</el-radio>
                 </el-form-item>
               </el-col>
-              <el-col :span="5" style="margin-bottom: -15px; line-height: 40px">
+              <el-col :span="5">
                 <el-form-item label="电话随访" prop="isPhoneFollow">
                   <el-radio v-model="form.isPhoneFollow" label="Y">是</el-radio>
                   <el-radio v-model="form.isPhoneFollow" label="N">否</el-radio>
                 </el-form-item>
               </el-col>
-              <el-col :span="5">
+              <el-col :span="3">
                 <el-form-item label="隐藏姓名" prop="isNameHide">
+                  <!--
                   <el-radio v-model="form.isNameHide" label="Y">是</el-radio>
                   <el-radio v-model="form.isNameHide" label="N">否</el-radio>
+                  -->
                 </el-form-item>
               </el-col>
-              <el-col :span="5">
-                <el-form-item label="是否锁住" prop="isLock">
+              <el-col :span="3">
+                <el-form-item label="锁住" prop="isLock" label-width="50px">
+                  <!--
                   <el-radio v-model="form.isLock" label="Y">是</el-radio>
                   <el-radio v-model="form.isLock" label="N">否</el-radio>
+                   -->
                 </el-form-item>
               </el-col>
-              <el-col :span="4">
+              <el-col :span="3">
                 <el-form-item label="体检开始" prop="isMedicalStart">
-                  <el-select v-model="form.isMedicalStart" placeholder="请选择" disabled
-                    :style="'width:' + Math.floor((window.pageWidth - 630) / 6) + 'px;'">
+                  <el-select v-model="form.isMedicalStart" placeholder="请选择" disabled>
                     <el-option label="是" value="Y" />
                     <el-option label="否" value="N" />
                   </el-select>
@@ -221,55 +232,44 @@
               </el-col>
             </el-row>
             <el-row>
-              <el-col :span="6">
-                <el-form-item label="体检中心" prop="organizationUnitId">
-                  <el-select v-model="form.organizationUnitId" placeholder="请选择" filterable
-                    :style="'width:' + Math.floor((window.pageWidth - 470) / 4) + 'px;'">
-                    <el-option v-for="item in dict.organization" :key="item.id" :label="item.displayName"
-                      :value="item.id">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
+              <el-col :span="5">
                 <el-form-item label="分组" prop="customerOrgGroupId">
                   <el-select v-model="form.customerOrgGroupId" placeholder="请选择" filterable clearable
                     @change="changeCustomerOrgGroupId" :disabled="form.customerOrgId === dict.personOrgId ? true : false"
-                    :style="'width:' + Math.floor((window.pageWidth - 470) / 4) + 'px;'">
+                    :style="'width:' + Math.floor((window.pageWidth - 530) / 4.8) + 'px;'">
                     <el-option v-for="item in patientRegister.customerOrgGroup" :key="item.id" :label="item.displayName"
                       :value="item.id" />
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="5">
                 <el-form-item label="套餐" prop="medicalPackageId">
                   <el-select v-model="form.medicalPackageId" placeholder="请选择" filterable clearable
                     @change="changeMedicalPackageId" :disabled="form.customerOrgId === dict.personOrgId ? false : true"
-                    :style="'width:' + Math.floor((window.pageWidth - 470) / 4) + 'px;'">
+                    :style="'width:' + Math.floor((window.pageWidth - 530) / 4.8) + 'px;'">
                     <el-option v-for="item in dict.medicalPackage" :key="item.id" :label="item.displayName"
                       :value="item.id" />
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
-                <el-form-item label="完成标志" prop="completeFlag">
-                  <el-select v-model="form.completeFlag" placeholder="请选择" disabled
-                    :style="'width:' + Math.floor((window.pageWidth - 470) / 4) + 'px;'">
+              <el-col :span="11">
+                <el-form-item label="备注" prop="remark">
+                  <el-input v-model="form.remark" type="textarea" :rows="1" placeholder="请输入备注"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="3">
+                <el-form-item label="状态" prop="completeFlag" label-width="50px">
+                  <el-select v-model="form.completeFlag" placeholder="请选择" disabled>
                     <el-option v-for="item in dict.completeFlag" :key="item.id" :label="item.displayName"
                       :value="item.id">
                     </el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="24">
-                <el-form-item label="备注" prop="remark">
-                  <el-input v-model="form.remark" type="textarea" :rows="1" placeholder="请输入备注"></el-input>
-                </el-form-item>
-              </el-col>
             </el-row>
             <el-row>
               <el-col :span="6">
-                <el-form-item label="创建者">
+                <el-form-item label="创建人员">
                   <el-input v-model="form.creatorId" disabled></el-input>
                 </el-form-item>
               </el-col>
@@ -282,7 +282,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="修改者">
+                <el-form-item label="修改人员">
                   <el-input v-model="form.lastModifierId" disabled></el-input>
                 </el-form-item>
               </el-col>
@@ -297,7 +297,7 @@
             </el-row>
           </el-form>
           <el-image
-            :style="'position: absolute;top:65px;right:' + (110 + Math.floor((window.pageWidth - 400) / 25)) + 'px; width: 150px; height: 160px;'"
+            :style="'position: absolute;top:65px;right:' + (110 + Math.floor((window.pageWidth - 750) / 24)) + 'px; width: 150px; height: 160px;'"
             :src="form.photo ? (apiurl + '/' + form.photo) : ''">
             <div slot="placeholder" class="image-slot">
               加载中<span class="dot">...</span>
@@ -309,7 +309,7 @@
         </div>
       </div>
       <div style="margin-left: 10px;width:110px;">
-        <div class="btn">
+        <div style="margin-top: -20px;">
           <el-button type="primary" class="btnClass" @click="openCamera" icon="el-icon-camera">拍照</el-button>
         </div>
         <div class="btn">
@@ -336,6 +336,43 @@
         <div class="btn">
           <el-button type="primary" class="btnClass" @click="guidePrint('0001', false)">指引单预览</el-button>
         </div>
+
+        <div style="margin-top: 30px;">
+          <el-button type="primary" class="btnClass" @click="guidePrint('0001', false)">全个人支付</el-button>
+        </div>
+        <div class="btn">
+          <el-button type="primary" class="btnClass" @click="guidePrint('0001', false)">全单位支付</el-button>
+        </div>
+        <div class="btn">
+          <el-button type="primary" class="btnClass" @click="guidePrint('0001', false)">全赠送</el-button>
+        </div>
+        <div class="btn">
+          <el-button type="success" class="btnClass" @click="guidePrint('0001', false)">收费</el-button>
+        </div>
+      </div>
+    </div>
+
+    <!--查询条件-->
+    <div style="position: absolute;top:40px;left:160px;display: flex; flex-wrap: wrap; height:60px;">
+      <div class="query">
+        <span>查找：&nbsp;&nbsp;条码号</span>
+        <el-input placeholder="条码号" v-model="query.patientRegisterNo" size="small" clearable
+          style="width: 140px" />
+      </div>
+      <div class="query">
+        <span>档案号</span>
+        <el-input placeholder="档案号" v-model="query.patientNo" size="small" clearable
+          style="width: 100px" />
+      </div>
+      <div class="query">
+        <span>姓名</span>
+        <el-input placeholder="姓名" v-model="query.patientName" size="small" clearable
+          style="width: 80px" />
+      </div>
+      <div class="query">
+        <span>手机号</span>
+        <el-input placeholder="预约手机号" v-model="query.tel" size="small" clearable
+          style="width: 120px" />
       </div>
     </div>
 
@@ -877,7 +914,7 @@ export default {
               // }
               return postapi('/api/app/lisrequest/updatelisrequestisprint', { operateType: 1, patientRegisterId: this.form.id })
             }
-          })          
+          })
           .catch(err => {
             this.$message.warning(err);
           });
@@ -921,11 +958,13 @@ export default {
 </script>
 <style scoped>
 ::v-deep .el-form-item {
-  margin-bottom: -15px;
+  margin-bottom: 0px;
 }
+
 ::v-deep .el-table--small .el-table__cell {
   padding: 0px 0;
 }
+
 ::v-deep .el-input__inner {
   text-align: left;
   padding-left: 5px;
@@ -933,21 +972,14 @@ export default {
 }
 
 .btn {
-  margin-top: 10px;
+  margin-top: 5px;
 }
 
 .btnClass {
   width: 110px;
 }
-
-.photo {
-  position: absolute;
-  top: 65px;
-  right: 150px;
-  /* width: 150px;
-  height: 150px; */
-  width: 150px;
-  height: 160px;
+.query {
+  margin-left: 10px;
 }
 
 </style>
diff --git a/src/components/patientRegister/PatientRegisterItem.vue b/src/components/patientRegister/PatientRegisterItem.vue
index 6616495..cd7e53d 100644
--- a/src/components/patientRegister/PatientRegisterItem.vue
+++ b/src/components/patientRegister/PatientRegisterItem.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="display: flex; margin-left: 10px; margin-top: 20px;">
+  <div style="display: flex; margin-left: 10px; margin-top: 10px;">
     <div style="width:230px;">
       <div>
         <span>项目类别</span>
@@ -10,7 +10,7 @@
       </div>
       <div class="mainareaBox">
         <el-table :data="dict.asbItem"
-          :height="(window.pageHeight > 735 ? (window.pageHeight - 537) : 198)" @row-dblclick="dbClickChoosedAsb"
+          :height="(window.pageHeight > 720 ? (window.pageHeight - 460) : 260)" @row-dblclick="dbClickChoosedAsb"
           @selection-change="handleSelectionChange" size="small">
           <el-table-column type="selection" align="center" />
           <el-table-column prop="displayName" label="未选组合项目" width="120" />
@@ -60,12 +60,12 @@
           <el-tooltip class="item" effect="dark" content="总金额即该人员此次体检实收金额，并根据此金额自动计算折扣" placement="top">
             <span>总金额 </span>
           </el-tooltip>
-          <el-input style="width:70px;" v-model="total" size="small" type="number" @input="changeTotal"
+          <el-input style="width:70px;" v-model="total" size="small" type="number" @input="changeTotal" ref="total"
             @focus="totalFoucs = true" @blur="totalFoucs = false" />
         </div>
         <div class="disTotal">
-          <el-select v-model="asbItemId" placeholder="快速选择组合项目" size="small" filterable clearable remote
-            :remote-method="remoteMethod" @change="quickChoosedAsb" default-first-option
+          <el-select v-model="asbItemId" placeholder="快速选择组合项目" size="small" filterable clearable remote automatic-dropdown
+            :remote-method="remoteMethod" @change="quickChoosedAsb" default-first-option ref="asbItemId"
             style="width:150px;text-align: left;padding-right: 15px;">
             <el-option v-for="item in quickAsb" :key="item.id" :value="item.id" :label="item.displayName" />
           </el-select>
@@ -73,7 +73,7 @@
       </div>
       <div class="mainareaBox">
         <el-table :data="patientRegister.patientRegisterAbs"
-          :height="(window.pageHeight > 735 ? (window.pageHeight - 537) : 198)" width="100%" :summary-method="getSummaries"
+          :height="(window.pageHeight > 720 ? (window.pageHeight - 460) : 260)" width="100%" :summary-method="getSummaries"
           show-summary :row-class-name="tableRowClassName" @row-dblclick="removeAbs" @selection-change="selecteditems" size="small">
           <!-- temporaryselection   personnelUnit.nogroupselected-->
           <el-table-column type="selection" align="center"/>
@@ -624,7 +624,8 @@ export default {
         if (lfind > -1) {
           this.addAbs([this.dict.asbItemQuick[lfind]])
         }
-      }
+      }    
+
     },
     // quickChoosedAsb(v){
     //   let lfind = -1
@@ -799,6 +800,19 @@ export default {
         this.onSubmit('');
       }
     },
+
+    //快速选择完后，重新将光标定位到 asbItemId
+    "asbItemId"(newVal, oldVal) {
+      if (newVal != oldVal && newVal != '') {
+        //重新定位光标
+        this.$nextTick(() => {
+          console.log("1this.$refs['asbItemId'].focus()");
+          this.$refs['asbItemId'].focus(); //total  asbItemId
+          console.log("2this.$refs['asbItemId'].focus()");
+        });
+      }
+    },
+
   },
 };
 </script>
@@ -807,7 +821,7 @@ export default {
 
 .mainareaBox {
   border: 1px solid #000;
-  height: v-bind("(window.pageHeight > 735 ? (window.pageHeight - 535) : 200) + 'px'");
+  height: v-bind("(window.pageHeight > 720 ? (window.pageHeight - 460) : 260) + 'px'");
   margin-top: 5px;
 }
 

From 3f62a86a280111ed38c9798c50b9f291695c1fc2 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Tue, 5 Sep 2023 15:09:12 +0800
Subject: [PATCH 2/3] charge

---
 .../customerOrg/customerOrgEdit.vue           | 20 ++---
 .../patientRegister/PatientRegisterEdit.vue   | 75 +++++++++++++++++--
 .../patientRegister/PatientRegisterItem.vue   | 14 +++-
 src/views/charge/charge.vue                   |  8 +-
 4 files changed, 93 insertions(+), 24 deletions(-)

diff --git a/src/components/customerOrg/customerOrgEdit.vue b/src/components/customerOrg/customerOrgEdit.vue
index d5ef268..9ce4561 100644
--- a/src/components/customerOrg/customerOrgEdit.vue
+++ b/src/components/customerOrg/customerOrgEdit.vue
@@ -123,7 +123,7 @@
         </el-row>
         <el-row>
           <el-col :span="5">
-            <el-form-item label="创建者">
+            <el-form-item label="创建人员">
               <el-input v-model="form.creatorName" size="small" disabled />
             </el-form-item>
           </el-col>
@@ -133,7 +133,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="5">
-            <el-form-item label="修改者">
+            <el-form-item label="修改人员">
               <el-input v-model="form.creatorName" size="small" disabled />
             </el-form-item>
           </el-col>
@@ -239,18 +239,10 @@ export default {
 
     changeBox(type) {
       //赋值
-      if (type == 'isActive') {
-        if (this.form.isActiveBox) {
-          this.form.isActive = 'Y';
-        } else {
-          this.form.isActive = 'N';
-        }
-      } else {
-        if (this.form.isLockBox) {
-          this.form.isLock = 'Y';
-        } else {
-          this.form.isLock = 'N';
-        }
+      if(this.form[type + 'Box']){
+        this.form[type] = 'Y';
+      }else{
+        this.form[type] = 'N';
       }
     },
 
diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index bd2df5f..feb5a46 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -196,14 +196,20 @@
               </el-col>
               <el-col :span="5">
                 <el-form-item label="是否VIP" prop="isVip">
+                  <!--
                   <el-radio v-model="form.isVip" label="Y">是</el-radio>
                   <el-radio v-model="form.isVip" label="N">否</el-radio>
+                  -->
+                  <el-checkbox v-model="form.isVipBox" @change="changeBox('isVip')" />
                 </el-form-item>
               </el-col>
               <el-col :span="5">
                 <el-form-item label="电话随访" prop="isPhoneFollow">
+                  <!--
                   <el-radio v-model="form.isPhoneFollow" label="Y">是</el-radio>
                   <el-radio v-model="form.isPhoneFollow" label="N">否</el-radio>
+                  -->
+                  <el-checkbox v-model="form.isPhoneFollowBox" @change="changeBox('isPhoneFollow')" />
                 </el-form-item>
               </el-col>
               <el-col :span="3">
@@ -212,6 +218,7 @@
                   <el-radio v-model="form.isNameHide" label="Y">是</el-radio>
                   <el-radio v-model="form.isNameHide" label="N">否</el-radio>
                   -->
+                  <el-checkbox v-model="form.isNameHideBox" @change="changeBox('isNameHide')" />
                 </el-form-item>
               </el-col>
               <el-col :span="3">
@@ -220,6 +227,7 @@
                   <el-radio v-model="form.isLock" label="Y">是</el-radio>
                   <el-radio v-model="form.isLock" label="N">否</el-radio>
                    -->
+                   <el-checkbox v-model="form.isLockBox" @change="changeBox('isLock')" />
                 </el-form-item>
               </el-col>
               <el-col :span="3">
@@ -305,7 +313,7 @@
           </el-image>
         </div>
         <div>
-          <PatientRegisterItem :patientRegisterForm="form" />
+          <PatientRegisterItem :patientRegisterForm="form" :payTypeFlag="payTypeFlag"/>
         </div>
       </div>
       <div style="margin-left: 10px;width:110px;">
@@ -338,16 +346,16 @@
         </div>
 
         <div style="margin-top: 30px;">
-          <el-button type="primary" class="btnClass" @click="guidePrint('0001', false)">全个人支付</el-button>
+          <el-button type="primary" class="btnClass" @click="payTypeFlag ='0'">全个人支付</el-button>
         </div>
         <div class="btn">
-          <el-button type="primary" class="btnClass" @click="guidePrint('0001', false)">全单位支付</el-button>
+          <el-button type="primary" class="btnClass" @click="payTypeFlag ='1'">全单位支付</el-button>
         </div>
         <div class="btn">
-          <el-button type="primary" class="btnClass" @click="guidePrint('0001', false)">全赠送</el-button>
+          <el-button type="primary" class="btnClass" @click="payTypeFlag ='2'">全赠送</el-button>
         </div>
         <div class="btn">
-          <el-button type="success" class="btnClass" @click="guidePrint('0001', false)">收费</el-button>
+          <el-button type="success" class="btnClass" @click="toCharge(form.patientRegisterNo)">收费</el-button>
         </div>
       </div>
     </div>
@@ -449,7 +457,7 @@ import { mapState } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import mm from "../../utlis/mm";
 
-import { objCopy, setNull, dddw, parseID, birthdayToAge } from "../../utlis/proFunc";
+import { objCopy, setNull, dddw, parseID, birthdayToAge,deepCopy } from "../../utlis/proFunc";
 import Camera from "./Camera.vue";
 import PatientRegisterItem from "./PatientRegisterItem.vue";
 import LisRequest from "./LisRequest.vue";
@@ -466,6 +474,7 @@ export default {
     return {
       apiurl: mm.apiurl,
       brushTimes: 0,
+      payTypeFlag:'',
       form: {
         id: "", //id
         patientId: "00000000-0000-0000-0000-000000000000", //档案号ID 选择了档案就传档案号，未选就传00000-0000...
@@ -509,6 +518,10 @@ export default {
         creationTime: "",
         lastModificationTime: "",
         lastModifierId: null,
+        isVipBox: false, //vip客户
+        isNameHideBox: false, //隐藏姓名
+        isPhoneFollowBox: false, //电话随访
+        isLockBox: false, //是否锁住
       }, //单位 记录 目前新增与更新是一致
 
       defaultNull: [
@@ -546,6 +559,7 @@ export default {
   //挂载完成
   mounted() {
     objCopy(this.formInitData, this.form);
+    this.initBox();
   },
 
   computed: {
@@ -635,12 +649,48 @@ export default {
       return moment(new Date(date)).format(forMat);
     },
 
+    changeBox(type) {
+      //赋值
+      if(this.form[type + 'Box']){
+        this.form[type] = 'Y';
+      }else{
+        this.form[type] = 'N';
+      }
+    },
+   
+    initBox(){
+      if(this.form.isVip == 'Y'){
+        this.form.isVipBox = true;
+      }else{
+        this.form.isVipBox = false;
+      }
+
+      if(this.form.isNameHide == 'Y'){
+        this.form.isNameHideBox = true;
+      }else{
+        this.form.isNameHideBox = false;
+      }
+
+      if(this.form.isPhoneFollow == 'Y'){
+        this.form.isPhoneFollowBox = true;
+      }else{
+        this.form.isPhoneFollowBox = false;
+      }
+
+      if(this.form.isLock == 'Y'){
+        this.form.isLockBox = true;
+      }else{
+        this.form.isLockBox = false;
+      }
+
+    },
+
     //提交
     Onsubmit(formName, msgTip) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           //赋值
-          let body = { ...this.form };
+          let body = deepCopy(this.form);
 
           delete body.id;
           delete body.patientRegisterNo;
@@ -652,6 +702,10 @@ export default {
           delete body.creationTime;
           delete body.lastModificationTime;
           delete body.lastModifierId;
+          delete body.isVipBox;
+          delete body.isNameHideBox;
+          delete body.isPhoneFollowBox;
+          delete body.isLockBox;
 
           setNull(body, this.defaultNull);
 
@@ -930,6 +984,12 @@ export default {
       this.brushTimes++;
       this.patientRegister.lisRequestVisble = true;
     },
+
+    toCharge(patientRegisterNo){
+      this.patientRegister.patientRegisterRd.patientRegisterNo = patientRegisterNo;
+      this.$router.push({ path: "/charge" });
+    },
+    
   },
 
   //监听事件
@@ -941,6 +1001,7 @@ export default {
       if (newVal != oldVal) {
         console.log('this.editTimes', this.editTimes)
         objCopy(this.formInitData, this.form);
+        this.initBox();
         //console.log('this.form',this.form)
       }
     },
diff --git a/src/components/patientRegister/PatientRegisterItem.vue b/src/components/patientRegister/PatientRegisterItem.vue
index cd7e53d..8975740 100644
--- a/src/components/patientRegister/PatientRegisterItem.vue
+++ b/src/components/patientRegister/PatientRegisterItem.vue
@@ -92,7 +92,7 @@
           </el-table-column>
           <el-table-column label="实收价格" prop="chargePrice" width="70">
             <template slot-scope="scope">
-              <el-input type="number" v-model="patientRegister.patientRegisterAbs[scope.$index].chargePrice" size="small"
+              <el-input type="number" v-model="scope.row.chargePrice" size="small"
                 @input="changePrice(scope.$index)" @blur="onSubmit('')" />
             </template>
           </el-table-column>
@@ -137,7 +137,7 @@ import { mapState, mapActions } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import { arrayFilter, arrayReduce, arrayExistObj, dddw } from "../../utlis/proFunc";
 export default {
-  props: ["patientRegisterForm"],
+  props: ["patientRegisterForm","payTypeFlag"],
   data() {
     return {
       itemType: [], //项目类别
@@ -813,6 +813,16 @@ export default {
       }
     },
 
+    //按钮更新支付方式
+    "payTypeFlag"(newVal, oldVal) {
+      if (newVal != oldVal && newVal != '') {
+        this.patientRegister.patientRegisterAbs.forEach(e =>{
+          e.payTypeFlag = newVal;
+          return e;
+        });
+        this.onSubmit('调整支付方式');
+      }
+    },
   },
 };
 </script>
diff --git a/src/views/charge/charge.vue b/src/views/charge/charge.vue
index 74880c7..1b93161 100644
--- a/src/views/charge/charge.vue
+++ b/src/views/charge/charge.vue
@@ -316,11 +316,17 @@ export default {
 
   created() {
     this.dictInit();
+    this.query.patientRegisterNo = this.patientRegister.patientRegisterRd.patientRegisterNo;    
   },
 
   //挂载完成
   mounted() {
-    this.Query();
+    if(this.query.patientRegisterNo){
+      this.Query('patientRegisterNo');
+    }else{
+      this.Query();
+    }
+    
   },
 
   computed: {

From 7a694fc926280b578c3c69e642ab0a0094874c7c Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Tue, 5 Sep 2023 18:01:35 +0800
Subject: [PATCH 3/3] report

---
 src/components/patientRegister/PatientRegisterList.vue | 3 ++-
 src/components/sumDoctorCheck/ButtonList.vue           | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index 28f2573..83fb717 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -1019,7 +1019,8 @@ export default {
             }
           })
           .then(res => {
-            if (res.toLowerCase() == 'success') {
+            console.log('res',res);
+            if (res && res.toLowerCase() == 'success') {
               //更新打印状态  /api/app/lisrequest/updatelisrequestisprint
               // {
               //   "operateType": 0,  操作类型（1.按PatientRegisterId 2.按LisRequestId）
diff --git a/src/components/sumDoctorCheck/ButtonList.vue b/src/components/sumDoctorCheck/ButtonList.vue
index 21039fc..8138ef6 100644
--- a/src/components/sumDoctorCheck/ButtonList.vue
+++ b/src/components/sumDoctorCheck/ButtonList.vue
@@ -256,6 +256,7 @@ export default {
                 preViewCanPrint: this.sumDoctorCheck.sumPREdit.isAudit,
                 Parameters: [
                     { Name: 'printer', Value: user },
+                    { Name: 'LTS', Value: 'Y' }, //Y、N 
                     { Name: 'hisLog', Value: 'pic/hisLog.jpg' },
                     { Name: "peisReportFirstPage", Value: "pic/peisReportFirstPage.jpg" },
                     { Name: "peisReportPageHeader", Value: "pic/peisReportPageHeader.jpg" },