Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/views/layout/components/Navbar.vue

@@ -129,7 +129,7 @@
         <!-- <i class="el-icon-question"></i>
         <a href="https://sso.kuyicloud.com/help" target="_blank">帮助中心</a> -->
        <div class="fixedBox">
-         <div class="fixed-item" @mouseover="mouseOver" @mouseleave="leave">
+         <div class="fixed-item" @mouseover="mouseOver" @mouseleave="leave" v-if="org_id!=0 && org_id!=10635">
           <i class="el-icon-chat-line-round"></i>
            <div class="fixed-text">联系客户经理</div>
             <div class="fixed-wrap" v-show="wrap1">
@@ -143,7 +143,7 @@
              </div>
             </div>
           </div>
-          <div class="fixed-item" @mouseover="mouseOver1" @mouseleave="leave1">
+          <div class="fixed-item" @mouseover="mouseOver1" @mouseleave="leave1" v-if="org_id!=0 && org_id!=10635">
            <i class="el-icon-full-screen"></i>
             <div class="fixed-text">微信联系</div>
             <div class="fixed-wrap" v-show="wrap2">

src/xt_pages/Pharmacy/DrugDispensing.vue

@@ -261,7 +261,7 @@
             </el-table-column>
             <el-table-column label="药品追溯码" width="162" align="center">
               <template slot-scope="scope">
-                 <el-input style="width: 100;" v-model="scope.row.DrugCode" @input="changeDrugCode(scope.row.ID,scope.row.data_sources,scope.row.DrugCode)"></el-input>
+                <div @click="getDrugCode(scope.row.ID,scope.row.data_sources,scope.row.DrugCode,scope.$index)"><el-input style="width: 100;" v-model="scope.row.DrugCode"></el-input></div> 
               </template>
             </el-table-column>
             <el-table-column
@@ -428,6 +428,26 @@
           <el-button type="primary" @click="SaveSetting">保 存</el-button>
         </span>
       </el-dialog>
+
+      <el-dialog
+        title="药品追溯码"
+        :visible.sync="dialogVisibleOne"
+         width="40%">
+       <span>
+        <el-input
+          @input="changeText"
+          type="textarea"
+          placeholder="请输入内容"
+          v-model="textarea"
+          :rows="10"
+        >
+        </el-input>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisibleOne = false">取 消</el-button>
+        <el-button type="primary" @click="saveTextArea()">确 定</el-button>
+      </span>
+      </el-dialog>
     </div>
 
     <drug-print
