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

src/router/modules/dialysis.js

@@ -928,6 +928,18 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/print/batch/seventy',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_seventy'),
+      hidden: true,
+      is_menu: false,
+      name: 'batch_print_order_seventy',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/flow',
       component: () => import('@/xt_pages/dialysis/dialysisFlow'),

src/xt_pages/data/components/drugs.vue

@@ -1461,18 +1461,18 @@
         console.log("params222222222",params)
 
 
-        // postDrugInformation(params).then(response=>{
-        //    if(response.data.state == 1){
-        //      var msg =  response.data.data.msg;
-        //      this.getList();
-        //      this.getAllManufacturer();
-        //      this.GetAllConfig();
-        //      this.$message.success("导入成功!")
-        //
-        //    }else{
-        //      this.$message.error("导入失败,请下载日志查看")
-        //    }
-        // })
+        postDrugInformation(params).then(response=>{
+           if(response.data.state == 1){
+             var msg =  response.data.data.msg;
+             this.getList();
+             this.getAllManufacturer();
+             this.GetAllConfig();
+             this.$message.success("导入成功!")
+        
+           }else{
+             this.$message.error("导入失败,请下载日志查看")
+           }
+        })
       },
       generateTxt: function(log) {
         var content = '';

src/xt_pages/device/objectTableDisinfectTwo.vue

@@ -1094,19 +1094,19 @@
                                 <td>楼层</td>
                                 <td>湿化瓶<br/>500mg/l含氯制剂</td>
                                 <td>负责人</td>
-                                <td width="40">检查合格<br/></td>
+                                <td width="40">消毒液浓度合格<br/></td>
                                 <td>止血带<br/>500mg/l含氯制剂</td>
                                 <td>负责人</td>
-                                <td width="40">检查合格<br/></td>
+                                <td width="40">消毒液浓度合格<br/></td>
                                 <td>医疗垃圾桶<br/>1000mg/l含<br/>氯制剂</td>
                                 <td>负责人</td>
-                                <td width="40">检查合格<br/></td>
+                                <td width="40">消毒液浓度合格<br/></td>
                                 <td>体温计<br/>75%酒精浸泡</td>
                                 <td>负责人</td>
-                                <td width="40">检查合格<br/></td>
+                                <td width="40">消毒液浓度合格<br/></td>
                                 <td>体温枪<br/>75%酒精擦拭</td>
                                 <td>负责人</td>
-                                <td width="40">检查合格<br/></td>
+                                <td width="40">消毒液浓度合格<br/></td>
                                
                             </tr>
 

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -428,6 +428,15 @@
           type="primary"
           >批量打印</el-button>
       </template>
+      <template v-if="this.template_id == 70">
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >批量打印</el-button>
+      </template>
     </div>
     <div class="app-container">
       <!-- <div class="filter-container">
@@ -2180,6 +2189,8 @@ export default {
       }
       else if (this.template_id == 68) {
         this.$router.push({ path: "/dialysis/print/batch/sixtyeight" });
+      }else if (this.template_id == 70) {
+        this.$router.push({ path: "/dialysis/print/batch/seventy" });
       }
     },
     batchPrintActionOne: function() {

src/xt_pages/dialysis/details/NavIgation.vue

@@ -193,7 +193,7 @@
       :prescription="prescription"
       :predialysis_evaluation="predialysis_evaluation"
       :dialysis_order="dialysis_order"
-    
+      :schedual="temp_schedual"
     ></assessment-after-dislysis>
   </div>
 </template>

src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue

@@ -746,6 +746,9 @@ export default {
         return { id: 0 }
       }
     },
