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

src/api/device.js

@@ -382,4 +382,21 @@ export function deleteObjectRegistration(id,params){
     method:"get",
     params:params
   })
+}
+
+export function getRegistGoodInforList(params){
+  return request({
+    url:"/api/manage/getregistgoodinforlist",
+    method:"Get",
+    params:params,
+  })
+}
+
+export function getRegistNumber(id,record_date,params){
+  
+  return request({
+    url:"/api/manage/getregistnumber?id="+id+"&record_date="+record_date,
+    method:"Get",
+    params:params,
+  })
 }

src/api/role/admin.js

@@ -92,4 +92,20 @@ export function toSign(params){
     method:"get",
     params:params
   })
+}
+
+export function toTestOne(params){
+  return request({
+    url:"/api/sign/createrusername",
+    method:"get",
+    params:params
+  })
+}
+
+export function toTestTwo(params){
+  return request({
+    url:"/api/sign/createpersionseal",
+    method:"get",
+    params:params
+  })
 }

src/router/modules/stock.js

@@ -506,7 +506,25 @@ export default {
       hidden: true,
       is_menu: false,
       meta: { title: 'drugQueryPrint', noCache: true }
-    }
+    },
+
+    {
+      path: '/stock/print_damage',
+      component: () => import('@/xt_pages/stock/print_damage'),
+      name: 'print_damage',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'print_damage', noCache: true }
+    },
+
+    {
+      path: '/stock/drug_damage/print',
+      component: () => import('@/xt_pages/stock/drug_damage_print'),
+      name: 'drug_damage_print',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drug_damage_print', noCache: true }
+    },
 
   ]
 }

src/xt_pages/device/objectRegistration.vue

@@ -45,7 +45,7 @@
 
                 <el-table-column prop="fenopda" label="使用数量" align="center" min-width="60">
                     <template slot-scope="scope">
-                        {{ scope.row.model_number }}
+                        {{ scope.row.user_count }}
                     </template>
                 </el-table-column>
 
@@ -128,20 +128,29 @@
                 <el-form :model="form" ref="form">
                     <el-row :span="24">
                       <el-col :span="8">
-                        <el-form-item label="登记日期:" label-width="110px" prop="record_date" >
+                        <el-form-item label="登记日期:" label-width="110px" prop="record_date">
                             <el-date-picker
                             value-format="yyyy-MM-dd"
                             v-model="form.record_date"
                             type="date"
                             placeholder="选择日期时间"
-                            style="width: 150px;">
+                            style="width: 150px;"
+                            @change="changeModelNumber">
                             </el-date-picker>
                         </el-form-item>
                       </el-col>
 
                       <el-col :span="8">
                         <el-form-item label="品名、型号:" label-width="110px" prop="record_date">
-                           <el-input v-model="form.model_number" style="width: 150px;"></el-input>
+                           <!-- <el-input v-model="form.model_number" style="width: 150px;"></el-input> -->
+                           <el-select v-model="form.model_number" filterable  placeholder="请选择" @change="changeModelNumber">
+                              <el-option
+                                v-for="item in goodList"
+                                :key="item.id"
+                                :label="item.specification_name"
+                                :value="item.id">
+                              </el-option>
+                           </el-select>
                         </el-form-item>
                       </el-col>
                     
@@ -251,14 +260,23 @@
                             v-model="form.record_date"
                             type="date"
                             placeholder="选择日期时间"
-                            style="width: 150px;">
+                            style="width: 150px;"
+                            @change="changeModelNumber">
                             </el-date-picker>
                         </el-form-item>
                       </el-col>
 
                       <el-col :span="8">
                         <el-form-item label="品名、型号:" label-width="110px" prop="model_number">
-                           <el-input v-model="form.model_number" style="width: 150px;"></el-input>
+                           <!-- <el-input v-model="form.model_number" style="width: 150px;"></el-input> -->
+                           <el-select v-model="form.model_number" filterable  placeholder="请选择" @change="changeModelNumber">
+                              <el-option
+                                v-for="item in goodList"
+                                :key="item.id"
+                                :label="item.specification_name"
+                                :value="item.id">
+                              </el-option>
+                           </el-select>
                         </el-form-item>
                       </el-col>
                     
@@ -427,7 +445,9 @@
         getRegistrationDisInfectList,
         getObjectRegistrationByIdList,
         UpdateObjectRegistration,
-        deleteObjectRegistration 
+        deleteObjectRegistration,
+        getRegistGoodInforList,
+        getRegistNumber 
     } from "@/api/device"
     import { uParseTime } from '@/utils/tools'
     const moment = require('moment')
@@ -491,10 +511,11 @@
          ],
          operators: [],
          operatorMaps:{},
-         
+         goodList:[],
         }
       },
       created(){
+        this.getRegistGoodInforList()
         this.getAllDoctorList()
         this.getlist()
       },
@@ -723,10 +744,16 @@
                 if(this.form.packaging_identification ==false ){
                     packaging_identification_one = 2
                 }
+                var model_number = ""
+                for(let i=0;i<this.goodList.length;i++){
+                  if(this.form.model_number == this.goodList[i].id){
+                    model_number = this.goodList[i].specification_name
+                  }
+                }
                 var params = {
                     id:this.form.id,
                     record_date:this.form.record_date,
-                    model_number:this.form.model_number,
+                    model_number:model_number,
                     user_count:this.form.user_count.toString(),
                     product_date:this.form.product_date,
                     expiry_date:this.form.expiry_date,
@@ -844,9 +871,15 @@
               if(this.form.packaging_identification ==false ){
                 packaging_identification_one = 2
               }
+              var model_number = ""
+              for(let i=0;i<this.goodList.length;i++){
+                if(this.form.model_number == this.goodList[i].id){
+                   model_number = this.goodList[i].specification_name
+                }
+              }
               var params = {
                 record_date:this.form.record_date,
-                model_number:this.form.model_number,
+                model_number:model_number,
                 user_count:this.form.user_count.toString(),
                 product_date:this.form.product_date,
                 expiry_date:this.form.expiry_date,
@@ -870,6 +903,32 @@
       },
       toSeach(){
         this.getlist()
+      },
+      getRegistGoodInforList(){
+        getRegistGoodInforList().then(response=>{
+           if(response.data.state == 1){
+             var  goodList =  response.data.data.list
+             this.goodList = goodList
+           } 
+        })
+      },
+
+      changeModelNumber(val){
+        console.log("val23233223",val)
+
+        getRegistNumber(val,this.form.record_date).then(response=>{
+          if(response.data.state ==1 ){
+            var list =  response.data.data.list
+            var count = 0
+            if(list!=null && list.length >0){
+              for(let i=0;i<list.length;i++){
+                count +=list[i].count
+              }
+            }
+            this.form.user_count = ""
+            this.form.user_count = count
+          }
+        })
       }
         
       }

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1336,6 +1336,7 @@
                           <td width="50">脉搏<br />(次/分)</td>
                           <td width="50">呼吸<br />(次/分)</td>
                           <td width="50">血流量<br />(ml/min)</td>
+                          <td width="50" v-if="org_id == 10478 || org_id == 0">动脉压<br />(mmHg)</td>
                           <td width="50">静脉压<br />(mmHg)</td>
                           <td width="50">跨膜压<br />(mmHg)</td>
                           <td width="60" v-if="org_id != 9836">
@@ -1378,6 +1379,7 @@
                           >
                           置换液的速度<br />(ml/h)
                           </td>
+                          <td width="50" v-if="org_id == 0 || org_id == 10375">置换率<br />(ml/h)</td>
                           <td width="50" v-if="org_id != 3877 && org_id != 10449">超滤量<br />(ml)</td>
                           <td width="50" v-if="org_id ==3877 || org_id ==10449">累计超滤量<br />(ml)</td>
                           <td
@@ -1465,6 +1467,13 @@
                                 : ""
                             }}
                           </td>
+                          <td v-if="org_id==0 || org_id == 10478">
+                            {{
+                              monitor_record.arterial_pressure
+                                ? monitor_record.arterial_pressure
+                                : ""
+                            }}
+                          </td>
                           <td>
                             {{
                               monitor_record.venous_pressure
@@ -1554,7 +1563,9 @@
                                 : ""
                             }}
                           </td>
-
+                          <td width="50" v-if="org_id == 0 || org_id == 10375"><br />
+                            {{ monitor_record.replacement_rate?monitor_record.replacement_rate:"0" }}
+                          </td>
                           <td>
                             <span v-if="org_id == 9671 || org_id == 10440 || org_id == 10471">
                                 {{
@@ -1681,6 +1692,7 @@
                         <td></td>
                         <td></td>
                         <td></td>
+                        <td  v-if="org_id == 0 || org_id == 10375"> </td>
                         <td v-if="org_id == 9671 || org_id == 9919"></td>
                         <td
                           v-if="
@@ -1757,6 +1769,7 @@
                             执行人签名
                           </td>
                           <td style="font-size: 16px" width="10%">时间</td>
+                           <td style="font-size: 16px" width="10%" v-if="org_id == 10375 || org_id ==0">核对护士</td>
                         </tr>
                         <!-- <template v-for="group in doctor_advices" > -->
 
@@ -1864,6 +1877,29 @@
                                 getTime(advice[0].execution_time, " {h}:{i}")
                               }}</span>
                             </td>
+                            <td height="35px" v-if="org_id == 10375 || org_id == 0">
+                              <span
+                                v-if="
+                                  setAdminUserES(
+                                    advice[0],
+                                    'checker'
+                                  ) == ''
+                                "
+                                >{{
+                                  getAdminUser(advice[0], "checker")
+                                }}</span
+                              >
+                              <img
+                                class="es-img"
+                                :src="
+                                  setAdminUserES(advice[0], 'checker')
+                                "
+                                alt=""
+                                srcset=""
+                                v-else
+                                style="height: 40px"
+                              />
+                            </td>
                           </tr>
                         </template>
                       </tbody>
@@ -2391,7 +2427,7 @@
                       <div
                         class="inline_block"
                         style="flex: 1"
-                        v-if="org_id != 10223"
+                        v-if="org_id != 10223 || org_id!=10375"
                       >
                         透析中入量(L)：
                         <div
@@ -2649,6 +2685,40 @@
                           }}
                         </div>
                       </div>
+
+                  
+                    </div>
+
+                    <div
+                      class="row"
+                      style="padding: 2px 0; line-height: 23px; display: flex"
+                      v-if="org_id == 0 || org_id ==10375"
+                    >
+                      <div
+                        class="inline_block"
+                        style="flex: 1; display: inline-block"
+                      >
+                        宣教知识：
+                        <div
+                          class="under_line"
+                          style="
+                            width: 840px;
+                            line-height: 25px;
+                            text-align: left;
+                            margin-left: 2px;
+                            display: inline-block;
+                            white-space: normal;
+                          "
+                        >
+                          {{
+                            record.summer && record.summer.mission
+                              ? record.summer.mission
+                              : "/"
+                          }}
+                        </div>
+                      </div>
+
+                  
                     </div>
                   </td>
                 </tr>

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -58,8 +58,8 @@
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{anticoagulant_zongliang != "0" ? anticoagulant_zongliang : ""}}</span>
           <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id !=45">
             <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" ></span>
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 &&  this.$store.getters.xt_user.template_info.template_id != 23 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 10234">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 10234 )">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 &&  this.$store.getters.xt_user.template_info.template_id != 23 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 10234 && this.$store.getters.xt_user.template_info.template_id != 65">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 10234 ||  this.$store.getters.xt_user.template_info.template_id== 65)">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3" >
             
               <span v-if="this.$store.getters.xt_user.template_info.org_id == 9671 || this.$store.getters.xt_user.template_info.org_id == 9675">
@@ -192,8 +192,8 @@
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{ anticoagulant_shouji != "0" ? anticoagulant_shouji : "" }}</span>
           <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45">
             <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" ></span>
-            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && this.$store.getters.xt_user.template_info.template_id != 13  && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 38 ">{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
-            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38)" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
+            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && this.$store.getters.xt_user.template_info.template_id != 13  && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 65 && this.$store.getters.xt_user.template_info.template_id!=0">{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
+            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38  || this.$store.getters.xt_user.template_info.template_id == 65 ||  this.$store.getters.xt_user.template_info.template_id == 0)" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3">
               <span v-if="this.$store.getters.xt_user.template_info.org_id == 9671">
                  {{ anticoagulant_shouji != "0" ? "mg" : "" }}
@@ -303,8 +303,8 @@
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{ anticoagulant_weichi != "0" ? anticoagulant_weichi : "" }}</span>
           <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45">
             <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1"></span>
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 38 ">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38)">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 65 ">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 65)">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3">
               <span v-if="this.$store.getters.xt_user.template_info.org_id ==9671">
               {{ anticoagulant_weichi != "0" ? "mg/h" : "" }}