@@ -508,32 +528,57 @@ export default {
       deliveryway: "全部", //给药途径
       total: "", //合计
       select_total: "",
+      dialogVisibleOne:false,
+      textarea:"",
+      id:0,
+      is_source:0,
+      drug_code:0,
+      currentRow:{},
+      currentIndex:0,
     };
   },
 
   methods: {
-    changeDrugCode(id,DataSources,drug_code){
-       var is_source =0
+    getDrugCode(id,DataSources,DrugCode,index){
+      this.id = id 
+      var is_source =0
        if (DataSources == "his处方"){
         is_source = 1
        }
        if (DataSources == "临时医嘱"){
          is_source = 2
        }
+       this.is_source = is_source
+       this.textarea = DrugCode
+       this.currentIndex = index
+       this.dialogVisibleOne = true
+
+    },
+    saveTextArea(){
+      
        var params = {
-        id:id,
-        data_source:is_source,
-        drug_code:drug_code,
+        id:this.id,
+        data_source:this.is_source,
+        drug_code:this.textarea,
        }
        console.log("paramss",params)
       
       changeDrugCode(params).then(response=>{
          if(response.data.state == 1){
             this.$message.success("保存成功!")
+            for(let i=0;i<this.tableData.length;i++){
+             if(this.currentIndex == i){
+                this.tableData[i].DrugCode = this.textarea
+             }
+            }
+            this.dialogVisibleOne = false
          }
       })
-    
-
+    },
+    changeText(){
+      var textarea = ""
+      textarea += this.textarea + ","
+      this.textarea = textarea
     },
     tt() {},
     async fun3() {

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -228,7 +228,7 @@
             </el-table-column>
             <el-table-column label="药品追溯码" width="162" align="center">
               <template slot-scope="scope">
-                 <el-input style="width: 100;" v-model="scope.row.DrugCode" @input="changeDrugCode(scope.row.ID,scope.row.DataSources,scope.row.DrugCode)"></el-input>
+                <div @click="getDrugCode(scope.row.ID,scope.row.DataSources,scope.row.DrugCode,scope.$index)"><el-input style="width: 100;" v-model="scope.row.DrugCode"></el-input></div> 
               </template>
             </el-table-column>
             <el-table-column label="开立医生" width="150" align="center">
@@ -281,6 +281,26 @@
           <el-button type="primary" @click="SaveSetting">保 存</el-button>
         </span>
       </el-dialog>
+
+      <el-dialog
+        title="药品追溯码"
+        :visible.sync="dialogVisibleOne"
+         width="40%">
+       <span>
+        <el-input
+          @input="changeText"
+          type="textarea"
+          placeholder="请输入内容"
+          v-model="textarea"
+          :rows="10"
+        >
+        </el-input>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisibleOne = false">取 消</el-button>
+        <el-button type="primary" @click="saveTextArea()">确 定</el-button>
+      </span>
+      </el-dialog>
     </div>
 
     <patient-print
@@ -361,6 +381,14 @@ export default {
       doctors:[],
       diagnosearr:[],
       diagnosis:'',
+      dialogVisibleOne:false,
+      textarea:"",
+      id:0,
+      is_source:0,
+      drug_code:0,
+      currentRow:{},
+      currentIndex:0,
+
     };
   },
   watch: {},
@@ -743,6 +771,7 @@ export default {
         if (response.data.state == 1) {
           var config = response.data.data.config;
           this.$message.success("保存成功!");
+         
           this.dialogVisible = false;
         }
       });
@@ -802,27 +831,44 @@ export default {
        }
        return spc
     },
-    changeDrugCode(id,DataSources,drug_code){
-       var is_source =0
+    getDrugCode(id,DataSources,DrugCode,index){
+      this.id = id 
+      var is_source =0
        if (DataSources == "his处方"){
         is_source = 1
        }
        if (DataSources == "临时医嘱"){
          is_source = 2
        }
+       this.is_source = is_source
+       this.textarea = DrugCode
+       this.currentIndex = index
+       this.dialogVisibleOne = true
+
+    },
+    saveTextArea(){
        var params = {
-        id:id,
-        data_source:is_source,
-        drug_code:drug_code,
+        id:this.id,
+        data_source:this.is_source,
+        drug_code:this.textarea,
        }
        console.log("paramss",params)
       changeDrugCode(params).then(response=>{
          if(response.data.state == 1){
             this.$message.success("保存成功!")
+            for(let i=0;i<this.tableData.length;i++){
+             if(this.currentIndex == i){
+                this.tableData[i].DrugCode = this.textarea
+             }
+            }
+            this.dialogVisibleOne = false
          }
       })
-    
-
+    },
+    changeText(){
+      var textarea = ""
+      textarea += this.textarea + ","
+      this.textarea = textarea
     }
   },
 };

src/xt_pages/dialysis/details/consumable/dialysisGather.vue

@@ -218,11 +218,7 @@
              </template>
           </el-table-column>
 
-          <el-table-column align="center" label="封管液" v-if="gatherSetting.tube==1">
-             <template slot-scope="scope">
-               <span v-if="getBloodAccessOption(scope.row.dialysis_prescription.blood_access).indexOf('导管')!==-1">1</span>
-             </template>
-          </el-table-column>
+         
           
   
           <el-table-column align="center" label="钾"  v-if="gatherSetting.kalium==1">
@@ -253,6 +249,12 @@
              </template>
           </el-table-column>
 