+    schedual: {
+        type: Object
+    },
   },
   data() {
     return {
@@ -1095,7 +1098,11 @@ export default {
     submitForm(formName) {
       this.$refs[formName].validate((valid)=>{
         if(valid){
-
+          var dateOne = this.schedual.schedule_date
+          var schedule_date = uParseTime(dateOne, '{y}-{m}-{d}')      
+          var date = this.$route.query && this.$route.query.date 
+          this.record_date = date ? uParseTime(date, '{y}-{m}-{d}') :schedule_date
+          console.log("日期我哦我",this.record_date)
           this.loading = true
           const ParamsQuery = {}
 
@@ -1509,7 +1516,17 @@ export default {
              this.infoDialogVisible = false
            }
         })
-      }
+      },
+      getTime(val) {
+         if(val < 0){
+           return ""
+         }
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+         }
+      },
   },
   created() {
     // console.log("this.form", this.form.consciousness);
@@ -1537,8 +1554,9 @@ export default {
     this.template_id = this.$store.getters.xt_user.template_info.template_id
     this.channels = this.$store.getters.channels
 
-    var date = this.$route.query && this.$route.query.date
-    this.record_date = date ? uParseTime(date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}')
+   
+    // this.record_date = date ? uParseTime(date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}')
+   
     if(this.$store.getters.xt_user.template_info.org_id == 0 ||  this.$store.getters.xt_user.template_info.org_id==9829 ||  this.$store.getters.xt_user.template_info.org_id==10469){
       this.form.pulse_frequency = 80
     }

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

@@ -936,7 +936,7 @@
             width="140"
             v-if="
               isShow('KT/V') &&
-              (org_id == 9987 || org_id == 10215 || org_id == 9800 || org_id == 9598)
+              (org_id == 9987 || org_id == 10215 || org_id == 9800 || org_id == 9598 || org_id ==10517)
             "
           >
             <template slot-scope="scope">

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -100,7 +100,7 @@
           <th v-if="isShow('脱水')" width="92px">{{monitor.dehydration ? monitor.dehydration : ""}}</th>
           <th v-if="isShow('滤前压')" width="92px">{{monitor.filter_pressure ? monitor.filter_pressure : ""}}</th>
           
-          <td v-if="isShow('KT/V') && (org_id == 9987 || org_id == 10215 || org_id ==  9800 || org_id ==  9598)">{{ monitor.ktv?monitor.ktv:""}}</td>
+          <td v-if="isShow('KT/V') && (org_id == 9987 || org_id == 10215 || org_id ==  9800 || org_id ==  9598 || org_id ==10517)">{{ monitor.ktv?monitor.ktv:""}}</td>
           <td v-if="isShow('病情变化')">{{ monitor.symptom }}
             <span v-if="(index == monitores.length-1) && (org_id == 0 || org_id == 10340)">累计血容量:{{monitor.accumulated_blood_volume }}L</span>
           </td>

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -857,6 +857,18 @@
         >
         </div>
       </template>
+      <template v-if="org_template_info.template_id == 70">
+        <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"-->
@@ -1328,6 +1340,12 @@
             v-if="org_template_info.template_id == 69"
           >
           </DialysisPrintOrderSixtynine>
+          <DialysisPrintOrderSeventy
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 70"
+          >
+
+          </DialysisPrintOrderSeventy>
 
           <DialysisPrintOrderZero
             v-bind:childResponse="childResponse"
@@ -1421,6 +1439,7 @@ import DialysisPrintOrderSixtysix from './template/DialysisPrintOrderSixtysix'
 import DialysisPrintOrdersixtySeven from './template/DialysisPrintOrdersixtySeven'
 import DialysisPrintOrderSixtyeight from './template/DialysisPrintOrderSixtyeight'
 import DialysisPrintOrderSixtynine from './template/DialysisPrintOrderSixtynine'
+import DialysisPrintOrderSeventy from './template/DialysisPrintOrderSeventy'
 import DialysisPrintOrderZero from './template/DialysisPrintOrderZero'
 export default {
   name: "dialysisPrintOrder",
@@ -1494,6 +1513,7 @@ export default {
     DialysisPrintOrderSixtysix,
     DialysisPrintOrderSixtyeight,
     DialysisPrintOrderSixtynine,
+    DialysisPrintOrderSeventy,
     DialysisPrintOrderZero,
     LabelBox,
     BreadCrumb,
@@ -2086,6 +2106,14 @@ export default {
           scanStyles: false,
         });
         console.log('77777',this.org_template_info.template_id);
+      }else if (this.org_template_info.template_id == 70 ) {
+        printJS({
+          printable: "dialysis-print-box-1",
+          type: "html",
+          style: style2,
+          scanStyles: false,
+        });
+        console.log('77777',this.org_template_info.template_id);
       }
       else if (
         this.org_template_info.template_id == 53

src/xt_pages/outpatientCharges/invoicePrint.vue

@@ -10,12 +10,12 @@
         type="primary"
       >打印</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 != 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 != 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 && org_id != 0 " >
+          <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 " :paramsObj="invoiceParams"></printThree>
-            <printfifteen v-if="org_id == 10510 " :paramsObj="invoiceParams"></printfifteen>
+            <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 || org_id == 4 " :paramsObj="invoiceParams"></printFour>
@@ -46,13 +46,13 @@
       </div>
     </div>
 
-     <div class="app-container" v-if="org_id == 10567 || org_id == 0">
+    <div class="app-container" v-if="org_id == 10567 ">
       <div class='dialysisPage'>
         <printfourteen :paramsObj="invoiceParams"></printfourteen>
       </div>
     </div>
 
-    <div class="app-container" style="padding-top:20px;" v-if="org_id == 10188">
+    <div class="app-container" style="padding-top:20px;" v-if="org_id == 10188  ">
       <div class='dialysisPage'>
         <printthirteen  :paramsObj="invoiceParams"></printthirteen>
       </div>

src/xt_pages/outpatientCharges/invoiceTemplate/printfifteen.vue

@@ -5,10 +5,10 @@
             <!-- <div>{{ list.id_card_no }}</div> -->
         </div>
         <div style="display:flex;justify-content: space-between;">
-            <div  style="position: absolute;top:80px;left:250px;">{{ list.department_name }}</div>
+            <div  style="position: absolute;top:80px;left:300px;">{{ list.department_name }}</div>
             <div></div>
             <div>
-                <span style="position: absolute;top:60px;left:120px;">{{ paramsObj.setl_time.split(' ')[0].slice(0,10) }}</span>
+                <span style="position: absolute;top:50px;left:120px;">{{ paramsObj.setl_time.split(' ')[0].slice(0,10) }}</span>
             </div>
         </div>
         <div style="display:flex;justify-content: space-between;">

src/xt_pages/outpatientCharges/invoiceTemplate/printfourteen.vue

@@ -1,84 +1,82 @@
 <template>
   <div id='invoice-print' style="position: relative;">
     <div>
-      <div style="display: inline-block; position: absolute;top: 30px;left: 30px;">{{list.order.mdtrt_id}}</div>
-
-
+      <div style="display: inline-block; position: absolute;top: 20px;left: 50px;">{{list.order.mdtrt_id}}</div>
     </div>
     <div>
-      <div style="display: inline-block; position: absolute;top: 60px;left: 30px;">血液透析中心</div>
-      <div style="display: inline-block; position: absolute;top: 60px;left: 260px;">{{  paramsObj.setl_time ? paramsObj.setl_time.split(' ')[0].slice(0,4) : getTime(list.date, '{y}-{m}-{d}').slice(0,4) }}</div>
-      <div style="display: inline-block; position: absolute;top: 60px;left: 330px;">{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(5,7)) : getTime(list.date, '{y}-{m}-{d}').slice(5,7) }}</div>
-      <div style="display: inline-block; position: absolute;top: 60px;left: 400px;">{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(8,11)) : getTime(list.date, '{y}-{m}-{d}').slice(8,11) }}</div>
+      <div style="display: inline-block; position: absolute;top: 40px;left: 50px;">血液透析中心</div>
+      <div style="display: inline-block; position: absolute;top: 40px;left: 460px;">{{  paramsObj.setl_time ? paramsObj.setl_time.split(' ')[0].slice(0,4) : getTime(list.date, '{y}-{m}-{d}').slice(0,4) }}</div>
+      <div style="display: inline-block; position: absolute;top: 40px;left: 520px;">{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(5,7)) : getTime(list.date, '{y}-{m}-{d}').slice(5,7) }}</div>
+      <div style="display: inline-block; position: absolute;top: 40px;left: 560px;">{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(8,11)) : getTime(list.date, '{y}-{m}-{d}').slice(8,11) }}</div>
     </div>
     <div>
