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/batch_print/batch_print_order_fortyeight.vue

@@ -1201,8 +1201,6 @@ export default {
       return vascular_access_part_name
     },
     printThisPage() {
-      
-      
       var ptime = Math.round(new Date().getTime() / 1000)
       this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')
       const style =

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -988,6 +988,18 @@
         >
         </div>
       </template>
+      <template v-if="org_template_info.template_id == 80">
+        <div>
+          <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+        </div>
+      </template>
     </div>
     <div class="app-container" style="min-height: 0">
       <!--<div class="order-print-btn"-->
@@ -1507,8 +1519,11 @@
 
           <DialysisPrintOrderSeventynine v-bind:childResponse="childResponse"
           v-if="org_template_info.template_id == 79">
-
           </DialysisPrintOrderSeventynine>
+
+          <DialysisPrintOrdereighty v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 80">
+          </DialysisPrintOrdereighty>
         </div>
       </el-container>
     </div>
@@ -1606,6 +1621,7 @@ import DialysisPrintOrderSeventysix from './template/DialysisPrintOrderSeventysi
 import DialysisPrintOrderSeventyseven from './template/DialysisPrintOrderSeventyseven'
 import DialysisPrintOrderSeventyeight from './template/DialysisPrintOrderSeventyeight'
 import DialysisPrintOrderSeventynine from './template/DialysisPrintOrderSeventynine'
+import DialysisPrintOrdereighty from './template/DialysisPrintOrdereighty'
 import DialysisPrintOrderZero from './template/DialysisPrintOrderZero'
 export default {
   name: "dialysisPrintOrder",
@@ -1689,6 +1705,7 @@ export default {
     DialysisPrintOrderSeventyseven,
     DialysisPrintOrderSeventyeight,
     DialysisPrintOrderSeventynine,
+    DialysisPrintOrdereighty,
     DialysisPrintOrderZero,
     LabelBox,
     BreadCrumb,
@@ -2248,9 +2265,7 @@ export default {
           scanStyles: false,
         });
 
-      }else if (
-        this.org_template_info.template_id == 52
-      ) {
+      }else if ( this.org_template_info.template_id == 52) {
         printJS({
           printable: "dialysis-print-box-1",
           type: "html",
@@ -2402,6 +2417,13 @@ export default {
           style: style4,
           scanStyles: false,
         });
+      }else if (this.org_template_info.template_id == 80) {
+        printJS({
+          printable: "dialysis-print-box-1",
+          type: "html",
+          style: style2,
+          scanStyles: false,
+        });
       }
        else if (this.org_template_info.template_id == 199 ) {
         printJS({

src/xt_pages/eleFaPiao/fapiao.vue

@@ -116,7 +116,7 @@
         <el-table-column align="center" prop="name" label="操作">
           <template slot-scope="scope">
 
-            <el-button v-if="scope.row.id > 0 && scope.row.is_red_washed == 1" size="mini" type="primary"
+            <el-button v-if="scope.row.id > 0 && scope.row.is_red_washed == 0" size="mini" type="primary"
                        @click="hongchong(scope.row)">
               红冲
             </el-button>
@@ -260,10 +260,38 @@ export default {
     blue(row){
 
     }, yulan(row){
-
+      window.open( row.pdf_url, "_blank");
 
     },hongchong(row){
+      var  id = row.id
+
+      let params = {
+        "id":id,
+        "admin_user_id":this.$store.getters.xt_user.user.id,
+      }
 
+      var that = this;
+      axios.get('http://127.0.0.1:9532/api/fapiao/red',{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.$confirm(response.data.data.msg, '错误信息', {
+              confirmButtonText: '确 定',
+              type: 'warning'
+            }).then(() => {
+
+            }).catch(() => {
+            })
+          }else{
+            that.$message.success(response.data.data.msg)
+            that.getHisOrderList()
+          }
+
+        }
+      }).catch(function(error) {
+      })
     },
     getAllstaff(){
       adminMainView()

src/xt_pages/eleFaPiao/settleDetail.vue

@@ -151,19 +151,24 @@
                         @click="blue(scope.row)">
               开票
             </el-button>
-            <el-button v-if="scope.row.result.id > 0 && scope.row.result.fapiao_status == 1" disabled="true" size="mini" type="primary"
-                       @click="blue(scope.row)">
+            <el-button v-if="scope.row.result.id > 0  && scope.row.result.fapiao_status == '1'" disabled="true" size="mini" type="primary"
+            >
               开票审核中
             </el-button>
-            <el-button v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0 && scope.row.result.fapiao_status == 2" size="mini" type="primary"
+            <el-button v-if="scope.row.result.id == 0 && scope.row.result.fapiao_status == '3'" size="mini" type="primary"
+                       @click="blue(scope.row)">
+              开具蓝票失败，点击查看原因
+            </el-button>
+            <el-button v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0 && scope.row.result.fapiao_status == '2'" size="mini" type="primary"
                         @click="hongchong(scope.row)">
               红冲
             </el-button>
-            <el-button size="mini" type="primary" v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0 && scope.row.result.fapiao_status == 2"
+            <el-button size="mini" type="primary" v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0 && scope.row.result.fapiao_status == '2'"
                        @click="yulan(scope.row)">
               下载
             </el-button>
-            <el-button size="mini" type="primary" v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0 && scope.row.result.fapiao_status == 2 && scope.row.fapiao_number == ''"
+
+            <el-button size="mini" type="primary" v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0 && scope.row.result.fapiao_status == '2'"
                        @click="chaxun(scope.row)">
               查询并同步发票号码
             </el-button>
@@ -399,7 +404,7 @@ export default {
             }).catch(() => {
             })
           }else{
-            this.getHisOrderList()
+            that.getHisOrderList()
             that.$confirm(response.data.data.msg, '信息', {
               confirmButtonText: '确 定',
               type: 'warning'
@@ -605,23 +610,18 @@ export default {
             })
           }else{
             if(response.data.data.cus_status == 1){
-              Vue.nextTick(() => {
-                // 确保二维码数据存在
-                if (response.data.data.qr_code) {
-                  // 生成新的二维码
-                  var qrcode = new QRCode(that.$refs.qrCodeUrl, {
-                    text: response.data.data.qr_code,
-                    width: 120,
-                    height: 120,
-                    colorDark: '#000000',
-                    colorLight: '#ffffff',
-                    correctLevel: QRCode.CorrectLevel.H
-                  });
-                  that.qr_dialogVisible = true;
-                } else {
-                  that.$message.error('二维码数据为空。');
-                }
-              });
+              that.$nextTick(() =>{
+                that.$refs.qrCodeUrl.innerHTML = ""
+                var qrcode = new QRCode(that.$refs.qrCodeUrl, {
+                  text: response.data.data.qr_code, // 需要转换为二维码的内容
+                  width: 120,
+                  height: 120,
+                  colorDark: '#000000',
+                  colorLight: '#ffffff',
+                  correctLevel: QRCode.CorrectLevel.H
+                })
+              })
+              that.qr_dialogVisible =true
             }else if(response.data.data.cus_status == -1){
               // this.$message.error(response.data.msg)/*  */
               that

src/xt_pages/outpatientTool/components/settle.vue

@@ -83,6 +83,13 @@
               </template>
           </el-table-column>
 
+        <el-table-column align="center" prop="item_name" label="参保地">
+          <template slot-scope="scope">
+            {{scope.row.clr_optins}}
+          </template>
+        </el-table-column>
+
+
         <el-table-column align="center" prop="item_name" label="病种名称">
           <template slot-scope="scope">
             {{scope.row.sick_name}}
@@ -250,14 +257,18 @@
           {{scope.row.setl_time?scope.row.setl_time.split(" ")[0]:getTimes(scope.row.settle_accounts_date)}}
         </template>
       </el-table-column>
-
-
       <el-table-column align="center" prop="item_name" label="病种名称">
         <template slot-scope="scope">
           {{scope.row.sick_name}}
         </template>
       </el-table-column>
 
+      <el-table-column align="center" prop="item_name" label="参保地">
+        <template slot-scope="scope">
+          {{scope.row.clr_optins}}
+        </template>
+      </el-table-column>
+
       <el-table-column align="center" prop="item_name" label="结算类型">
         <template slot-scope="scope">
           <div v-if="scope.row.is_medicine_insurance == 0">自费</div>