@@ -945,7 +945,7 @@ export default {
   
   },
   created() {
-   
+    console.log("template_id", this.$store.getters.xt_user.template_info.template_id)
     var perfusion_apparatus = this.$store.getters.perfusion_apparatus
     var map = {}
     for (let index = 0; index < perfusion_apparatus.length; index++) {

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -17,8 +17,8 @@
           <span class="content" v-if="actual_ultrafiltration != '0'">{{
             actual_ultrafiltration
           }}</span>
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 44 || this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10340 ||  this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10430 ||  this.$store.getters.xt_user.template_info.org_id == 10432 ||  this.$store.getters.xt_user.template_info.org_id == 10441 ||  this.$store.getters.xt_user.template_info.org_id == 10445  ) " >ml</span>
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 44 && this.$store.getters.xt_user.template_info.template_id != 60 &&  this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10340 &&  this.$store.getters.xt_user.template_info.org_id!= 10387 &&  this.$store.getters.xt_user.template_info.org_id!= 10430 &&  this.$store.getters.xt_user.template_info.org_id!= 10432 &&  this.$store.getters.xt_user.template_info.org_id!= 10441 &&  this.$store.getters.xt_user.template_info.org_id!= 10445"  >L</span>
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 44 || this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10340 ||  this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10430 ||  this.$store.getters.xt_user.template_info.org_id == 10432 ||  this.$store.getters.xt_user.template_info.org_id == 10441 ||  this.$store.getters.xt_user.template_info.org_id == 10445 ||  this.$store.getters.xt_user.template_info.org_id == 10495  ) " >ml</span>
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 44 && this.$store.getters.xt_user.template_info.template_id != 60 &&  this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10340 &&  this.$store.getters.xt_user.template_info.org_id!= 10387 &&  this.$store.getters.xt_user.template_info.org_id!= 10430 &&  this.$store.getters.xt_user.template_info.org_id!= 10432 &&  this.$store.getters.xt_user.template_info.org_id!= 10441 &&  this.$store.getters.xt_user.template_info.org_id!= 10445  &&  this.$store.getters.xt_user.template_info.org_id!= 10495"  >L</span>
         </li>
         <li v-if="isShow('导管')">
           <label>导管 : </label>

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

@@ -29,7 +29,7 @@
           <el-col :span="8" v-if="isShow('实际超滤量')">
             <el-form-item
               label="实际超滤量(ml): " :prop="isName('实际超滤量')" :rules="isCheckmust('实际超滤量')"
-              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.template_id == 56 || this.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10307 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410"  >
+              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.template_id == 56 || this.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10307 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10495"  >
               <el-input v-model="form.actual_ultrafiltration"></el-input>
             </el-form-item>
             <el-form-item label="实际超滤量(L): " v-else :prop="isName('实际超滤量')" :rules="isCheckmust('实际超滤量')">
@@ -628,6 +628,12 @@
             </el-form-item>
         </el-col>
 
+        <el-col :span="24" v-if="isShow('备注')">
+            <el-form-item label="备注：" :prop="isName('备注')">
+              <el-input type="textarea" :rows="4" v-model="form.remark"></el-input>
+            </el-form-item>
+        </el-col>
+
       </el-form>
 
 
@@ -852,6 +858,7 @@ export default {
         machine_run:0,
         after_urea:"",
         accumulated_blood_volume:"",
+     
       },
       lapseList:[],
       leaveOfficeMethod:[],
@@ -1174,6 +1181,7 @@ export default {
           data["after_urea"] = this.form.after_urea
           data["pip_coagulation"] = this.form.pip_coagulation
           data["accumulated_blood_volume"] = this.form.accumulated_blood_volume
+       
           console.log("Data",data)
           console.log("Paramsquery",data)
 

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

@@ -312,11 +312,13 @@
                         this.$store.getters.xt_user.template_info.org_id != 9829 &&
                         this.$store.getters.xt_user.template_info.org_id != 10440 &&
                         this.$store.getters.xt_user.template_info.org_id != 10469 &&
-                        this.$store.getters.xt_user.template_info.org_id != 10471">
-                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 &&
+                        this.$store.getters.xt_user.template_info.org_id != 10471 &&
+                        this.$store.getters.xt_user.template_info.org_id != 10495">
+                       <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 &&
                           this.$store.getters.xt_user.template_info.template_id != 45 &&
                           this.$store.getters.xt_user.template_info.org_id != 10346 &&
-                          this.$store.getters.xt_user.template_info.org_id != 10387">
+                          this.$store.getters.xt_user.template_info.org_id != 10387 &&
+                          this.$store.getters.xt_user.template_info.org_id != 10495 ">
                             <el-form-item
                                     v-if='dialysisPrescription.anticoagulant != 1 &&
                                     this.$store.getters.xt_user.template_info.template_id != 21 &&
@@ -360,7 +362,8 @@
                                     this.$store.getters.xt_user.template_info.template_id == 38 ||
                                     this.$store.getters.xt_user.template_info.org_id == 9987 ||
                                     this.$store.getters.xt_user.template_info.org_id == 10346 ||
-                                    this.$store.getters.xt_user.template_info.org_id == 10387'
+                                    this.$store.getters.xt_user.template_info.org_id == 10387 ||
+                                    this.$store.getters.xt_user.template_info.org_id ==10495'
                                     :label="'首剂(mg) : '" prop="anticoagulant_shouji" :rules="isCheckmust('首剂')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
@@ -411,8 +414,8 @@
 
 
                     <el-col :span="8" v-if="anticoagulant!=undefined &&anticoagulant.weichi != -1 && isShows('维持')  && dialysisPrescription.anticoagulant!=1&& dialysisPrescription.anticoagulant!=12">
-                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157  && this.$store.getters.xt_user.template_info.org_id != 9990 && this.$store.getters.xt_user.template_info.org_id != 9671  && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469 && this.$store.getters.xt_user.template_info.org_id != 10471">
-                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387 ">
+                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157  && this.$store.getters.xt_user.template_info.org_id != 9990 && this.$store.getters.xt_user.template_info.org_id != 9671  && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469 && this.$store.getters.xt_user.template_info.org_id != 10471 && this.$store.getters.xt_user.template_info.org_id != 10495">
+                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387 && this.$store.getters.xt_user.template_info.org_id != 10495 ">
                             <el-form-item :label="'维持(' + anticoagulant.weichi_unit + ') : '"
                                           v-if="anticoagulant.weichi != -1 &&
                                            this.$store.getters.xt_user.template_info.template_id != 21 &&
@@ -420,7 +423,8 @@
                                             this.$store.getters.xt_user.template_info.template_id != 38 &&
                                             this.$store.getters.xt_user.template_info.org_id != 9987  &&
                                             this.$store.getters.xt_user.template_info.org_id != 54 &&
-                                            this.$store.getters.xt_user.template_info.org_id != 9990" prop="anticoagulant_weichi" :rules="isCheckmust('维持')">
+                                            this.$store.getters.xt_user.template_info.org_id != 9990 &&
+                                            this.$store.getters.xt_user.template_info.org_id != 10495" prop="anticoagulant_weichi" :rules="isCheckmust('维持')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
@@ -435,7 +439,9 @@
                                           this.$store.getters.xt_user.template_info.org_id == 54 ||
                                           this.$store.getters.xt_user.template_info.org_id == 10346 ||
                                           this.$store.getters.xt_user.template_info.org_id == 10387  ||
-                                          this.$store.getters.xt_user.template_info.org_id == 9990" prop="anticoagulant_weichi" :rules="isCheckmust('维持')">
+                                          this.$store.getters.xt_user.template_info.org_id == 9990 ||
+                                          this.$store.getters.xt_user.template_info.org_id == 10495
+                                          " prop="anticoagulant_weichi" :rules="isCheckmust('维持')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
@@ -490,10 +496,10 @@
 
 
                     <el-col :span="8" v-if="anticoagulant!=undefined &&anticoagulant.zongliang != -1 && isShows('总量') && dialysisPrescription.anticoagulant!=1&& dialysisPrescription.anticoagulant!=12">
-                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 && this.$store.getters.xt_user.template_info.org_id != 9671 && this.$store.getters.xt_user.template_info.org_id != 9675 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469 && this.$store.getters.xt_user.template_info.org_id != 10471">
-                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387">
+                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 && this.$store.getters.xt_user.template_info.org_id != 9671 && this.$store.getters.xt_user.template_info.org_id != 9675 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469 && this.$store.getters.xt_user.template_info.org_id != 10471 && this.$store.getters.xt_user.template_info.org_id != 10495">
+                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387 && this.$store.getters.xt_user.template_info.org_id != 10495">
                             <el-form-item
-                                    v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38  && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387 && this.$store.getters.xt_user.template_info.org_id != 9990'
+                                    v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38  && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387 && this.$store.getters.xt_user.template_info.org_id != 9990 && this.$store.getters.xt_user.template_info.org_id != 10495'
                                     :label="'总量(' + anticoagulant.zongliang_unit + ') : '" prop="anticoagulant_zongliang" :rules="isCheckmust('总量')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
@@ -501,7 +507,7 @@
                                           v-model="dialysisPrescription.no_anticoagulant_zongliang"></el-input>
                             </el-form-item>
                             <el-form-item
-                                    v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38||  this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.template_id == 54 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10387'
+                                    v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38||  this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.template_id == 54 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10495 '
                                     :label="'总量(mg) : '" prop="anticoagulant_zongliang" :rules="isCheckmust('总量')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>

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

@@ -796,17 +796,17 @@ export default {
     changeBox(val) {
       var arr = [];
       var str = val.join(";");
-      if (str.indexOf("透析器/灌流器") != -1 && this.prescription != null) {
+      if (str.indexOf("透析器/灌流器/滤过器") != -1 && this.prescription != null) {
         arr.push(
-          "透析器/灌流器:" +
+          "透析器/灌流器/滤过器:" +
             (this.prescription.dialyzer_perfusion_apparatus
               ? this.prescription.dialyzer_perfusion_apparatus
               : "")
         );
       }
 
-      if (str.indexOf("透析器/灌流器") != -1 && this.prescription == null) {
-        arr.push("透析器/灌流器:");
+      if (str.indexOf("透析器/灌流器/滤过器") != -1 && this.prescription == null) {
+        arr.push("透析器/灌流器/滤过器:");
       }
 
       if (str.indexOf("穿刺针") != -1 && this.predialysis_evaluation.id != 0) {
@@ -1366,7 +1366,7 @@ export default {
       if (this.prescription != null && this.prescription.id != 0) {
         if (this.prescription.dialyzer_perfusion_apparatus != "" ||this.prescription.dialysis_dialyszers != "" || this.prescription.dialysis_irrigation != "") {
 
-          if(this.org_id == 10440 || this.org_id == 0){
+          if(this.org_id == 10440){
             this.diazes = "透析器/灌流器:";
             this.diazes = this.diazes + this.prescription.dialyzer_perfusion_apparatus;
             this.diazes = this.diazes + this.prescription.dialysis_dialyszers + this.prescription.dialysis_irrigation + "  " +"批号:"+ " ";
@@ -1374,15 +1374,12 @@ export default {
             console.log("hhahahahhahahahawowoowowowowo--------",this.diazes)
           }
 
-          if(this.org_id!=0 && this.org_id!=10440){
+          if(this.org_id!=10440){
            
-            this.diazes = "透析器/灌流器:";
-            this.diazes =
-              this.diazes + this.prescription.dialyzer_perfusion_apparatus;
-            this.diazes =
-              this.diazes +
-              this.prescription.dialysis_dialyszers +
-              this.prescription.dialysis_irrigation 
+            this.diazes = "透析器/灌流器/滤过器:";
+            this.diazes = this.diazes + this.prescription.dialyzer_perfusion_apparatus;
+            this.diazes = this.diazes + this.prescription.dialysis_dialyszers + this.prescription.dialysis_irrigation + this.prescription.dialysis_strainer
+
           }
         
         } else {

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

@@ -242,6 +242,7 @@
                 || org_id == 10445
                 || org_id == 10410 ||
                 org_id == 10495 ||
+                org_id == 10375 ||
                 org_id == 10485) &&
                 org_id!=10387
             "
@@ -312,7 +313,7 @@
               org_id != 9555
               && org_id!=10432 && org_id!=10445
               && org_id!=10410 && org_id!=10495 &&
-               org_id!=10485 )
+               org_id!=10485 && org_id!=10395 )
               || org_id == 10387
             "
           >
@@ -366,7 +367,8 @@
                 org_id == 10432 ||
                 org_id == 10445 ||
                 org_id == 10410 ||
-                org_id == 10495 
+                org_id == 10495  ||
+                org_id == 10395
                 || org_id == 10485)
                 && org_id!=10387
             "
@@ -420,7 +422,7 @@
               org_id!=10432 &&
               org_id!=10445 &&
               org_id!=10410 && org_id!=10495
-              && org_id!=10485) ||
+              && org_id!=10485 && org_id!=10395) ||
               org_id == 10387
             "
           >
@@ -481,7 +483,8 @@
                 template_id == 56 ||
                 org_id ==10432 ||
                 org_id ==10445 ||
-                org_id ==10410
+                org_id ==10410 ||
+                org_id == 10395
 
                )
             "
@@ -510,6 +513,7 @@
               template_id != 56 &&
               org_id !=10432 &&
               org_id !=10445 &&
+              org_id!=10395 && 
               org_id !=10410
             "
           >
@@ -556,7 +560,8 @@
                 template_id == 48 ||
                 org_id == 10340 ||
                 org_id == 10432 ||
-                org_id == 10445)
+                org_id == 10445 ||
+                org_id == 10395)
             "
           >
             <template slot-scope="scope">
@@ -588,7 +593,8 @@
               template_id != 48 &&
               org_id !=10340 &&
               org_id !=10432 &&
-              org_id !=10445
+              org_id !=10445 &&
+              org_id!=10395
             "
           >
             <template slot-scope="scope">
@@ -1245,7 +1251,8 @@
                 org_id == 10445 ||
                 org_id == 10410 ||
                 org_id == 10495 ||
-                org_id == 10485)
+                org_id == 10485 ||
+                org_id == 10395)
                 && org_id!=10387
             "
           >
@@ -1302,7 +1309,8 @@
               org_id!=10445 &&
               org_id!=10410 &&
               org_id!=10495 &&
-              org_id!=10485
+              org_id!=10485 &&
+              org_id!=10395
               )
               || org_id == 10387
             "