-      <div style="position: absolute;top: 90px;left: 60px;">{{ paramsObj.name }}</div>
+      <div style="position: absolute;top: 60px;left: 60px;">{{ paramsObj.name }}</div>
       <div style="display:flex;justify-content: space-between;">
-          <div  style="position: absolute;top:90px;left:270px;">√</div>
+          <div  style="position: absolute;top:60px;left:200px;">√</div>
           <div  style="position: absolute;top:90px;left:220px;"></div>
           <div  style="position: absolute;top:90px;left:250px;"></div>
       </div>
     </div>
 
     <div style="display:flex;justify-content: space-between;">
-      <div  style="position: absolute;top:120px;left:60px;" v-if="list.gender == 1">√</div>
-      <div  style="position: absolute;top:120px;left:80px;" v-else-if="list.gender == 2">√</div>
-      <div  style="position: absolute;top:120px;left:200px;">{{list.order.fund_pay_sumamt}}</div>
-      <div  style="position: absolute;top:120px;left:300px;">{{list.psn_cash_money}}</div>
-      <div  style="position: absolute;top:120px;left:400px;">{{"医保-门慢"}}</div>
+      <div  style="position: absolute;top:85px;left:60px;" v-if="list.gender == 1">√</div>
+      <div  style="position: absolute;top:85px;left:80px;" v-else-if="list.gender == 2">√</div>
+      <div  style="position: absolute;top:85px;left:220px;">{{list.order.fund_pay_sumamt}}</div>
+      <div  style="position: absolute;top:85px;left:380px;">{{list.psn_cash_money}}</div>
+      <div  style="position: absolute;top:85px;left:530px;">{{"医保-门慢"}}</div>
     </div>
     <div style="display:flex;justify-content: space-between;">
       <div v-if="list.westernMedicineCostTotal != ''">
