Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/outpatientCharges/invoiceTemplate/printTen.vue

@@ -4,8 +4,8 @@
       <div style="display: flex;width: 575px;margin-bottom: 5px; position: relative;left: 506px;">
         {{printDate}}
       </div>
-      <div style="border: 1px solid black;width: 573px;">
-        <div style="display: flex; justify-content: space-between;width: 573px;border-bottom: 1px solid black; position: relative;padding: 5px;">
+      <div style="border: 1px solid black;width: 610px;">
+        <div style="display: flex; justify-content: space-between;width: 608px;border-bottom: 1px solid black; position: relative;padding: 5px;">
           <div >
             <span>姓名：{{paramsObj.name}}</span>
             <span style="margin-left: 60px;">性别：</span>
@@ -16,7 +16,7 @@
             <span style="margin-right: 60px;">NO：</span>
           </div>
         </div>
-        <div style="display: flex;justify-content: space-around;width: 573px;  padding: 5px;border-bottom: 1px solid black;">
+        <div style="display: flex;justify-content: space-around;width: 608px;  padding: 5px;border-bottom: 1px solid black;">
           <div>项目</div>
           <div>金额</div>
           <div>项目</div>
@@ -24,7 +24,7 @@
           <div>项目</div>
           <div>金额</div>
         </div>
-        <div style=" width: 573px;min-height: 220px;">
+        <div style=" width: 608px;min-height: 200px;">
           <div style="display:flex;justify-content: space-around;">
             
             <div style="">西药费</div>
@@ -61,7 +61,7 @@
             <div style="position:  relative;left: -169px;">{{ list.materialCostTotal ? list.materialCostTotal.toFixed(2) : '' }}</div>
           </div>
         </div>
-        <div style="border-top:1px solid black;width: 573px;">
+        <div style="border-top:1px solid black;width: 608px;">
           
           <div style="border-right: 1px solid black;display: inline-block;width: 360px;padding: 5px;">
             <span>合计（大写）:</span>
@@ -109,9 +109,9 @@
           <span style="position: relative;top:0px;left:0px">￥：{{totalPrice.toFixed(2)}}</span>
         </div>
       </div>
-      <div style="width: 20px;font-size: 13px;position: absolute;top: 120px;left: -15px;">报销联加盖医院收费章有效</div>
-      <div style="width: 20px;font-size: 13px;position: absolute;top: 100px;left: 575px;">白 &nbsp; 存根 &nbsp; 红 &nbsp; 收据 &nbsp; 黄 &nbsp; 记账</div>
-      <div style="border-bottom: 1px solid black;width:573px;font-Size:12px">
+      <div style="width: 20px;font-size: 13px;position: absolute;top: 100px;left: -15px;">报销联加盖医院收费章有效</div>
+      <div style="width: 20px;font-size: 13px;position: absolute;top: 100px;left: 611px;">白 &nbsp; 存根 &nbsp; 红 &nbsp; 收据 &nbsp; 黄 &nbsp; 记账</div>
+      <div style="border-bottom: 1px solid black;width:608px;font-Size:12px">
         <div  style="display:flex;margin: 3px 0px;">
           <div style="width:140px">医保：门慢统筹：{{list.order.hifp_pay}}</div>
           <div style="width:140px">大病保险：{{list.order.hifmi_pay}}</div>
@@ -124,7 +124,7 @@
           <div style="width:140px">个账余额：{{list.order.balc}}</div>
         </div>
       </div>
-      <div style="width:573px;font-Size:12px">
+      <div style="width:608px;font-Size:12px">
         <div style="display:flex;margin: 3px 0px;">
           <div style="width:140px">现金支付：{{list.order.psn_cash_pay}}</div>
           <div style="width:140px">预存扣减：</div>

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -23,7 +23,7 @@
           org_id == 10138 ||
           org_id == 9504 ||
           org_id == 10028 ||
-          org_id == 10278 || org_id == 0
+          org_id == 10278
         "
       >
         <printTwo :info="info" v-if="org_id == 9990"></printTwo>