@@ -1345,7 +1353,8 @@
               template_id != 53 &&
               org_id!=10432 &&
               org_id!=10445 &&
-              org_id!=10410
+              org_id!=10410 &&
+              org_id!=10395
             "
           >
             <el-form-item label="置换率(L/h)：" :prop="isName('置换率')"
@@ -1370,7 +1379,8 @@
                 template_id == 48 ||
                 org_id==10432 ||
                 org_id!=10445 ||
-                org_id!=10410)
+                org_id!=10410 ||
+                org_id!=10395)
             "
           >
             <el-form-item label="置换率(ml/min)：" :prop="isName('置换率')"
@@ -1402,7 +1412,8 @@
               template_id != 48 &&
               org_id!=10340 &&
               org_id!=10432 &&
-              org_id!=10445
+              org_id!=10445 &&
+              org_id!=10395
             "
           >
             <el-form-item label="置换量(L)：" :prop="isName('置换量')"
@@ -1430,7 +1441,8 @@
                 template_id == 48 ||
                 org_id!=10340 ||
                 org_id ==10432 ||
-                org_id ==10445)
+                org_id ==10445 ||
+                org_id == 10395)
             "
           >
             <el-form-item label="置换量(ml)：" :prop="isName('置换量')"

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1432,6 +1432,14 @@
                         <td width="50">脉搏<br />(次/分)</td>
                         <td width="50">呼吸<br />(次/分)</td>
                         <td width="50">血流量<br />(ml/min)</td>
+                        <td width="50" v-if="org_id==10478 || org_id == 0">
+                          动脉压<br />({{
+                            monitors[0] &&
+                            monitors[0]["venous_pressure_type"] == 2
+                              ? "kpa"
+                              : "mmHg"
+                          }})
+                        </td>
                         <td width="50">
                           静脉压<br />({{
                             monitors[0] &&
@@ -1459,6 +1467,7 @@
                           <span v-if="org_id == 0 || org_id == 10490"> 置换液的速度<br />(ml/h)</span> 
                         </td>
                         <td width="50" v-if="org_id == 10121">SpO₂<br />(%)</td>
+                        <td width="50" v-if="org_id == 10375 || org_id == 0">置换率<br />(ml/h)</td>
                         <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id != 0">超滤量<br />(ml)</td>
                         <td width="50" v-if="org_id ==3877 || org_id == 10449 || org_id ==0">累计超滤量<br />(ml)</td>
                         <td v-if="(prescription.mode_id == 2 ||prescription.mode_id == 5 ||prescription.mode_id == 12) &&org_id!=10478 && org_id!=0" width="50">
@@ -1480,6 +1489,13 @@
                         <td>{{ monitor.pulse_frequency? monitor.pulse_frequency: ""}}</td>
                         <td>{{monitor.breathing_rate ? monitor.breathing_rate : ""}}</td>
                         <td>{{monitor.blood_flow_volume? monitor.blood_flow_volume: ""}}</td>
+                        <td v-if="org_id == 0 ||org_id ==10478">
+                          {{
+                            monitor.arterial_pressure
+                              ? monitor.arterial_pressure
+                              : ""
+                          }}
+                        </td>
                         <td>
                           {{
                             monitor.venous_pressure
@@ -1550,7 +1566,9 @@
                         </td>
 
                       
-
+                        <td v-if="org_id == 10375 || org_id == 0"><br />
+                          {{ monitor.replacement_rate? monitor.replacement_rate: ""}}
+                        </td>
                         <td>
                           <span v-if="org_id!=9671 && org_id!=10440"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</span>
                           <span v-if="org_id==9671 || org_id==10440"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>
@@ -1635,12 +1653,14 @@
                         <td></td>
                         <td></td>
                         <td></td>
+                        <td v-if="org_id == 0 || org_id ==10478"></td>
                         <td></td>
                         <td></td>
                         <td></td>
                         <td></td>
                         <td></td>
                         <td></td>
+                        <td v-if="org_id == 10375 || org_id == 0"><br /></td>
                         <td v-if="org_id == 9671 || org_id == 9919"></td>
                         <td
                           v-if="
@@ -1716,7 +1736,7 @@
                         <td
                           style="font-size: 16px"
                           width="10%"
-                          v-if="org_id == 10223 || org_id == 9538"
+                          v-if="org_id == 10223 || org_id == 9538 || org_id == 0 || org_id ==10375"
                         >
                           核对护士
                         </td>
@@ -1807,7 +1827,7 @@
                             getTime(advice.execution_time, "{h}:{i}")
                           }}</span>
                         </td>
-                        <td height="32px" v-if="org_id == 10223 || org_id == 9538">
+                        <td height="32px" v-if="org_id == 10223 || org_id == 9538 || org_id == 0 || org_id ==10375">
                           <span v-if="setAdminUserES(advice.checker) == ''">{{
                             getAdminUser(advice.checker)
                           }}</span>
@@ -2401,7 +2421,7 @@
                     <div
                       class="inline_block"
                       style="flex: 1"
-                      v-if="org_id != 10223"
+                      v-if="org_id != 10223 || org_id!=10375"
                     >
                       透析中入量(L)：
                       <div
@@ -2597,6 +2617,34 @@
                       </div>
                     </div>
                   </div>
+                  <div
+                    class="row"
+                    style="padding: 2px 0; line-height: 23px; display: flex"
+                  >
+                    <div
+                      class="inline_block"
+                      style="flex: 1; display: inline-block"
+                    >
+                      宣教知识：
+                      <div
+                        class="under_line"
+                        style="
+                          width: 860px;
+                          line-height: 25px;
+                          text-align: left;
+                          margin-left: 2px;
+                          display: inline-block;
+                          white-space: normal;
+                        "
+                      >
+                        {{
+                          summary.mission
+                            ? summary.mission
+                            : "/"
+                        }}
+                      </div>
+                    </div>
+                  </div>
                   <div
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
@@ -3009,13 +3057,13 @@
                       >
                         <span
                           style="height: 30px; display: inline-block"
-                          v-if="setAdminUserES(prescription.creater) == ''"
+                          v-if="setAdminUserES(doctor_advices[0].advice_doctor) == ''"
                         >
-                          {{ getAdminUser(prescription.creater) }}
+                          {{ getAdminUser(doctor_advices[0].advice_doctor) }}
                         </span>
                         <img
                           style="height: 40px"
-                          :src="setAdminUserES(prescription.creater)"
+                          :src="setAdminUserES(doctor_advices[0].advice_doctor)"
                           alt=""
                           srcset=""
                           v-else

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyFive.vue

@@ -1092,14 +1092,14 @@
                         }}
                       </div>
                      
-                     <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471">
+                     <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471 && org_id!=10495">
                       <span v-if="prescription.anticoagulant == 4">mg</span>
                       <span v-if="prescription.anticoagulant == 3">iu</span>
                       <span v-if="prescription.anticoagulant == 2">iu</span>
                       <span v-if="prescription.anticoagulant == 1">mg</span>
                     </span>
 
-                    <span v-if="org_id==9675 || org_id==10447 || org_id==9829 || org_id==10440 || org_id==10469 || org_id == 10471">
+                    <span v-if="org_id==9675 || org_id==10447 || org_id==9829 || org_id==10440 || org_id==10469 || org_id == 10471 || org_id == 10495">
                       <span v-if="prescription.anticoagulant == 4">iu</span>
                       <span v-if="prescription.anticoagulant == 3">iu</span>
                       <span v-if="prescription.anticoagulant == 2">mg</span>
@@ -1138,7 +1138,7 @@
                             : "0"
                         }}
                       </div>
-                      <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471">
+                      <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471 && org_id!=10495">
 
                         <span v-if="prescription.anticoagulant == 5">ml/h</span>
                           <span v-if="prescription.anticoagulant == 4">mg/h</span>
@@ -1146,7 +1146,7 @@
                           <span v-if="prescription.anticoagulant == 2">iu/h</span>
                           <span v-if="prescription.anticoagulant == 1">mg/h</span>
                       </span>
-                      <span v-if="org_id==9675 || org_id==10447 || org_id== 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471">
+                      <span v-if="org_id==9675 || org_id==10447 || org_id== 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id == 10495">
                         <span v-if="prescription.anticoagulant == 2">mg/h</span>
                           <span v-if="prescription.anticoagulant == 3">iu/h</span>
                           <span v-if="prescription.anticoagulant == 4">ml</span>
@@ -1211,13 +1211,13 @@
                             : "/"
                         }}
                       </div>
-                      <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471">
+                      <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471 && org_id!=10495">
                       <span v-if="prescription.anticoagulant == 4">mg</span>
                       <span v-if="prescription.anticoagulant == 3">iu</span>
                       <span v-if="prescription.anticoagulant == 2">iu</span>
                       <span v-if="prescription.anticoagulant == 1">mg</span>
                      </span>
-                    <span v-if="org_id==9675 || org_id==10447 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471">
+                    <span v-if="org_id==9675 || org_id==10447 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id == 10495">
                        <span v-if="prescription.anticoagulant == 2">mg</span>
                        <span v-if="prescription.anticoagulant == 3">iu</span>
                        <span v-if="prescription.anticoagulant == 4">ml</span>

src/xt_pages/hospitalStation/batchStatementTemplate/hospitalBatchPrint.vue

@@ -9,78 +9,78 @@
         <td width="80">机构编码</td>
         <td colspan="4">{{info.fixmedins_code}}</td>
         <td width="100">医保结算级别</td>
-        <td width="100" v-if="info.hosp_lv == '1'">三级特等</td>
-        <td width="100" v-if="info.hosp_lv == '2'">三级甲等</td>
-        <td width="100" v-if="info.hosp_lv == '3'">三级乙等</td>
-        <td width="100" v-if="info.hosp_lv == '4'">三级丙等</td>
-        <td width="100" v-if="info.hosp_lv == '5'">二级甲等</td>
-        <td width="100" v-if="info.hosp_lv == '6'">二级乙等</td>
-        <td width="100" v-if="info.hosp_lv == '7'">二级丙等</td>
-        <td width="100" v-if="info.hosp_lv == '8'">一级甲等</td>
-        <td width="100" v-if="info.hosp_lv == '9'">一级乙等</td>
-        <td width="100" v-if="info.hosp_lv == '10'">一级丙等</td>
-        <td width="100" v-if="info.hosp_lv == '11'">无等级</td>
+        <td width="100" v-if="info.info.hosp_lv == '1'">三级特等</td>
+        <td width="100" v-if="info.info.hosp_lv == '2'">三级甲等</td>
+        <td width="100" v-if="info.info.hosp_lv == '3'">三级乙等</td>
+        <td width="100" v-if="info.info.hosp_lv == '4'">三级丙等</td>
+        <td width="100" v-if="info.info.hosp_lv == '5'">二级甲等</td>
+        <td width="100" v-if="info.info.hosp_lv == '6'">二级乙等</td>
+        <td width="100" v-if="info.info.hosp_lv == '7'">二级丙等</td>
+        <td width="100" v-if="info.info.hosp_lv == '8'">一级甲等</td>
+        <td width="100" v-if="info.info.hosp_lv == '9'">一级乙等</td>
+        <td width="100" v-if="info.info.hosp_lv == '10'">一级丙等</td>
+        <td width="100" v-if="info.info.hosp_lv == '11'">无等级</td>
         <td width="100" v-else></td>
 
       </tr>
       <tr>
         <td width="90">就医登记号</td>
-        <td colspan="11">{{info.mdtrt_id}}</td>
+        <td colspan="11">{{info.order.mdtrt_id}}</td>
       </tr>
       <tr>
         <td width="80">姓名</td>
-        <td width="80">{{info.psn_name}}</td>
+        <td width="80">{{info.order.psn_name}}</td>
         <td width="80">性别</td>
-        <td width="50" v-if="info.gend == '1'">男</td>
-        <td width="50" v-if="info.gend == '2'">女</td>
+        <td width="50" v-if="info.order.gend == '1'">男</td>
+        <td width="50" v-if="info.order.gend == '2'">女</td>
 
         <td width="80">出生日期</td>
-        <td width="100">{{info.brdy}}</td>
+        <td width="100">{{info.info.brdy}}</td>
         <td width="90">个人电脑号</td>
-        <td width="110">{{info.psn_no}}</td>
+        <td width="110">{{info.order.psn_no}}</td>
         <td width="80">人员类别</td>