-        <div  style="position: absolute;top:150px;left:0px;">西药费</div>
-        <div  style="position: absolute;top:150px;left:60px;">{{ list.westernMedicineCostTotal ? list.westernMedicineCostTotal.toFixed(2) : '' }}</div>
+        <div  style="position: absolute;top:140px;left:0px;">西药费</div>
+        <div  style="position: absolute;top:140px;left:60px;">{{ list.westernMedicineCostTotal ? list.westernMedicineCostTotal.toFixed(2) : '' }}</div>
       </div>
       <div v-if="list.laboratoryCostTotal != ''">
-        <div  style="position: absolute;top:150px;left:120px;">化验费</div>
-        <div  style="position: absolute;top:150px;left:180px;">{{ list.laboratoryCostTotal ? list.laboratoryCostTotal.toFixed(2) : '' }}</div>
+        <div  style="position: absolute;top:140px;left:140px;">化验费</div>
+        <div  style="position: absolute;top:140px;left:210px;">{{ list.laboratoryCostTotal ? list.laboratoryCostTotal.toFixed(2) : '' }}</div>
       </div>
       <div v-if="list.treatCostTotal != ''">
-        <div  style="position: absolute;top:150px;left:240px;">治疗费</div>
-        <div  style="position: absolute;top:150px;left:300px;">{{ list.treatCostTotal ? list.treatCostTotal.toFixed(2) : '' }}</div>
+        <div  style="position: absolute;top:140px;left:300px;">治疗费</div>
+        <div  style="position: absolute;top:140px;left:360px;">{{ list.treatCostTotal ? list.treatCostTotal.toFixed(2) : '' }}</div>
       </div>
       <div v-if="list.materialCostTotal != ''">