+          <el-table-column align="center" label="封管液" v-if="gatherSetting.tube==1">
+             <template slot-scope="scope">
+               <span v-if="getBloodAccessOption(scope.row.dialysis_prescription.blood_access).indexOf('导管')!==-1">1</span>
+             </template>
+          </el-table-column>
+
           <el-table-column align="center" label="尿激酶" v-if="gatherSetting.niaojimei == 1">
              <template slot-scope="scope">
                <span v-if="scope.row.schedule_date <= timenow">{{ scope.row.advice_spc_two }}</span>

src/xt_pages/dialysis/details/consumable/dialysisGatherPrint.vue

@@ -26,7 +26,7 @@
                 <thead>
                 <tr>
                   <td width="60" v-if="gatherSetting.index_number == 1">序号</td>
-                  <td width="200" v-if="org_id == 0 || org_id ==10683">备注</td>
+                 
                   <td width="100"  v-if="gatherSetting.name==1">姓名</td>
                   <td width="100"  v-if="gatherSetting.dialysis_no==1">透析号</td>
                   <td width="100"  v-if="gatherSetting.admission_number==1">住院(门诊)号</td>
@@ -36,22 +36,22 @@
                   <td width="100"  v-if="gatherSetting.dialysis_strainer ==1">滤过器</td>
                   <td width="100"  v-if="gatherSetting.change_nurse ==1">换药包/穿刺针</td>
                   <td width="100"  v-if="gatherSetting.puncture_needle ==1">穿刺针</td>
-                  <td width="100" v-if="gatherSetting.anticoagulant==1">抗凝剂(首剂)(维持)(总量)</td>
-                  <td width="200" v-if="gatherSetting.tube==1">封管液</td>
+                  <td width="600" v-if="gatherSetting.anticoagulant==1">抗凝剂(首剂)(维持)(总量)</td>
+                
                   <td width="100" v-if="gatherSetting.kalium==1">钾</td>
                   <td width="100"  v-if="gatherSetting.calcium==1">钙</td>
                   <td width="100" v-if="gatherSetting.cuhong == 1">促红素</td>
                   <td width="100"  v-if="gatherSetting.zuoka == 1">左卡</td>
                   <td width="100" v-if="gatherSetting.niaojimei == 1">尿激酶</td>
                   <td width="100" v-if="gatherSetting.putaosuangai == 1">葡萄糖酸钙</td>
-
+                  <td width="200" v-if="gatherSetting.tube==1">封管液</td>
                   <td width="100" v-if="org_id == 0 || org_id ==10683">肝素钠</td>
                  
                 </tr>
                 </thead>
                 <tbody>
                  <tr v-for="(item,i) in list" :key="i">
-                  <td width="100" v-if="org_id == 0 || org_id ==10683"> </td>
+                
                    <td width="60" v-if="gatherSetting.index_number == 1">{{ i+1 }}</td>
                   <td width="100"  v-if="gatherSetting.name==1">
                     {{item.patient.name}}
@@ -164,9 +164,7 @@
                       <span v-if="item.dialysis_solution.anticoagulant_zongliang > 0">({{item.dialysis_solution.anticoagulant_zongliang}})</span>
                     </span>
                  </td>
-                  <td width="200" v-if="gatherSetting.tube==1">
-                    <span v-if="getBloodAccessOption(item.dialysis_prescription.blood_access).indexOf('导管')!==-1">1</span>
-                  </td>
+                  
                   <td width="100" v-if="gatherSetting.kalium==1">
                     <span v-if="item.dialysis_prescription.kalium>0">{{item.dialysis_prescription.kalium}}</span>
                  </td>
@@ -189,6 +187,9 @@
                     <span v-if="item.schedule_date<=timenow">  {{ item.advice_spc_three }}</span>
                     <span v-if="item.schedule_date>timenow">{{ getLongAdviceThree(item.long_doctor_advice,item.schedule_date) }}</span>
                  </td>
+                 <td width="200" v-if="gatherSetting.tube==1">
+                    <span v-if="getBloodAccessOption(item.dialysis_prescription.blood_access).indexOf('导管')!==-1">1</span>
+                  </td>
                  <td width="100" v-if="org_id == 0 || org_id ==10683">
                   <span v-if="item.schedule_date<=timenow">  {{ item.advice_spc_four }}</span>
                   <span v-if="item.schedule_date>timenow">{{ getLongAdviceFour(item.long_doctor_advice,item.schedule_date) }}</span>

