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

src/xt_pages/dialysis/template/DialysisPrintOrdereightytwo.vue

@@ -2,8 +2,7 @@
   <div>
     <el-button type="primary" @click="checkData">一键核对</el-button>
     <div id="dialysis-print-box-1">
-      <div
-        id="dialysis-print-box-1-1"
+      <div id="dialysis-print-box-1-1"
         class="dialysis-print-order print-template-two print_page_main_content"
       >
 
@@ -293,7 +292,7 @@
             <td width="10%">核对者签名</td>
           </tr>
           <tr v-for="(advice, advice_index) in tableAdvice" :key="advice_index">
-            <td style="height:25px;line-height:25px">{{ getTime(advice.start_time, "{y}-{m}-{d} {h}:{i}") }}</td>
+            <td style="height:25px;line-height:25px">{{ getTime(advice.start_time, "{h}:{i}") }}</td>
             <td class="parent">
               <span v-if="advice.parent_id > 0">---></span>
               <span>{{ advice.advice_name }}</span>
@@ -317,7 +316,7 @@
                 <img style="height:25px;" :src="setAdminUserES(advice.advice_doctor)" alt srcset />
               </span>
             </td>
-            <td>{{ getTime(advice.execution_time, "{y}-{m}-{d} {h}:{i}") }}</td>
+            <td>{{ getTime(advice.execution_time, "{h}:{i}") }}</td>
             <td>
               <span v-if="setAdminUserES(advice.execution_staff) == ''">
                 {{
@@ -1465,7 +1464,7 @@ export default {
             this.isShowZero = true
           }
           if (this.monitors.length < 7) {
-            var nl = 8 - this.monitors.length
+            var nl = 7 - this.monitors.length
             for (let index = 0; index < nl; index++) {
               this.monitors.push([])
             }

src/xt_pages/eleFaPiao/settleDetail.vue

@@ -168,7 +168,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column align="center" prop="name" label="操作" v-if="$store.getters.xt_user.org_id != 10318">
+        <el-table-column align="center" prop="name" label="操作" v-if="$store.getters.xt_user.org_id != 10318 && $store.getters.xt_user.org_id != 0">
           <template slot-scope="scope">
             <el-button v-if="scope.row.result.id == 0" size="mini" type="primary"
                         @click="blue(scope.row)">
@@ -212,10 +212,10 @@
                        @click="yulan(scope.row)">
               下载
             </el-button>
-            <el-button size="mini" type="primary" v-if="scope.row.result.id > 0 && scope.row.result.fapiao_status > 0"
-                       @click="BWchaxun(scope.row)">
-              查询并同步发票号码
-            </el-button>
+<!--            <el-button size="mini" type="primary" v-if="scope.row.result.id > 0 && scope.row.result.fapiao_status > 0"-->
+<!--                       @click="BWchaxun(scope.row)">-->
+<!--              查询并同步发票号码-->
+<!--            </el-button>-->
           </template>
         </el-table-column>
 
@@ -441,7 +441,7 @@ export default {
         "admin_user_id":this.$store.getters.xt_user.user.id,
       }
       var that = this;
-      axios.get('http://127.0.0.1:9532/api/fapiao/query',{params:params}).then(function(response) {
+      axios.get('http://127.0.0.1:9532/api/bwfapiao/query',{params:params}).then(function(response) {
         if (response.data.state == 0) {
           that.$message.error(response.data.data.msg);
           return false
@@ -867,8 +867,38 @@ export default {
 
 
     }, BWchaxun(row){
+      let params = {
+        "id": row.result.id,
+        "admin_user_id":this.$store.getters.xt_user.user.id,
+      }
+      var that = this;
+      axios.get('http://127.0.0.1:9531/api/bwfapiao/query',{params:params}).then(function(response) {
+        if (response.data.state == 0) {
+          that.$message.error(response.data.data.msg);
+          return false
+        } else {
+          if(response.data.data.failed_code == -10){
+            that.settlementVisible = false
+            that.$confirm(response.data.data.msg, '错误信息', {
+              confirmButtonText: '确 定',
+              type: 'warning'
+            }).then(() => {
 
+            }).catch(() => {
+            })
+          }else{
+            that.getHisOrderList()
+            that.$confirm(response.data.data.msg, '信息', {
+              confirmButtonText: '确 定',
+              type: 'warning'
+            }).then(() => {
 
+            }).catch(() => {
+            })
+          }
+        }
+      }).catch(function(error) {
+      })
 
 
     },yulan(row){

src/xt_pages/hospitalStation/statementTemplate/printOne.vue

@@ -106,9 +106,9 @@
         <td colspan="2" v-if="info.insutype == '392'">城乡居民大病医疗保险</td>
         <td colspan="2" v-if="info.insutype == '510'">生育保险</td>
         <td>入院第一诊断</td>
-        <td colspan="3">{{info.diagnosis}}</td>
+        <td colspan="3">{{"慢性肾功能不全(血透治疗)"}}</td>
         <td>出院第一诊断</td>
-        <td colspan="4">{{info.diagnosis}}</td>
+        <td colspan="4">{{"慢性肾功能不全(血透治疗)"}}</td>
 
 
       </tr>

src/xt_pages/outpatientTool/labelPrint.vue

@@ -134,7 +134,7 @@
                               <div>{{getTime(current_ctime,'{m}-{d}')}}</div>
                               <div>{{getTime(current_ctime,'{h}:{i}')}}</div>
                           </div>
-                          <img style="height: 85px;" v-if="$store.getters.xt_user.org.id != 10138 && $store.getters.xt_user.org.id != 10217"  id="barcode">
+                          <img style="" v-if="$store.getters.xt_user.org.id != 10138 && $store.getters.xt_user.org.id != 10217"  id="barcode">
                       </div>
                       <div style="margin-bottom:0px;">{{current_number}}</div>
                       <div style="display:flex;">
@@ -491,10 +491,10 @@
                   format: 'CODE39',
                   lineColor: '#000',
                   background: '#EBEEF5',
-                  // width: 3,
-                  // height: 200,
-                  width: 1,
-                  height: 90,
+                  width: 3,
+                  height: 200,
+                  // width: 1,
+                  // height: 90,
                   displayValue: false,
                   fontOptions:"bold italic",//使文字加粗体或变斜体
                   font:"fantasy",//设置文本的字体

src/xt_pages/user/coursePrint.vue

@@ -45,19 +45,15 @@
 
             </div>
           </div>
-          <div class="row" style="padding: 2px 0;line-height:24px;margin-top:10px;" v-for="(item,index) in this.record" :key="index">
+          <div class="row" style="padding: 2px 0;line-height:24px;margin-top:30px;" v-for="(item,index) in this.record" :key="index">
             <div class="inline_block" style="display: inline-block;">
               <div>{{getTime(item.record_time,'{y}-{m}-{d} {h}:{i}')}}</div>
             </div>
             <div class="inline_block" style="margin-left: 30px;display: inline-block;">
               <div>{{item.title}}</div>
             </div>
-
-            <!-- <div class="inline_block" style="width:100%; word-wrap: break-word; word-break: break-all;"> -->
-              <div v-html="item.content" ></div>
-            <!-- </div> class="printP" -->
-
-            <div class="row" style="padding: 2px 0;line-height:24px;margin-top:10px;float:right">
+            <div v-html="item.content" ></div>
+            <div class="row" style="padding: 2px 0;line-height:24px;float:right">
              医生签名：
              <span v-if="setAdminUserES(item.recorder?item.recorder:item.recorder) == ''">
                   {{getName(item.recorder)}}
@@ -68,7 +64,6 @@
             </div>
           </div>
 
-
         </div>
         <div class="print_page_main_content" v-if="org_id ==10206" >
           <div v-for="(item,index) in this.record" :key="index" style="page-break-after: always;">