-        <div  style="position: absolute;top:150px;left:360px;">材料费</div>
-        <div  style="position: absolute;top:150px;left:420px;">{{ list.materialCostTotal ? list.materialCostTotal.toFixed(2) : '' }}</div>
+        <div  style="position: absolute;top:140px;left:470px;">材料费</div>
+        <div  style="position: absolute;top:140px;left:540px;">{{ list.materialCostTotal ? list.materialCostTotal.toFixed(2) : '' }}</div>
       </div>
     </div>
     <div style="display:flex;justify-content: space-between;">
       <div v-if="list.chineseTraditionalMedicineCostTotal !=' '">
-        <div  style="position: absolute;top:180px;left:0px;">中成药</div>
-        <div  style="position: absolute;top:180px;left:60px;">{{ list.chineseTraditionalMedicineCostTotal ? list.chineseTraditionalMedicineCostTotal.toFixed(2) : '' }}</div>
+        <div  style="position: absolute;top:160px;left:0px;">中成药</div>
+        <div  style="position: absolute;top:160px;left:60px;">{{ list.chineseTraditionalMedicineCostTotal ? list.chineseTraditionalMedicineCostTotal.toFixed(2) : '' }}</div>
       </div>
       <div v-if="list.zhenChaCostTotal !=''">
-        <div  style="position: absolute;top:180px;left:120px;">诊疗费</div>
-        <div  style="position: absolute;top:180px;left:180px;">{{ list.zhenChaCostTotal ? list.zhenChaCostTotal.toFixed(2) : '' }}</div>
+        <div  style="position: absolute;top:160px;left:140px;">诊疗费</div>
+        <div  style="position: absolute;top:160px;left:210px;">{{ list.zhenChaCostTotal ? list.zhenChaCostTotal.toFixed(2) : '' }}</div>
       </div>
       <div>
-        <div  style="position: absolute;top:180px;left:240px;"></div>
-        <div  style="position: absolute;top:180px;left:300px;"></div>
+        <div  style="position: absolute;top:160px;left:300px;"></div>
+        <div  style="position: absolute;top:160px;left:360px;"></div>
       </div>
       <div v-if="list.otherCostTotal !=''">
-        <div  style="position: absolute;top:180px;left:360px;"> 其他</div>
-        <div  style="position: absolute;top:180px;left:420px;">{{ list.otherCostTotal ? list.otherCostTotal.toFixed(2) : '' }}</div>
+        <div  style="position: absolute;top:160px;left:470px;"> 其他</div>
+        <div  style="position: absolute;top:160px;left:540px;">{{ list.otherCostTotal ? list.otherCostTotal.toFixed(2) : '' }}</div>
       </div>
     </div>
     <div style="display:flex;justify-content: space-between;">
       <div>
-        <div  style="position: absolute;top:210px;left:0px;"></div>
-        <div  style="position: absolute;top:210px;left:60px;"></div>
+        <div  style="position: absolute;top:180px;left:0px;"></div>
+        <div  style="position: absolute;top:180px;left:60px;"></div>
       </div>
       <div v-if="list.checkCostTotal !=''">
-        <div  style="position: absolute;top:210px;left:120px;">检查费</div>
-        <div  style="position: absolute;top:210px;left:180px;">{{ list.checkCostTotal ? list.checkCostTotal.toFixed(2) : '' }}</div>
+        <div  style="position: absolute;top:180px;left:140px;">检查费</div>
+        <div  style="position: absolute;top:180px;left:210px;">{{ list.checkCostTotal ? list.checkCostTotal.toFixed(2) : '' }}</div>
       </div>
       <div >
-        <div  style="position: absolute;top:210px;left:240px;"></div>
-        <div  style="position: absolute;top:210px;left:300px;"></div>
+        <div  style="position: absolute;top:180px;left:300px;"></div>
+        <div  style="position: absolute;top:180px;left:360px;"></div>
       </div>
       <div v-if="list.hiliCostTotal !=''">
