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/DialysisPrintOrderSeventyeight.vue

@@ -211,7 +211,7 @@
 
                   <div class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
-                  > 
+                  >
                     <!-- <div class="inline_block" style=" flex: 1">
                       透析期间：
                       <div
@@ -276,14 +276,14 @@
                         {{ predialysis.complication ? predialysis.complication : "/" }}
                       </div>
                     </div>
-                    <div class="inline_block" style=" flex: 1">
+                    <!-- <div class="inline_block" style=" flex: 1">
                       跌倒评估：
                       <div
                         style="width: 50%; text-align: center;display: inline-block;border-bottom: 1px solid #999;"
                       >
                         {{ receiverTreatmentAccess.score ? receiverTreatmentAccess.score : '/' }}
                       </div>
-                    </div>
+                    </div> -->
                   </div>
 
                   <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
@@ -300,7 +300,7 @@
                       <div
                         style="width: 50%; text-align: center;display: inline-block;border-bottom: 1px solid #999;"
                       >
-                        {{ predialysis.weight_before ? 
+                        {{ predialysis.weight_before ?
                           parseFloat( predialysis.weight_before - predialysis.additional_weight ).toFixed(1) : "/"
                         }}
                       </div>kg
@@ -313,17 +313,17 @@
                         class="under_line"
                         style=" width: 50%;text-align: center;white-space: normal;"
                       >
-                      {{ predialysis.weight_before > 0 && predialysis.dry_weight > 0 ? 
+                      {{ predialysis.weight_before > 0 && predialysis.dry_weight > 0 ?
                       parseFloat(predialysis.weight_before - predialysis.dry_weight - predialysis.additional_weight).toFixed(2): "/" }}
                       </div>kg
                     </div>
                     <div class="inline_block" style=" flex: 1">
-                      预增脱水量：
+                      <!-- 预增脱水量：
                       <div
                         style="width: 50%; text-align: center;display: inline-block;border-bottom: 1px solid #999;"
                       >
                          {{predialysis.dehydration?predialysis.dehydration:"" }}
-                      </div>L
+                      </div>L -->
                     </div>
                   </div>
                 </td>
@@ -409,7 +409,7 @@
                         {{ afterdialysis.symptom_after_dialysis ? afterdialysis.symptom_after_dialysis : "/" }}
                       </div>
                     </div>
-                    
+
                   </div>
 
                   <div class="row" style="padding: 2px 0; line-height: 23px; display: flex"
@@ -615,7 +615,7 @@
                         {{ prescription.blood_flow_volume ? prescription.blood_flow_volume : "/" }}
                       </div>ml/min
                     </div>
-                    
+
                   </div>
 
                   <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
@@ -631,13 +631,13 @@
                      <div class="inline_block" style="flex: 1">
                       膜面积：
                       <div class="under_line" style="width: 50px; text-align: center">
-                      
+
                       </div>㎡
                     </div>
                     <div class="inline_block" style="flex: 1">
                       膜材质：
                       <div class="under_line" style="width: 80px; text-align: center">
-                        
+
                       </div>
                     </div>
                     <div class="inline_block" style="flex: 1">
@@ -652,7 +652,7 @@
                         {{ dialysisOrder && dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0
                         ? dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number }}
                       </div>
-                      
+
                     </div>
                   </div>
 
@@ -669,7 +669,7 @@
                             : "/"
                         }}
                         </span>
-                        
+
                       </div>
                     </div>
                     <div
@@ -701,7 +701,7 @@
                      <span v-if="prescription.anticoagulant == 11">iu</span>
                      <span v-if="prescription.anticoagulant == 13">iu</span>
 
-                  
+
                     </div>
                     <div class="inline_block" style="margin-left: 20px">
                       维持：
@@ -805,9 +805,9 @@
                        <span v-if="prescription.anticoagulant == 10">iu</span>
                       <span v-if="prescription.anticoagulant == 11">iu</span>
                       <span v-if="prescription.anticoagulant == 13">iu</span>
-                   
+
                     </div>
-                    
+
                   </div>
 
                   <div class="row" style="padding: 2px 0; line-height: 23px">
@@ -937,7 +937,7 @@
                             >({{ advice.remark }})</span
                           >
                         </td>
-                       
+
                         <td height="32px">
                           <span v-if="advice!=null && advice.advice_doctor>0">
                               <span
@@ -979,7 +979,7 @@
                           <img style="height:30px;" :src="setAdminUserES(advice.checker)" alt="" srcset="" v-else>
                         </td>
                       </tr>
-                  
+
                     </tbody>
                   </table>
                 </td>
@@ -1046,12 +1046,12 @@
                           {{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : '0'  }}
                         </td>
                         <td>
-                          {{ monitor.replacement_rate ? monitor.replacement_rate : '0' }} / 
+                          {{ monitor.replacement_rate ? monitor.replacement_rate : '0' }} /
                           {{ monitor.displacement_quantity ? monitor.displacement_quantity : '0'  }}
                         </td>
                         <!-- 钠浓度(mmol/L)/温度°C -->
                         <td>
-                          {{ monitor.sodium_concentration ? monitor.sodium_concentration : "0" }} / 
+                          {{ monitor.sodium_concentration ? monitor.sodium_concentration : "0" }} /
                           {{ monitor.temperature ? monitor.temperature : '0' }}
                         </td>
 
@@ -1076,7 +1076,7 @@
                                 "
                                 >【开始透析】引血{{ dialysisOrder.blood_drawing }} ml/min
                                 </template>
-                              
+
                                 {{ monitor.dispose }} {{ monitor.end }}  &nbsp;
                               &nbsp;
                             </span>
@@ -1304,7 +1304,7 @@
                       透后宣教：
                       <div class="under_line" style="width: 70%; text-align: center">
                         {{ summary.mission ? summary.mission : '/' }}
-                      </div>                     
+                      </div>
                     </div>
                   </div>
 
@@ -1634,7 +1634,7 @@
         </div>
       </div>
     </div>
-     
+
   </div>
 </template>
 
@@ -1938,7 +1938,11 @@ export default {
         this.predialysis.diastolic_blood_pressure == 0
       ) {
         this.$message.error("透前血压未填完整");
-      } else if (this.predialysis.symptom_before_dialysis == "") {
+      }
+      // else if (this.predialysis.dialysis_interphase == "") {
+      //   this.$message.error("透析期间未填");
+      // }
+      else if (this.predialysis.symptom_before_dialysis == "") {
         this.$message.error("透前症状未填");
       } else if (this.predialysis.internal_fistula == "") {
         this.$message.error("透前内瘘未填");

src/xt_pages/hospitalStation/listPrint.vue

@@ -13,7 +13,8 @@
     </template>
 
     <div class='dialysisPage' style="padding-top:40px;">
-       <printOne :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
+       <!-- <printOne :list="list" :patient="patient" :order="order" :admin="admin"></printOne> -->
+       <printthree :list="list" :patient="patient" :order="order" :admin="admin"></printthree>
 <!--      <printTwo :list="list" :patient="patient" :order="order" :admin="admin"></printTwo>-->
     </div>
   </div>
@@ -22,14 +23,16 @@
 <script>
   import printOne from './listTemplate/printOne'
   import printTwo from './listTemplate/printTwo'
+  import printthree from './listTemplate/printthree'
   import { getHisOrderDetail } from '@/api/his/his'
   import { uParseTime } from '@/utils/tools'
-
+  import print from "print-js";
   export default {
     name: 'listPrint',
     components: {
       printOne,
-      printTwo
+      printTwo,
+      printthree
     },
     props: {
       paramsObj: Object
@@ -63,13 +66,15 @@
             this.patient = response.data.data.patient
             this.admin = response.data.data.admin_info
 
-
+            console.log('response.data.data',response.data.data);
+            
             for (let i = 0; i < response.data.data.order_info.length; i++) {
               var infos = response.data.data.order_info[i]
               let obj = {
                 med_chrgitm_type: this.getType(infos.med_chrgitm_type),
                 price: infos.pric,
-                count: infos.cnt
+                count: infos.cnt,
+                selfpay_prop:infos.selfpay_prop,
               }
               console.log("-----1-------")
 
@@ -77,13 +82,21 @@
                 obj['p_time'] = this.getTimes(infos.project.prescription.ctime)
                 if(infos.project.type == 2){
                   obj['name'] = infos.project.project.project_name
+                  obj['code'] = infos.project.project.medical_code
+                  obj['spec'] = ''
+                  obj['unit'] =  infos.project.project.unit
+                  obj['is_total']= 0
+                  obj['start_time'] = infos.project.start_time
 
                 }else if (infos.project.type == 3){
                   obj['name'] = infos.project.good_info.good_name
-
+                  obj['code'] = infos.project.good_info.medical_insurance_number
+                  obj['unit'] = infos.project.good_info.packing_unit
+                  obj['is_total']= 0
+                  obj['start_time'] = infos.project.start_time
                 }
-                obj['spec'] = 1
-                obj['unit'] = infos.project.unit
+                // obj['spec'] = 1
+                // obj['unit'] = infos.project.unit
 
               }
               console.log("-----2-------")
@@ -93,7 +106,9 @@
                 obj['name'] = infos.advice.advice_name
                 obj['spec'] = infos.advice.drug.drug_spec
                 obj['unit'] = infos.advice.drug.max_unit
-
+                obj['code'] = infos.advice.drug.medical_insurance_number
+                obj['start_time'] = infos.advice.created_time
+                obj['spec'] =  infos.advice.drug.dose +  infos.advice.drug.dose_unit+"*" + infos.advice.drug.min_number +  infos.advice.drug.min_unit+"/"+infos.advice.drug.max_unit
               }
               console.log("～～～3～～～～～～")
 

src/xt_pages/hospitalStation/listTemplate/printthree.vue

@@ -0,0 +1,232 @@
+<template>
+  <div id="list-print" class="list-print">
+      <div style="page-break-after: always;">
+        <div class="listTitle">{{$store.getters.xt_user.org.org_name}}费用清单</div>
+        <div class="listInfo">
+            <div>患者姓名：{{patient.name}}</div>
+            <div>性别：{{patient.gender == 1 ? '男': '女'}}</div>
+            <div>身份证号：{{patient.id_card_no}}</div>
+            <div>年龄：{{patient.age}}  岁</div>
+            <!-- <div>开方日期：{{getTimes(order.settle_accounts_date) }}</div> -->
+        </div>
+        <div class="listInfo">
+            <div>结算类型：{{order.is_medicine_insurance == 1 ? "医保" : "自费"}}</div>
+            <div>就诊流水号：{{ order.mdtrt_id }}</div>
+            <div>透析号：{{patient.dialysis_no}}</div>
+            <div>发票号：{{order.fa_piao_number}}</div>
+        </div>
+        <div class="listInfo">
+            <div>总金额：{{ order.medfee_sumamt }}</div>
+            <div>个人支付金额：{{ order.psn_part_amt }}</div>
+            <div>基金支付金额：{{ order.fund_pay_sumamt }}</div>
+            <div>收费日期：{{getTimes(order.ctime)}}</div>
+        </div>
+        
+        <table class="listTable" style="text-align: center;">
+            <tr style="border-bottom: 1px solid black;">
+              <td style="width:12%">开方日期</td>
+              <td style="width:20%">医保编码</td>
+              <td style="width:20%">项目名称</td>
+              <td style="width:13%">规格</td>
+              <td style="width:5%">数量</td>
+              <td style="width:5%">单位</td>
+              <td style="width:8%">单价(元)</td>
+              <td style="width:8%">金额(元)</td>
+              <td style="width:10%">自付比例</td>
+            </tr>
+            <tr v-for="(item,index) in list" style="line-height: 30px;">
+                <!-- <template v-if="index == (list.length)-1">
+                    <tr style="border-bottom: 1px solid black;"></tr>
+                </template> -->
+                <td style="width:12%">{{getTimes(item.start_time)}}</td>
+                <td style="width:20%">{{item.code}}</td>
+                <td style="width:20%">{{item.name}}</td>
+                <td style="width:13%">{{item.spec}}</td>
+                <td style="width:5%" >
+                  <span v-if="item.code!=undefined">{{item.count}}</span>
+                </td>
+                <td style="width:5%" >{{item.unit}}</td>
+                <td style="width:7%">
+                  <span v-if="item.code!=undefined">{{(item.price*1).toFixed(2)}}</span>
+                </td>
+                <td style="width:7%">{{(item.price * item.count).toFixed(2)}}</td>
+                <td style="width:10%" v-if="item.code!=undefined">
+                  {{(item.selfpay_prop)*100}}
+                  <span v-if="item.selfpay_prop !=''">%</span>
+                </td>
+            </tr>
+        </table>
+        <div style="border-top: 1px solid black;">
+          <div style="text-align: right;">
+            合计金额:{{order.medfee_sumamt}}
+          </div>
+        </div>
+      </div>
+  </div>
+</template>
+
+<script>
+import { uParseTime } from '@/utils/tools'
+
+export default {
+  props: {
+    list: {
+      type: Array,
+      default: function () {
+        return [];
+      }
+    },
+    patient: {
+      type: Object,
+      default: function () {
+        return {};
+      }
+    }, order: {
+      type: Object,
+      default: function () {
+        return {};
+      }
+    }, admin: {
+      type: Object,
+      default: function () {
+        return {};
+      }
+    },
+  },
+  data(){
+      return{
+          page:1,
+          pageArr:[],
+          org_id:'',
+          list:[]
+      }
+  },
+  // mounted(){
+  //     this.getPage()
+  // },
+  methods:{
+    getMedicineInsuranceKind(type){
+      switch (type) {
+        case "01":
+          return '甲类';
+        case "02":
+          return '乙类';
+        case "03":
+          return '自费';
+          break;
+      }
+
+    },
+    getNowTime: function () {
+      let dateTime
+      let yy = new Date().getFullYear()
+      let mm = new Date().getMonth() + 1
+      let dd = new Date().getDate()
+      let hh = new Date().getHours()
+      let mf = new Date().getMinutes() < 10 ? '0' + new Date().getMinutes()
+        :
+        new Date().getMinutes()
+      let ss = new Date().getSeconds() < 10 ? '0' + new Date().getSeconds()
+        :
+        new Date().getSeconds()
+      dateTime = yy + '-' + mm + '-' + dd
+      return dateTime
+    },
+    getTimes(time) {
+      return uParseTime(time, '{y}-{m}-{d}')
+    },
+    getPage(){
+
+      if(this.list.length <= 17){
+          this.page = 1
+          this.pageArr.push(this.list.length)
+      }else if(this.list.length > 17){
+          this.page = parseInt(this.list.length / 17)
+          let num = this.list.length % 17
+          for (var i=0;i<this.page;i++){
+              this.pageArr.push(17)
+          }
+          if(num != 0){
+              this.pageArr.push(num)
+          }
+      }
+      console.log('this.pageArr',this.list);
+    },
+    getlist(){
+      // if(this.list.length <= 17){
+          this.page = 1
+          this.pageArr.push(this.list.length)
+          console.log('this.pageArr',this.pageArr);
+      // }else if(this.list.length > 17){
+      //     this.page = parseInt(this.list.length / 17)
+      //     let num = this.list.length % 17
+      //     for (var i=0;i<this.page;i++){
+      //         this.pageArr.push(17)
+      //     }
+      //     if(num != 0){
+      //         this.pageArr.push(num)
+      //     }
+      // }
+    }
+  },
+  created(){
+   
+    this.org_id = this.$store.getters.xt_user.org_id
+  },
+  watch:{
+      list: {
+          handler(newVal) {
+            // this.list = newVal
+              this.getPage()
+              // this.getlist()
+          },
+          deep: true
+      }
+  }
+
+}
+
+
+</script>
+
+<style lang="scss" scoped>
+.list-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;
+}
+.listTitle{
+  font-size: 24px;
+  text-align: center;
+  font-weight: bold;
+  margin-bottom: 10px;
+}
+.listInfo{
+  display: flex;
+  font-size: 16px;
+  justify-content: space-between;
+  margin: 10px 0;
+}
+.listTable{
+  width: 100%;
+  text-align: center;
+  border-collapse: collapse;
+  line-height: 20px;
+  font-size: 14px;
+  border-color: #000;
+  text-align: left;
+}
+.listTable tr td {
+  padding: 0 5px;
+}
+.tableBottom{
+  font-size: 12px;
+  display: flex;
+  margin-top: 20px;
+}
+.tableBottomOne{
+  margin-right: 20px;
+}
+</style>

src/xt_pages/outpatientCharges/chargeDetailManagement.vue

@@ -119,7 +119,7 @@
 
                       </el-tab-pane>
 
-                      <charge-month-prescription-table v-if="this.radio == 1"
+                      <charge-month-prescription-table v-loading="loading_two" v-if="this.radio == 1"
                                                        :prescription="curPrescriptions"></charge-month-prescription-table>
 
                     </el-tabs>
@@ -232,23 +232,18 @@
                       <!--<prescription-table :preTableData='preTableData'></prescription-table>-->
                       <!--<month-prescription-table ref="prescription_tables"-->
                       <!--:activeType="activeType"  :prescription="curMonthPrescriptions"></month-prescription-table>-->
-                      <charge-month-prescription-table v-if="this.radio == 1"
+                      <charge-month-prescription-table v-loading="loading_two" v-if="this.radio == 1"
                                                        :prescription="curMonthPrescriptions"></charge-month-prescription-table>
 
-                      <settle-prescription-table v-if="this.radio == 2"
+                      <settle-prescription-table v-loading="loading_two"  v-if="this.radio == 2"
                                                  :prescription="curMonthPrescriptions"></settle-prescription-table>
-
                     </el-tabs>
-
                   </div>
                   <div class="costBox">
                     <span>当前处方总费用：<span style="color:red;">{{ month_total }}元</span></span>
                     <span>处方总价：<span style="color:red;">{{ all_month_total }}元</span></span>
-
-
                   </div>
                 </div>
-
               </div>
             </el-tab-pane>
           </el-tabs>
@@ -306,6 +301,7 @@ export default {
       dialogVisible:false,
       charge_type:1,
       isloading: false,
+      loading_two:false,
       isdisabled: false,
       register: [
         { value: 1, label: '门诊' },
@@ -822,7 +818,7 @@ export default {
           .catch(function(error) {
           })
       }
-    }, 
+    },
 
     changePatientInfo() {
       let params = {
@@ -894,6 +890,7 @@ export default {
       }
       getZuoBiaoPatientList(params).then(response => {
         if (response.data.state == 0) {
+
           this.$message.error(response.data.msg)
           return false
         } else {
@@ -1281,18 +1278,23 @@ export default {
         'is_upload': this.radio
       }
       this.loading = true
+      this.loading_two = true
       getZuoBiaoPatientInfo(params).then(response => {
         if (response.data.state == 0) {
           this.loading = false
+          this.loading_two = false
+
           this.$message.error(response.data.msg)
           return false
         } else {
+          this.loading_two = false
+
+          this.loading = false
 
           this.prescriptions = []
           this.month_prescriptions = []
           this.curPrescriptions = {}
           this.curMonthPrescriptions = {}
-          this.loading = false
           this.hisPatientInfo = response.data.data.patient
           this.prescription_info = response.data.data.prescription_info
           this.sick_type = this.prescription_info.sick_type

src/xt_pages/outpatientCharges/components/chargeDialog.vue

@@ -334,7 +334,9 @@
       },getfapiaonumber(){
         getfapiaonumber().then((res) => {
           if (res.data.state == 1) {
-            this.form.fapiao_number = res.data.data.fapiao_number;
+            if(this.$store.getters.xt_user.org.id != 10644) {
+              this.form.fapiao_number = res.data.data.fapiao_number;
+            }
           }
         })
       },

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -689,122 +689,6 @@
           'certificates':this.form.certificates,
         }
 
-        if ((this.$store.getters.xt_user.org_id == 10387 && this.form.id_card_type ==  4) || (this.$store.getters.xt_user.org_id == 4 && this.form.id_card_type ==  4)) {
-          try {
-            //检测当前浏览器是否支持websocket模式
-            window.WebSocket = window.WebSocket || window.MozWebSocket;
-            if (!window.WebSocket){
-              alert("WebSocket not supported by this browser");
-              return;
-            }
-            this.ws = new WebSocket("ws://127.0.0.1:8899");//连接服务器
-            var that = this
-            this.ws.onopen = function(event){
-              if (that.$store.getters.xt_user.org_id == 10387){
-                that.ws.send("{\"url\":\"http://10.93.33.243:20001/localcfc/api/hsecfc/localQrCodeQuery\",\"indata\":{\"data\":{\"businessType\":\"01101\",\"deviceType\":\"\",\"officeId\":\"32760\",\"officeName\":\"肾内科\",\"operatorId\":\"admin\",\"operatorName\":\"罗佳菊\",\"orgId\":\"H43082200408\"},\"orgId\":\"H43082200408\",\"transType\":\"ec.query\"}}");
-              }else if(that.$store.getters.xt_user.org_id == 10318){
-                that.ws.send("{\"url\":\"http://igb.hsa.gdgov.cn/prd_nation_eccode/prd_eccode/localcfc/api/hsecfc/localQrCodeQuery\",\"indata\":{\"data\":{\"businessType\":\"01101\",\"deviceType\":\"\",\"officeId\":\"32760\",\"officeName\":\"肾内科\",\"operatorId\":\"admin\",\"operatorName\":\"邹刘阳\",\"orgId\":\"H44011701749\"},\"orgId\":\"H44011701749\",\"transType\":\"ec.query\"}}");
-              }else if(that.$store.getters.xt_user.org_id == 4){
-                that.ws.send("{\"url\":\"http://igb.hsa.gdgov.cn/prd_nation_eccode/prd_eccode/localcfc/api/hsecfc/localQrCodeQuery\",\"indata\":{\"data\":{\"businessType\":\"01101\",\"deviceType\":\"\",\"officeId\":\"32760\",\"officeName\":\"肾内科\",\"operatorId\":\"admin\",\"operatorName\":\"邹刘阳\",\"orgId\":\"H44011701749\"},\"orgId\":\"H44011701749\",\"transType\":\"ec.query\"}}");
-              }
-            };
-
-            this.ws.onmessage = function(event){
-              // alert("接收到服务器发送的数据：\r\n"+event.data);
-              var newParams =  JSON.parse(event.data)
-              console.log(newParams)
-              console.log(newParams.data)
-              console.log(newParams.data)
-              console.log(newParams.data.ecToken)
-              console.log(newParams.data.idNo)
-              console.log(newParams.data.userName)
-              console.log(newParams.data.insuOrg)
-
-              newParams['ecToken'] = newParams.data.ecToken
-              newParams['idNo'] = newParams.data.idNo
-              newParams['userName'] = newParams.data.userName
-              newParams['insuOrg'] = newParams.data.insuOrg
-
-              newParams['id_card_type'] =  that.form.id_card_type
-              newParams['admin_user_id'] = that.$store.getters.xt_user.user.id
-              newParams['certificates'] = that.form.certificates
-              axios.get('http://127.0.0.1:9532/api/readcard', {
-                params: newParams
-              })
-                .then(function(response) {
-                  if (response.data.state == 0) {
-                    that.$message.error(response.data.msg)
-                    return false
-                  } else {
-
-                    if (response.data.data.failed_code == -10) {
-                      that.$confirm(response.data.data.msg, '医保错误信息', {
-                        confirmButtonText: '确 定',
-                        type: 'warning'
-                      }).then(() => {
-
-                      }).catch(() => {
-                      })
-                    } else {
-
-                      var patient = response.data.data.patient
-
-                      if (that.form.id_card_type == 1) {
-                        that.form.id = patient.id
-                        that.form.name = patient.name
-                        that.form.gender = patient.gender
-                        that.form.age = patient.age
-                        that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
-                        that.form.phone = patient.phone
-                        that.form.id_card = patient.id_card_no
-                        that.form.medical_insurance_card = response.data.data.number
-                        that.form.social_type = parseInt(response.data.data.insutype)
-
-
-
-                      } else if (that.form.id_card_type == 2) {
-                        that.form.id = patient.id
-                        that.form.name = patient.name
-                        that.form.gender = patient.gender
-                        that.form.age = patient.age
-                        that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
-                        that.form.phone = patient.phone
-                        that.form.id_card = patient.id_card_no
-                        that.form.social_type = parseInt(response.data.data.insutype)
-
-                      } else {
-                        that.form.id = patient.id
-                        that.form.name = patient.name
-                        that.form.gender = patient.gender
-                        that.form.age = patient.age
-                        that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
-                        that.form.phone = patient.phone
-                        that.form.id_card = patient.id_card_no
-                        that.form.social_type = parseInt(response.data.data.insutype)
-
-                      }
-                      that.$message({ message: '读卡成功', type: 'success' })
-                    }
-                  }
-                })
-                .catch(function(error) {
-
-                })
-
-
-            };
-            this.ws.onclose = function(event){
-              // alert("已经与服务器断开连接\r\n当前连接状态："+this.readyState);
-            };
-            this.ws.onerror = function(event){
-              // if (this.flag!=1)
-              // alert("WebSocket接收异常！");
-            };
-          } catch (ex) {
-            alert(ex.message);
-          }
-
-        }else{
           axios.get('http://127.0.0.1:9532/api/readcard', {
             params: params
           })
@@ -869,8 +753,7 @@
             .catch(function(error) {
 
             })
-        }
-      },
+        },
       // reading() {
       //   var that = this
       //   if (this.form.id_card_type.length == 0 || this.form.id_card_type == 0) {
@@ -1045,6 +928,7 @@
       }
     }
 
+
   }
 </script>
 

src/xt_pages/workforce/components/editTableData.vue

@@ -4194,14 +4194,14 @@ export default {
             ) {
               return "hover-td schedule-table-cell-disable";
             }
-            // if(column.label == '晚'){
-            //   return 'evening_border schedule-table-cell-disable'
-            // }
+            if(row.cut.indexOf('滤')>-1 && columnIndex!=1 &&columnIndex!=23&&columnIndex!=0){
+              return 'thefilter schedule-table-cell-disable'
+            }
             return "schedule-table-cell-disable";
           } else {
-            // if(column.label == '晚' ){
-            //     return 'evening_border'
-            // }
+            if(row.cut.indexOf('滤')>-1 && columnIndex!=1 &&columnIndex!=23&&columnIndex!=0){
+              return 'thefilter'
+            }
             if (
                 row[column.property].patient_id > 0 &&
                 row[column.property].patient_id == this.patient_id_hover
@@ -6274,6 +6274,12 @@ textarea{
 .infectious {
   color: red !important;
 }
+.backPurple{
+  color: #f32424 !important;
+}
+.thefilter{
+  color: #93d104 !important;
+}
 // .border_bott{
 //   border-left: 1px solid aqua !important;
 //   border-right: 1px solid aqua !important;

src/xt_pages/workforce/components/tableData.vue

@@ -1395,19 +1395,17 @@ export default {
      },
     //  单元格样式的回调
     cellClass({ row, column, rowIndex, columnIndex }) {
-      // if(row[column.property].patient_id>0){
-      //   console.log('qqqqq',row[column.property])
-      // }
-
+      
+      
       // console.log('wwwww',column)
       // console.log('eeeee',rowIndex)
       // console.log('rrrrr',columnIndex)
       if(columnIndex==1&&row.zone_type!=1){
         return "table-row-new-class schedule-table-row Infectious_disease";
       }
-      if(columnIndex!=1&&row.zone_type!=1&&columnIndex!=23&&columnIndex!=0){
-        return 'backPurple'
-      }
+      // if(columnIndex!=1&&row.zone_type!=1&&columnIndex!=23&&columnIndex!=0){
+      //   return 'backPurple table-row-new-class schedule-table-row'
+      // }
       // 机号蓝线
       // if(columnIndex==1 ){
       //   return 'border_bott '
@@ -1436,17 +1434,22 @@ export default {
             if(row[column.property].patient_id > 0 && row[column.property].patient_id == this.patient_id_hover ){
               return 'hover-td schedule-table-cell-disable'
             }
-            //  if(column.label == '晚'){
-            //    return 'evening_border schedule-table-cell-disable'
-            //  }
+            if(columnIndex!=1&&row.zone_type!=1&&columnIndex!=23&&columnIndex!=0){
+              return 'backPurple schedule-table-cell-disable'
+            }
+            if(row.cut.indexOf('滤')>-1 && columnIndex!=1 &&columnIndex!=23&&columnIndex!=0){
+              return 'thefilter schedule-table-cell-disable'
+            }
             return "schedule-table-cell-disable";
           }else{
-            // 分日期
-            // if(column.label == '晚' ){
-            //     return 'evening_border'
-            // }
+            if(columnIndex!=1&&row.zone_type!=1&&columnIndex!=23&&columnIndex!=0){
+              return 'backPurple'
+            }
+            if(row.cut.indexOf('滤')>-1 && columnIndex!=1 &&columnIndex!=23&&columnIndex!=0){
+              return 'thefilter'
+            }
             if(row[column.property].patient_id > 0 && row[column.property].patient_id == this.patient_id_hover){
-              return 'hover-td '
+              return 'hover-td schedule-table-cell-disable'
             }else {
               return ''
             }
@@ -4411,6 +4414,9 @@ textarea{
 .backPurple{
   color: #f32424 !important;
 }
+.thefilter{
+  color: #93d104 !important;
+}
 .eldialog{
   .el-dialog__headerbtn {
     // position: absolute;