src/xt_pages/dialysis/details/consumable/dialysisParameter.vue

@@ -273,43 +273,43 @@
            </template>
         </el-table-column>
 
-        <el-table-column align="center" label="封管液" v-if="dialysisSett.blood_access==1 && org_id!=10629">
+        <el-table-column align="center" label="封管液" v-if="dialysisSett.sealing_fluid_dispose==1">
            <template slot-scope="scope">
              <span v-if="getBloodAccessOption(scope.row.dialysis_solution.blood_access).indexOf('导管')!==-1">1</span>
            </template>
         </el-table-column>
 
-        <el-table-column align="center" label="促红" v-if="org_id!=10599 && org_id!=10629">
+        <el-table-column align="center" label="促红" v-if="dialysisSett.cuhong_set == 1">
            <template slot-scope="scope">
               {{ scope.row.advice_spc }}
            </template>
         </el-table-column>
 
-        <el-table-column align="center" label="左卡" v-if="org_id!=10599 && org_id!=10629">
+        <el-table-column align="center" label="左卡" v-if="dialysisSett.zuoka_set == 1">
            <template slot-scope="scope">
               {{ scope.row.advice_spc_one }}
            </template>
         </el-table-column>
 
-        <el-table-column align="center" label="低分子" v-if="org_id!=10599 && org_id!=10629">
+        <el-table-column align="center" label="低分子" v-if="dialysisSett.difenzi_set == 1">
            <template slot-scope="scope">
               {{ scope.row.advice_spc_two }}
            </template>
         </el-table-column>
 
-        <el-table-column align="center" label="肝素钠" v-if="org_id!=10599 && org_id!=10629">
+        <el-table-column align="center" label="肝素钠" v-if="dialysisSett.gansuna_set == 1">
            <template slot-scope="scope">
               {{ scope.row.advice_spc_three }}
            </template>
         </el-table-column>
 
-        <el-table-column align="center" label="蔗糖铁" v-if="org_id!=10599 && org_id!=10629">
+        <el-table-column align="center" label="蔗糖铁" v-if="dialysisSett.zhetangtie == 1">
            <template slot-scope="scope">
               {{ scope.row.advice_spc_four }}
            </template>
         </el-table-column>
 
-        <el-table-column align="center" label="尿激酶" v-if="org_id!=10599 && org_id!=10629">
+        <el-table-column align="center" label="尿激酶" v-if="dialysisSett.niaojimei_set == 1">
            <template slot-scope="scope">
               {{ scope.row.advice_spc_five }}
            </template>
@@ -366,6 +366,13 @@
            <el-checkbox v-model="sodium" label="钠"></el-checkbox>
            <el-checkbox v-model="calcium" label="钙"></el-checkbox>
            <el-checkbox v-model="blood_access" label="血管通路"></el-checkbox>
+
+           <el-checkbox v-model="cuhong" label="促红"></el-checkbox>
+           <el-checkbox v-model="zuoka" label="左卡"></el-checkbox>
+           <el-checkbox v-model="difenzi" label="低分子"></el-checkbox>
+           <el-checkbox v-model="gansuna" label="肝素钠"></el-checkbox>
+           <el-checkbox v-model="zhetangtie" label="蔗糖铁"></el-checkbox>
+           <el-checkbox v-model="niaojimei" label="尿激酶"></el-checkbox>
         </span>
         <span slot="footer" class="dialog-footer">
           <el-button @click="dialogVisible = false">取 消</el-button>
@@ -519,6 +526,7 @@
   import {getRemindPrintList,saveRemindPrint} from '@/api/schedule'
   import { getDataConfig } from '@/utils/data'
   import store from "@/store";