-        <div  style="position: absolute;top:210px;left:360px;">护理费</div>
-        <div  style="position: absolute;top:210px;left:420px;">{{list.hiliCostTotal ? list.hiliCostTotal.toFixed(2) : ''}}</div>
+        <div  style="position: absolute;top:180px;left:470px;">护理费</div>
+        <div  style="position: absolute;top:180px;left:540px;">{{list.hiliCostTotal ? list.hiliCostTotal.toFixed(2) : ''}}</div>
       </div>
     </div>
     <div style="display:flex;justify-content: space-between;">
@@ -89,62 +87,62 @@
     </div>
     <div>
       <span>
-        <span  style="position: absolute;top:290px;left:100px">
+        <span  style="position: absolute;top:240px;left:140px">
           <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;top:290px;left:140px">
+        <span  style="position: absolute;top:240px;left:180px">
             <span v-if="zhongwen.indexOf('万') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('万') - 1,zhongwen.indexOf('万')) }}
                 </span>
                 <span v-else>零</span>
         </span>
-        <span  style="position: absolute;top:290px;left:190px">
+        <span  style="position: absolute;top:240px;left:215px">
             <span v-if="zhongwen.indexOf('仟') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('仟') - 1,zhongwen.indexOf('仟')) }}
                 </span>
                 <span v-else>零</span>
         </span>
-        <span  style="position: absolute;top:290px;left:260px">
+        <span  style="position: absolute;top:240px;left:255px">
             <span v-if="zhongwen.indexOf('佰') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('佰') - 1,zhongwen.indexOf('佰')) }}
                 </span>
                 <span v-else>零</span>
         </span>
-        <span style="position: absolute;top:290px;left:310px">
+        <span style="position: absolute;top:240px;left:295px">
             <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;top:290px;left:380px">
+        <span  style="position: absolute;top:240px;left:335px">
            <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;top:290px;left:450px">
+        <span  style="position: absolute;top:240px;left:375px">
              <span v-if="zhongwen.indexOf('角') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('角') - 1,zhongwen.indexOf('角')) }}
                 </span>
                 <span v-else>零</span>
         </span>
-        <span  style="position: absolute;top:290px;left:510px">
+        <span  style="position: absolute;top:240px;left:415px">
              <span v-if="zhongwen.indexOf('分') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('分') - 1,zhongwen.indexOf('分')) }}
                 </span>
                 <span v-else>零</span>
         </span>
       </span>
-      <span style="position: absolute;top:290px;left:600px">{{ totalPrice.toFixed(2) }}</span>
+      <span style="position: absolute;top:240px;left:490px">{{ totalPrice.toFixed(2) }}</span>
     </div>
 
     <div style="display:flex;justify-content: space-between;">
-      <div style="position: absolute;top:390px;left:100px;">{{ org_name}}</div>
-      <div style="position: absolute;top:390px;left:240px;"></div>
-      <div style="position: absolute;top:390px;left:460px;">{{list.admin_user_name}}</div>
+      <div style="position: absolute;top:320px;left:60px;">{{ org_name}}</div>
+      <div style="position: absolute;top:320px;left:240px;"></div>
+      <div style="position: absolute;top:320px;left:380px;">{{list.admin_user_name}}</div>
     </div>
   </div>
 </template>

src/xt_pages/outpatientDoctorStation/template/prinSeven.vue

@@ -140,11 +140,11 @@
                   </div>
                   <!-- v-if="arr.length>0 && arr[0][0].groupno==it.groupno" 'border-right':arr.length>0 && arr[0][0].groupno==it.groupno ? '1px solid black' :'none',-->
                 </div>
-                <div style="display: inline-block;position: absolute;left:80%;margin-left: 10px;" >
+                <div style="display: inline-block;position: absolute;left:80%;bottom:30px;margin-left: 10px;" >
                   ×&nbsp;{{ it.prescribing_number}}
                 </div>
                 <template v-if="item.arr.length>0&&item.arr[0][0].groupno==it.groupno">