@@ -58,18 +58,23 @@
       </printSeven>
       <print10191 :info="info" v-if="org_id == 10191"></print10191>
       <printTen :info="info" v-if="org_id == 10210"></printTen>
+      <printEleven v-if="org_id == 10485 || org_id == 0"></printEleven>
       <printOne :info="info" v-if=" org_id != 9990 &&
             org_id != 10138 &&
             org_id != 9504 &&
             org_id != 10028 &&
             org_id != 0 &&
-            org_id != 10278 && org_id != 10387 && org_id != 10191 &&org_id != 10210 && this.paramsObj.balance_accounts_type == 1"></printOne>
+            org_id != 10278 && org_id != 10387 && org_id != 10191 &&org_id != 10210 &&org_id != 10485 && this.paramsObj.balance_accounts_type == 1">
+      </printOne>
 
       <privateChargePrint  :info="info" v-if="org_id != 9990 &&
             org_id != 10138 &&
             org_id != 9504 &&
             org_id != 10028 &&
-            org_id != 10278 && org_id != 10387 && org_id != 10191 &&org_id != 10210 && this.paramsObj.balance_accounts_type == 2"></privateChargePrint>
+            org_id != 10278 && org_id != 10387 && org_id != 10191 &&org_id != 10210 &&org_id != 10485 &&org_id != 0 && this.paramsObj.balance_accounts_type == 2">
+      </privateChargePrint>
+
+
     </div>
   </div>
 </template>
@@ -91,6 +96,7 @@
   import printSeven from "./statementTemplate/printSeven";
   import Print10191 from "./statementTemplate/print10191";
   import printTen from "./statementTemplate/printTen";
+  import printEleven from "./statementTemplate/printeEleven"
   export default {
     name: "dialysisPrintOrder",
     components: {
@@ -104,7 +110,8 @@
       printFour,
       testVue,
       printFive,
-      printTen
+      printTen,
+      printEleven
     },
     props: {
       paramsObj: Object,
@@ -337,7 +344,6 @@
             this.patientTableData = response.data.data.list;
             this.patientTableDataTwo = response.data.data.list;
 
-            console.log("222", this.patientTableData);
             let cal_one = 0;
             let cal_two = 0;
             for (let i = 0; i < response.data.data.list.length; i++) {
@@ -527,7 +533,8 @@
                   console.log(111, this.balanceAccounts);
                 }
               });