+import dialysis from '../../../../router/modules/dialysis';
   const moment = require('moment')
   export default {
     components: {
@@ -621,6 +629,12 @@
         anticoagulant: false,
         anticoagulant_zongliang: false,
         doctor_advice: false,
+        cuhong:false,
+        zuoka:false,
+        difenzi:false,
+        gansuna:false,
+        zhetangtie:false,
+        niaojimei:false,
         displace_liqui_part_option:[],
         ids:"",
         form: {
@@ -1232,6 +1246,22 @@
          if(id ==37){
            mode_name ="HDF1000"
          }
+         if(id ==38){
+           mode_name ="HDF80"
+         }
+         if(id ==39){
+           mode_name ="HF16"
+         }
+         if(id ==40){
+           mode_name ="HD(无肝素)"
+         }
+         if(id ==41){
+           mode_name ="HDF17H"
+         }
+
+         if(id ==42){
+           mode_name ="HD."
+         }
         
          return mode_name
       },
@@ -1633,6 +1663,44 @@
             }else{
               this.displace_liqui_part = false
             }
+
+            if(dialysisSett.cuhong_set == 1){
+               this.cuhong = true
+            }else{
+               this.cuhong = false
+            }
+
+            if(dialysisSett.zuoka_set == 1){
+               this.zuoka = true
+            }else{
+               this.zuoka = false
+            }
+
+            if(dialysisSett.difenzi_set == 1){
+               this.difenzi = true
+            }else{
+               this.difenzi = false
+            }
+
+            if(dialysisSett.gansuna_set == 1){
+               this.gansuna = true
+            }else{
+               this.gansuna = false
+            }
+
+            if(dialysisSett.zhetangtie_set == 1){
+               this.zhetangtie = true
+            }else{
+               this.zhetangtie = false
+            }
+
+            if(dialysisSett.niaojimei_set == 1){
+               this.niaojimei = true
+            }else{
+               this.niaojimei = false
+            }
+
+
           }
      
         }
@@ -1667,7 +1735,57 @@
        var blood_access_set =0
        var dialyzer_perfusion_apparatus_set =0
        var displace_liqui_part_set =0
+        
+       var cuhong_set = 0
+       var zuoka_set =0
+       var difenzi_set =0
+       var gansuna_set =0
+       var zhetangtie_set =0
+       var niaojimei_set =0
+
+       if(this.cuhong == false){
+          cuhong_set = 2
+       }
+       if(this.cuhong == true){
+          cuhong_set = 1
+       }
+
+       if(this.zuoka == false){
+          zuoka_set = 2
+       }
+       if(this.zuoka == true){
+          zuoka_set = 1
+       }
+
+       if(this.difenzi == false){
+          difenzi_set = 2
+       }
        
+       if(this.difenzi == true){
+          difenzi_set = 1
+       }
+
+       if(this.gansuna == false){
+          gansuna_set = 2
+       }
+       if(this.gansuna == true){
+          gansuna_set = 1
+       }
+
+       if(this.zhetangtie == false){
+          zhetangtie_set = 2
+       }
+       if(this.zhetangtie == true){
+          zhetangtie_set = 1
+       }
+
+       if(this.niaojimei == false){
+          niaojimei_set = 2
+       }
+       if(this.niaojimei == true){
+          niaojimei_set = 1
+       }
+      
        if(this.sodium == false){
          sodium_set = 2
        }
@@ -1865,6 +1983,12 @@
           blood_access_set:blood_access_set,
           dialyzer_perfusion_apparatus_set:dialyzer_perfusion_apparatus_set,
           displace_liqui_part_set:displace_liqui_part_set,
