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

src/api/fapiao.js

@@ -64,4 +64,14 @@ export function GetQRCode(params){
 }
 
 
+export function getFaPiaoData(params){
+  return request({
+    url:"/api/newfapiao/get",
+    methods:"get",
+    params:params
+  })
+}
+
+
+
 

src/xt_pages/eleFaPiao/newInvoicePrint.vue

@@ -0,0 +1,136 @@
+<template>
+  <div>
+    <template>
+      <el-button
+        style="position:fixed;right:25px;z-index:999"
+        size="small"
+        @click="printThisPage"
+        type="primary"
+      >开票</el-button>
+    </template>
+    <!-- 新发票 -->
+    <div class="app-container" style="padding-top:20px;">
+      <div class='dialysisPage'>
+<!--        <printseventeen :paramsObj="paramsObjtwo"></printseventeen>-->
+        <new-print-one :paramsObj="paramsObjtwo"></new-print-one>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import NewPrintOne from './newPrintOne.vue'
+
+export default {
+  name: "invoicePrint",
+  components: {
+    NewPrintOne,
+  },
+  props:{
+    paramsObj:Object
+  },
+  data() {
+    return {
+      childResponse: {},
+      org_id:'',
+      showclick:false,
+      paramsObjtwo:{},
+    };
+  },
+  methods: {
+    getAdminUser(id) {
+      if (id == 0) {
+        return "";
+      }
+      if (id == undefined) {
+        return "";
+      }
+      for (let i = 0; i < this.adminUser.length; i++) {
+        if (this.adminUser[i].id == id) {
+          return this.adminUser[i].name;
+        }
+      }
+    },
+    getTime(value, temp) {
+      if (value == 0) {
+        return "";
+      }
+      if (value != undefined) {
+        return uParseTime(value, temp);
+      }
+      return "";
+    },
+    printThisPage() {
+
+
+    },
+  },
+  created() {
+    this.org_id = this.$store.getters.xt_user.org_id
+  },
+  watch:{
+    paramsObj:{//深度监听，可监听到对象、数组的变化
+      handler(val, oldVal){
+        this.paramsObjtwo = val
+
+      },
+      deep:true
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.printTitle{
+  font-size: 22px;
+  text-align: center;
+  font-weight: bold;
+}
+.infoMain{
+  display: flex;
+  flex-wrap: wrap;
+  border-bottom: 2px solid #000;
+  padding:0 10px;
+}
+.infoMain .infoP{
+  width: 33%;
+  line-height: 24px;
+}
+.prescriptionBox{
+  padding:0 10px;
+  height:600px;
+}
+.Rp{
+  font-size: 22px;
+  font-weight: bold;
+}
+.drugsBox{
+  padding-left: 40px;
+  margin-bottom: 10px;
+}
+.drugsBox p{
+  line-height: 30px;
+}
+.drugsOne{
+  line-height: 24px;
+}
+.drugsOne span{
+  margin-right: 20px;
+}
+.doctorBox{
+  display: flex;
+  justify-content: space-between;
+  padding:0 10px;
+  line-height: 24px;
+  border-bottom: 2px solid #000;
+}
+.actionBar{
+  display: flex;
+  justify-content: space-between;
+  line-height: 24px;
+  padding:0 10px;
+}
+.actionBar p{
+  width:150px;
+}
+</style>

src/xt_pages/eleFaPiao/newPrintOne.vue

@@ -0,0 +1,263 @@
+<template>
+  <div id='invoice-print' style="position: relative;">
+    <div style="display: flex;text-align: center;">
+      <div style="width: 25%;">交款人:{{list.patient.name}}</div>
+      <div style="width: 50%;">交款人统一社会信用代码:{{list.patient.id_card_no}}</div>
+      <div style="width: 25%;">开票日期:{{now}}</div>
+    </div>
+    <div style="border: 1px solid black;border-bottom: 0px;padding: 5px 0;">
+      <div style="display: flex; text-align: center;border-bottom: 1px solid balck;">
+        <div style="flex: 1;">项目名称</div>
+        <div style="flex: 1;">金额(元)</div>
+        <div style="flex: 1;">备注</div>
+        <div style="flex: 1;">项目名称</div>
+        <div style="flex: 1;">金额(元)</div>
+        <div style="flex: 1;">备注</div>
+        <div style="flex: 1;">项目名称</div>
+        <div style="flex: 1;">金额(元)</div>
+        <div style="flex: 1;">备注</div>
+      </div>
+
+    </div>
+    <div style="border: 1px solid black;border-bottom: 0;height: 150px;">
+      <div style="display: flex; text-align: center;padding: 5px 0;">
+        <div style="flex: 1;">西药费</div>
+        <div style="flex: 1;">{{list.westernMedicineCostTotal}}</div>
+        <div style="flex: 1;"></div>
+        <div style="flex: 1;">中成药</div>
+        <div style="flex: 1;">{{list.chineseTraditionalMedicineCostTotal}}</div>
+        <div style="flex: 1;"></div>
+        <div style="flex: 1;">治疗费</div>
+        <div style="flex: 1;">{{list.treatCostTotal}}</div>
+        <div style="flex: 1;"></div>
+      </div>
+      <div style="display: flex; text-align: center;padding: 5px 0;">
+        <div style="flex: 1;">检查费</div>
+        <div style="flex: 1;">{{list.checkCostTotal}}</div>
+        <div style="flex: 1;"></div>
+        <div style="flex: 1;">化验费</div>
+        <div style="flex: 1;">{{list.laboratoryCostTotal}}</div>
+        <div style="flex: 1;"></div>
+        <div style="flex: 1;">床位费</div>
+        <div style="flex: 1;">{{list.bedCostTotal}}</div>
+        <div style="flex: 1;"></div>
+      </div>
+      <div style="display: flex; text-align: center;padding: 5px 0;">
+        <div style="flex: 1;">护理费</div>
+        <div style="flex: 1;">{{list.hiliCostTotal}}</div>
+        <div style="flex: 1;"></div>
+        <div style="flex: 1;">诊察费</div>
+        <div style="flex: 1;">{{list.zhenChaCostTotal}}</div>
+        <div style="flex: 1;"></div>
+        <div style="flex: 1;">材料费</div>
+        <div style="flex: 1;">{{list.materialCostTotal}}</div>
+        <div style="flex: 1;"></div>
+      </div>
+    </div>
+    <div style="border: 1px solid black;border-bottom: 0;padding: 5px;">
+      <div style="display: inline-block;width: 49%;margin-bottom: 15px">
+        <!--        金额合计(大写) 肆仟壹佰肆拾肆元捌角叁分-->
+            <span  style="position: absolute;left:180px">
+                <span v-if="zhongwen.indexOf('万') > -1 && zhongwen.indexOf('拾') > -1 && zhongwen.indexOf('拾') == 1">
+                    {{ zhongwen.substring(0,1) }}
+                </span>
+                <span v-else>零</span>
+            </span>
+            <span  style="position: absolute;left:220px">
+                <span v-if="zhongwen.indexOf('万') > -1">
+                    {{ zhongwen.substring(zhongwen.indexOf('万') - 1,zhongwen.indexOf('万')) }}
+                </span>
+                <span v-else>零</span>
+            </span>
+            <span  style="position: absolute;left:260px">
+                <span v-if="zhongwen.indexOf('仟') > -1">
+                    {{ zhongwen.substring(zhongwen.indexOf('仟') - 1,zhongwen.indexOf('仟')) }}
+                </span>
+                <span v-else>零</span>
+            </span>
+            <span  style="position: absolute;left:300px">
+                <span v-if="zhongwen.indexOf('佰') > -1">
+                    {{ zhongwen.substring(zhongwen.indexOf('佰') - 1,zhongwen.indexOf('佰')) }}
+                </span>
+                <span v-else>零</span>
+            </span>
+            <span style="position: absolute;left:340px">
+                <span v-if="zhongwen.indexOf('拾') > -1">
+                    {{zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) == '佰' ||  !zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾'))? '壹' : zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) }}
+                </span>
+                <span v-else>零</span>
+            </span>
+            <span  style="position: absolute;left:380px">
+                <span v-if="zhongwen.indexOf('元') > -1 && zhongwen.substring(this.zhongwen.indexOf('元') - 1).substring(0,1)!= '拾'">
+                    {{ zhongwen.substring(zhongwen.indexOf('元') - 1,zhongwen.indexOf('元')) }}
+                </span>
+                <span v-else>零</span>
+            </span>
+            <span  style="position: absolute;left:420px">
+                <span v-if="zhongwen.indexOf('角') > -1">
+                    {{ zhongwen.substring(zhongwen.indexOf('角') - 1,zhongwen.indexOf('角')) }}
+                </span>
+                <span v-else>零</span>
+            </span>
+            <span  style="position: absolute;left:460px">
+                <span v-if="zhongwen.indexOf('分') > -1">
+                    {{ zhongwen.substring(zhongwen.indexOf('分') - 1,zhongwen.indexOf('分')) }}
+                </span>
+                <span v-else>零</span>
+            </span>
+      </div>
+      <div style="display: inline-block;width: 49%;">
+        (小写) {{totalPrice}}
+      </div>
+    </div>
+    <div style="border: 1px solid black;">
+      <div style="display: flex;">
+        <div style="width: 3%;border-right: 1px solid black;padding: 5px;">其他信息</div>
+        <div style="width: 96%;padding-left: 5px;">
+          <div style="display: flex;padding: 5px 0;">
+            <div style="width: 30%;">医疗费总额:{{list.medfee_sumamt}}元</div>
+            <div style="width: 30%;">基金支付总额:{{list.fund_pay_sumamt}}元</div>
+            <div style="width: 40%;">基本医疗保险统筹基金支出:{{list.hifp_pay}}元</div>
+          </div>
+          <div style="display: flex;">
+            <div style="width: 30%;">医疗救助基金支出:{{list.maf_pay}}元</div>
+            <div style="width: 30%;">个人账户支付金额:{{list.acct_pay}}元</div>
+            <div style="width: 40%;">个人支付金额:{{list.psn_cash_pay}}元</div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+  </div>
+</template>
+<script>
+import { getFaPiaoData } from '@/api/fapiao'
+import { uParseTime } from '@/utils/tools'
+export default {
+  props:{
+    paramsObj:Object
+  },
+  data(){
+    return{
+      gender:'',
+      list:{},
+      printDate:'',
+      zhongwen:'',
+      totalPrice:0.0,
+      org_id:'',
+      org_name:'',
+      now:""
+    }
+  },
+  created(){
+    const currentDate = new Date();
+    const year = currentDate.getFullYear();
+    const month = currentDate.getMonth() + 1;
+    const day = currentDate.getDate();
+    this.now =
+      year +
+      '-' +
+      (month < 10 ? '0' + month : month) +
+      '-' +
+      (day < 10 ? '0' + day : day)
+
+    console.log('paramsObj=-----',this.paramsObj)
+    let params = {
+      order_ids: this.paramsObj.order_ids,
+      patient_id: this.paramsObj.patient_id,
+    }
+    this.getInvoice(params)
+    this.org_id = this.$store.getters.xt_user.org_id
+    this.org_name = this.$store.getters.xt_user.org.org_name
+  },
+  methods:{
+    getInvoice(params){
+      getFaPiaoData(params).then((res) => {
+        console.log('res',res)
+        this.list = res.data.data
+        this.totalPrice = this.list.westernMedicineCostTotal + this.list.checkCostTotal + this.list.treatCostTotal + this.list.bedCostTotal + this.list.chineseTraditionalMedicineCostTotal +
+          this.list.laboratoryCostTotal + this.list.operationCostTotal + this.list.otherCostTotal + this.list.materialCostTotal + this.list.zhenChaCostTotal + this.list.hiliCostTotal
+        if(this.totalPrice == 0){
+
+          this.totalPrice = this.list.medfee_sumamt
+        }
+        console.log( "this.totalPrice")
+
+        this.smalltoBIG(this.totalPrice.toFixed(2))
+        var data = new Date(res.data.data.date * 1000);
+        var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
+        var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
+        this.printDate = data.getFullYear() + "-" + month + "-" + date;
+        this.gender = this.list.gender
+      })
+    },
+    smalltoBIG(n) {
+      // let fraction = ['角', '分'];
+      // let digit = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
+      // let unit = [['元.', '万,', '亿,'], ["元",'拾', '佰', '仟']];
+      // let head = price < 0 ? '欠' : '';
+      // price = Math.abs(price);
+      // let upper = '';
+      // for (let i = 0; i < fraction.length; i++) {
+      // upper += (digit[Math.floor(price * 10 * Math.pow(10, i)) % 10] + fraction[i]).replace(/零./, '');
+      // }
+      // upper = upper || '整';
+      // price = Math.floor(price);
+      // for (let i = 0; i < unit[0].length && price > 0; i++) {
+      // let p = '';
+      // for (let j = 0; j < unit[1].length && price > 0; j++) {
+      //     p = digit[price % 10] + unit[1][j] + p;
+      //     price = Math.floor(price / 10);
+      // }
+      // upper = p.replace(/(零.)*零$/, '').replace(/^$/, '零') + unit[0][i] + upper;
+      // }
+      // this.zhongwen = head + upper.replace(/(零.)*零圆/, '圆').replace(/(零.)+/g, '零').replace(/^整$/, '零圆整')
+      // console.log('6666',head + upper.replace(/(零.)*零圆/, '圆').replace(/(零.)+/g, '零').replace(/^整$/, '零圆整'))
+      if (!/^(0|[1-9]\d*)(\.\d+)?$/.test(n)){
+        return "数据非法";  //判断数据是否大于0
+      }
+
+      var unit = "仟佰拾亿仟佰拾万仟佰拾元角分", str = "";
+      n += "00";
+
+      var indexpoint = n.indexOf('.');  // 如果是小数，截取小数点前面的位数
+
+      if (indexpoint >= 0){
+
+        n = n.substring(0, indexpoint) + n.substr(indexpoint+1, 2);   // 若为小数，截取需要使用的unit单位
+      }
+
+      unit = unit.substr(unit.length - n.length);  // 若为整数，截取需要使用的unit单位
+      for (var i=0; i < n.length; i++){
+        str += "零壹贰叁肆伍陆柒捌玖".charAt(n.charAt(i)) + unit.charAt(i);  //遍历转化为大写的数字
+      }
+
+      this.zhongwen =  str.replace(/零(仟|佰|拾|角)/g, "零").replace(/(零)+/g, "零").replace(/零(万|亿|元)/g, "$1").replace(/(亿)万|壹(拾)/g, "$1$2").replace(/^元零?|零分/g, "").replace(/元$/g, "元整");
+      console.log(this.zhongwen)
+    },
+    getTime(value, temp) {
+      if (value == 0) {
+        return ''
+      }
+      if (value != undefined) {
+        return uParseTime(value, temp)
+      }
+      return ''
+    },
+  },
+  watch:{
+    paramsObj:{//深度监听，可监听到对象、数组的变化
+      handler(val, oldVal){
+        let params = {
+          order_ids: val.order_ids,
+          patient_id: val.patient_id,
+          // number: val.number,
+        }
+        this.getInvoice(params)
+
+      },
+      deep:true
+    }
+  }
+}
+</script>

src/xt_pages/eleFaPiao/newSettleDetail.vue

@@ -147,7 +147,7 @@
         <el-table-column align="center" prop="name" label="操作">
           <template slot-scope="scope">
             <el-button v-if="scope.row.result.id == 0" size="mini" type="primary"
-                       @click="blue()">
+                       @click="blueDailog()">
               开票
             </el-button>
             <el-button v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0" size="mini" type="primary"
@@ -178,11 +178,25 @@
       </el-pagination>
     </div>
 
+    <el-dialog
+      class="centerDialog"
+      width="1200px"
+      :visible.sync="settlementVisible">
+      <div>
+<!--        <new-print-one :paramsObj="paramsObj"></new-print-one>-->
+        <new-print-one :paramsObj="paramsObj"></new-print-one>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="settlementVisible = false">取 消</el-button>
+        <el-button type="primary" @click="blue">开票</el-button>
+      </span>
+    </el-dialog>
 
   </div>
 </template>
 
 
+
 <script>
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import { getDoctorList, getExportConsumeDetailList, getHisOrderList, Refund } from '@/api/his/his'
@@ -201,11 +215,13 @@ import {
 import { getDialysisRecordInitData } from '@/api/dialysis_record'
 import { number } from 'echarts/lib/export'
 import QRCode from 'qrcodejs2'
+import NewPrintOne from './newPrintOne.vue'
 
 const moment = require('moment')
 export default {
   name: 'newSettleDetail',
   components: {
+    NewPrintOne,
     BreadCrumb,
   },
   props: {
@@ -213,6 +229,7 @@ export default {
   },
   data() {
     return {
+      dialogVisible:false,
       staff:"",
       admins:[],
       orderObj: {},
@@ -267,6 +284,7 @@ export default {
       settlementVisible: false,
       settlementObj: {},
       accounts_click_vi:false,
+      cur_ids:"",
     }
   },
 
@@ -307,6 +325,23 @@ export default {
         }
       }).catch(function(error) {
       })
+    },blueDailog(){
+      var order_ids = ""
+      for(let i = 0; i < this.selecting_schs.length;i++){
+        if(order_ids.length == 0){
+          order_ids = this.selecting_schs[i].id
+        }else{
+          order_ids =order_ids + ","+this.selecting_schs[i].id
+        }
+      }
+      this.cur_ids =order_ids
+      this.patient_id = this.patient_id
+      let paramsObj = {
+        order_ids: order_ids,
+        patient_id: this.patient_id,
+      }
+      this.settlementVisible = true
+      this.paramsObj = paramsObj
     },
     blue(){
       var order_ids = ""

src/xt_pages/eleFaPiao/settleDetail.vue

@@ -228,6 +228,20 @@
         <el-button type="primary" @click="qr_dialogVisible = false">确 定</el-button>
       </span>
     </el-dialog>
+
+    <el-dialog
+      class="centerDialog"
+      width="1200px"
+      :visible.sync="settlementVisible">
+      <div>
+        <new-print-one :paramsObj="paramsObj"></new-print-one>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="settlementVisible = false">取 消</el-button>
+        <el-button type="primary" @click="blueRequest">开票</el-button>
+      </span>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -253,10 +267,14 @@ import {
 
 import { getDialysisRecordInitData } from '@/api/dialysis_record'
 import QRCode from 'qrcodejs2'
+import NewInvoicePrint from './newInvoicePrint.vue'
+import NewPrintOne from './newPrintOne.vue'
 const moment = require('moment')
 export default {
   name: 'OutpatientChargesSummary',
   components: {
+    NewPrintOne,
+    NewInvoicePrint,
     BreadCrumb,
   },
   data() {
@@ -266,6 +284,7 @@ export default {
       orderObj: {},
       batchOrderObj: {},
       fapiao_number:"",
+      invoiceVisible: false,
       med_options: [
         { id: 0, text: '全部' },
         { id: 11, text: '普通门诊' },
@@ -309,13 +328,13 @@ export default {
       listVisible: false,
       allListVisible: false,
       adminUserOptions: [],
-      invoiceVisible: false,
       paramsObj: {},
       invoiceParams: {},
       settlementVisible: false,
       settlementObj: {},
       accounts_click_vi:false,
-
+      cur_ids:0,
+      patient_id:0,
       login_dialogVisible:false,
       qr_dialogVisible:false,
       formLabelAlign: {
@@ -606,11 +625,9 @@ export default {
     },download(){
 
 
-    },
-    blue(row){
-     var  ids = row.id
+    },blueRequest(){
       let params = {
-        "order_ids":ids,
+        "order_ids": this.cur_ids,
         "admin_user_id":this.$store.getters.xt_user.user.id,
       }
 
@@ -636,6 +653,22 @@ export default {
         }
       }).catch(function(error) {
       })
+    },
+    blue(row){
+      var  ids = row.id
+      this.cur_ids =ids
+      this.patient_id = row.patient_id
+      console.log(row)
+      let paramsObj = {
+        order_ids: ids,
+        patient_id: row.patient_id,
+      }
+      this.settlementVisible = true
+      this.paramsObj = paramsObj
+      console.log(this.paramsObj)
+
+      // this.invoiceVisible = true
+
       // OpenBlueFapiao(params).then((response) => {
       //   if (response.data.state == 0) {
       //     this.$message.error(response.data.msg)
@@ -871,7 +904,7 @@ export default {
       this.invoiceVisible = true
       var obj = this.targeObj
       let paramsObj = {
-        order_id: obj.id,
+        order_ids: obj.id,
         patient_id: obj.patient_id,
         number: obj.mdtrt_id,
         name: obj.patient.name,

src/xt_pages/outpatientCharges/invoicePrint.vue

@@ -15,12 +15,12 @@
       size="small" type="success"
       @click="showclick = !showclick">{{ showclick==false ? '白纸' : '发票' }}</el-button>
     </template>
-    <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 10485 && org_id != 10375 && org_id != 10567 && org_id != 10188 && org_id != 10633 && org_id != 0"><!--&& org_id != 10188 && org_id != 0-->
+    <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 10485 && org_id != 10375 && org_id != 10567 && org_id != 10188 && org_id != 10633"><!--&& org_id != 10188 && org_id != 0-->
         <div class='dialysisPage'>
           <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217 && org_id != 10387&& org_id != 10210 && org_id != 10387 && org_id != 10480 " >
             <printOne v-if="org_id != 10088 && org_id != 10510 && org_id != 0" :paramsObj="invoiceParams"></printOne>
-            <printThree v-if="org_id == 10088 || org_id == 0" :paramsObj="invoiceParams" :show="showclick"></printThree>
-            <printfifteen v-if="org_id == 10510  " :paramsObj="invoiceParams"></printfifteen>
+            <printThree v-if="org_id == 10088 " :paramsObj="invoiceParams" :show="showclick"></printThree>
+            <printfifteen v-if="org_id == 10510 || org_id == 0 " :paramsObj="invoiceParams"></printfifteen>
           </div>
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
           <printFour v-if="org_id == 10215 " :paramsObj="invoiceParams"></printFour>
@@ -65,10 +65,10 @@
     <!-- 新发票 -->
     <div class="app-container" style="padding-top:20px;" v-if="org_id == 10188 || org_id ==0 ">
       <div class='dialysisPage'>
-        <printseventeen :paramsObj="invoiceParams"></printseventeen>
+<!--        <printseventeen :paramsObj="invoiceParams"></printseventeen>-->
       </div>
     </div>
-      
+
     <!-- <div class="app-container" style="" v-if="org_id == 0">
       <div class='dialysisPage'>
         <printSixteen :paramsObj="invoiceParams"></printSixteen>
@@ -94,7 +94,7 @@
   import printfourteen from './invoiceTemplate/printfourteen'
   import printfifteen from './invoiceTemplate/printfifteen'
   import printSixteen from './invoiceTemplate/printSixteen'
-  import printseventeen from './invoiceTemplate/printseventeen'
+  // import printseventeen from '../eleFaPiao/printseventeen.vue'
   export default {
     name: "invoicePrint",
     components: {
@@ -114,7 +114,7 @@
       printfourteen,
       printfifteen,
       printSixteen,
-      printseventeen
+      // printseventeen
     },
     props:{
       invoiceParams:Object

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -3366,7 +3366,7 @@ export default {
         }
 
         if (this.hisPatientInfo.id_card_type == 1) {
-          if (this.hisPatientInfo.balance_accounts_type != 2 && this.$store.getters.xt_user.org_id != 10510 && this.$store.getters.xt_user.org_id != 10088 && this.$store.getters.xt_user.org_id != 10106 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 && this.$store.getters.xt_user.org_id != 10191 && this.$store.getters.xt_user.org_id !=  10318 && this.$store.getters.xt_user.org_id !=  10210 && this.$store.getters.xt_user.org_id !=  10375 &&  this.$store.getters.xt_user.org_id !=  10480  &&  this.$store.getters.xt_user.org_id !=  10598) {
+          if (this.hisPatientInfo.balance_accounts_type != 2 && this.$store.getters.xt_user.org_id != 10510 && this.$store.getters.xt_user.org_id != 10088 && this.$store.getters.xt_user.org_id != 10106 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 && this.$store.getters.xt_user.org_id != 10191 && this.$store.getters.xt_user.org_id !=  10318 && this.$store.getters.xt_user.org_id !=  10210 && this.$store.getters.xt_user.org_id !=  10375 &&  this.$store.getters.xt_user.org_id !=  10480 &&  this.$store.getters.xt_user.org_id !=  10387  &&  this.$store.getters.xt_user.org_id !=  10598) {
             this.pwdFormVisible = true
             this.pwd = ''
           } else {

src/xt_pages/workforce/components/tableWeeks.vue

@@ -719,9 +719,8 @@
             dialysisPipe.push(obj)
           }
         }
-        console.log(dialysisPipe)
+    
         dialysisPipe = this.uniqueDialysisPipe(dialysisPipe)
-        console.log(dialysisPipe)
 
         let desc = ''
         for (let b = 0; b < dialysisPipe.length; b++) {

src/xt_pages/workforce/remind.vue

@@ -15,7 +15,6 @@
     </el-tabs>
     <table-push v-if="activeName=='pushTime'"></table-push>
     <!-- <table-weeks v-else :week-time="activeName"> </table-weeks> -->
-
    <table-weeks v-if="activeName == 'thisWeek'"> </table-weeks>
    <nextTableWeeks v-if="activeName =='nextWeek'"></nextTableWeeks>
   </div>