-            } else {
+            } else
+            {
               getPrivateExpensesOrder(params).then((response) => {
                 if (response.data.state == 0) {
                   // this.$message.error(response.data.msg)

src/xt_pages/outpatientCharges/statementTemplate/printeEleven.vue

@@ -0,0 +1,288 @@
+<template>
+  <div id="statement-print" class="statement-print">
+    <div class="statementTitle">费用明细算单</div>
+    <div class="statementTable">
+      <table border="1" style="border-collapse: collapse;width: 100%;border: none;">
+        <tr>
+<<<<<<< HEAD
+          <td colspan="4">医院机构名称：</td>
+          <td colspan="4">发票号：</td>
+        </tr>
+        <tr style="border-bottom: 1px solid black;">
+          <td colspan="4" >单据编码：</td>
+          <td colspan="2" >就诊时间：</td>
+          <td colspan="2" >金额单位：元</td>
+        </tr>
+        <tr>
+          <td colspan="4">姓名：</td>
+          <td colspan="4">身份证号：</td>
+        </tr>
+        <tr>
+          <td colspan="8">诊断：</td>
+        </tr>
+        <tr style="border-bottom: 1px solid black;">
+          <td colspan="4">人员类别：</td>
+          <td colspan="4">险种类型：</td>
+=======
+          <td colspan="4">医院机构名称：{{info.fixmedins_name}}</td>
+          <td colspan="4">发票号：</td>
+        </tr>
+        <tr style="border-bottom: 1px solid black;">
+          <td colspan="4" >单据编码：{{info.number}}</td>
+          <td colspan="2" >就诊时间：{{info.setl_time}}</td>
+          <td colspan="2" >金额单位：{{info.medfee_sumamt}}元</td>
+        </tr>
+        <tr>
+          <td colspan="4">姓名：{{info.patient.name}}</td>
+          <td colspan="4">身份证号：{{info.patient.id_card_no}}</td>
+        </tr>
+        <tr>
+          <td colspan="8">诊断：{{info.diagnosis}}</td>
+        </tr>
+        <tr style="border-bottom: 1px solid black;">
+          <td colspan="4" v-if="info.psn_type == '11'">人员类别：在职</td>
+          <td colspan="4"  v-else-if="info.psn_type == '1101'">人员类别：职工在职</td>
+          <td colspan="4" v-else-if="info.psn_type == '1102'">人员类别：公务员在职</td>
+          <td colspan="4" v-else-if="info.psn_type == '1103'">人员类别：灵活就业人员在职</td>
+          <td colspan="4" v-else-if="info.psn_type == '1160'">人员类别：地方其他扩展人员</td>
+          <td colspan="4" v-else-if="info.psn_type == '12'">人员类别：退休人员</td>
+          <td colspan="4" v-else-if="info.psn_type == '1201'">人员类别：职工退休</td>
+          <td colspan="4" v-else-if="info.psn_type == '1202'">人员类别：公务员退休</td>
+          <td colspan="4" v-else-if="info.psn_type == '1203'">人员类别：灵活就业人员退休</td>
+          <td colspan="4" v-else-if="info.psn_type == '1260'">人员类别：地方其他扩展人员</td>
+          <td colspan="4" v-else-if="info.psn_type == '13'">人员类别：离休</td>
+          <td colspan="4" v-else-if="info.psn_type == '1300'">人员类别：离休人员</td>
+          <td colspan="4" v-else-if="info.psn_type == '1360'">人员类别：地方其他扩展人员</td>
+          <td colspan="4" v-else-if="info.psn_type == '14'">人员类别：居民(未成年)</td>
+          <td colspan="4" v-else-if="info.psn_type == '1401'">人员类别：新生儿</td>
+          <td colspan="4" v-else-if="info.psn_type == '1402'">人员类别：学龄前儿童</td>
+          <td colspan="4" v-else-if="info.psn_type == '1403'">人员类别：中小学生</td>
+          <td colspan="4" v-else-if="info.psn_type == '1404'">人员类别：大学生</td>
+          <td colspan="4" v-else-if="info.psn_type == '1405'">人员类别：未成年(未入学)</td>
+          <td colspan="4" v-else-if="info.psn_type == '15'">人员类别：居民(成年)</td>
+          <td colspan="4" v-else-if="info.psn_type == '1501'">人员类别：普通居民(成年)</td>
+          <td colspan="4" v-else-if="info.psn_type == '1560'">人员类别：地方其他扩展身份</td>
+          <td colspan="4" v-else-if="info.psn_type == '16'">人员类别：居民(老年)</td>
+          <td colspan="4" v-else></td>
+          <td colspan="4" v-if="info.insutype == '310'">险种类型：职工基本医疗保险</td>
+          <td colspan="4" v-if="info.insutype == '320'">险种类型：公务员医疗补助</td>
+          <td colspan="4" v-if="info.insutype == '330'">险种类型：大额医疗费用补助</td>
+          <td colspan="4" v-if="info.insutype == '340'">险种类型：离休人员医疗保障</td>
+          <td colspan="4" v-if="info.insutype == '390'">险种类型：城乡居民基本医疗保险</td>
+          <td colspan="4" v-if="info.insutype == '392'">险种类型：城乡居民大病医疗保险</td>
+          <td colspan="4" v-if="info.insutype == '510'">险种类型：生育保险</td>
+          <td colspan="4" v-else></td>
+
+
+>>>>>>> origin/20230223_pc_vue_new_branch
+        </tr>
+        <tr style="border-bottom: 1px solid black;text-align: center;">
+          <td width="12.5%">项目</td>
+          <td width="12.5%">金额</td>
+          <td width="12.5%">项目</td>
+          <td width="12.5%">金额</td>
+          <td width="12.5%">项目</td>
+          <td width="12.5%">金额</td>
+          <td width="12.5%">项目</td>
+          <td width="12.5%">金额</td>
+        </tr>
+        <tr style="text-align: center;">
+          <td>西药费</td>
+<<<<<<< HEAD
+          <td>金额</td>
+          <td>化验费</td>
+          <td>金额</td>
+          <td>治疗费</td>
+          <td>金额</td>
+          <td>处置费</td>
+          <td>金额</td>
+        </tr>
+        <tr style="text-align: center;">
+          <td>中成药</td>
+          <td>金额</td>
+          <td>诊疗费</td>
+          <td>金额</td>
+          <td>材料费</td>
+          <td>金额</td>
+          <td>护理费</td>
+          <td>金额</td>
+        </tr>
+        <tr style="text-align: center;">
+          <td>注射费</td>
+          <td>金额</td>
+          <td>检查费</td>
+          <td>金额</td>
+          <td>输氧费</td>
+          <td>金额</td>
+          <td>其他</td>
+          <td>金额</td>
+        </tr>
+        <tr style="border-bottom: 1px solid black; font: 16px bolder;">
+          <td colspan="8">合计：</td>
+        </tr>
+        <tr>
+          <td colspan="8">医保基金支付金额：</td>
+        </tr>
+        <tr style="border-bottom: 1px solid black;">
+          <td colspan="8">个人现金支付金额：</td>
+        </tr>
+        <tr>
+          <td colspan="2">家属或参保人签名：</td>
+          <td colspan="2">收费员签名：</td>
+          <td colspan="2">医院盖章：</td>
+=======
+          <td>{{info.western_medicine_cost_total}}</td>
+          <td>化验费</td>
+          <td>{{info.laboratory_cost_total}}</td>
+          <td>治疗费</td>
+          <td>{{info.treat_cost_total}}</td>
+          <td>处置费</td>
+          <td></td>
+        </tr>
+        <tr style="text-align: center;">
+          <td>中成药</td>
+          <td>{{info.chinese_traditional_medicine_cost_total}}</td>
+          <td>诊疗费</td>
+          <td></td>
+          <td>材料费</td>
+          <td>{{info.material_cost_total}}</td>
+          <td>护理费</td>
+          <td></td>
+        </tr>
+        <tr style="text-align: center;">
+          <td>注射费</td>
+          <td></td>
+          <td>检查费</td>
+          <td>{{info.check_cost_total}}</td>
+          <td>输氧费</td>
+          <td></td>
+          <td>其他</td>
+          <td>{{info.other_cost_total}}</td>
+        </tr>
+        <tr style="border-bottom: 1px solid black; font: 16px bolder;">
+          <td colspan="8">合计：{{info.medfee_sumamt}}</td>
+        </tr>
+        <tr>
+          <td colspan="8">医保基金支付金额：{{info.fund_pay_sumamt}}</td>
+        </tr>
+        <tr style="border-bottom: 1px solid black;">
+          <td colspan="8">个人现金支付金额：{{info.psn_cash_pay}}</td>
+        </tr>
+        <tr>
+          <td colspan="2" >家属或参保人签名：</td>
+          <td colspan="2" >收费员签名：</td>
+          <td colspan="2" >医院盖章：</td>
+>>>>>>> origin/20230223_pc_vue_new_branch
+        </tr>
+        <tr>
+          <td colspan="8">医师签名：</td>
+        </tr>
+      </table>
+    </div>
+  </div>
+</template>
+<<<<<<< HEAD
+=======
+<script>
+import { uParseTime } from '@/utils/tools'
+
+export default {
+  data() {
+    return {
+      list: {},
+      prescription: [],
+      patient: {},
+      orgname: '',
+
+      result: {},
+      org_code: '',
+      patient_name: '',
+      doctor_code: '',
+      doctor_name: '',
+
+      name_arr: [],
+      spec_arr: [],
+      count_arr: [],
+      price_arr: [],
+      total_arr: []
+
+    }
+  },
+  props: {
+    paramsObj: Object,
+    info: {
+      type: Object,
+      default: function() {
+        return {}
+      }
+    },
+    balanceAccounts: Object
+  },
+  methods: {
+    getDay(dateString1,dateString2){
+      var  startDate = Date.parse(dateString1);
+      var  endDate = Date.parse(dateString2);
+      if (startDate>endDate){
+        return 0;
+      }
+      if (startDate==endDate){
+        return 1;
+      }
+      var days=(endDate - startDate)/(1*24*60*60*1000);
+      return  days;
+    },
+    getTime(value, temp) {
+      if (value != undefined) {
+        return uParseTime(value, temp)
+      }
+      return ''
+    }
+  },
+  mounted() {
+
+
+  },
+  watch: {
+    paramsObj: {//深度监听，可监听到对象、数组的变化
+      handler(val, oldVal) {
+
+
+      },
+      deep: true
+    }
+  }
+}
+</script>
+>>>>>>> origin/20230223_pc_vue_new_branch
+
+<style lang="scss" scoped>
+.statement-print {
+  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
+  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+  margin-bottom: 20px;
+  padding: 20px 10px;
+}
+.statementTitle {
+  font-size: 28px;
+  text-align: center;
+  font-weight: bold;
+  margin-bottom: 10px;
+}
+.statementTable {
+  width: 100%;
+  font-size: 14px;
+  word-wrap: break-word;
+  word-break: break-all;
+  table tr td{
+    padding: 5px;
+    line-height: 30px;
+    border: none;
+  }
+}
+
+<<<<<<< HEAD
+</style>
+=======
+</style>
+>>>>>>> origin/20230223_pc_vue_new_branch

src/xt_pages/user/inspection.vue

@@ -131,7 +131,7 @@
                 min-width="180"
               >
                 <template slot-scope="scope">
-                 <span v-if="scope.row.item_name!=''"> {{ scope.row.item_name }} {{ scope.row.item_name_addition }}</span> 
+                 <span v-if="scope.row.item_name!=''"> {{ scope.row.item_name }} {{ scope.row.item_name_addition }}</span>
                 </template>
               </el-table-column>
 
@@ -192,7 +192,7 @@
                 <el-col :span="7" :key="index">
                   <div style=" margin: 5px;">
                     <el-row :gutter="20">
-                      <el-col :span="8" style="width: 100%;height: 150px;">
+                      <el-col :span="8" style="width: 100%;">
                         <div style="width: 100%;height: 150px;" >
                           <div @click="imgClicks(item.value)">
                             <el-tooltip
@@ -448,7 +448,7 @@
       <div slot="footer" class="dialog-footer">
         <el-upload
           :data="uploadData"
-          :multiple="false"
+          :multiple="true"
           action="https://upload.qiniup.com"
           :show-file-list="false"
           :on-error="handleAvatarError"
@@ -816,12 +816,12 @@ export default {
       this.dialogRemindFormVisible = true
       // this.temp_remind_cycle = this.
 
-    },openPic() {
+    },
+    openPic() {
       if (this.project == null) {
         this.$message.error('请先选择项目')
         return false
       }
-
       this.form.pic_method = 'add'
       this.formTitle = '新增' + this.project.project_name
       this.form.project_id = this.project.project_id
@@ -1296,22 +1296,22 @@ export default {
             var items = this.project.inspection_reference
             console.log("i5ems2323232wo",items)
             for (var index in items) {
-             
+
              console.log("obj",items[index])
               // console.log("inspectionsMap",inspectionsMap[items[index].item_id])
               var item = {}
-            
+
               for (var key in items[index]) {
                 //  console.log("key",key,items[index][key])
                 //  console.log("item[key]",item[key])
                 item[key] = items[index][key]
               }
-             
+
               if (item.item_id > 0) {
-                 
+
                 if (typeof(inspectionsMap[parseInt(items[index].item_id)])  == "undefined") {
-                  
-                 
+
+
 
                   if(this.org_id == 10121 || this.org_id == 0 ){
                     item.value = inspectionsMap[items[index].id].inspect_value
@@ -1322,13 +1322,13 @@ export default {
                   }
 
                 } else {
-                 
+
                   item.value = inspectionsMap[items[index].item_id].inspect_value
                   item.item_name = inspectionsMap[items[index].item_id].item_name
 
                 }
               } else {
-               
+
                 item.value = inspectionsMap[items[index].id].inspect_value
                 item.item_name = inspectionsMap[items[index].id].item_name
 
@@ -1350,7 +1350,7 @@ export default {
               if(item.item_name!=""){
                 this.items.push(item)
               }
-            
+
               console.log("items232232332wo",this.items)
 
               if(item.value.indexOf("http") >= 0){

src/xt_pages/user/inspectionCheck.vue

@@ -117,9 +117,23 @@
             <el-row>
               <template v-for="(item, index) in items">
                 <el-col :span="7" :key="index">
-                  <div style="width: 400px">
+                  <div style="margin: 5px;">
                     <el-row>
-                      <img  :src="item.value" alt="">
+                      <el-col :span="8" style="width: 100%;">
+                        <div style="width: 100%;height: 150px;" >
+                          <div @click="imgClicks(item.value)">
+                            <el-tooltip
+                              class="item"
+                              effect="dark"
+                              :hide-after="2000"
+                              content="点击查看大图"
+                              placement="top-start"
+                              >
+                                <img style="width: 300px;height: 150px;" :src="item.value" alt="">
+                              </el-tooltip>
+                          </div>
+                        </div>
+                      </el-col>
                     </el-row>
                     <el-row>
                       <div style="word-break: break-all;word-wrap: break-word">{{item.item_name}}</div>
@@ -266,7 +280,7 @@
       <div slot="footer" class="dialog-footer">
         <el-upload
           :data="uploadData"
-          :multiple="false"
+          :multiple="true"
           action="https://upload.qiniup.com"
           :show-file-list="false"
           :on-error="handleAvatarError"
@@ -322,15 +336,19 @@
         >
       </div>
     </el-dialog>
-
+    <el-image-viewer
+        v-if="showViewer"
+        :on-close="closeViewer"
+        :url-list="imgs"
+      ></el-image-viewer>
   </div>
 
 </template>
 
 <script>
 import PatientSidebar from './components/PatientSidebar'
+import ElImageViewer from 'element-ui/packages/image/src/image-viewer'
 import { getToken } from '@/api/qiniu'
-
 import {
   CreatePatientInspection,
   CreatePatientPICInspection,
@@ -345,7 +363,7 @@ import { getFileExtension, uParseTime } from '@/utils/tools'
 
 export default {
   name: 'Inspection',
-  components: { PatientSidebar },
+  components: { PatientSidebar,ElImageViewer },
   data() {
     return {
       temp_remind_cycle:"",
@@ -353,6 +371,7 @@ export default {
       check_content:"",
       qiniuDomain: 'https://images.shengws.com/',
       isPic:false,
+      showViewer:false,
       uploadData: { token: '', key: '' },
       pageLoading: true,
       itemLoading: false,
@@ -395,6 +414,15 @@ export default {
     }
   },
   methods: {
+    imgClicks(val){
+      console.log('asdasgg',val);
+      this.imgs = []
+      this.imgs.push(val)
+      this.showViewer = true
+    },
+    closeViewer(){
+      this.showViewer = false
+    },
     beforeAvatarUpload(file) {
       // const isJPG = file.type === "image/jpeg";
       var fileType = file.type