+          cuhong_set:cuhong_set,
+          zuoka_set:zuoka_set,
+          difenzi_set:difenzi_set,
+          gansuna_set:gansuna_set,
+          zhetangtie_set:zhetangtie_set,
+          niaojimei_set:niaojimei_set,
         }
        
        saveDialysisSetting(params).then(response=>{

src/xt_pages/dialysis/details/consumable/dialysisParameterPrint.vue

@@ -49,16 +49,16 @@
                 <td width="100" v-if="dialysisSett.calcium==1">钙</td>
                 <td width="100" v-if="dialysisSett.bicarbonate == 1">碳酸氢盐</td>
                 <td width="100" v-if="dialysisSett.blood_access==1">血管通路</td>
-                <td width="100" v-if="dialysisSett.sealing_fluid_dispose == 1 && org_id!=10629">封管液</td>
+                <td width="100" v-if="dialysisSett.sealing_fluid_dispose == 1">封管液</td>
                 <td width="100"  v-if="dialysisSett.glucose==1">葡萄糖</td>
                 <td width="100"  v-if="dialysisSett.blood_flow_volume==1">血流量</td>
-                <td v-if="org_id!=10587 && org_id!=10599 && org_id!=10629">封管液</td>
-                <td v-if="org_id!=10587 && org_id!=10599 && org_id!=10629">促红</td>
-                <td v-if="org_id!=10587 && org_id!=10599 && org_id!=10629">左卡</td>
-                <td v-if="org_id!=10587 && org_id!=10599 && org_id!=10629">低分子</td>
-                <td v-if="org_id!=10587 && org_id!=10599 && org_id!=10629">肝素钠</td>
-                <td v-if="org_id!=10587 && org_id!=10599 && org_id!=10629">蔗糖铁</td>
-                <td v-if="org_id!=10587 && org_id!=10599 && org_id!=10629">尿激酶</td>
+                <td  v-if="dialysisSett.sealing_fluid_dispose==1">封管液</td>
+                <td v-if="dialysisSett.cuhong_set==1">促红</td>
+                <td v-if="dialysisSett.zuoka_set == 1">左卡</td>
+                <td v-if="dialysisSett.difenzi_set == 1">低分子</td>
+                <td v-if="dialysisSett.advice_spc_three == 1">肝素钠</td>
+                <td v-if="dialysisSett.zhetangtie == 1">蔗糖铁</td>
+                <td v-if="dialysisSett.niaojimei_set == 1">尿激酶</td>
               </tr>
               </thead>
               <tbody>
@@ -101,8 +101,13 @@
                   <span v-if="item.mode_id == 33">HFD</span>
                   <span v-if="item.mode_id == 34">HDF100</span>
                   <span v-if="item.mode_id == 35">HDF600</span>
-                  <span v-if="item.mode_id == 35">HDF800</span>
-                  <span v-if="item.mode_id == 35">HDF1000</span>
+                  <span v-if="item.mode_id == 36">HDF800</span>
+                  <span v-if="item.mode_id == 37">HDF1000</span>
+                  <span v-if="item.mode_id == 38">HDF80</span>
+                  <span v-if="item.mode_id == 39">HF16</span>
+                  <span v-if="item.mode_id == 40">HD(无肝素)</span>
+                  <span v-if="item.mode_id == 41">HDF17H</span>
+                  <span v-if="item.mode_id == 42">HD.</span>
                  
                 </td>
                 <td width="100" v-if="dialysisSett.dialysis_no==1">
@@ -180,7 +185,7 @@
                    <span>{{item.dialysis_solution.blood_flow_volume?item.dialysis_solution.blood_flow_volume:""}}</span> 
                 </td>
                 
-                <td v-if="org_id!=10587 && org_id!=0 && org_id!=10599 && org_id!=10629">
+                <td v-if="dialysisSett.sealing_fluid_dispose ==1">
                   <span v-if="getBloodAccessOption(item.dialysis_solution.blood_access).indexOf('导管')!==-1">1</span>
                   <span v-else></span>
                 </td>
@@ -342,10 +347,10 @@
               this.total_three = total_three
              
             }
-            console.log("list====================",list)
+            // console.log("list====================",list)
             this.list = list
             this.dialysisSett = response.data.data.dialysisSett
-            console.log("设置",this.dialysisSett)
+            // console.log("设置",this.dialysisSett)
           }
       }) 
      },

src/xt_pages/outpatientCharges/components/chargeDialog.vue

@@ -71,37 +71,37 @@
       </el-form-item>
 
 