-        <td colspan="3" v-if="info.psn_type == '11'">在职</td>
-        <td colspan="3" v-if="info.psn_type == '1101'">职工在职</td>
-        <td colspan="3" v-if="info.psn_type == '1102'">公务员在职</td>
-        <td colspan="3" v-if="info.psn_type == '1103'">灵活就业人员在职</td>
-        <td colspan="3" v-if="info.psn_type == '1160'">地方其他扩展人员</td>
+        <td colspan="3" v-if="info.order.psn_type == '11'">在职</td>
+        <td colspan="3" v-if="info.order.psn_type == '1101'">职工在职</td>
+        <td colspan="3" v-if="info.order.psn_type == '1102'">公务员在职</td>
+        <td colspan="3" v-if="info.order.psn_type == '1103'">灵活就业人员在职</td>
+        <td colspan="3" v-if="info.order.psn_type == '1160'">地方其他扩展人员</td>
 
 
-        <td colspan="3" v-if="info.psn_type == '12'">退休人员</td>
-        <td colspan="3" v-if="info.psn_type == '1201'">职工退休</td>
-        <td colspan="3" v-if="info.psn_type == '1202'">公务员退休</td>
-        <td colspan="3" v-if="info.psn_type == '1203'">灵活就业人员退休</td>
-        <td colspan="3" v-if="info.psn_type == '1260'">地方其他扩展人员</td>
+        <td colspan="3" v-if="info.order.psn_type == '12'">退休人员</td>
+        <td colspan="3" v-if="info.order.psn_type == '1201'">职工退休</td>
+        <td colspan="3" v-if="info.order.psn_type == '1202'">公务员退休</td>
+        <td colspan="3" v-if="info.order.psn_type == '1203'">灵活就业人员退休</td>
+        <td colspan="3" v-if="info.order.psn_type == '1260'">地方其他扩展人员</td>
 
 
-        <td colspan="3" v-if="info.psn_type == '13'">离休</td>
-        <td colspan="3" v-if="info.psn_type == '1300'">离休人员</td>
-        <td colspan="3" v-if="info.psn_type == '1360'">地方其他扩展人员</td>
+        <td colspan="3" v-if="info.order.psn_type == '13'">离休</td>
+        <td colspan="3" v-if="info.order.psn_type == '1300'">离休人员</td>
+        <td colspan="3" v-if="info.order.psn_type == '1360'">地方其他扩展人员</td>
 
-        <td colspan="3" v-if="info.psn_type == '14'">居民(未成年)</td>
-        <td colspan="3" v-if="info.psn_type == '1401'">新生儿</td>
-        <td colspan="3" v-if="info.psn_type == '1402'">学龄前儿童</td>
-        <td colspan="3" v-if="info.psn_type == '1403'">中小学生</td>
-        <td colspan="3" v-if="info.psn_type == '1404'">大学生</td>
-        <td colspan="3" v-if="info.psn_type == '1405'">未成年(未入学)</td>
+        <td colspan="3" v-if="info.order.psn_type == '14'">居民(未成年)</td>
+        <td colspan="3" v-if="info.order.psn_type == '1401'">新生儿</td>
+        <td colspan="3" v-if="info.order.psn_type == '1402'">学龄前儿童</td>
+        <td colspan="3" v-if="info.order.psn_type == '1403'">中小学生</td>
+        <td colspan="3" v-if="info.order.psn_type == '1404'">大学生</td>
+        <td colspan="3" v-if="info.order.psn_type == '1405'">未成年(未入学)</td>
 
 
-        <td colspan="3" v-if="info.psn_type == '15'">居民(成年)</td>
-        <td colspan="3" v-if="info.psn_type == '1501'">普通居民(成年)</td>
-        <td colspan="3" v-if="info.psn_type == '1560'">地方其他扩展身份</td>
+        <td colspan="3" v-if="info.order.psn_type == '15'">居民(成年)</td>
+        <td colspan="3" v-if="info.order.psn_type == '1501'">普通居民(成年)</td>
+        <td colspan="3" v-if="info.order.psn_type == '1560'">地方其他扩展身份</td>
 
-        <td colspan="3" v-if="info.psn_type == '16'">居民(老年)</td>
+        <td colspan="3" v-if="info.order.psn_type == '16'">居民(老年)</td>
 
 
 
       </tr>
       <tr>
         <td>单位名称</td>
-        <td colspan="5">{{info.emp_name}}</td>
+        <td colspan="5">{{info.info.emp_name}}</td>
         <td width="80">联系电话</td>
         <td width="110">{{info.patient.phone}}</td>
         <td width="80">身份证号</td>
-        <td colspan="3">{{info.certno}}</td>
+        <td colspan="3">{{info.info.certno}}</td>
       </tr>
       <tr>
         <td>住院号</td>
@@ -90,22 +90,22 @@
         <td>床号</td>
         <td></td>
         <td>入院日期</td>
-        <td>{{info.begndate}}</td>
+        <td>{{info.his.in_hosptial_time.split(" ")[0]}}</td>
         <td>出院日期</td>
-        <td width="100">{{info.enddate}}</td>
+        <td width="100">{{info.his.out_hosptial_time.split(" ")[0]}}</td>
         <td>住院天数</td>
-        <td>{{getDay(info.begndate,info.enddate)}}</td>
+        <td>{{getDay(info.his.in_hosptial_time.split(" ")[0],info.his.out_hosptial_time.split(" ")[0])}}</td>
 
       </tr>
       <tr>
         <td>险种</td>
-        <td colspan="2" v-if="info.insutype == '310'">职工基本医疗保险</td>
-        <td colspan="2" v-if="info.insutype == '320'">公务员医疗补助</td>
-        <td colspan="2" v-if="info.insutype == '330'">大额医疗费用补助</td>
-        <td colspan="2" v-if="info.insutype == '340'">离休人员医疗保障</td>
-        <td colspan="2" v-if="info.insutype == '390'">城乡居民基本医疗保险</td>
-        <td colspan="2" v-if="info.insutype == '392'">城乡居民大病医疗保险</td>
-        <td colspan="2" v-if="info.insutype == '510'">生育保险</td>
+        <td colspan="2" v-if="info.order.insutype == '310'">职工基本医疗保险</td>
+        <td colspan="2" v-if="info.order.insutype == '320'">公务员医疗补助</td>
+        <td colspan="2" v-if="info.order.insutype == '330'">大额医疗费用补助</td>
+        <td colspan="2" v-if="info.order.insutype == '340'">离休人员医疗保障</td>
+        <td colspan="2" v-if="info.order.insutype == '390'">城乡居民基本医疗保险</td>
+        <td colspan="2" v-if="info.order.insutype == '392'">城乡居民大病医疗保险</td>
+        <td colspan="2" v-if="info.order.insutype == '510'">生育保险</td>
         <td>入院第一诊断</td>
         <td colspan="3">{{info.diagnosis}}</td>
         <td>出院第一诊断</td>
@@ -115,21 +115,21 @@
       </tr>
       <tr>
         <td>业务类别</td>
-        <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '11'">普通门诊</td>
-        <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '12'">门诊挂号</td>
-        <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '13'">急诊</td>
-        <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '14'">门诊慢性病</td>
-        <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '15'">门诊统筹</td>
+        <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.order.med_type == '11'">普通门诊</td>
+        <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.order.med_type == '12'">门诊挂号</td>
+        <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.order.med_type == '13'">急诊</td>
+        <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.order.med_type == '14'">门诊慢性病</td>
+        <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.order.med_type == '15'">门诊统筹</td>
         <!--        <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '16'">门诊慢性病</td>-->
-        <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '21'">普通住院</td>
+        <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.order.med_type == '21'">普通住院</td>
 
         <td>结算时间</td>
-        <td colspan="5" style="text-align:left;padding-left:10px;">{{info.setl_time.split(' ')[0]}}</td>
+        <td colspan="5" style="text-align:left;padding-left:10px;">{{info.order.setl_time.split(' ')[0]}}</td>
       </tr>
       <tr>
         <td colspan="12" style="text-align:left;padding-left:10px;">
-          本次就医：总费用{{info.medfee_sumamt}}元，基金支付{{info.fund_pay_sumamt}}元，个人支付{{info.psn_pay}}元。
-          (起付线 {{info.act_pay_dedc}}元, 先自付 {{info.preselfpay_amt}}元, 段内自付 {{(info.psn_pay - info.preselfpay_amt).toFixed(2)}} )
+          本次就医：总费用{{info.order.medfee_sumamt}}元，基金支付{{info.order.fund_pay_sumamt}}元，个人支付{{info.order.psn_cash_pay}}元。
+          (起付线 {{info.order.act_pay_dedc}}元, 先自付 {{info.order.preselfpay_amt}}元, 段内自付 {{(info.order.psn_cash_pay - info.order.preselfpay_amt).toFixed(2)}} )
 
         </td>
       </tr>
@@ -264,28 +264,28 @@
       </tr>
       <tr>
         <td colspan="3" style="text-align:left;padding-left:10px;">基本医疗保险统筹基金支付</td>
-        <td colspan="3">{{info.hifp_pay}}</td>
+        <td colspan="3">{{info.order.hifp_pay}}</td>
         <td colspan="3" style="text-align:left;padding-left:10px;">大额基金支付</td>
-        <td colspan="3">{{info.hifob_pay}}</td>
+        <td colspan="3">{{info.order.hifob_pay}}</td>
       </tr>
       <tr>
         <td colspan="3" style="text-align:left;padding-left:10px;">大病基金支付</td>
-        <td colspan="3">{{info.hifmi_pay}}</td>
+        <td colspan="3">{{info.order.hifmi_pay}}</td>
         <td colspan="3" style="text-align:left;padding-left:10px;">补充保险基金支付</td>
-        <td colspan="3">{{info.hifes_pay}}</td>
+        <td colspan="3">{{info.order.hifes_pay}}</td>
       </tr>
       <tr>
         <td colspan="3" style="text-align:left;padding-left:10px;">医疗救助基金支付</td>
-        <td colspan="3">{{info.maf_pay}}</td>
+        <td colspan="3">{{info.order.maf_pay}}</td>
         <td colspan="3" style="text-align:left;padding-left:10px;">公务员基金支付</td>
-        <td colspan="3">{{info.cvlserv_pay}}</td>
+        <td colspan="3">{{info.order.cvlserv_pay}}</td>
       </tr>
 
       <tr>
         <td colspan="3" style="text-align:left;padding-left:10px;">其他基金支付</td>
-        <td colspan="3">{{info.oth_pay}}</td>
+        <td colspan="3">{{info.order.oth_pay}}</td>
         <td colspan="3" style="text-align:left;padding-left:10px;">个人账户支付</td>
-        <td colspan="3">{{info.acct_pay}}</td>
+        <td colspan="3">{{info.order.acct_pay}}</td>
       </tr>
       <tr>
         <td>收款人:</td>

src/xt_pages/hospitalStation/hospitalBatchStatementPrint.vue