-                  <div style="display: inline-block;position: absolute;left:80%;bottom:20px;margin-left: 10px;" >
+                  <div style="display: inline-block;position: absolute;left:80%;bottom:15px;margin-left: 10px;" >
                     ×&nbsp;{{ item.arr[0][0].prescribing_number}}
                   </div>
                 </template>

src/xt_pages/role/admin.vue

@@ -209,12 +209,12 @@
           @click="toCheckPDFInformation">PDF验证</el-button> -->
 
 
-          <el-button
+          <!-- <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toAutoDrug">自动生成</el-button>
+          @click="toAutoDrug">自动生成</el-button> -->
 
 
      </div>

src/xt_pages/user/components/PatientDetail.vue

@@ -292,6 +292,20 @@
               </el-form-item>
              </el-col>
 
+             <el-col :span="24">
+              <el-form-item label="主管护士 : " prop="record_number">
+                <el-select v-model="form.nurse" style="width:200px"   disabled>
+                <el-option
+                  v-for="(item,index) in adminUserOptions"
+                  :key="index"
+                  :label="item.name"
+                  :value="item.id"
+               
+                />
+              </el-select>
+              </el-form-item>
+             </el-col>
+
               <el-col :span="6">
               <el-form-item
                 label="本院前透析频率 : "