-      <el-form-item label="" style="width:100%;" v-if="this.$store.getters.xt_user.org.id != 10138 && this.$store.getters.xt_user.org.id != 10278 && this.$store.getters.xt_user.org.id != 0 && this.$store.getters.xt_user.org.id != 10610 && this.$store.getters.xt_user.org.id != 10537">
+      <el-form-item label="" style="width:100%;" v-if="this.$store.getters.xt_user.org.id != 10138 && this.$store.getters.xt_user.org.id != 10278 && this.$store.getters.xt_user.org.id != 0 && this.$store.getters.xt_user.org.id != 10610 && this.$store.getters.xt_user.org.id != 10537  && this.$store.getters.xt_user.org.id != 10635">
 
         <el-radio-group v-model="form.pay_way">
           <el-radio :label="item.value" v-for="(item,index) in payWays" :key="index">{{ item.label }}</el-radio>
         </el-radio-group>
       </el-form-item>
 
-      <el-form-item label="" style="width:100%;" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278 || this.$store.getters.xt_user.org.id == 10510 ||  this.$store.getters.xt_user.org.id == 10610  ||  this.$store.getters.xt_user.org.id == 10537">
+      <el-form-item label="" style="width:100%;" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278 || this.$store.getters.xt_user.org.id == 10510 ||  this.$store.getters.xt_user.org.id == 10610  ||  this.$store.getters.xt_user.org.id == 10537 ||  this.$store.getters.xt_user.org.id == 10635">
 
         <el-checkbox-group v-model="form.pay_wayss">
           <el-checkbox :label="item.value" v-for="(item,index) in payWays" :key="item.value">{{ item.label }}</el-checkbox>
         </el-checkbox-group>
       </el-form-item>
 
-      <el-form-item label="现金支付金额：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510 || this.$store.getters.xt_user.org.id == 10610 ||  this.$store.getters.xt_user.org.id == 10537 ">
+      <el-form-item label="现金支付金额：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510 || this.$store.getters.xt_user.org.id == 10610 ||  this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10635">
         <el-input class="number_style" v-model="form.cash_pay" ></el-input>
       </el-form-item>
 
-      <el-form-item label="微信支付金额：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510  || this.$store.getters.xt_user.org.id == 10610 ||  this.$store.getters.xt_user.org.id == 10537">
+      <el-form-item label="微信支付金额：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510  || this.$store.getters.xt_user.org.id == 10610 ||  this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10635">
         <el-input class="number_style" v-model="form.wechat_pay" ></el-input>
       </el-form-item>
-      <el-form-item label="银行卡支付金额：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510  || this.$store.getters.xt_user.org.id == 10610 ||  this.$store.getters.xt_user.org.id == 10537">
+      <el-form-item label="银行卡支付金额：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510  || this.$store.getters.xt_user.org.id == 10610 ||  this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10635">
         <el-input class="number_style" v-model="form.band_card_pay" ></el-input>
       </el-form-item>
-      <el-form-item label="支付宝支付金额：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510 || this.$store.getters.xt_user.org.id == 10610 ||  this.$store.getters.xt_user.org.id == 10537 ">
+      <el-form-item label="支付宝支付金额：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510 || this.$store.getters.xt_user.org.id == 10610 ||  this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10635 ">
         <el-input class="number_style" v-model="form.ali_pay" ></el-input>
       </el-form-item>
-      <el-form-item label="积分支付：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510 || this.$store.getters.xt_user.org.id == 10610 ||  this.$store.getters.xt_user.org.id == 10537 ">
+      <el-form-item label="积分支付：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510 || this.$store.getters.xt_user.org.id == 10610 ||  this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10635 ">
         <el-input class="number_style" v-model="form.jifen_pay" ></el-input>
       </el-form-item>
-      <el-form-item label="其他说明：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510 || this.$store.getters.xt_user.org.id == 10610 ||  this.$store.getters.xt_user.org.id == 10537 ">
+      <el-form-item label="其他说明：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510 || this.$store.getters.xt_user.org.id == 10610 ||  this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10635 ">
         <el-input class="number_style" v-model="form.oth_desc" ></el-input>
       </el-form-item>
 

src/xt_pages/qcd/workAnalysis/nurse.vue

@@ -127,7 +127,7 @@
             </el-table-column>
 
 