@@ -197,54 +197,113 @@ export default {
             return false
           } else {
             let infos = []
+            console.log(response.data.data.infos)
             for(var i  = 0; i < response.data.data.infos.length; i++){
+              let tempInfo = {}
               var info = response.data.data.infos[i]
-              that.info['patient'] = info.patient
-              that.info['diagnosis'] = info.diagnosis
-              that.info['p_admin'] = info.printor_admin
-              that.info['charge_admin'] = info.charge_admin
-              that.info['fixmedins_name'] = info.org_name
-              that.info['fixmedins_code'] = info.org_code
-              that.info['order'] = info.order
-              that.info['date'] = info.date
-              that.info['number'] = info.number
-              that.info['order_infos'] = info.order_infos
-              that.info['diagnosis'] = info.diagnosis
-              that.info['dia_config'] = info.dia_config
-              that.info['doctor_info'] = info.doctor_info
-              that.info['bed_cost_total'] = info.bedCostTotal
-              that.info['bed_cost_self_total'] = info.bedCostSelfTotal
-              that.info['bed_cost_part_self_total'] = info.bedCostPartSelfTotal
-              that.info['operation_cost_total'] = info.operationCostTotal
-              that.info['operation_cost_self_total'] = info.operationCostSelfTotal
-              that.info['operation_cost_part_self_total'] = info.operationCostPartSelfTotal
-              that.info['other_cost_total'] = info.otherCostTotal
-              that.info['other_cost_self_total'] = info.otherCostSelfTotal
-              that.info['other_cost_part_self_total'] = info.otherCostPartSelfTotal
-              that.info['material_cost_total'] = info.materialCostTotal
-              that.info['material_cost_self_total'] = info.materialCostSelfTotal
-              that.info['material_cost_part_self_total'] = info.materialCostPartSelfTotal
-              that.info['western_medicine_cost_total'] = info.westernMedicineCostTotal
-              that.info['western_medicine_cost_self_total'] = info.westernMedicineCostSelfTotal
-              that.info['western_medicine_cost_part_self_total'] = info.westernMedicineCostPartSelfTotal
-              that.info['chinese_traditional_medicine_cost_total'] = info.chineseTraditionalMedicineCostTotal
-              that.info['chinese_traditional_medicine_cost_self_total'] = info.chineseTraditionalMedicineCostSelfTotal
-              that.info['chinese_traditional_medicine_cost_part_self_total'] = info.chineseTraditionalMedicineCostPartSelfTotal
-              that.info['check_cost_total'] = info.checkCostTotal
-              that.info['check_cost_self_total'] = info.checkCostSelfTotal
-              that.info['check_cost_part_self_total'] = info.checkCostPartSelfTotal
-              that.info['laboratory_cost_total'] = info.laboratoryCostTotal
-              that.info['laboratory_cost_self_total'] = info.laboratoryCostSelfTotal
-              that.info['laboratory_cost_part_self_total'] = info.laboratoryCostPartSelfTotal
-              that.info['treat_cost_total'] = info.treatCostTotal
-              that.info['treat_cost_self_total'] = info.treatCostSelfTotal
-              that.info['treat_cost_part_self_total'] = info.treatCostPartSelfTotal
-              that.info['date'] = info.date
-              that.info['number'] = info.number
-              that.info['order_infos'] = info.order_infos
-              that.info['diagnosis'] = info.diagnosis
-              that.info['his'] = info.his_hospital
-              infos.push(that.info)
+              console.log("info1")
+              console.log(info)
+              tempInfo["patient"] = info.patient
+              console.log("info2")
+              console.log(info.patient)
+
+              tempInfo["diagnosis"] = info.diagnosis
+              console.log("info3")
+              console.log(info.diagnosis)
+
+              tempInfo["p_admin"] = info.printor_admin
+              console.log("info4")
+              console.log( info.printor_admin)
+              tempInfo['charge_admin'] = info.charge_admin
+              console.log("info5")
+              console.log( info.charge_admin)
+              tempInfo['fixmedins_name'] = info.org_name
+              console.log("info6")
+              console.log( info.org_name)
+              tempInfo['fixmedins_code'] = info.org_code
+              console.log("info7")
+              console.log( info.org_code)
+              tempInfo['order'] = info.order
+              console.log("info8")
+              console.log( info.order)
+              tempInfo['date'] = info.date
+              console.log("info9")
+              console.log( info.date)
+              tempInfo['number'] = info.number
+              console.log("info10")
+              console.log( info.number)
+              tempInfo['order_infos'] = info.order_infos
+              console.log("info11")
+              console.log( info.order_infos)
+              tempInfo['diagnosis'] = info.diagnosis
+              console.log("info12")
+              console.log( info.diagnosis)
+              tempInfo['dia_config'] = info.dia_config
+              console.log("info13")
+              console.log( info.dia_config)
+              tempInfo['doctor_info'] = info.doctor_info
+              console.log("info14")
+              console.log( info.doctor_info)
+              tempInfo['bed_cost_total'] = info.bedCostTotal
+              console.log("info15")
+              console.log( info.bedCostTotal)
+              tempInfo['bed_cost_self_total'] = info.bedCostSelfTotal
+              console.log("info16")
+              console.log( info.bedCostSelfTotal)
+              tempInfo['bed_cost_part_self_total'] = info.bedCostPartSelfTotal
+              console.log("info17")
+              console.log( info.bedCostPartSelfTotal)
+              tempInfo['operation_cost_total'] = info.operationCostTotal
+              console.log("info18")
+              console.log( info.operationCostTotal)
+              tempInfo['operation_cost_self_total'] = info.operationCostSelfTotal
+              console.log("info19")
+              console.log( info.operationCostSelfTotal)
+              tempInfo['operation_cost_part_self_total'] = info.operationCostPartSelfTotal
+              console.log("info20")
+              console.log( info.operationCostPartSelfTotal)
+              tempInfo['other_cost_total'] = info.otherCostTotal
+              console.log("info21")
+              console.log( info.otherCostTotal)
+              tempInfo['other_cost_self_total'] = info.otherCostSelfTotal
+              console.log("info22")
+              console.log( info.otherCostSelfTotal)
+              tempInfo['other_cost_part_self_total'] = info.otherCostPartSelfTotal
+              console.log("info23")
+              console.log( info.otherCostPartSelfTotal)
+              tempInfo['material_cost_total'] = info.materialCostTotal
+              console.log("info24")
+              console.log( info.materialCostTotal)
+              tempInfo['material_cost_self_total'] = info.materialCostSelfTotal
+              console.log("info25")
+              console.log( info.materialCostSelfTotal)
+              tempInfo['material_cost_part_self_total'] = info.materialCostPartSelfTotal
+              console.log("info26")
+              console.log( info.materialCostPartSelfTotal)
+              tempInfo['western_medicine_cost_total'] = info.westernMedicineCostTotal
+              console.log("info27")
+              console.log( info.westernMedicineCostTotal)
+              tempInfo['western_medicine_cost_self_total'] = info.westernMedicineCostSelfTotal
+              console.log("info28")
+              console.log( info.westernMedicineCostSelfTotal)
+              tempInfo['western_medicine_cost_part_self_total'] = info.westernMedicineCostPartSelfTotal
+              console.log("info29")
+              console.log( info.westernMedicineCostPartSelfTotal)
+              tempInfo['chinese_traditional_medicine_cost_total'] = info.chineseTraditionalMedicineCostTotal
+              tempInfo['chinese_traditional_medicine_cost_self_total'] = info.chineseTraditionalMedicineCostSelfTotal
+              tempInfo['chinese_traditional_medicine_cost_part_self_total'] = info.chineseTraditionalMedicineCostPartSelfTotal
+              tempInfo['check_cost_total'] = info.checkCostTotal
+              tempInfo['check_cost_self_total'] = info.checkCostSelfTotal
+              tempInfo['check_cost_part_self_total'] = info.checkCostPartSelfTotal
+              tempInfo['laboratory_cost_total'] = info.laboratoryCostTotal
+              tempInfo['laboratory_cost_self_total'] = info.laboratoryCostSelfTotal
+              tempInfo['laboratory_cost_part_self_total'] = info.laboratoryCostPartSelfTotal
+              tempInfo['treat_cost_total'] = info.treatCostTotal
+              tempInfo['treat_cost_self_total'] = info.treatCostSelfTotal
+              tempInfo['treat_cost_part_self_total'] = info.treatCostPartSelfTotal
+              tempInfo['his'] = info.his_hospital
+              tempInfo['info'] = info.info
+              infos.push(tempInfo)
             }
             that.infos = infos
             console.log(infos)

src/xt_pages/management/components/ManageForm.vue

@@ -34,6 +34,24 @@
             </el-form-item>
           </el-col>
 
+          <!-- <el-col :span="8">
+            <el-form-item
+              label="分区:"
+              v-show="bedShow"
+              required
+              prop="zone_id"
+            >
+              <el-select style="width:135px" v-model="form.zone_id">
+                <el-option
+                  v-for="item in this.deviceType"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col> -->
+
           <el-col :span="8">
             <el-form-item
               label="机位号:"
@@ -388,7 +406,8 @@ export default {
         revers_mode: "", // 反渗模式
         treat_mode: [],
         treat_type: [], // 治疗模式
-        beds: ""
+        beds: "",
+        zone_id:"",
       },
       forms: {
         beds: ""
@@ -471,6 +490,7 @@ export default {
       getAllSubregion().then(response => {
         if (response.data.state === 1) {
           var zones = response.data.data.zones;
+        
           this.deviceType = zones;
           var numbers = response.data.data.numbers;
           var devicenumber = response.data.data.devicenumber;

src/xt_pages/management/home.vue

@@ -117,6 +117,13 @@
                                   </el-select>
                                  </el-form-item>
                               </el-col>
+                              <el-col :span="8">
+                                  <el-form-item label="分区:">
+                                       <el-select style="width:150px" v-model="form.zone_id" :disabled="disableThree">
+                                          <el-option v-for="item in this.bedZone" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                                       </el-select>
+                                  </el-form-item>
+                              </el-col>
                               <el-col :span="8">
                                   <el-form-item label="机位号:">
                                        <el-select style="width:150px" v-model="form.bed_number" :disabled="disableThree">
@@ -2779,7 +2786,8 @@ export default {
           Disinfection_mode: '',
           revers_mode: '',
           beds: '',
-          bed_numbers: ''
+          bed_numbers: '',
+          zone_id:"",
         },
         activeName: 'first',
         activeNameTwo: 'first',
@@ -3347,6 +3355,7 @@ export default {
       getAllSubregion() {
         getAllSubregion().then(response => {
           var zones = response.data.data.zones
+          console.log("zones",zones)
           this.deviceType = zones
           var numbers = response.data.data.numbers
 
@@ -3469,6 +3478,7 @@ export default {
         getMachineDetailById(id).then(response => {
           if (response.data.state === 1) {
             var addmacher = response.data.data.addmacher
+            console.log("addmacher",addmacher)
             var warning = response.data.data.warning
 
             var time = this.getTimestamp(this.userform.date) - warning.stime
@@ -3587,7 +3597,10 @@ export default {
             this.form.device_name = addmacher.device_name
             this.form.manufacture_factory = addmacher.manufacture_factory
             this.form.service_manufacturer = addmacher.service_manufacturer
-
+            if(addmacher.zone_id >=0){
+              this.form.zone_id = addmacher.zone_id
+            }
+          
             // this.form.unit_type = addmacher.unit_type
 
             this.form.unit_type = parseInt(addmacher.device_mode)

src/xt_pages/medicalScheduling/index.vue

@@ -443,7 +443,7 @@ export default {
                     this.getStaffScheduleList()
 
                     var doctorlist =  response.data.data.doctorlist
-                    let arr = []
+                  
                     for(let i=0;i<doctorlist.length;i++){
                         if(doctorlist[i].sort == 0){
                           doctorlist[i].sort = ""
@@ -485,7 +485,7 @@ export default {
             })
         },
         hangdleClick(val,index,num){
-        //  console.log("val",val)
+          console.log("val",val)
          this.docobj = val
          if(this.getTimestamp(this.weekDayArr[num]) < this.timeNow){
             this.$message.error("过去日期不可以编辑")
@@ -647,7 +647,7 @@ export default {
             getStaffScheduleList(params).then(response=>{
                 if(response.data.state == 1){
                     var staffList =  response.data.data.staffList
-                    // console.log("获取所有排班",staffList)
+                    console.log("获取所有排班",staffList)
                     var sevenStr = ""
                     var oneStr = ""
                     var twoStr = ""
@@ -691,6 +691,7 @@ export default {
                         })
                         sevenStr = zeroStr
                     }
+                    
                     if(staffList[i].schedule_week == 1){
                         staffList[i].class_index = 1
                         var arr = []
@@ -772,6 +773,8 @@ export default {
                         })
                         threeStr = strThree
                     }
+
+
                     if(staffList[i].schedule_week == 4){
                         staffList[i].class_index = 4
                         var arr = []
@@ -799,6 +802,8 @@ export default {
                         })
                         fourStr = strFour
                     }
+
+                    
                     if(staffList[i].schedule_week == 5){
                         staffList[i].class_index = 5
 
@@ -827,6 +832,7 @@ export default {
                         })
                          fiveStr = strFive
                     }
+
                     if(staffList[i].schedule_week == 6){
                         staffList[i].class_index = 6
                          var arr = []
@@ -857,7 +863,7 @@ export default {
                     }
                     let tempArr = [], newArr = []
                     for (let i = 0; i < staffList.length; i++) {
-                        if (tempArr.indexOf(staffList[i].user_name) === -1) {
+                        if (tempArr.indexOf(staffList[i].user_name) == -1) {
                             newArr.push({
                                 user_name: staffList[i].user_name,
                                 admin_user_id:staffList[i].admin_user_id,
@@ -868,18 +874,20 @@ export default {
                             })
                             tempArr.push(staffList[i].user_name);
                         } else {
+                            console.log("staffList",staffList[i].user_name)
                             for (let j = 0; j < newArr.length; j++) {
-                                if (newArr[j].user_name == staffList[i].user_name) {
+                                if (newArr[j].admin_user_id == staffList[i].admin_user_id) {
                                     newArr[j].list.push({class_name:staffList[i].class_name,admin_user_id:staffList[i].admin_user_id,schedule_week:staffList[i].schedule_week,user_type:staffList[i].doctor_type,class_attributes:staffList[i].class_attributes})
                                 }
                             }
                         }
                     }
-
-                    let arr = [...newArr]
+                    
+                    let arrTen = [...newArr]
+                    console.log("newArr22o2o2o2o2wo",arrTen)
                     let newNurse = []
                     let newDoctor = []
-                    arr.map(item => {
+                    arrTen.map(item => {
                         if(item.user_type == 2){
                             newDoctor.push(item)
                         }
@@ -888,6 +896,7 @@ export default {
                         }
                     })
                     //护士
+                    console.log("newNurse",newNurse)
                     newNurse.sort(this.compare('admin_user_id'))
                     let newNurseTableData = []
                     this.nurseTableData.map(item => {
@@ -896,6 +905,7 @@ export default {
                         }
                     })
                     newNurseTableData.sort(this.compare('admin_user_id'))
+                    console.log("newNurseTableData",newNurseTableData)
                     newNurseTableData.map((item,index) => {
                         if (newNurse[index] && item.admin_user_id == newNurse[index].admin_user_id) {
 
@@ -904,8 +914,8 @@ export default {
                         }
                     })
                     newNurse.sort(this.compare('sort'))
-
-                    //医生
+                  
+                    // //医生
                     newDoctor.sort(this.compare('admin_user_id'))
                     let newDoctorTableData = []
                     this.doctorTableData.map(item => {
@@ -924,25 +934,15 @@ export default {
                     newDoctor.sort(this.compare('sort'))
 
 
-                    // arr.sort(this.compare('admin_user_id'))
-                    // this.doctorlist.sort(this.compare('admin_user_id'))
-                    // this.doctorlist.forEach((item, index) => {
-                    //   if (arr[index] && item.admin_user_id == arr[index].admin_user_id) {
-
-                    //   }else{
-                    //     arr.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: [],user_type:item.user_type})
-                    //   }
-                    // })
-                    // arr.sort(this.compare('user_type'))
-
                     let arr2 = []
+                    
                     arr2.push({class_name:oneStr,schedule_week:1})
                     arr2.push({class_name:twoStr,schedule_week:2})
                     arr2.push({class_name:threeStr,schedule_week:3})
                     arr2.push({class_name:fourStr,schedule_week:4})
                     arr2.push({class_name:fiveStr,schedule_week:5})
                     arr2.push({class_name:sixStr,schedule_week:6})
-                    arr2.push({class_name:zeroStr,schedule_week:0})
+                    arr2.push({class_name:sevenStr,schedule_week:0})
                     var obj = {}
                     obj.admin_user_id = "1000000"
                     obj.user_name = "合计"
@@ -951,16 +951,30 @@ export default {
                     arr.push(obj)
 
                     let data = []
+                  
                     data.push(...newNurse)
                     data.push(...newDoctor)
                     data.push(obj)
-
+                    console.log("data2o2oo2o2o2o22o",data)
+                    
+                    // this.tableData = this.distinct(data)
                     this.tableData = data
 
 
                 }
             })
         },
+        distinct(tempArr) {
+            for (let i = 0; i < tempArr.length; i++) {
+                for (let j = i + 1; j < tempArr.length; j++) {
+                    if (tempArr[i].admin_user_id == tempArr[j].admin_user_id) {
+                        tempArr.splice(j, 1);
+                        j--;
+                    };
+                };
+            };
+            return tempArr;
+       },
 
         getClass(name,index){
             if(name != undefined){
@@ -1060,6 +1074,7 @@ export default {
                         })
                         sevenStr = zeroStr
                     }
+
                     if(staffList[i].schedule_week == 1){
                         staffList[i].class_index = 1
                         var arr = []
@@ -1311,7 +1326,7 @@ export default {
                     arr2.push({class_name:fourStr,schedule_week:4})
                     arr2.push({class_name:fiveStr,schedule_week:5})
                     arr2.push({class_name:sixStr,schedule_week:6})
-                    arr2.push({class_name:zeroStr,schedule_week:0})
+                    arr2.push({class_name:sevenStr,schedule_week:0})
                     var obj = {}
                     obj.admin_user_id = "1000000"
                     obj.user_name = "合计"
@@ -1630,7 +1645,7 @@ export default {
                         arr2.push({class_name:fourStr,schedule_week:4})
                         arr2.push({class_name:fiveStr,schedule_week:5})
                         arr2.push({class_name:sixStr,schedule_week:6})
-                        arr2.push({class_name:zeroStr,schedule_week:0})
+                        arr2.push({class_name:sevenStr,schedule_week:0})
                         var obj = {}
                         obj.admin_user_id = "1000000"
                         obj.user_name = "合计"
@@ -1669,7 +1684,7 @@ export default {
                         arr2.push({class_name:fourStr,schedule_week:4})
                         arr2.push({class_name:fiveStr,schedule_week:5})
                         arr2.push({class_name:sixStr,schedule_week:6})
-                        arr2.push({class_name:zeroStr,schedule_week:0})
+                        arr2.push({class_name:sevenStr,schedule_week:0})
                         var obj = {}
                         obj.admin_user_id = "1000000"
                         obj.user_name = "合计"
@@ -1707,7 +1722,7 @@ export default {
                         arr2.push({class_name:fourStr,schedule_week:4})
                         arr2.push({class_name:fiveStr,schedule_week:5})
                         arr2.push({class_name:sixStr,schedule_week:6})
-                        arr2.push({class_name:zeroStr,schedule_week:0})
+                        arr2.push({class_name:sevenStr,schedule_week:0})
                         var obj = {}
                         obj.admin_user_id = "1000000"
                         obj.user_name = "合计"

src/xt_pages/outpatientCharges/summary.vue

@@ -436,6 +436,19 @@
           :paramsObj="settlementObj"
       ></settlement-print>
     </el-dialog>
+
+    <el-dialog
+      class="centerDialog"
+      width="1200px"
+      title="打印"
+      :visible.sync="settlementVisible"
+    >
+      <settlement-print
+        ref="print"
+        :paramsObj="settlementObj"
+      ></settlement-print>
+    </el-dialog>
+
   </div>
 </template>
 

src/xt_pages/role/admin.vue

@@ -21,7 +21,22 @@
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toTest">测试</el-button> -->
+          @click="toTest">短信</el-button> -->
+
+        <!-- <el-button
+          type="primary"
+          size="small"
+          icon="el-icon-circle-plus-outline"
+          style="float:left"
+          @click="toTestOne">个人用户实名</el-button> -->
+         
+          <!-- <el-button
+          type="primary"
+          size="small"
+          icon="el-icon-circle-plus-outline"
+          style="float:left"
+          @click="toTestTwo">创建个人印章</el-button> -->
+          
      </div>
     
       
@@ -176,7 +191,7 @@
 </template>
 
 <script>
-import { adminMainView, getAdmins, setAdminStatus,toSign } from "@/api/role/admin";
+import { adminMainView, getAdmins, setAdminStatus,toSign,toTestOne,toTestTwo } from "@/api/role/admin";
 import { getRoles } from "@/api/role/role";
 
 import { parseTime } from "@/utils";
@@ -473,6 +488,22 @@ export default {
           console.log("sign",sign)
         }
       })
+    },
+    toTestOne(){
+      toTestOne().then(response=>{
+        if(response.data.state==1){
+          var sign = response.data.data.sign
+          console.log("sign",sign)
+        }
+      })
+    },
+    toTestTwo(){
+      toTestTwo().then(response=>{
+        if(response.data.state ==1){
+          var sign = response.data.data.sign
+          console.log("sign",sign)
+        }
+      })
     }
   },
   watch: {

src/xt_pages/stock/drug_damage_print.vue

@@ -0,0 +1,244 @@
+<template>
+    <div class="main-contain">
+        <div class="position">
+        <bread-crumb :crumbs="crumbs"></bread-crumb>
+        <el-row style="float:right;">
+            <el-col :span="24">
+            <el-button size="small" icon="el-icon-printer" type="primary" @click="printAction">打印</el-button>
+            </el-col>
+        </el-row>
+        </div>
+        <div class="app-container" style="background-color: white;">
+            <div id="print_content">
+
+                <table class="printTable" border="0" cellspacing="0" align="center">
+                    <thead class="print_head">
+                        <tr><td colspan="11">{{org_name}}</td></tr>
+                        <tr><td colspan="11">药品盘点</td></tr>
+                    </thead>
+                    <tbody class="print_body">
+                    <tr>
+                        <td>报损日期</td>
+                        <td>药品名称</td>
+                        <td>规格</td>
+                        <td>总损耗数量</td>
+                        <td>总报损金额</td>
+                        <td>仓库名称</td>
+                        <td>操作人</td>
+                        
+                    </tr>
+                    <tr v-for="(item,index) in tableList" :key="index">
+                        <td>
+                            {{getTime(item.start_time)}}
+                        </td>
+                        <td>
+                            {{item.drug_name}}
+                        </td>
+                        <td>
+                            {{item.specification_name}}
+                        </td>
+                        <td>
+                            {{getTotalCount(item.drug_id,item.max_unit,item.min_unit,item.min_number)}}
+                        </td>
+                        <td>
+                            {{getTotalPrice(item.drug_id,item.min_price)}}
+                        </td>
+                        <td>
+                            {{getHouseName(item.storehouse_id)}}
+                        </td>
+                        <td>
+                            {{getDoctorName(item.creater)}}
+                        </td>
+                      
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+const moment = require('moment');
+import { uParseTime } from '@/utils/tools'
+import { getDrugDamageList } from "@/api/drug/drug"
+import print from "print-js";
+export default {
+    components:{
+        BreadCrumb
+    },
+    data(){
+        return{
+          crumbs: [
+            { path: false, name: '库存管理' },
+            { path: false, name: '耗材管理' },
+            { path: false, name: '耗材盘点打印' },
+          ],
+          org_name: this.$store.getters.xt_user.org.org_name,
+          ids:"",
+          tableList:[],
+          manufacturerList:[],
+          houseList:[],
+          datamageList:[],
+          doctorList:[]
+        }
+    },
+    methods:{
+        printAction: function() {
+            const style = '@page{size:landscape;margin: 10mm;} @media print { print_content{width:960px;margin:0} .flex{display: flex;justify-content: space-between;} .printTable{width:100%;border-collapse: collapse;border:0px;margin:10px 0;} .printTable thead{text-align:center}.printTable td{padding:5px;} .print_body tr td{border: 1px solid;font-size:12px;border-collapse:collapse;} }';
+            printJS({ 
+            printable: 'print_content',
+            type: 'html',
+            documentTitle: '  ',
+            style: style,
+            scanStyles: false
+            })
+        },
+        getTime(val) {
+         if(val < 0){
+            return ""
+          }
+         if(val == ""){
+            return ""
+          }else {
+            return uParseTime(val, '{y}-{m}-{d}')
+         }
+        },
+        getlist(){
+        var params = {
+          limit:this.$route.query.limit,
+          page:this.$route.query.page,
+          start_time:this.$route.query.start_time,
+          end_time:this.$route.query.end_time,
+          keyword:this.$route.query.keyword,
+          storehouse_id:this.$route.query.storehouse_id,
+        }
+
+        getDrugDamageList(params).then(response=>{
+           if(response.data.state == 1){
+             this.tableList = response.data.data.list
+             this.total = response.data.data.total
+             this.doctorList = response.data.data.doctorList
+             var datamagelist = response.data.data.damagelist
+             this.datamageList = datamagelist
+             var obj = {id:0,storehouse_name:"全部"}
+             this.houseList = []
+             this.houseList.push(obj)
+             for(let i=0;i<response.data.data.houseList.length;i++){
+              this.houseList.push(response.data.data.houseList[i])
+             }
+           }
+        })
+      },
+        getManufacturerName(id){
+           var name = ""
+           for(let i=0;i<this.manufacturerList.length;i++){
+              if(id == this.manufacturerList[i].id){
+                  name = this.manufacturerList[i].manufacturer_name
+              }
+           }
+           return name
+        },
+        getHouseName(id){
+         var storehouse_name = ""
+         for(let i=0;i<this.houseList.length;i++){
+           if(id == this.houseList[i].id){
+              storehouse_name = this.houseList[i].storehouse_name
+           }
+         }
+         if(storehouse_name == "全部"){
+           return ""
+         }else{
+           return storehouse_name
+         }
+       },
+       getDamageCount(good_id){
+        var count = 0
+        for(let i=0;i<this.damageList.length;i++){
+          if(good_id == this.damageList[i].good_id){
+             count = this.damageList[i].count
+          }
+        }
+        return count
+      },
+      getAllDamageCount(good_id,price){
+        var count = 0
+        for(let i=0;i<this.damageList.length;i++){
+          if(good_id == this.damageList[i].good_id){
+             count = this.damageList[i].count
+          }
+        }
+        return (count * price).toFixed(2)
+      },
+      getStorehouseName(id){
+        var storehouse_name = ""
+        for(let i=0;i<this.houseList.length;i++){
+          if(id == this.houseList[i].id){
+            storehouse_name = this.houseList[i].storehouse_name
+          }
+        }
+        if(storehouse_name == "全部"){
+          return ""
+        }else{
+          return storehouse_name
+        }
+      },
+    
+      getTotalCount(drugid,max_unit,min_unit,min_number){
+
+        var total = 0
+        var str = ""
+        var str_min = ""
+        for(let i=0;i<this.datamageList.length;i++){
+        if(drugid == this.datamageList[i].drug_id){
+            total +=this.datamageList[i].count
+        }
+        }
+        if(parseInt(total/min_number)!=0){
+        str = parseInt(total/min_number) + max_unit
+        }
+        if((total%min_number)!=0){
+        str_min = total%min_number + min_unit
+        }
+        return str+str_min
+        },
+        getTotalPrice(drugid,minprice){
+        var total = 0
+        for(let i=0;i<this.datamageList.length;i++){
+        if(drugid == this.datamageList[i].drug_id){
+            total+=this.datamageList[i].count
+        }
+        }
+        return (total*minprice).toFixed(2)
+    },
+    getDoctorName(id){
+        var user_name = ""
+        for(let i=0;i<this.doctorList.length;i++){
+          if(id == this.doctorList[i].admin_user_id){
+            user_name = this.doctorList[i].user_name
+          }
+        }
+        return user_name
+     },
+    },
+    created(){
+
+      this.getlist()
+    }
+}
+</script>
+
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.printTitle{font-size: 22px;text-align: center;}
+.flex{display: flex;justify-content: space-between;}
+.tableTitle{display: flex;border-top:1px solid #000;border-bottom: 1px solid #000;padding: 10px 0;}
+.tableTr{display: flex;border-bottom: 1px dashed #000;padding: 10px 0;}
+.tableBottom{display: flex;border-bottom: 1px solid #000;padding: 10px 0;}
+.printTable{width:100%;border-collapse: collapse;}
+.printTable td{padding:5px;}
+.print_head{border: none;display: table-header-group;}
+.print_head tr td{text-align: center;border: none;}
+.print_body tr td{border:1px solid}
+</style>

src/xt_pages/stock/drugs/components/drugQuery.vue

@@ -94,6 +94,11 @@
                 {{getManufacturName(scope.row.manufacturer)}}
               </template>
             </el-table-column>
+            <el-table-column label="经销商" align="center" v-if="org_id ==10485">
+              <template slot-scope="scope">
+                  {{getDearName(scope.row.dealer)}}
+              </template>
+            </el-table-column>
             <el-table-column label="批准文号" align="center">
               <template slot-scope="scope">
                 {{scope.row.number}}
@@ -402,6 +407,7 @@ export default {
      isClose: false,
      drug_type: 0,
      storehouseId:0,
+     dealerList:[],
     }
   
   },
@@ -454,6 +460,7 @@ export default {
            this.manufacturerList = response.data.data.manufacturerList
            this.goodTypeList = response.data.data.goodTypeList
            this.patientList = response.data.data.patientList
+           this.dealerList = response.data.data.dealerList
          }
       })
     },
@@ -1489,7 +1496,16 @@ export default {
           this.$message.success("保存成功!")
         }
       })
-    }
+    },
+    getDearName(id){
+      var dear_name = ""
+      for(let i=0;i<this.dealerList.length;i++){
+        if(id == this.dealerList[i].id){
+          dear_name = this.dealerList[i].dealer_name
+        }
+      }
+      return dear_name
+    },
   },
   created(){
     this.getStorehouseList()

src/xt_pages/stock/drugs/drugDamaged.vue

@@ -24,6 +24,7 @@
       @click="search"
       >搜索</el-button
       >
+     
       <el-date-picker
       size="small"
       v-model="start_time"
@@ -40,9 +41,18 @@
       placeholder="选择日期"
       @change="changeEndTime">
       </el-date-picker>
+
+      <el-button
+      size="small"
+      class="filter-item"
+      type="primary"
+      icon="el-icon-search"
+      @click="toPrint"
+      >打印</el-button
+      >
     </div>
     <el-table :data="tableList" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }" >
-        <el-table-column type="selection" width="55" align="center"> </el-table-column>
+        <!-- <el-table-column type="selection" width="55" align="center"> </el-table-column> -->
         <el-table-column  prop="date" label="报损日期" align="center">
             <template slot-scope="scope">
               {{getTime(scope.row.start_time)}}
@@ -474,6 +484,9 @@ export default {
       }else{
         return storehouse_name
       }
+     },
+     toPrint(){
+      this.$router.push({path:'/stock/drug_damage/print?storehouse_id='+this.storehouse_id+"&limit="+this.limit+"&page="+this.page+"&start_time"+this.start_time+"&end_time="+this.end_time+"&keyword"+this.searchKey}) 
      }
     },
     created(){

src/xt_pages/stock/drugs/inventoryDetails.vue

@@ -99,6 +99,18 @@
                  <span v-if="scope.row.inventory_type == 11">盘亏</span>
                </template>
             </el-table-column>
+
+            <el-table-column prop="name" label="盘点人"  width="100" align="center">
+                <template slot-scope="scope">
+                   {{getName(scope.row.creater)}}
+                </template>
+            </el-table-column>
+
+            <el-table-column prop="name" label="盘点时间"  width="100" align="center">
+                <template slot-scope="scope">
+                   {{ getTime(scope.row.ctime) }}
+                </template>
+            </el-table-column>
         </el-table>
         <el-pagination
             @size-change="handleSizeChange"
@@ -222,6 +234,15 @@ export default {
         console.log("str",str)
         this.ids = str  
       },
+      getName(admin_user_id){
+         var user_name = ""
+         for(let i=0;i<this.doctorList.length;i++){
+           if(admin_user_id == this.doctorList[i].admin_user_id){
+               user_name = this.doctorList[i].user_name
+           }
+         }
+         return user_name
+      }
     },
     created(){
       this.getlist()

src/xt_pages/stock/inventoryDetails.vue

@@ -41,13 +41,13 @@
                   {{scope.row.good_name}}
                 </template>
             </el-table-column>
-            <el-table-column prop="name" label="规格" width="200" align="center">
+            <el-table-column prop="name" label="规格" width="100" align="center">
                <template slot-scope="scope">
                   {{scope.row.specification_name}}
                 </template>
             </el-table-column>
 
-            <el-table-column  prop="name" label="有效日期" width="200" align="center">
+            <el-table-column  prop="name" label="有效日期" width="100" align="center">
                <template slot-scope="scope">
                  {{getTime(scope.row.expire_date)}}
                </template>
@@ -88,6 +88,18 @@
                 <span v-if="scope.row.inventory_type ==7">有效期到期</span>
                </template>
             </el-table-column>
+
+            <el-table-column prop="name" label="盘点人"  width="100" align="center">
+                <template slot-scope="scope">
+                   {{getName(scope.row.creater)}}
+                </template>
+            </el-table-column>
+
+            <el-table-column prop="name" label="盘点时间"  width="100" align="center">
+                <template slot-scope="scope">
+                   {{ getTime(scope.row.ctime) }}
+                </template>
+            </el-table-column>
           
         </el-table>
         <el-pagination
@@ -107,6 +119,7 @@
 <script>
 import { uParseTime } from '@/utils/tools'
 import { getInventoryDetailList } from "@/api/stock"
+import user from '../../store/modules/user';
 
 export default {
     name: "inventory",
@@ -127,6 +140,7 @@ export default {
             damageList:[],
             storehouse_id:0,
             houseList:[],
+            docList:[]
          }
     },
     methods:{
@@ -173,6 +187,7 @@ export default {
                for(let i=0;i<response.data.data.houseList.length;i++){
                  this.houseList.push(response.data.data.houseList[i])
                }
+               this.docList = response.data.data.doclist
               
              }
           })
@@ -236,6 +251,15 @@ export default {
       changeHouseList(){
         this.houseList = []
         this.getlist()
+      },
+      getName(admin_user_id){
+         var user_name = ""
+         for(let i=0;i<this.docList.length;i++){
+           if(admin_user_id == this.docList[i].admin_user_id){
+               user_name = this.docList[i].user_name
+           }
+         }
+         return user_name
       }
     },
     created(){

src/xt_pages/stock/print_damage.vue

@@ -0,0 +1,202 @@
+<template>
+    <div class="main-contain">
+        <div class="position">
+        <bread-crumb :crumbs="crumbs"></bread-crumb>
+        <el-row style="float:right;">
+            <el-col :span="24">
+            <el-button size="small" icon="el-icon-printer" type="primary" @click="printAction">打印</el-button>
+            </el-col>
+        </el-row>
+        </div>
+        <div class="app-container" style="background-color: white;">
+            <div id="print_content">
+
+                <table class="printTable" border="0" cellspacing="0" align="center">
+                    <thead class="print_head">
+                        <tr><td colspan="11">{{org_name}}</td></tr>
+                        <tr><td colspan="11">耗材盘点</td></tr>
+                    </thead>
+                    <tbody class="print_body">
+                    <tr>
+                        <td>报损日期</td>
+                        <td>耗材名称</td>
+                        <td>耗材规格</td>
+                        <td>总损耗数量</td>
+                        <td>总报损金额</td>
+                        <td>仓库名称</td>
+                     
+                        
+                    </tr>
+                    <tr v-for="(item,index) in tableList" :key="index">
+                        <td>
+                            {{getTime(item.ctime)}}
+                        </td>
+                        <td>
+                           {{item.good_name}}
+                        </td>
+                        <td>
+                          {{item.specification_name}}
+                        </td>
+                        <td>
+                          {{getDamageCount(item.good_id)}}
+                        </td>
+                        <td>
+                            {{getAllDamageCount(item.good_id,item.buy_price)}}   
+                        </td>
+                        <td>{{getHouseName(item.storehouse_id)}}</td>
+                      
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+const moment = require('moment');
+import { uParseTime } from '@/utils/tools'
+import { getReportStockList } from "@/api/stock"
+import print from "print-js";
+export default {
+    components:{
+        BreadCrumb
+    },
+    data(){
+        return{
+          crumbs: [
+            { path: false, name: '库存管理' },
+            { path: false, name: '耗材管理' },
+            { path: false, name: '耗材盘点打印' },
+          ],
+          org_name: this.$store.getters.xt_user.org.org_name,
+          ids:"",
+          tableList:[],
+          manufacturerList:[],
+          houseList:[],
+        }
+    },
+    methods:{
+        printAction: function() {
+            const style = '@page{size:landscape;margin: 10mm;} @media print { print_content{width:960px;margin:0} .flex{display: flex;justify-content: space-between;} .printTable{width:100%;border-collapse: collapse;border:0px;margin:10px 0;} .printTable thead{text-align:center}.printTable td{padding:5px;} .print_body tr td{border: 1px solid;font-size:12px;border-collapse:collapse;} }';
+            printJS({ 
+            printable: 'print_content',
+            type: 'html',
+            documentTitle: '  ',
+            style: style,
+            scanStyles: false
+            })
+        },
+        getTime(val) {
+         if(val < 0){
+            return ""
+          }
+         if(val == ""){
+            return ""
+          }else {
+            return uParseTime(val, '{y}-{m}-{d}')
+         }
+        },
+        getlist(){
+          var params = {
+            start_time:this.$route.query.start_time,
+            end_time:this.$route.query.end_time,
+            keyword:this.$route.query.searchKey,
+            limit:this.$route.query.limit,
+            page:this.$route.query.page,
+            storehouse_id:this.$route.query.storehouse_id,
+         }
+         getReportStockList(params).then(response=>{
+          if(response.data.state == 1){
+            var list = response.data.data.list
+            console.log("list2oo2o2oo2",list)
+            this.total = response.data.data.total
+            this.tableList = list
+            var doctorlist = response.data.data.doctorlist
+            this.doctorList = doctorlist
+            var damageList =  response.data.data.damageList
+            this.damageList = damageList
+            var obj = {id:0,storehouse_name:"全部"}
+            this.houseList = []
+            this.houseList.push(obj)
+            for(let i=0;i<response.data.data.houseList.length;i++){
+                this.houseList.push(response.data.data.houseList[i])
+            }
+           }
+          })   
+        },
+        getManufacturerName(id){
+           var name = ""
+           for(let i=0;i<this.manufacturerList.length;i++){
+              if(id == this.manufacturerList[i].id){
+                  name = this.manufacturerList[i].manufacturer_name
+              }
+           }
+           return name
+        },
+        getHouseName(id){
+         var storehouse_name = ""
+         for(let i=0;i<this.houseList.length;i++){
+           if(id == this.houseList[i].id){
+              storehouse_name = this.houseList[i].storehouse_name
+           }
+         }
+         if(storehouse_name == "全部"){
+           return ""
+         }else{
+           return storehouse_name
+         }
+       },
+       getDamageCount(good_id){
+        var count = 0
+        for(let i=0;i<this.damageList.length;i++){
+          if(good_id == this.damageList[i].good_id){
+             count = this.damageList[i].count
+          }
+        }
+        return count
+      },
+      getAllDamageCount(good_id,price){
+        var count = 0
+        for(let i=0;i<this.damageList.length;i++){
+          if(good_id == this.damageList[i].good_id){
+             count = this.damageList[i].count
+          }
+        }
+        return (count * price).toFixed(2)
+      },
+      getStorehouseName(id){
+        var storehouse_name = ""
+        for(let i=0;i<this.houseList.length;i++){
+          if(id == this.houseList[i].id){
+            storehouse_name = this.houseList[i].storehouse_name
+          }
+        }
+        if(storehouse_name == "全部"){
+          return ""
+        }else{
+          return storehouse_name
+        }
+      },
+    },
+    created(){
+
+      this.getlist()
+    }
+}
+</script>
+
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.printTitle{font-size: 22px;text-align: center;}
+.flex{display: flex;justify-content: space-between;}
+.tableTitle{display: flex;border-top:1px solid #000;border-bottom: 1px solid #000;padding: 10px 0;}
+.tableTr{display: flex;border-bottom: 1px dashed #000;padding: 10px 0;}
+.tableBottom{display: flex;border-bottom: 1px solid #000;padding: 10px 0;}
+.printTable{width:100%;border-collapse: collapse;}
+.printTable td{padding:5px;}
+.print_head{border: none;display: table-header-group;}
+.print_head tr td{text-align: center;border: none;}
+.print_body tr td{border:1px solid}
+</style>

src/xt_pages/stock/query/goodNewQuery.vue

@@ -48,6 +48,11 @@
             border
            :cell-class-name="cellStyle"
           >
+          <el-table-column label="耗材编码" align="center" v-if="org_id ==9956 || org_id == 0">
+              <template slot-scope="scope">
+                 {{ scope.row.good_number?scope.row.good_number:"" }}
+              </template>
+            </el-table-column>
             <el-table-column label="耗材类型" align="center">
               <template slot-scope="scope">
                 {{getGoodTypeName(scope.row.good_type_id)}}
@@ -68,6 +73,11 @@
                   {{getManufacturName(scope.row.manufacturer)}}
               </template>
             </el-table-column>
+            <el-table-column label="经销商" align="center" v-if="org_id ==10485">
+              <template slot-scope="scope">
+                  {{getDearName(scope.row.dealer)}}
+              </template>
+            </el-table-column>
             <el-table-column label="批准文号" align="center">
               <template slot-scope="scope">
                  {{scope.row.number}}
@@ -358,7 +368,8 @@ export default {
      warehouseOutByList:[],
      flushList:[],
      type_name:0,
-     storehouseId:0
+     storehouseId:0,
+     dealerList:[]
     }
   
   },
@@ -411,6 +422,7 @@ export default {
            this.manufacturerList = response.data.data.manufacturerList
            this.goodTypeList = response.data.data.goodTypeList
            this.patientList = response.data.data.patientList
+           this.dealerList = response.data.data.dealerList
          }
       })
     },
@@ -445,6 +457,15 @@ export default {
       }
       return manufacturer_name
     },
+    getDearName(id){
+      var dear_name = ""
+      for(let i=0;i<this.dealerList.length;i++){
+        if(id == this.dealerList[i].id){
+          dear_name = this.dealerList[i].dealer_name
+        }
+      }
+      return dear_name
+    },
     handleSizeChange(val) {
       this.limit = val;
       this.getlist()

src/xt_pages/stock/stockDamaged.vue

@@ -40,10 +40,17 @@
           placeholder="选择日期"
           @change="changeEndTime">
       </el-date-picker>
+
+      <el-button
+        size="small"
+        class="filter-item"
+        type="primary"
+        icon="el-icon-printer"
+        @click="toPrint">打印</el-button>
     </div>
   
     <el-table :data="tableList" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
-        <el-table-column type="selection" width="55" align="center"> </el-table-column>
+        <!-- <el-table-column type="selection" width="55" align="center"> </el-table-column> -->
         <el-table-column  prop="date" label="报损日期" align="center">
             <template slot-scope="scope">
               {{getTime(scope.row.ctime)}}
@@ -833,6 +840,12 @@ export default {
       changeHouseList(){
         this.houseList = []
         this.getlist()
+      },
+      toPrint(){
+        this.$router.push({path:'/stock/print_damage?storehouse_id='+this.storehouse_id+"&start_time="+this.start_time+"&end_time="+this.end_time+"&keyword="+this.searchKey+"&limit="+this.limit+"&page="+this.page})
+      },
+      SaveCheckedDamage(){
+
       }
     },
     created(){

src/xt_pages/user/components/PatientForm.vue

@@ -1497,6 +1497,14 @@ export default {
       this.submitMsg = "新增患者成功";
       this.form = Object.assign({}, defaultForm);
       this.form.lapseto  = 1
+      if(this.org_id == 0 || this.org_id ==9919){
+         this.form.diagnose = "1.慢性肾脏病5期  IgA肾病 维持性血液透析 肾性贫血 肾性高血压  继发性甲状旁腺功能亢进症  2.右前臂自体动静脉内瘘成形术后"
+         this.form.treatment_plan ="完善相关检查，规律血液透析，每周2次，每次5小时。纠正贫血，  达泊丁 （自备） 120ug  皮下注射  每4周1次；控制血压：非洛地平缓释片 5mg    口服  1次/日，酒石酸美托洛尔片 50mg/次 口服  每日1次；阿托伐他汀钙片 40mg/次  口服  每日1次。"
+         this.form.patient_complains = "维持性血液透析1年余"
+         this.form.past_history = "既往否认冠心病、糖尿病等慢性疾病；否认肝炎、结核、艾滋、梅毒等传染病史；否认药物、食物过敏史；无重大手术、外伤史。"
+         this.form.present_history = "患者于30年前体检查尿蛋白+，行肾穿刺活检，病理结果示：IgA肾病，此后于香港当地医院规范治疗，定时复查，至2021年12月复查发现血肌酐渐升高，300+umol/L，血压高于正常，开始为肾透析行右前臂自体动静脉内瘘成形术，1年前导入透析治疗，每周2次，每次5小时，规律维持至今。平素无胸闷、心慌，无咳嗽、咳痰，无恶心、呕吐，饮食、睡眠可，尿量约1000ml/日。本次检查感染四项阴性，血红蛋白103g/L，PTH 28.2pmol/L， Ca 2.17mmol/L ，P 1.57mmol/L。"
+         this.form.remark = "神志清，精神可，体型肥胖，面色黝黑，颜面、眼睑无浮肿，皮肤未见出血点、瘀斑；胸廓对称，心前区无隆起，心界向左扩大，心音有力，节律规整，未闻及明显杂音，双肺呼吸音粗；腹部呈脂肪堆积，腹软，无包块、无皮疹、无静脉曲张、无压痛；脊柱、四肢未见畸形，关节活动正常，肌力正常；双下肢无明显水肿；右前臂自体动静脉内瘘能触及震颤、闻及连续杂音。"
+      }
     }
 
   },

src/xt_pages/user/inspection.vue

@@ -40,6 +40,29 @@
         </el-col>
         <el-col :span="17" v-loading="itemLoading">
           <div class="filter-container" style="float:right">
+
+            <el-button
+              size="small"
+              class="filter-item"
+              type="primary"
+              @click="setRemindDialog()"
+              v-if="project && project.project_id != 14"
+              icon="el-icon-circle-plus-outline"
+              :disabled="project ? false : true"
+            >设置提醒弹窗
+            </el-button>
+
+            <el-button
+              size="small"
+              class="filter-item"
+              type="primary"
+              @click="setRemind()"
+              v-if="project && project.project_id != 14"
+              icon="el-icon-circle-plus-outline"
+              :disabled="project ? false : true"
+            >设置提醒周期
+            </el-button>
+
             <el-button
               size="small"
               class="filter-item"
@@ -210,6 +233,67 @@
       </el-row>
     </div>
 
+    <el-dialog
+      :title="formTitle"
+      :visible.sync="dialogRemindFormVisible"
+      width="1000px"
+      id="user-inspection-form"
+    >
+      <el-form :model="form" ref="form" label-position="top">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="周期提醒: ">
+              <el-radio-group v-model="temp_remind_cycle">
+                <el-radio :label="1">一月一次</el-radio>
+                <el-radio :label="2">两月一次</el-radio>
+                <el-radio :label="3">三月一次</el-radio>
+                <el-radio :label="4">半年一次</el-radio>
+                <el-radio :label="5">一年一次</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+
+<!--          <el-col :span="24">-->
+<!--            <p style="margin-top:20px;">是否弹窗提醒：-->
+<!--              <el-switch v-model="is_open"></el-switch>-->
+<!--            </p>-->
+<!--          </el-col>-->
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogRemindFormVisible = false">取 消</el-button>
+        <el-button
+          type="primary"
+          @click="submitNewRemind()"
+        >保 存
+        </el-button
+        >
+      </div>
+    </el-dialog>
+
+    <el-dialog
+      :visible.sync="dialogRemindDialogFormVisible"
+      width="1000px"
+      id="user-inspection-form"
+    >
+      <el-col :span="24">
+        <p style="margin-top:20px;">是否弹窗提醒：
+          <el-switch v-model="is_open"></el-switch>
+        </p>
+      </el-col>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogRemindDialogFormVisible = false">取 消</el-button>
+        <el-button
+          type="primary"
+          @click="submitRemindDialog()"
+        >保 存
+        </el-button
+        >
+      </div>
+    </el-dialog>
+
+
+
     <el-dialog
       :title="formTitle"
       :visible.sync="dialogFormVisible"
@@ -410,7 +494,9 @@ import {
   DeletePatientInspection,
   EditPatientInspection,
   fetchInspectionReference,
-  fetchPatientInspections
+  fetchPatientInspections,
+  setRemind,
+  setRemindDialog
 } from '@/api/inspection'
 import { getFileExtension, uParseTime } from '@/utils/tools'
 
@@ -419,6 +505,9 @@ export default {
   components: { PatientSidebar, ElImageViewer},
   data() {
     return {
+      temp_remind_cycle:"",
+      is_open:false,
+      record_id:0,
       showViewer:false,
       imgs:[],
       total: 0,
@@ -436,6 +525,8 @@ export default {
       },
       itemName: '请选择项目',
       formTitle: '',
+      dialogRemindFormVisible:false,
+      dialogRemindDialogFormVisible:false,
       dialogPicFormVisible: false,
       dialogFormVisible: false,
       patient_info: null,
@@ -610,8 +701,55 @@ export default {
         })
         .catch(() => {
         })
-    },
-    openEdit() {
+    },submitRemindDialog(){
+      var temp_is_open = 0
+      if(this.is_open){
+        temp_is_open = 1
+      }else{
+        temp_is_open = 0
+      }
+      setRemindDialog(this.record_id,temp_is_open).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          this.record_id = response.data.data.config.id
+          if(response.data.data.config.is_open == 1){
+            this.is_open = true
+          }else{
+            this.is_open = false
+          }
+          this.$notify({
+            title: '成功',
+            message: '设置成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.dialogRemindDialogFormVisible = false
+        }
+      })
+    },submitNewRemind(){
+      // console.log(this.is_open)
+      var params = {
+        patient: this.patientID,
+        project_id: this.project.project_id,
+        remind_cycle: this.temp_remind_cycle
+      }
+      setRemind(params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          this.$notify({
+            title: '成功',
+            message: '设置成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.dialogRemindFormVisible = false
+        }
+      })
+    }, openEdit() {
 
       if (this.project == null) {
         this.$message.error('请先选择项目')
@@ -641,7 +779,11 @@ export default {
         this.form.project_id = this.project.project_id
         this.form.inspect_date = this.itemDate
         this.form.old_inspect_date = this.itemDate
-        this.form.remind_cycle = this.patient_info.remind_cycle
+        if(this.form.project_id == 14) {
+          this.form.remind_cycle = this.patient_info.remind_cycle
+        }else{
+          this.form.remind_cycle =""
+        }
         console.log(this.form.remind_cycle)
 
         this.form.formItem = []
@@ -664,8 +806,15 @@ export default {
 
       }
 
-    },
-    openPic() {
+    },setRemindDialog(){
+      this.dialogRemindDialogFormVisible = true
+
+
+    },setRemind(){
+      this.dialogRemindFormVisible = true
+      // this.temp_remind_cycle = this.
+
+    },openPic() {
       if (this.project == null) {
         this.$message.error('请先选择项目')
         return false
@@ -676,7 +825,9 @@ export default {
       this.form.project_id = this.project.project_id
       this.form.imgs=[]
       this.form.delete_imgs=[]
-      this.form.remind_cycle = this.patient_info.remind_cycle
+      if(this.form.project_id == 14) {
+        this.form.remind_cycle = this.patient_info.remind_cycle
+      }
       var today = new Date()
       this.form.inspect_date = uParseTime(today, '{y}-{m}-{d} {h}:{i}')
       this.form.formItem = []
@@ -713,7 +864,10 @@ export default {
       this.form.method = 'add'
       this.formTitle = '新增' + this.project.project_name
       this.form.project_id = this.project.project_id
-      this.form.remind_cycle = this.patient_info.remind_cycle
+      if(this.form.project_id == 14) {
+        this.form.remind_cycle = this.patient_info.remind_cycle
+      }
+      // this.form.remind_cycle = this.patient_info.remind_cycle
       var today = new Date()
       this.form.inspect_date = uParseTime(today, '{y}-{m}-{d} {h}:{i}')
       this.form.formItem = []
@@ -1049,7 +1203,8 @@ export default {
             this.projects = reference
             this.patient_info = patient_info
             this.pageLoading = false
-            this.form.remind_cycle = this.patient_info.remind_cycle
+
+            // this.form.remind_cycle = this.patient_info.remind_cycle
           } else {
             this.$message.error(response.data.msg)
             return false
@@ -1099,6 +1254,29 @@ export default {
             var inspections = response.data.data.inspections
             this.total = response.data.data.total
             this.itemDate = response.data.data.date
+            let remind = response.data.data.remind
+
+            let config = response.data.data.config
+            this.record_id = config.id
+            if(config.id > 0){
+
+              if(config.is_open == 1){
+                this.is_open = true
+              }else{
+                this.is_open = false
+
+              }
+            }else{
+              this.is_open = false
+            }
+
+
+            if(remind.id > 0 && remind.remind_cycle > 0){
+              this.temp_remind_cycle = remind.remind_cycle
+            }else{
+              this.temp_remind_cycle = ""
+            }
+
             this.inspections = response.data.data.inspections
             if (inspections == null) {
               this.inspections = []

src/xt_pages/workforce/components/nextTableWeeks.vue

@@ -665,7 +665,7 @@ export default {
     },
     signPrint() {
         
-        if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340){
+        if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340 || this.org_id ==10375){
          var zone = this.zone
           var newArr = []
           for(let i=0;i<this.zoneList.length;i++){

src/xt_pages/workforce/components/tableData.vue

@@ -1379,9 +1379,9 @@ export default {
             }
           }
         } else {
-          if(column.label == '晚' ){
-            return 'evening_border'
-          }
+          // if(column.label == '晚' ){
+          //   return 'evening_border'
+          // }
         }
       }
       return "";

src/xt_pages/workforce/components/tableWeeks.vue

@@ -888,7 +888,7 @@
       ,
       signPrint() {
 
-        if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340 || this.org_id == 0){
+        if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340 || this.org_id == 0 || this.org_id == 10375){
          var zone = this.zone
           console.log("zone23232",zone)
           var newArr = []