From 6cce4fb9ea233bbf9f8881f1e44e0f97747013f0 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Mon, 25 Nov 2024 14:30:08 +0800
Subject: [PATCH] submit

---
 src/components/common/LocalConfig.vue       | 10 ++++++++--
 src/components/doctorCheck/PacsTemplate.vue |  9 ++++-----
 src/components/webBooking/WebBooking.vue    |  5 ++++-
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/components/common/LocalConfig.vue b/src/components/common/LocalConfig.vue
index 706e81d..310c463 100644
--- a/src/components/common/LocalConfig.vue
+++ b/src/components/common/LocalConfig.vue
@@ -89,8 +89,8 @@
               </el-form-item>
             </el-col>            
             <el-col :span="6">
-              <el-form-item label="pacs分类">
-                <el-select v-model="LocalConfig.doctorCheck.pacsType" placeholder="pacs分类" clearable filterable
+              <el-form-item label="pacs看图分类">
+                <el-select v-model="LocalConfig.doctorCheck.pacsType" placeholder="pacs图片分类" clearable filterable
                   size="small" >
                   <el-option v-for="item in localDict.pacsTypes" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>                
@@ -101,6 +101,12 @@
                 <el-checkbox v-model="LocalConfig.doctorCheck.isSelectAll" size="small" true-label="Y" false-label="N" />
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="自动下一个项目">
+                
+                <el-checkbox v-model="LocalConfig.doctorCheck.isAutoNext" size="small" true-label="Y" false-label="N" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="6">
diff --git a/src/components/doctorCheck/PacsTemplate.vue b/src/components/doctorCheck/PacsTemplate.vue
index 14f418f..760307f 100644
--- a/src/components/doctorCheck/PacsTemplate.vue
+++ b/src/components/doctorCheck/PacsTemplate.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
-    <div>
-      <el-table :data="bigTexts" style="width: 100%;" highlight-current-row @row-click="rowClick" height="260">
+    <div style="margin-top: -10px;">
+      <el-table :data="bigTexts" style="width: 100%;" highlight-current-row @row-click="rowClick" height="240">
         <el-table-column type="index" label="序号" width="40" align="center" />
         <el-table-column prop="bigtextResultTypeName" label="词条类别" min-width="80" align="center" />
         <el-table-column prop="bigtextResultTemplateName" label="词条模版" min-width="150" align="center" />
@@ -27,7 +27,7 @@
         </div>
         <div>
           <el-input style="width: 100%" type="textarea" v-model="doctorCheck.checkItemList[refParams.index].result"
-            placeholder="请输入检查结果" :autosize="{ minRows: 9, maxRows: 9 }" />
+            placeholder="请输入检查结果" :autosize="{ minRows: 8, maxRows: 8 }" />
         </div>
       </div>
       <div style="margin-left: 8px; width: 50%;">
@@ -36,9 +36,8 @@
           <div>
           </div>
         </div>
-
         <div>
-          <el-table row-key="id" :data="doctorCheck.checkSummaryList" size="samll" height="186"
+          <el-table row-key="id" :data="doctorCheck.checkSummaryList" size="samll" height="150"
             width="100%" border>
             <el-table-column width="30" align="center">
               <template slot-scope="scope">
diff --git a/src/components/webBooking/WebBooking.vue b/src/components/webBooking/WebBooking.vue
index c7d86fc..3bc3d3b 100644
--- a/src/components/webBooking/WebBooking.vue
+++ b/src/components/webBooking/WebBooking.vue
@@ -329,7 +329,10 @@ export default {
                 e.isBelongGroupPackage = e.isInMedicalPackage
               }              
               // e.standTotal = e.amount * e.standardPrice
-              if(this.currRowData.chargeFlag == '1') e.isCharge = 'Y'
+              if(this.currRowData.chargeFlag == '1'){
+                e.isCharge = 'Y'
+                e.chargeSourceFlag = '1'  // 0-体检系统收费，1-小程序收费，2-第三方HIS收费
+              }
               e.total = e.amount * e.chargePrice
             });