-            <el-table-column label="治疗" align="center">
+            <el-table-column label="治疗(监测护士)" align="center">
               <template slot-scope="scope">
                 {{scope.row.cure_count?scope.row.cure_count:''}}
 

src/xt_pages/user/components/PatientDetail.vue

@@ -1209,11 +1209,13 @@
                   <td colspan="8">
                     <div
                       class="td_proj_content td_align_left"
-                      v-html="patientPrint.remark"
-                    ></div>
+                     
+                    >  {{ patientPrint.remark }}</div>
                   </td>
                 </tr>
 
+              
+
                 <tr>
                   <td>
                     <div class="td_proj_title">诊<br />断</div>
@@ -1221,8 +1223,9 @@
                   <td colspan="7">
                     <div
                       class="td_proj_content td_align_left"
-                      v-html="patientPrint.diagnose"
-                    ></div>
+                    >
+                    {{ patientPrint.diagnose }}
+                    </div>
                   </td>
                 </tr>
                 <tr>
@@ -1232,8 +1235,10 @@
                   <td colspan="7">
                     <div
                       class="td_proj_content td_align_left"
-                      v-html="patientPrint.treatment_plan"
-                    ></div>
+                     
+                    >
+                     {{ patientPrint.treatment_plan }}
+                   </div>
                   </td>
                 </tr>
               </tbody>
@@ -2104,6 +2109,9 @@ export default {
               /\n/g,
               "<br/>"
             );
+            
+            
+
             this.patientPrint.sch_remark = patietInfo.sch_remark.replace(
               /\n/g,
               "<br/>"

src/xt_pages/user/components/PatientForm.vue

@@ -969,11 +969,11 @@
           <el-row :gutter="24">
             <el-col>
               <el-form-item>
-                <el-input v-model="form.sbp" style="width: 240px" >
+                <el-input v-model="form.sbp" style="width: 300px" >
                   <template slot="prepend">收缩压:</template>
                   <template slot="append">mmHg</template>
                 </el-input>
-                <el-input v-model="form.dbp" style="width: 240px" >
+                <el-input v-model="form.dbp" style="width: 300px" >
                   <template slot="prepend">舒张压:</template>
                   <template slot="append">mmHg</template>
                 </el-input>

src/xt_pages/user/templateSummaryPrint.vue

@@ -52,7 +52,7 @@
           <div style="line-height:24px; word-break: break-all;word-wrap: break-word" 
           v-html="patientList.template_summary_content"></div>
       </div>
-     <div style="padding:20px 0;border-bottom:1px solid #000;min-height:250px;">
+     <div style="padding:20px 0;border-bottom:1px solid #000;min-height:250px;" v-if="org_id!=0&&org_id!=10635">
         <span style="font-weight:bold;">阶段小结化验结果:</span>
         <div class="borderBox">
           <div v-for="item in patientList.template_inspection_content">
@@ -266,6 +266,7 @@ export default {
       patientList:{},
       doctorList:[],
       anticoagulantList:[],
+      org_id:0,
     }
   },
   methods: {
@@ -301,12 +302,7 @@ export default {
         })
       
     },
-  
 
-   
-  
-   
-  
     getAge: function(val) {
       if (val.birthday != 0) {
         return jsGetAge(val.birth, '-')
@@ -405,6 +401,7 @@ export default {
   },
  
   created() {
+     this.org_id = this.$store.getters.xt_user.org.id
      var anticoagulantsConfitOne = this.$store.getters.anticoagulants_confit
      const arrFour = []
      Object.keys(anticoagulantsConfitOne).map((item, index) => {

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-  //   store.dispatch('VerifyConfigList', []).then(() => {
-  //     next()
-  //   })
-  // }
-  // if (store.getters.permission_routers === undefined) {
-  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //     next()
-  //   })
-  // } else {
-  //   next()
-  // }
-  // return
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+    store.dispatch('VerifyConfigList', []).then(() => {
+      next()
+    })
+  }
+  if (store.getters.permission_routers === undefined) {
+    store.dispatch('xt_GenerateRoutes', []).then(() => {
+      next()
+    })
+  } else {
+    next()
+  }
+  return
   // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))