@@ -1756,9 +1770,9 @@ export default {
             // if (patietInfo.attending_doctor_id > 0) {
             //   this.form.doctor = patietInfo.attending_doctor_id;
             // }
-            // if (patietInfo.head_nurse_id > 0) {
-            //   this.form.nurse = patietInfo.head_nurse_id;
-            // }
+            if (patietInfo.head_nurse_id > 0) {
+              this.form.nurse = patietInfo.head_nurse_id;
+            }
             // if (patietInfo.registrars_id > 0) {
             //   this.form.registrars = patietInfo.registrars_id;
             // }

src/xt_pages/user/components/PatientForm.vue

@@ -343,6 +343,19 @@
               </el-form-item>
              </el-col>
 
+             <el-col :span="24">
+              <el-form-item label="主管护士 : " prop="record_number">
+                <el-select v-model="form.nurse" style="width:200px">
+                <el-option
+                  v-for="(item,index) in adminUserOptions"
+                  :key="index"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+              </el-form-item>
+             </el-col>
+
             <el-col :span="6" :style="isEdit ? 'width:360px' : ''">
               <el-form-item
                 label="本院前透析频率 : "
@@ -1027,7 +1040,7 @@
           </el-col>
 
          <el-col :span="6">
-          <el-form-item label="医生 : ">
+          <el-form-item label="主治医生 : ">
             <el-select v-model="form.doctor">
                 <el-option
                   v-for="(item,index) in adminUserOptions"
@@ -1157,6 +1170,7 @@ const defaultForm = {
   troble_shoot:2,
   zb_patient_id:"",
   doctor:"",
+  nurse:"",
   patient_source:0,
   patient_start_time:"",
   patient_end_time:"",
@@ -1593,6 +1607,7 @@ export default {
         if (response.data.state === 1) {
           this.form.doctor = this.$store.getters.xt_user.user.id
           this.adminUserOptions = response.data.data.users;
+          
 
         }
       });
@@ -1663,6 +1678,7 @@ export default {
             this.form.user_sys_before_count = this.form.user_sys_before_count.toString();
             this.form.troble_shoot = parseInt(this.form.troble_shoot)
             this.form.doctor = parseInt(this.form.doctor)
+            this.form.nurse = parseInt(this.form.nurse)
             if(this.form.patient_source >0){
               this.form.patient_source = parseInt(this.form.patient_source)
             }else{
@@ -1714,6 +1730,7 @@ export default {
             this.form.age = parseInt(this.form.age);
             this.form.troble_shoot = parseInt(this.form.troble_shoot)
             this.form.doctor = parseInt(this.form.doctor)
+            this.form.nurse = parseInt(this.form.nurse)
             if(this.form.patient_source >0){
               this.form.patient_source = parseInt(this.form.patient_source)
             }else{
@@ -2043,9 +2060,9 @@ export default {
             // if (patietInfo.attending_doctor_id > 0) {
             //   this.form.doctor = patietInfo.attending_doctor_id;
             // }
-            // if (patietInfo.head_nurse_id > 0) {
-            //   this.form.nurse = patietInfo.head_nurse_id;
-            // }
+            if (patietInfo.head_nurse_id > 0) {
+              this.form.nurse = patietInfo.head_nurse_id;
+            }
             // if (patietInfo.registrars_id > 0) {
             //   this.form.registrars = patietInfo.registrars_id;
             // }

src/xt_pages/user/dialysisRecord.vue

@@ -686,8 +686,12 @@ export default {
     },
     rowclick(val){
       // console.log('kkkkkkk',val.dialysis_date);
+      // this.$router.push({
+      //   path: "/dialysis/details/indexs",
+      //   query: { patient_id: val.patient_id, date: val.dialysis_date }
+      // });
       this.$router.push({
-        path: "/dialysis/details/indexs",
+        path: "/dialysis/details",
         query: { patient_id: val.patient_id, date: val.dialysis_date }
       });
       // console.log('kkkkkkk',event);

src/xt_pages/user/patients.vue

@@ -268,6 +268,20 @@
           </ul>
         </div>
       </div> -->
+      <div  class="cell clearfix">
+        <label class="title"><span class="name">主管护士</span> : </label>
+        <el-select v-model="form.nurse" style="width:200px"  @change="changeNuseSearch">
+            <el-option
+              placeholder="主管护士"
+              v-for="(item,index) in adminUserOptions"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+             
+            
+            />
+        </el-select>
+      </div>
       <div class="cell clearfix">
         <label class="title"><span class="name">其它查询</span> : </label>
         <el-select
@@ -335,8 +349,13 @@
           >
           </el-option>
         </el-select>
+      
+  
         <el-button type="primary" size="small" style="float:right" @click="toExport">导出</el-button>
       </div>
+      <div  class="cell clearfix">
+
+      </div>
 
       <el-table
         ref="multipleTable"
@@ -720,6 +739,7 @@
 </template>
 
 <script>
+  import { fetchAllAdminUsers } from "@/api/doctor";
   import { code, EditLapseto, fetchList, getMaxDialysisNo, OpenView, postExportPatients,GetRemind,getPatientAllagic } from '@/api/patient'
   import { generateLog } from '@/api/config'
   import QRCode from 'qrcodejs2'
@@ -869,6 +889,7 @@
           isscheduling: '',
           isprescription: '',
           patientSoureType:'',
+          nurse:0,
         },
         multipleSelection: [],
         bindWechatDialog: false,
@@ -899,7 +920,9 @@
           patient_address:"",
           patient_start_time:"",
           patient_end_time:"",
-        }
+          nurse:"0"
+        },
+        adminUserOptions:[]
       }
     },
     created() {
@@ -918,9 +941,21 @@
       }
       //获取
       this.GetRemindPatientList()
+      this.fetchAllAdminUsers();
     },
 
     methods: {
+      fetchAllAdminUsers() {
+        fetchAllAdminUsers().then((response) => {
+          if (response.data.state === 1) {
+            var obj ={id:0,name:"全部"}
+            this.adminUserOptions.push(obj)
+            for(let i=0;i<response.data.data.users.length;i++){
+              this.adminUserOptions.push(response.data.data.users[i])
+            }
+          }
+        });
+      },
       putOnRecord:function(type,row){
         if(type == 1){
 
@@ -1531,6 +1566,9 @@
       changeOtherSearch() {
         this.getList()
       },
+      changeNuseSearch(){
+        this.getList()
+      },
       getList() {
          console.log("query23323223wo",this.listQuery)
         fetchList(this.listQuery).then(response => {