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

src/api/dialysis.js

@@ -403,3 +403,40 @@ export function getDialysisAdviceToday(params) {
     params: params
   })
 }
+
+
+export function SaveDialysisInformationSetting(params) {
+  return request({
+    url: '/api/patient/savedialysisInformationsetting',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getDialysisInformationSetting(params){
+  
+  return request({
+    url:"/api/patient/getdialyisinformationsetting",
+    method:"get",
+    params:params
+  })
+}
+
+export function checkDialysisInformation(params){
+  
+  return request({
+    url:"/api/patient/checkdialysisinformation",
+    method:"Get",
+    params:params
+  })
+}
+
+
+
+export function getSchedualPatientFlow(params) {
+  return request({
+    url: '/api/dialysis/patientsflow',
+    method: 'get',
+    params: params
+  })
+}

src/lang/en.js

@@ -78,6 +78,7 @@ export default {
     dialysisSolution: 'dialysisSolution',
     inspection: 'Inspection',
     home: 'home',
+    infor:'infor',
     weight: 'weight',
     dialysisRecord: 'dialysisRecord',
     scheduling: 'scheduling',

src/lang/zh.js

@@ -81,6 +81,7 @@ export default {
     template: '数据模版',
     druguse: '医嘱模版',
     watch: '透析监测',
+    flow:'透析流程',
     addAdmin: '新增用户',
     editAdmin: '编辑用户信息',
     setupPerview: '设置权限',
@@ -92,6 +93,7 @@ export default {
     dialysisSolution: '透析处方',
     inspection: '检验检查',
     home: '透析首页',
+    infor:'信息归档',
     weight: '干体重',
     dialysisRecord: '透析记录',
     scheduling: '排班信息',
@@ -102,6 +104,7 @@ export default {
     deviceManage: '院感管理',
     modemanagement: '型号配置',
     dialysisMachineManage: '设备管理',
+    
     workforce: '患者排班',
     appointment: '排班管理',
     sign: '治疗签到',
@@ -398,7 +401,7 @@ export default {
     manage_ment: '设备管理',
     nursing_record: '透析护理记录',
     special_record: '特殊记录',
-    template_summary: '治疗小结',
+    template_summary: '阶段小结',
     template_plan: '个性化方案',
     admitting_diagnosis: '入院诊断',
     discharge_diagnosis: '出院诊断',
@@ -414,6 +417,5 @@ export default {
     diagnostic_basis: '诊断依据',
     differential_diagnosis: '鉴别诊断',
     treatment_plan: '诊疗计划'
-
   }
 }

src/router/index.js

@@ -12,6 +12,7 @@ import role from './modules/role'
 import stock from './modules/stock'
 import weight_sign from './modules/weight_sign'
 import workforce from './modules/workforce'
+
 import service from './modules/service'
 import org from './modules/org'
 import systems from './modules/systems'
@@ -59,7 +60,7 @@ import bedManagement from './modules/bedManagement'
 import dictionaryManagement from './modules/dictionaryManagement'
 import templateManagement from './modules/templateManagement'
 import DepartManage from './modules/DepartManage'
-import basicConfig from './modules/basicConfig'
+import basicConfig from './modules/basicConfig' 
 
 Vue.use(Router)
 
@@ -119,6 +120,7 @@ var _constant_router_map = [{
     }
   }]
 },
+
 {
   path: '/kuyiShopping',
   component: Layout,
@@ -199,7 +201,8 @@ var _asy_router_map = [
   hisTool,
   integration,
   basicConfig,
-  supply
+  supply,
+ 
 ]
 
 var is_asy_router = process.env.NODE_ENV === 'production' // true; 设置为 true 强制进行路由验证

src/router/index_路由未分离前.js

@@ -40,6 +40,7 @@ export const xt_constantRouterMap = [
       meta: { title: 'home', icon: 'dashboard', noCache: true }
     }]
   },
+ 
   {
     path: '/service',
     component: Layout,

src/router/modules/device.js

@@ -88,6 +88,19 @@ export default {
 
       }
     },
+
+
+    {
+      path: '/infor/index',
+      component: () => import('@/xt_pages/infor/index'),
+      name: 'infor',
+     
+      meta: {
+        title: 'infor',
+        noCache: true,
+      }
+    },
+
     {
       path: '/device/waterformprint',
       component: () => import('@/xt_pages/management/components/waterFormPrint'),
@@ -99,7 +112,9 @@ export default {
         noCache: true,
         
       }
-    }
+    },
+
+  
 
   ]
 }

src/router/modules/dialysis.js

@@ -815,5 +815,14 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/flow',
+      component: () => import('@/xt_pages/dialysis/dialysisFlow'),
+      name: 'flow',
+      meta: {
+        title: 'flow',
+        noCache: true
+      }
+    },
   ]
 }

src/store/getters.js

@@ -2,6 +2,7 @@ const getters = {
   sidebar: state => state.app.sidebar,
   language: state => state.app.language,
   device: state => state.app.device,
+  information:state => state.app.information,
   visitedViews: state => state.tagsView.visitedViews,
   cachedViews: state => state.tagsView.cachedViews,
   token: state => state.user.token,

src/xt_pages/device/airDisinfectTwo.vue

@@ -910,7 +910,7 @@
           start_time:[{required:true,message:"请选择开始时间",trigger:"blur"}],
           end_time:[{required:true,message:"请选择结束时间",trigger:"blur"}]
          },
-         limit:20,
+         limit:10,
          page:1,
          total:0,
          tableData: [],

src/xt_pages/device/objectTableDisinfectTwo.vue

@@ -129,9 +129,10 @@
               style="margin-top:20px;float: right"
               layout="total, sizes, prev, pager, next, jumper"
               :total="total"
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
           >
-          <!-- @size-change="handleSizeChange"
-              @current-change="handleCurrentChange" -->
+            
           </el-pagination>
          </div>
 
@@ -1149,7 +1150,7 @@
           start_time:[{required:true,message:"请选择开始时间",trigger:"blur"}],
           end_time:[{required:true,message:"请选择结束时间",trigger:"blur"}]
          },
-         limit:20,
+         limit:10,
          page:1,
          total:0,
          tableData: [],
@@ -1590,6 +1591,15 @@
            // return ''
            // }
        },
+
+       handleSizeChange(val) {
+        this.limit = val;
+        this.getObjectTableDisInfectList()
+      },
+      handleCurrentChange(val) {
+        this.page = val;
+        this.getObjectTableDisInfectList()
+      },
         
       }
     }

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -894,7 +894,7 @@
                       style="padding: 2px 0; line-height: 23px; display: flex"
                     >
                       <div class="inline_block" style="flex: 1"
-                        v-if="org_id!=10440 && org_id !=0">
+                        v-if="org_id!=10440 && org_id!=0 && org_id!=10469 && org_id!=10490 && org_id!=10478 && org_id!=10495">
                         上次透后体重：
                         <div
                           class="under_line"
@@ -918,6 +918,21 @@
                         </div>
                         kg
                       </div>
+
+                      <div class="inline_block" style="flex: 1"
+                        v-if="org_id==10440 && org_id ==0 || org_id==10469 || org_id==10490 || org_id==10478  || org_id==10495">
+                        上次透后体重：
+                        <div
+                          class="under_line"
+                          style="width: 100px; text-align: center"
+                        >
+                          <span>{{
+                            record.lastafterweight.weight_after
+                          }}</span>
+                       
+                        </div>
+                        kg
+                      </div>
                       <div class="inline_block" style="flex: 1">
                         透前体重：
                         <div
@@ -938,7 +953,7 @@
                         </div>
                         kg
                       </div>
-                      <div class="inline_block" style="flex: 1">
+                      <div class="inline_block" style="flex: 1" v-if="org_id!=0 && org_id!=10469">
                         计划超滤量：
                         <div
                           class="under_line"
@@ -954,6 +969,22 @@
                          <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471">ml</span> 
                          <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469  && org_id!=10471">L</span>
                       </div>
+
+                      <div class="inline_block" style="flex: 1" v-if="org_id==0 || org_id == 10469">
+                        处方脱水量：
+                        <div
+                          class="under_line"
+                          style="width: 100px; text-align: center"
+                        >
+                          {{
+                            record.prescription &&
+                            record.prescription.prescription_water
+                              ? record.prescription.prescription_water
+                              : "/"
+                          }}
+                        </div>
+                        ml
+                      </div>
                       <div class="inline_block" style="flex: 1">
                         干体重：
                         <div
@@ -1295,11 +1326,19 @@
                           <td
                             width="50"
                             v-if="
-                              org_id == 10121 || org_id == 9675 || org_id == 0
+                              org_id == 10121 || org_id == 9675 
                             "
                           >
                             SpO₂<br />(%)
                           </td>
+                          <td
+                            width="50"
+                            v-if="
+                              org_id == 0 || org_id ==  10469
+                            "
+                          >
+                            钠浓度<br />(mmol/L)
+                          </td>
                           <td width="50" v-if="org_id != 0 && org_id != 3877 && org_id != 10449">超滤量<br />(ml)</td>
                           <td width="50" v-if="org_id ==0 || org_id ==3877 || org_id ==10449">累计超滤量<br />(ml)</td>
                           <td
@@ -1414,8 +1453,9 @@
                             v-if="
                               org_id != 9538 &&
                               org_id != 10121 &&
-                              org_id != 9675 &&
-                              org_id != 0
+                              org_id != 9675 && 
+                              org_id!=0
+                             
                             "
                           >
                             {{
@@ -1427,7 +1467,7 @@
 
                           <td
                             v-if="
-                              org_id == 10121 || org_id == 9675 || org_id == 0
+                              org_id == 10121 || org_id == 9675 
                             "
                           >
                             {{
@@ -1437,6 +1477,18 @@
                             }}
                           </td>
 
+                          <td
+                            v-if="
+                              org_id == 0 || org_id == 10469 
+                            "
+                          >
+                            {{
+                              monitor_record.sodium_concentration
+                                ? monitor_record.sodium_concentration
+                                : ""
+                            }}
+                          </td>
+
                           <td v-if="org_id == 9538">
                             {{
                               monitor_record.sodium_concentration

src/xt_pages/dialysis/components/consumablesDialog.vue

@@ -10,6 +10,8 @@
         style="width:150px;margin-right:10px"
         v-model="startTime"
         type="date"
+        format="yyyy-MM-dd"
+        value-format="yyyy-MM-dd"
         placeholder="选择日期"
         @change="selectStartime">
       </el-date-picker>
@@ -17,6 +19,8 @@
         style="width:150px;margin-right:10px"
         v-model="endTime"
         type="date"
+        format="yyyy-MM-dd"
+        value-format="yyyy-MM-dd"
         placeholder="选择日期"
         @change="selectEndtime">
       </el-date-picker>

src/xt_pages/dialysis/components/dialysisDrugsDialog.vue

@@ -10,6 +10,8 @@
         style="width:140px;margin-right:10px"
         v-model="startTime"
         type="date"
+        format="yyyy-MM-dd"
+        value-format="yyyy-MM-dd"
         placeholder="选择日期"
         @change="changeStartTime">
         </el-date-picker>
@@ -17,6 +19,8 @@
         style="width:140px;margin-right:10px"
         v-model="endTime"
         type="date"
+        format="yyyy-MM-dd"
+        value-format="yyyy-MM-dd"
         placeholder="选择日期"
         @change="changeEndTime">
         </el-date-picker>

src/xt_pages/dialysis/components/dialysisParametersDialog.vue

@@ -11,12 +11,16 @@
         v-model="startTime"
         type="date"
         placeholder="选择日期"
+        format="yyyy-MM-dd"
+        value-format="yyyy-MM-dd"
         @change="selectStartime">
         </el-date-picker>
         <el-date-picker
         style="width:150px;margin-right:10px"
         v-model="endTime"
         type="date"
+        format="yyyy-MM-dd"
+        value-format="yyyy-MM-dd"
         placeholder="选择日期">
         </el-date-picker>
         <el-button icon="el-icon-printer" type="primary" @click="toPrint">打印</el-button>

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

@@ -28,7 +28,7 @@
                 <td width="50">序号</td>
                 <td width="100">透析机号</td>
                 <td width="100">姓名</td>
-                <td width="100">透析机号</td>
+                <td width="100">透析号</td>
                 <td width="200" v-for="(item,index) in rowList" :key="index">
                   {{item.filed_name_cn}} 
                 </td>

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 == 10485"  >
               <el-input v-model="form.actual_ultrafiltration"></el-input>
             </el-form-item>
             <el-form-item label="实际超滤量(L): " v-else :prop="isName('实际超滤量')" :rules="isCheckmust('实际超滤量')">

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

@@ -1326,12 +1326,12 @@
               }
 
               if(msg == 2){
-                this.$message.error("库存不足,请入库")
+                this.$message.error("执行失败,库存不足,请入库")
                 this.execTimeDialogVisible = false
                 return false
               }
               if(msg == 3){
-                this.$message.error("无库存,请入库")
+                this.$message.error("执行失败,无库存,请入库")
                 this.execTimeDialogVisible = false
                 return false
               }

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

@@ -239,7 +239,9 @@
                 org_id == 9555 
                 || org_id == 10432
                 || org_id == 10445
-                || org_id == 10410) &&
+                || org_id == 10410 ||
+                org_id == 10495 ||
+                org_id == 10485) &&
                 org_id!=10387
             "
           >
@@ -307,7 +309,8 @@
               org_id!= 10210 &&
               org_id != 9555 
               && org_id!=10432 && org_id!=10445
-              && org_id!=10410)
+              && org_id!=10410 && org_id!=10495 &&
+               org_id!=10485 )
               || org_id == 10387
             "
           >
@@ -359,7 +362,8 @@
                 template_id == 60 ||
                 org_id == 10432 ||
                 org_id == 10445 ||
-                org_id == 10410)
+                org_id == 10410 ||
+                org_id == 10495)
                 && org_id!=10387
             "
           >
@@ -410,7 +414,7 @@
               template_id != 60 &&
               org_id!=10432 &&
               org_id!=10445 &&
-              org_id!=10410) || 
+              org_id!=10410 && org_id!=10495) || 
               org_id == 10387
             "
           >
@@ -851,6 +855,30 @@
             </template>
           </el-table-column>
 
+          <el-table-column
+            prop="heparin"
+            align="center"
+            label="置换液速度(ml/h)"
+            width="140"
+            v-if="isShow('置换液速度')"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.replacement_speed }}
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            prop="heparin"
+            align="center"
+            label="碳酸氢钠用量(ml)"
+            width="140"
+            v-if="isShow('碳酸氢钠用量')"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.dicarbonate }}
+            </template>
+          </el-table-column>
+
           <el-table-column
             prop="heparin"
             align="center"
@@ -1203,7 +1231,9 @@
                 org_id == 10340 ||
                 org_id == 10432 ||
                 org_id == 10445 ||
-                org_id == 10410) 
+                org_id == 10410 ||
+                org_id == 10495 ||
+                org_id == 10485) 
                 && org_id!=10387
             "
           >
@@ -1257,7 +1287,10 @@
               org_id != 9555 &&
               org_id!=10432 && 
               org_id!=10445 && 
-              org_id!=10410)
+              org_id!=10410 &&
+              org_id!=10495 &&
+              org_id!=10485
+              )
               || org_id == 10387
             "
           >
@@ -1568,6 +1601,20 @@
             </el-form-item>
           </el-col>
 
+          <el-col :span="8" v-if="isShow('置换液速度')">
+            <el-form-item label="置换液速度(ml/h):" :prop="isName('置换液速度')"
+              :rules="isCheckmust('置换液速度')">
+              <el-input v-model="form.replacement_speed"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8" v-if="isShow('碳酸氢钠用量')">
+            <el-form-item label="碳酸氢钠用量(ml):" :prop="isName('碳酸氢钠用量')"
+              :rules="isCheckmust('碳酸氢钠用量')">
+              <el-input v-model="form.dicarbonate"></el-input>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="8" v-if="isShow('滤前压')">
             <el-form-item label="滤前压(mmHg):">
               <el-input v-model="form.filter_pressure"></el-input>
@@ -1789,6 +1836,8 @@ export default {
         heparin_amount: "", //肝素量
         dehydration: "",
         filter_pressure:"",
+        replacement_speed:"",
+        dicarbonate:"",
       },
 
       table_current_row: null,
@@ -2497,7 +2546,18 @@ export default {
         parseFloat(this.form.dehydration) == NaN
           ? 0
           : parseFloat(this.form.dehydration);
+        
       this.form.filter_pressure = this.form.filter_pressure?this.form.filter_pressure:""
+
+      this.form.replacement_speed =
+        parseFloat(this.form.replacement_speed) == NaN
+          ? 0
+          : parseFloat(this.form.replacement_speed);
+
+          this.form.dicarbonate =
+        parseFloat(this.form.dicarbonate) == NaN
+          ? 0
+          : parseFloat(this.form.dicarbonate);
       let mode = "1";
       if (this.form.id > 0) {
         mode = "2";
@@ -2656,6 +2716,16 @@ export default {
               parseFloat(this.form.heparin_amount) == NaN
                 ? 0
                 : parseFloat(this.form.heparin_amount);
+
+                this.form.replacement_speed =
+            parseFloat(this.form.replacement_speed) == NaN
+          ? 0
+          : parseFloat(this.form.replacement_speed);
+
+          this.form.dicarbonate =
+        parseFloat(this.form.dicarbonate) == NaN
+          ? 0
+          : parseFloat(this.form.dicarbonate);
             this.$message.error(resp.msg);
           }
         }

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -14,8 +14,8 @@
           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || 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 == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410) &&this.$store.getters.xt_user.template_info.org_id!=10387 " width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && 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!=10432  && 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 == 10387"  width="76px"> 超滤量(L) </th>
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || 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 == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485) &&this.$store.getters.xt_user.template_info.org_id!=10387 " width="76px" > 超滤量(ml)</th>
+          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && 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!=10432  && 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!=10485) || this.$store.getters.xt_user.template_info.org_id == 10387"  width="76px"> 超滤量(L) </th>
           <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || 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!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
           <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && 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==10387" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -105,14 +105,14 @@
       </template>
       <template
         v-if="
-          org_template_info.template_id == 6 ||
+          (org_template_info.template_id == 6 ||
           org_template_info.template_id == 10 ||
           org_template_info.template_id == 11 ||
           org_template_info.template_id == 50 ||
           org_template_info.template_id == 52 ||
           org_template_info.template_id == 53  ||
-          org_template_info.template_id == 64  ||
-          $store.getters.xt_user.org.id == 0 
+          org_template_info.template_id == 64)
+          && $store.getters.xt_user.org.id != 0
         "
       >
       <div>
@@ -798,6 +798,19 @@
         </div>
       </template>
 
+      <template v-if="org_template_info.template_id == 65  || $store.getters.xt_user.org.id == 0 ">
+        <div>
+          <el-button
+            :loading="loading"
+            size="small"
+            icon="el-icon-printer"
+            @click="printThisPage"
+            type="primary"
+            >打印</el-button
+          >
+        </div>
+      </template>
+
     </div>
     <div class="app-container" style="min-height: 0">
       <!--<div class="order-print-btn"-->
@@ -934,8 +947,7 @@
           <DialysisPrintOrderTwo
             v-bind:childResponse="childResponse"
             v-if="
-              org_template_info.template_id == 2 ||
-              org_template_info.template_id == 0
+              org_template_info.template_id == 2
             "
           ></DialysisPrintOrderTwo>
 
@@ -959,7 +971,7 @@
                                   
           <DialysisPrintOrderSix
             v-bind:childResponse="childResponse"
-            v-if="org_template_info.template_id == 6"
+            v-if="org_template_info.template_id == 6 && $store.getters.xt_user.org.id!=0"
           >
           </DialysisPrintOrderSix>
 
@@ -1245,6 +1257,12 @@
             v-if="org_template_info.template_id == 64">
 
           </DialysisPrintOrderSixtyfour>
+
+          <DialysisPrintOrderSixtyFive
+              v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 65 || $store.getters.xt_user.org.id ==0">
+
+          </DialysisPrintOrderSixtyFive>
         </div>
       </el-container>
     </div>
@@ -1327,6 +1345,7 @@ import DialysisPrintOrderSixtyOne from "./template/DialysisPrintOrderSixtyOne"
 import DialysisPrintOrderSixtyTwo from "./template/DialysisPrintOrderSixtyTwo"
 // import DialysisPrintOrderSixtyThree from "./template/DialysisPrintOrderSixtyThree"
 import DialysisPrintOrderSixtyfour from './template/DialysisPrintOrderSixtyfour'
+import DialysisPrintOrderSixtyFive from "./template/DialysisPrintOrderSixtyFive.vue"
 export default {
   name: "dialysisPrintOrder",
   components: {
@@ -1394,9 +1413,11 @@ export default {
     DialysisPrintOrderEight,
     DialysisPrintOrderNine,
     DialysisPrintOrderSixtyfour,
+    DialysisPrintOrderSixtyFive,
     LabelBox,
     BreadCrumb,
-  },
+    DialysisPrintOrderSixtyFive
+},
   data() {
     return {
       crumbs: [
@@ -1546,6 +1567,11 @@ export default {
       return "";
     },
     printThisPage() {
+      // console.log("this.org_template_info.template_id",this.org_template_info.template_id)
+      // if(this.$store.getters.xt_user.org.id == 0){
+      //   this.org_template_info.template_id = 65
+      // }
+       
       var ptime = Math.round(new Date().getTime() / 1000);
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
 
@@ -1638,8 +1664,9 @@ export default {
         // this.org_template_info.template_id == 51 ||
         this.org_template_info.template_id == 58 ||
         this.org_template_info.template_id == 60 ||
-        this.org_template_info.template_id == 61  ||
-        this.org_template_info.template_id ==0
+        this.org_template_info.template_id == 61
+      
+       
       ) {
         printJS({
           printable: "dialysis-print-box-1",
@@ -1954,6 +1981,15 @@ export default {
           scanStyles: false,
         });
         
+      }else if (this.org_template_info.template_id == 65 || this.org_template_info.template_id == 6) {
+        console.log("进来")
+        printJS({
+          printable: "dialysis-print-box-65",
+          type: "html",
+          style: style12,
+          scanStyles: false,
+        });
+        
       }else if (
         this.org_template_info.template_id == 53
       ) {

src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue

@@ -227,7 +227,23 @@
                   </tbody>
                 </table>
 
-                <table class="table-box">
+                <table class="table-box" v-if="org_id==10394 || org_id == 0">
+                  <tbody>
+                    <tr>
+                      <td width="40">内瘘:</td>
+                      <td width="800">
+                        <div class="under-line">
+                          &nbsp;
+                          <span v-if="predialysis&&predialysis.internal_fistula!=undefined">{{ predialysis.internal_fistula }}</span>
+                        </div>
+                      </td>
+                     
+                     
+                     
+                    </tr>
+                  </tbody>
+                </table>
+                <table class="table-box" v-if="org_id!=10394 && org_id!=0">
                   <tbody>
                     <tr>
                       <td width="40">内瘘:</td>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -684,6 +684,28 @@
                       >
                         血浆胆红素吸附
                       </div>
+                      <div
+                        class="under_line"
+                        style="
+                          bwidth: 150px;
+                          text-align: center;
+                          font-weight: 600;
+                        "
+                        v-if="prescription.mode_id == 24"
+                      >
+                       I-HDF
+                      </div>
+                      <div
+                        class="under_line"
+                        style="
+                          bwidth: 150px;
+                          text-align: center;
+                          font-weight: 600;
+                        "
+                        v-if="prescription.mode_id == 25"
+                      >
+                       HD高通
+                      </div>
                       <div
                         class="under_line"
                         style="
@@ -915,16 +937,16 @@
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
                   >
-                    <div class="inline_block" style="flex: 1" v-if="org_id!=0 && org_id!=10440">
+                    <div class="inline_block" style="flex: 1" v-if="org_id!=10440">
                       上次透后体重：
                       <div
                         class="under_line"
                         style="width: 100px; text-align: center"
                       >
-                        <span v-if="org_id == 10290 || org_id == 10318 || org_id== 10217 || org_id== 10188 || org_id== 9956 || org_id == 10440 ">{{
+                        <span v-if="org_id == 10290 || org_id == 10318 || org_id== 10217 || org_id== 10188 || org_id== 9956 || org_id == 10440 || org_id == 0 || org_id == 10469 || org_id == 10478 || org_id == 10490 || org_id ==10495">{{
                           lastafterdialysis.weight_after
                         }}</span>
-                        <span v-if="org_id != 10290 && org_id != 10318  && org_id!= 10217 && org_id!=10188 && org_id!=9956 && org_id != 10440">{{
+                        <span v-if="org_id != 10290 && org_id != 10318  && org_id!= 10217 && org_id!=10188 && org_id!=9956 && org_id != 10440 && org_id!=0 && org_id!=10469 && org_id!=10478 && org_id!=10490 && org_id!=10495">{{
                           predialysis.weight_after_last_transparency
                             ? predialysis.weight_after_last_transparency
                             : "未称重"
@@ -961,7 +983,7 @@
                       </div>
                       kg
                     </div>
-                    <div class="inline_block" style="flex: 1">
+                    <div class="inline_block" style="flex: 1" v-if="org_id!=10469 && org_id!=0">
                       计划超滤量： 
                       <div
                         class="under_line"
@@ -976,6 +998,22 @@
                       <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471">ml</span> 
                       <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471">L</span>
                     </div>
+
+
+                    <div class="inline_block" style="flex: 1" v-if="org_id == 10469 || org_id == 0">
+                      处方脱水量： 
+                      <div
+                        class="under_line"
+                        style="width: 100px; text-align: center"
+                      >
+                        {{
+                          prescription.prescription_water
+                            ? prescription.prescription_water
+                            : "/"
+                        }}
+                      </div>
+                       ml
+                    </div>
                     <div class="inline_block" style="flex: 1">
                       干体重：
                       <div
@@ -1408,7 +1446,10 @@
                         <td width="60" v-if="org_id == 9919">血温(°C)</td>
                         <td width="60" v-if="org_id == 9671">血温(°C)</td>
                         <td width="60" v-if="org_id!=9836&&org_id!=9919&&org_id!=9671">透析液温度(°C)</td>
-                        <td width="50" v-if="org_id != 10121">电导度<br />(ms/cm)</td>
+                        <td width="50" v-if="org_id != 10121">
+                          <span v-if="org_id != 0 && org_id !=10469"> 电导度<br />(ms/cm)</span> 
+                          <span v-if="org_id == 0 || org_id ==10469"> 钠浓度<br />(mmol/L)</span> 
+                        </td>
                         <td width="50" v-if="org_id == 10121">SpO₂<br />(%)</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>
@@ -1501,7 +1542,9 @@
 
 
                         <td v-if="org_id != 9538 &&org_id != 10121">
-                          {{ monitor.conductivity ? monitor.conductivity : "" }}
+                          <span v-if="org_id!=0&&org_id!=10469"> {{ monitor.conductivity ? monitor.conductivity : "" }}</span>
+                          <span v-if="org_id==0||org_id==10469"> {{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}</span>
+                          
                         </td>
 
                       

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyfour.vue

@@ -210,11 +210,11 @@
                         : "/"
                     }} ml/min
                   </div>
-                  <div style="margin-left:70px ;display: inline-block;">
+                  <!-- <div style="margin-left:70px ;display: inline-block;">
                     实际预冲量:
-                    {{ afterdialysis.actual_ultrafiltration ? afterdialysis.actual_ultrafiltration : "/" }} 
+                    {{ prescription.pre_impulse ? prescription.pre_impulse : "/" }} 
                      &nbsp;L
-                  </div>
+                  </div> -->
                   <div style="margin-left:70px ; display: inline-block;">
                     医师签名:
 
@@ -349,22 +349,22 @@
                     <!-- border-bottom: 1px solid gray; border-right: 1px solid gray;-->
                       <tr style="">
                         <td rowspan="2" style=" ">时间</td>
-                        <td colspan="5" style=" ">透析参数</td>
-                        <td colspan="3" style=" ">生命体征</td>
-                        <td colspan="3" style=" ">治疗中病情变化</td>
+                        <td colspan="4" style=" ">透析参数</td>
+                        <td colspan="4" style=" ">生命体征</td>
+                        <td colspan="2" style=" ">治疗中病情变化</td>
                       </tr>
                       <tr style="">
                         <td style=" ">TMP<br />mmHg</td>
                         <td style=" ">静脉压<br />mmHg</td>
                         <td style=" ">血流量<br />ml/min</td>
-                        <td style="">脱水量<br />L</td>
+                        <td style="">脱水量<br />ml</td>
                         <td style=" ">T<br />ºC</td>
                         <td style=" ">HR<br />bpm</td>
                         <td style=" ">R<br />bpm</td>
                         <td style=" ">BP<br />mmHg</td>
                         <!-- <td style=" ">时间</td> -->
                         <td style=" ">记录</td>
-                        <td >护士签名</td>
+                        <!-- <td >护士签名</td> -->
                       </tr>
                     
                       <tr style="" v-for="(monitor, monindex) in monitors" :key="monindex" >
@@ -449,7 +449,7 @@
                               {{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{monitor.result}}
                           </span>
                         </td>
-                        <td>
+                        <!-- <td>
                           <span v-if="
                             setAdminUserES(
                               dialysisOrder == null
@@ -479,7 +479,7 @@
                             srcset=""
                             v-else
                           />
-                        </td>
+                        </td> -->
                       </tr>
                     
                   </table>
@@ -550,7 +550,7 @@
                       </td>
                       <!-- 执行时间 -->
                       <td width="130" style="">
-                        {{ getTime(advice.execution_time, "{y}-{m}-{d} {h}:{i}") }}
+                        {{ getTime(advice.execution_time, "{h}:{i}") }}
                       </td>
                       <!-- 执行 -->
                       <td width="110" style="">
@@ -623,9 +623,11 @@
                       <td v-if="advice_index > 5" width="150" style=""></td>
                       <td v-if="advice_index > 5" width="110"></td>
                     </tr>
+                  
                   </table>
                 </td>
               </tr>
+     
               <tr>
                 <td colspan="3">
                   <!-- <div style="display: inline-block;">
@@ -701,6 +703,8 @@
                   </div>
                 </td>
               </tr>
+
+           
             </table>
           </div>
         </div>
@@ -761,6 +765,7 @@ export default {
       adminUser: [],
       bloodAccessParOpera: {},
       lastafterdialysis: {},
+      projects:[]
     };
   },
   computed: {},
@@ -974,8 +979,50 @@ export default {
           advices.push(item);
         }
 
+        let projects = [];
+        response.data.data.projects.map((item) => {
+          if (item.type == 2) {
+            projects.push(item);
+          }
+        });
+        this.projects = projects;
+        if (this.doctor_advices.length + this.projects.length <= 6) {
+          var nl = 6 - (this.doctor_advices.length + this.projects.length);
+          this.print_length = 6;
+
+          for (let index = 0; index < nl; index++) {
+            if (
+              this.projects[index] == undefined ||
+              this.projects[index].length <= 0
+            ) {
+              this.projects.push([]);
+            } else {
+              continue;
+            }
+          }
+        }
+        console.log("advices",this.advices)
+        console.log("this.projects", this.projects);
+
+        var objProject = {advice_name:"",start_time:"",single_dose:"",single_dose_unit:"",}
+        if(this.projects!=null && this.projects.length >0){
+           for(let i=0;i<this.projects.length;i++){
+              if(this.projects[i].project_id ==  7620){
+                 objProject.advice_name = this.projects[i].project.project_name
+                 objProject.start_time = this.projects[i].start_time
+                 objProject.single_dose = this.projects[i].single_dose
+                 objProject.single_dose_unit = this.projects[i].unit
+                 objProject.execution_time = this.projects[i].execution_time
+                 objProject.execution_staff= this.projects[i].execution_staff
+              }
+           }
+        }
+        this.advices.push(objProject)
+
         var tableAdvice = this.advices;
 
+
+
         if (tableAdvice.length === 0) {
           var obj = { advice_name: "", start_time: "" };
           var obj1 = { advice_name: "", start_time: "" };
@@ -1051,6 +1098,9 @@ export default {
           this.advices = tableAdvice;
         }
 
+ 
+         
+
         // this.loading = false;
         // console.log(this.advice_groups);
         } else {

src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue

@@ -239,7 +239,7 @@
                         {{ predialysis.catheter ? predialysis.catheter : "/" }}
                       </div>
                     </div>
-                    <div class="inline_block" style="flex:4;" v-if="org_id == 10081">
+                    <div class="inline_block" style="flex:4;" v-if="org_id == 9779">
                       穿刺点：
                       <div class="under_line" style="min-width: 120px;text-align: center">
                         {{ predialysis.point_puncture ? predialysis.point_puncture : "/" }}

src/xt_pages/home/index.vue

@@ -171,7 +171,8 @@ export default {
           imgUrl: require("../../assets/home/analyze.png"),
           name: "透析监控",
           link: "/dialysis/watch"
-        }
+        },
+      
       ],
       subscibe: {},
       subscibeBan: {

src/xt_pages/hospitalStation/index.vue

@@ -240,7 +240,7 @@ export default {
       loadingone: false,
       read_loading: false,
       registers: [
-        { value: 11, label: '普通门诊' },
+        { value: 21, label: '普通住院' },
         // {value: 12, label: '门诊挂号'},
         // {value: 13, label: '急诊'},
         { value: 14, label: '门诊慢性病' }
@@ -346,6 +346,8 @@ export default {
         'id_card_type': this.form.id_card_type,
         'admin_user_id': this.$store.getters.xt_user.user.id,
         'certificates':this.form.certificates,
+        'is_settle':"0",
+
       }
       axios.get('http://127.0.0.1:9532/zh/api/readcard', {
         params: params
@@ -359,13 +361,11 @@ export default {
               if (that.form.id_card_type == 1) {
                 that.form.id = patient.id
                 that.form.name = patient.name
-                that.form.gender = patient.gender
+                that.form.sex = patient.gender
                 that.form.age = patient.age
                 that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
                 that.form.phone = patient.phone
                 that.form.id_card_no = patient.id_card_no
-                that.form.medicalInsuranceCard = response.data.data.number
-
                 that.InsuplcAdmdvs = []
                 // console.log(parseNumber(response.data.data.info.output.insuinfo.psn_type))
                 // console.log(parseNumber(response.data.data.insutype))
@@ -380,21 +380,24 @@ export default {
                 that.form.social_type = parseInt(response.data.data.insutype)
 
               } else if (that.form.id_card_type == 2) {
+
+
                 that.form.id = patient.id
                 that.form.name = patient.name
-                that.form.gender = patient.gender
+                that.form.sex = patient.gender
                 that.form.age = patient.age
                 that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
                 that.form.phone = patient.phone
-                that.form.id_card = patient.id_card_no
+                that.form.id_card_no = patient.id_card_no
+
               } else {
                 that.form.id = patient.id
                 that.form.name = patient.name
-                that.form.gender = patient.gender
+                that.form.sex = patient.gender
                 that.form.age = patient.age
                 that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
                 that.form.phone = patient.phone
-                that.form.id_card = patient.id_card_no
+                that.form.id_card_no = patient.id_card_no
 
                 that.InsuplcAdmdvs = []
                 for (let i = 0; i < response.data.data.info.output.insuinfo.length; i++) {

src/xt_pages/hospitalStation/summary.vue

@@ -115,9 +115,9 @@
                       <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
 
                     </el-popover> -->
-          <el-button size="small" type="primary" @click="export_detail"
-            >报表下载</el-button
-          >
+          <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
+
+          <el-button size="small" type="primary" @click="batch_print_settle" v-if="$store.getters.xt_user.org_id == 10215">批量打印结算单</el-button>
         </div>
       </div>
       <el-table
@@ -129,8 +129,16 @@
           backgroundColor: 'rgb(245, 247, 250)',
           color: '#606266',
         }"
+        @selection-change="handleSelectionChange"
         highlight-current-row
       >
+        <el-table-column
+          prop="date"
+          width="60"
+          align="center"
+          type="selection"
+        >
+        </el-table-column>
         <el-table-column
           prop="date"
           label="序号"
@@ -357,6 +365,19 @@
                 :visible.sync="settlementVisible">
             <settlement-print ref="print" :paramsObj='orderObj'></settlement-print>
         </el-dialog> -->
+
+
+    <el-dialog
+      class="centerDialog"
+      width="1200px"
+      title="打印"
+      :visible.sync="batchStatementVisible"
+    >
+      <hospital-batch-statement-print
+        ref="hospital_batch_print" :paramsObj="batchParams"
+      >
+      </hospital-batch-statement-print>
+    </el-dialog>
   </div>
 </template>
 
@@ -382,11 +403,15 @@ import axios from "axios";
 import invoicePrint from "./invoicePrint";
 import statementPrint from "./statementPrint";
 import ShouJuPrint from "./shouJuPrint";
+import BatchStatementPrint from '../outpatientCharges/batchStatementPrint.vue'
+import HospitalBatchStatementPrint from './hospitalBatchStatementPrint.vue'
 
 // import settlementPrint from './settlementPrint'
 
 export default {
   components: {
+    HospitalBatchStatementPrint,
+    BatchStatementPrint,
     ShouJuPrint,
     NewStatementPrintTwo,
     NewStatementPrint,
@@ -399,6 +424,9 @@ export default {
   },
   data() {
     return {
+      batchParams:{},
+      selecting_schs:[],
+      batchStatementVisible:false,
       loading1: true,
       orderObj: {},
       statementVisible: false,
@@ -478,6 +506,9 @@ export default {
   },
 
   methods: {
+    handleSelectionChange(val) {
+      this.selecting_schs = val
+    },
     confirmUploadInfo(row){
       var that = this;
       axios
@@ -975,8 +1006,24 @@ export default {
     },
     settlementPrint() {
       this.settlementVisible = true;
-    },
-    export_detail() {
+    },batch_print_settle(){
+      if (this.selecting_schs.length === 0) {
+        this.$message.error('请至少选择一条需要打印的内容')
+        return false
+      } else {
+        var sch_ids = []
+        for (let index = 0; index < this.selecting_schs.length; index++) {
+          sch_ids.push(this.selecting_schs[index].id)
+        }
+        this.batchStatementVisible = true;
+        let params = {
+          order_ids: sch_ids.join(","),
+          admin_user_id: this.$store.getters.xt_user.user.id,
+        };
+        this.batchParams = params
+
+      }
+    },   export_detail() {
       let params = {
         start_time: this.start_time,
         end_time: this.end_time,

src/xt_pages/management/components/UserForm.vue

@@ -788,7 +788,7 @@
             <div class="order_title">设备使用记录清单</div>
           </div>
           <div>
-            <div class="printClass">打印日期:{{ nowTime }}</div>
+            <div class="printClass" v-if="org_id!=10340">打印日期:{{ nowTime }}</div>
             <table
               border="1"
               style="width:100%"
@@ -854,18 +854,22 @@
                 <td
                   :rowspan="2"
                   style="text-align:center;min-width:40px;font-size:15px"
+                  v-if="org_id!=0&&org_id!=10060&& org_id!=10340"
                 >
                  透析机消毒液(更换)
+                 
                 </td>
                 <td
                   :rowspan="2"
                   style="text-align:center;width:80px;font-size:15px"
+                  v-if="org_id!=0&&org_id!=10060&& org_id!=10340"
                 >
                  细菌过滤器(更换)
                 </td>
                 <td
                   :rowspan="2"
                   style="text-align:center;width:80px;font-size:15px"
+                  v-if="org_id!=0&&org_id!=10060&& org_id!=10340"
                 >
                  空气滤网
                 </td>
@@ -961,13 +965,16 @@
                 <td style="text-align:center;font-size:15px;height:30px">
                   {{ item.disinfection_residue }}
                 </td>
-                <td style="text-align:center;font-size:15px;height:30px">
+                <td style="text-align:center;font-size:15px;height:30px"
+                v-if="org_id!=0&&org_id!=10060 && org_id!=10340">
                    {{item.dialysis_checked }}
                 </td>
-                <td style="text-align:center;font-size:15px;height:30px">
+                <td style="text-align:center;font-size:15px;height:30px"
+                v-if="org_id!=0&&org_id!=10060&& org_id!=10340">
                   {{item.germ_checked }}
                 </td>
-                <td style="text-align:center;font-size:15px;height:30px">
+                <td style="text-align:center;font-size:15px;height:30px"
+                v-if="org_id!=0&&org_id!=10060&& org_id!=10340">
                   {{item.clean}}
                 </td>
 
@@ -1190,7 +1197,8 @@ export default {
       bed: "",
       bedNumberTwo: [],
       four: true,
-      showone: false
+      showone: false,
+      org_id:0,
     };
   },
   methods: {
@@ -2590,6 +2598,7 @@ export default {
     this.getAllSubregion();
     // this.getInformationData();
     this.getAllOrganization();
+    this.org_id = this.$store.getters.xt_user.template_info.org_id;
   },
   watch: {
     userdata(newvalue, oldvalue) {

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -214,6 +214,7 @@
     data() {
 
       return {
+        ws:null,
         registers: [
           { value: 11, label: '普通门诊' },
           { value: 1102, label: '新冠门诊' },
@@ -632,55 +633,238 @@
           'admin_user_id': this.$store.getters.xt_user.user.id,
           'certificates':this.form.certificates,
         }
-        axios.defaults.retry = 0
-        axios.get('http://127.0.0.1:9532/api/readcard', {
-          params: params
-        })
-          .then(function(response) {
-            if (response.data.state == 0) {
-              that.$message.error(response.data.msg)
-              return false
-            } else {
-              var patient = response.data.data.patient
-
-              if (that.form.id_card_type == 1) {
-                that.form.id = patient.id
-                that.form.name = patient.name
-                that.form.gender = patient.gender
-                that.form.age = patient.age
-                that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
-                that.form.phone = patient.phone
-                that.form.id_card = patient.id_card_no
-                that.form.medical_insurance_card = response.data.data.number
-                that.form.social_type = parseInt(response.data.data.insutype)
-
-
-              } else if (that.form.id_card_type == 2) {
-                that.form.id = patient.id
-                that.form.name = patient.name
-                that.form.gender = patient.gender
-                that.form.age = patient.age
-                that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
-                that.form.phone = patient.phone
-                that.form.id_card = patient.id_card_no
-              } else {
-                that.form.id = patient.id
-                that.form.name = patient.name
-                that.form.gender = patient.gender
-                that.form.age = patient.age
-                that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
-                that.form.phone = patient.phone
-                that.form.id_card = patient.id_card_no
-                that.form.social_type = parseInt(response.data.data.insutype)
 
-              }
-              that.$message({ message: '读卡成功', type: 'success' })
+        if ((this.$store.getters.xt_user.org_id == 10387 && this.form.id_card_type ==  4) || (this.$store.getters.xt_user.org_id == 4 && this.form.id_card_type ==  4) || (this.$store.getters.xt_user.org_id == 10318 && this.form.id_card_type ==  4) ){
+          try {
+            //检测当前浏览器是否支持websocket模式
+            window.WebSocket = window.WebSocket || window.MozWebSocket;
+            if (!window.WebSocket){
+              alert("WebSocket not supported by this browser");
+              return;
             }
-          })
-          .catch(function(error) {
+            this.ws = new WebSocket("ws://127.0.0.1:8899");//连接服务器
+            var that = this
+            this.ws.onopen = function(event){
+              if (that.$store.getters.xt_user.org_id == 10387){
+                that.ws.send("{\"url\":\"http://10.93.33.243:20001/localcfc/api/hsecfc/localQrCodeQuery\",\"indata\":{\"data\":{\"businessType\":\"01101\",\"deviceType\":\"\",\"officeId\":\"32760\",\"officeName\":\"肾内科\",\"operatorId\":\"admin\",\"operatorName\":\"罗佳菊\",\"orgId\":\"H43082200408\"},\"orgId\":\"H43082200408\",\"transType\":\"ec.query\"}}");
+              }else if(that.$store.getters.xt_user.org_id == 10318){
+                that.ws.send("{\"url\":\"http://igb.hsa.gdgov.cn/prd_nation_eccode/prd_eccode/localcfc/api/hsecfc/localQrCodeQuery\",\"indata\":{\"data\":{\"businessType\":\"01101\",\"deviceType\":\"\",\"officeId\":\"32760\",\"officeName\":\"肾内科\",\"operatorId\":\"admin\",\"operatorName\":\"邹刘阳\",\"orgId\":\"H44011701749\"},\"orgId\":\"H44011701749\",\"transType\":\"ec.query\"}}");
+              }else if(that.$store.getters.xt_user.org_id == 4){
+                that.ws.send("{\"url\":\"http://igb.hsa.gdgov.cn/prd_nation_eccode/prd_eccode/localcfc/api/hsecfc/localQrCodeQuery\",\"indata\":{\"data\":{\"businessType\":\"01101\",\"deviceType\":\"\",\"officeId\":\"32760\",\"officeName\":\"肾内科\",\"operatorId\":\"admin\",\"operatorName\":\"邹刘阳\",\"orgId\":\"H44011701749\"},\"orgId\":\"H44011701749\",\"transType\":\"ec.query\"}}");
+              }
+            };
+
+            this.ws.onmessage = function(event){
+              // alert("接收到服务器发送的数据：\r\n"+event.data);
+              var newParams =  JSON.parse(event.data)
+              console.log(newParams)
+              console.log(newParams.data)
+              console.log(newParams.data)
+              console.log(newParams.data.ecToken)
+              console.log(newParams.data.idNo)
+              console.log(newParams.data.userName)
+              console.log(newParams.data.insuOrg)
+
+              newParams['ecToken'] = newParams.data.ecToken
+              newParams['idNo'] = newParams.data.idNo
+              newParams['userName'] = newParams.data.userName
+              newParams['insuOrg'] = newParams.data.insuOrg
+
+              newParams['id_card_type'] =  that.form.id_card_type
+              newParams['admin_user_id'] = that.$store.getters.xt_user.user.id
+              newParams['certificates'] = that.form.certificates
+              axios.get('http://127.0.0.1:9532/api/readcard', {
+                params: newParams
+              })
+                .then(function(response) {
+                  if (response.data.state == 0) {
+                    that.$message.error(response.data.msg)
+                    return false
+                  } else {
+                    var patient = response.data.data.patient
+
+                    if (that.form.id_card_type == 1) {
+                      that.form.id = patient.id
+                      that.form.name = patient.name
+                      that.form.gender = patient.gender
+                      that.form.age = patient.age
+                      that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
+                      that.form.phone = patient.phone
+                      that.form.id_card = patient.id_card_no
+                      that.form.medical_insurance_card = response.data.data.number
+                      that.form.social_type = parseInt(response.data.data.insutype)
+
+
+                    } else if (that.form.id_card_type == 2) {
+                      that.form.id = patient.id
+                      that.form.name = patient.name
+                      that.form.gender = patient.gender
+                      that.form.age = patient.age
+                      that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
+                      that.form.phone = patient.phone
+                      that.form.id_card = patient.id_card_no
+                    } else {
+                      that.form.id = patient.id
+                      that.form.name = patient.name
+                      that.form.gender = patient.gender
+                      that.form.age = patient.age
+                      that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
+                      that.form.phone = patient.phone
+                      that.form.id_card = patient.id_card_no
+                      that.form.social_type = parseInt(response.data.data.insutype)
+
+                    }
+                    that.$message({ message: '读卡成功', type: 'success' })
+                  }
+                })
+                .catch(function(error) {
+
+                })
+
+
+            };
+            this.ws.onclose = function(event){
+              // alert("已经与服务器断开连接\r\n当前连接状态："+this.readyState);
+            };
+            this.ws.onerror = function(event){
+              // if (this.flag!=1)
+              // alert("WebSocket接收异常！");
+            };
+          } catch (ex) {
+            alert(ex.message);
+          }
 
+        }else{
+          axios.get('http://127.0.0.1:9532/api/readcard', {
+            params: params
           })
+            .then(function(response) {
+              if (response.data.state == 0) {
+                that.$message.error(response.data.msg)
+                return false
+              } else {
+                var patient = response.data.data.patient
+
+                if (that.form.id_card_type == 1) {
+                  that.form.id = patient.id
+                  that.form.name = patient.name
+                  that.form.gender = patient.gender
+                  that.form.age = patient.age
+                  that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
+                  that.form.phone = patient.phone
+                  that.form.id_card = patient.id_card_no
+                  that.form.medical_insurance_card = response.data.data.number
+                  that.form.social_type = parseInt(response.data.data.insutype)
+
+
+                } else if (that.form.id_card_type == 2) {
+                  that.form.id = patient.id
+                  that.form.name = patient.name
+                  that.form.gender = patient.gender
+                  that.form.age = patient.age
+                  that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
+                  that.form.phone = patient.phone
+                  that.form.id_card = patient.id_card_no
+                } else {
+                  that.form.id = patient.id
+                  that.form.name = patient.name
+                  that.form.gender = patient.gender
+                  that.form.age = patient.age
+                  that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
+                  that.form.phone = patient.phone
+                  that.form.id_card = patient.id_card_no
+                  that.form.social_type = parseInt(response.data.data.insutype)
+
+                }
+                that.$message({ message: '读卡成功', type: 'success' })
+              }
+            })
+            .catch(function(error) {
+
+            })
+        }
       },
+      // reading() {
+      //   var that = this
+      //   if (this.form.id_card_type.length == 0 || this.form.id_card_type == 0) {
+      //     this.$message.error('请先选择读卡类型')
+      //     return
+      //   }
+      //   let params = {
+      //     'id_card_type': this.form.id_card_type,
+      //     'admin_user_id': this.$store.getters.xt_user.user.id,
+      //     'certificates':this.form.certificates,
+      //   }
+      //   axios.defaults.retry = 0
+      //
+      //   if(this.$store.getters.xt_user.org_id == 10387){
+      //
+      //     // 创建WebSocket实例并指定服务器地址
+      //     this.socket = new WebSocket("ws://localhost:8899");
+      //
+      //     // 监听WebSocket事件
+      //     this.socket.onopen = () => {
+      //       console.log("WebSocket连接已建立");
+      //     };
+      //
+      //     this.socket.onmessage = (event) => {
+      //       console.log("收到消息:", event.data);
+      //     };
+      //
+      //     this.socket.onclose = () => {
+      //       console.log("WebSocket连接已关闭");
+      //     };
+      //   }
+      //
+      //
+      //   axios.get('http://127.0.0.1:9532/api/readcard', {
+      //     params: params
+      //   })
+      //     .then(function(response) {
+      //       if (response.data.state == 0) {
+      //         that.$message.error(response.data.msg)
+      //         return false
+      //       } else {
+      //         var patient = response.data.data.patient
+      //
+      //         if (that.form.id_card_type == 1) {
+      //           that.form.id = patient.id
+      //           that.form.name = patient.name
+      //           that.form.gender = patient.gender
+      //           that.form.age = patient.age
+      //           that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
+      //           that.form.phone = patient.phone
+      //           that.form.id_card = patient.id_card_no
+      //           that.form.medical_insurance_card = response.data.data.number
+      //           that.form.social_type = parseInt(response.data.data.insutype)
+      //
+      //
+      //         } else if (that.form.id_card_type == 2) {
+      //           that.form.id = patient.id
+      //           that.form.name = patient.name
+      //           that.form.gender = patient.gender
+      //           that.form.age = patient.age
+      //           that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
+      //           that.form.phone = patient.phone
+      //           that.form.id_card = patient.id_card_no
+      //         } else {
+      //           that.form.id = patient.id
+      //           that.form.name = patient.name
+      //           that.form.gender = patient.gender
+      //           that.form.age = patient.age
+      //           that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
+      //           that.form.phone = patient.phone
+      //           that.form.id_card = patient.id_card_no
+      //           that.form.social_type = parseInt(response.data.data.insutype)
+      //
+      //         }
+      //         that.$message({ message: '读卡成功', type: 'success' })
+      //       }
+      //     })
+      //     .catch(function(error) {
+      //
+      //     })
+      // },
       getDictionaryDataConfig(module, filed_name) {
         return getDictionaryDataConfig(module, filed_name)
       },

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -455,6 +455,14 @@
 
                             <div>
 
+                              <el-button
+                                v-if="(hisPatientInfo.id_card_type == 4 && hisPatientInfo.balance_accounts_type != 2 && hisPatientInfo.id > 0  && org_id != 10340)"
+                                size="small"
+                                @click="open(50,items.med_type,items.curMonthPrescriptions.order,items.month_prescriptions)"
+                                type="primary"
+                              >读电子凭证
+                              </el-button>
+
                               <el-button
                                   v-if="(hisPatientInfo.balance_accounts_type != 2 && hisPatientInfo.id > 0 &&  items.curMonthPrescriptions.order.id == 0)"
                                   size="small"
@@ -1018,6 +1026,7 @@ export default {
   },
   data() {
     return {
+      ws:null,
       fapiaoCodeDialogVisible:false,
       fapiao_code:"",
       monthChargePatientTableData: [],
@@ -1086,6 +1095,8 @@ export default {
         { value: '9933', label: '门诊特殊病(9933)' },
         { value: '990602', label: '门诊特殊病(990602)' },
         { value: '1402', label: '门诊特殊病(1402)' },
+        { value: '1401', label: '门诊慢性病(1401)' },
+
         { value: '1111', label: '精一' },
         { value: '1112', label: '精二' },
         { value: '0', label: '自费' }
@@ -1099,6 +1110,8 @@ export default {
         { value: '9933', label: '门诊特殊病(9933)' },
         { value: '990602', label: '门诊特殊病(990602)' },
         { value: '1402', label: '门诊特殊病(1402)' },
+        { value: '1401', label: '门诊慢性病(1401)' },
+
         { value: '0', label: '自费' }
 
       ],
@@ -3359,7 +3372,7 @@ export default {
           })
         }
       } else if (index == 6) {
-        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10088 || this.$store.getters.xt_user.org_id == 10278) {
+        if (this.$store.getters.xt_user.org_id == 0 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10088 || this.$store.getters.xt_user.org_id == 10278) {
           this.$refs.register9504.show()
         } else {
           this.$refs.register.show(this.doctors, this.department)
@@ -3645,9 +3658,80 @@ export default {
           "admin_user_id":this.$store.getters.xt_user.user.id,
           'his_patient_id': this.hisPatientInfo.id,
         }
-        axios.get('http://127.0.0.1:9532/api/readele', {
-          params: params
-        })
+        if ((this.$store.getters.xt_user.org_id == 10387) || (this.$store.getters.xt_user.org_id == 10318)){
+          try {
+            //检测当前浏览器是否支持websocket模式
+            window.WebSocket = window.WebSocket || window.MozWebSocket;
+            if (!window.WebSocket){
+              alert("WebSocket not supported by this browser");
+              return;
+            }
+            this.ws = new WebSocket("ws://127.0.0.1:8899");//连接服务器
+            var that = this
+            this.ws.onopen = function(event){
+              if (that.$store.getters.xt_user.org_id == 10387){
+                that.ws.send("{\"url\":\"http://10.93.33.243:20001/localcfc/api/hsecfc/localQrCodeQuery\",\"indata\":{\"data\":{\"businessType\":\"01301\",\"deviceType\":\"\",\"officeId\":\"32760\",\"officeName\":\"肾内科\",\"operatorId\":\"admin\",\"operatorName\":\"罗佳菊\",\"orgId\":\"H43082200408\"},\"orgId\":\"H43082200408\",\"transType\":\"ec.query\"}}");
+              }else if(that.$store.getters.xt_user.org_id == 10318){
+                that.ws.send("{\"url\":\"http://igb.hsa.gdgov.cn/prd_nation_eccode/prd_eccode/localcfc/api/hsecfc/localQrCodeQuery\",\"indata\":{\"data\":{\"businessType\":\"01301\",\"deviceType\":\"\",\"officeId\":\"32760\",\"officeName\":\"肾内科\",\"operatorId\":\"admin\",\"operatorName\":\"邹刘阳\",\"orgId\":\"H44011701749\"},\"orgId\":\"H44011701749\",\"transType\":\"ec.query\"}}");
+              }else if(that.$store.getters.xt_user.org_id == 4){
+                that.ws.send("{\"url\":\"http://igb.hsa.gdgov.cn/prd_nation_eccode/prd_eccode/localcfc/api/hsecfc/localQrCodeQuery\",\"indata\":{\"data\":{\"businessType\":\"01301\",\"deviceType\":\"\",\"officeId\":\"32760\",\"officeName\":\"肾内科\",\"operatorId\":\"admin\",\"operatorName\":\"邹刘阳\",\"orgId\":\"H44011701749\"},\"orgId\":\"H44011701749\",\"transType\":\"ec.query\"}}");
+              }
+            };
+
+            this.ws.onmessage = function(event){
+              // alert("接收到服务器发送的数据：\r\n"+event.data);
+              var newParams =  JSON.parse(event.data)
+              newParams['ecToken'] = newParams.data.ecToken
+              newParams['idNo'] = newParams.data.idNo
+              newParams['userName'] = newParams.data.userName
+              newParams['insuOrg'] = newParams.data.insuOrg
+              newParams['id_card_type'] =  that.form.id_card_type
+              newParams['admin_user_id'] = that.$store.getters.xt_user.user.id
+              newParams['certificates'] = that.form.certificates
+              axios.get('http://127.0.0.1:9532/api/readele', {
+                params: newParams
+              })
+                .then(function(response) {
+                  if (response.data.state == 0) {
+                    that.$message.error(response.data.msg)
+                    return false
+                  } else {
+                    if (response.data.data.failed_code == -10) {
+                      // that.$message.error(response.data.data.msg)
+                      that.$confirm(response.data.data.msg, '医保错误信息', {
+                        confirmButtonText: '确 定',
+                        type: 'warning'
+                      }).then(() => {
+
+                      }).catch(() => {
+                      })
+                    }else{
+                      that.$message({ message: response.data.data.msg, type: 'success', duration: 5000 })
+                    }
+                  }
+                })
+                .catch(function(error) {
+
+                })
+
+
+            };
+            this.ws.onclose = function(event){
+              alert("已经与服务器断开连接\r\n当前连接状态："+this.readyState);
+            };
+            this.ws.onerror = function(event){
+              if (this.flag!=1)
+                alert("WebSocket接收异常！");
+            };
+          } catch (ex) {
+            alert(ex.message);
+          }
+
+        }else{
+
+          axios.get('http://127.0.0.1:9532/api/readele', {
+            params: params
+          })
             .then(function(response) {
               if (response.data.state == 0) {
                 that.$message.error(response.data.msg)
@@ -3669,6 +3753,7 @@ export default {
             })
             .catch(function(error) {
             })
+        }
       }
     },
      getName(admin_user_id) {
@@ -4661,6 +4746,9 @@ export default {
         case 1402:
           return '门诊特殊病(1402)' + '处方' + index
           break
+        case 1401:
+          return '门诊慢性病(1401)' + '处方' + index
+          break
         case 9922:
           return '家庭通道' + '处方' + index
           break

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -23,7 +23,7 @@
           org_id == 10138 ||
           org_id == 9504 ||
           org_id == 10028 ||
-          org_id == 4 ||
+          org_id == 0 ||
           org_id == 10278
         "
       >
@@ -32,7 +32,7 @@
           :info="info"
           :paramsObj="paramsObj"
           :balanceAccounts="balanceAccounts"
-          v-if="org_id == 10138 || org_id == 4 || org_id == 10278"
+          v-if="org_id == 10138 || org_id == 0 || org_id == 10278  "
         ></printThree>
         <printFour
           v-if="org_id == 9504 || org_id == 10028 || org_id == 10088"
@@ -64,7 +64,7 @@
             org_id != 10138 &&
             org_id != 9504 &&
             org_id != 10028 &&
-            org_id != 4 &&
+            org_id != 0 &&
             org_id != 10278 && org_id != 10387 && org_id != 0 && org_id != 10191 &&org_id != 10210"></printOne>
 
     </div>
@@ -406,7 +406,7 @@
             };
             if (
               this.org_id == 10138 ||
-              this.$store.getters.xt_user.org_id == 4 ||
+              this.$store.getters.xt_user.org_id == 0 ||
               this.org_id == 10278
             ) {
               getPrivateExpenses(params).then((response) => {

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -660,14 +660,14 @@ export default {
       if (this.org_id == 10138 || this.org_id == 10278 ) {
         const style =
             '@media print {#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 88%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 87%;}}}'
-            
+
           printJS({
           printable: 'printMain',
           type: 'html',
           style: style,
           scanStyles: false
         })
-      } 
+      }
       else {
         const style =
             '@media print {#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 88%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.doctorBoxtwo{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}.NoCell{display: flex;justify-content: space-between;margin-bottom: 10px;}.underLine{display: inline-block;border-bottom: 1px solid #000;text-align: center;line-height: 24px;}.basicCell{display: flex;} .basicCell span{line-height: 24px;margin-bottom: 10px;}}'
@@ -1441,7 +1441,7 @@ export default {
           }else{
             this.diagnoses = []
           }
-         
+
           this.additions = response.data.data.additions
 
         }
@@ -3224,8 +3224,6 @@ export default {
                       groupno: prescription.advices[b].groupno,
                       hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
                       execution_state: prescription.advices[b].execution_state
-
-
                     }
                     tempAdvice.push(obj)
                   }

src/xt_pages/outpatientDoctorStation/recordTemplate/printFour.vue

@@ -216,7 +216,7 @@
     
         },
         created(){
-            this.educationOptions = getDataConfig("patient", "education_types");
+            this.educationOptions = getDataConfig("patient", "profession_options");
             this.getAllDoctorList()
             this.getPatientCaseHistory()
     

src/xt_pages/stock/detail/print.vue

@@ -51,13 +51,13 @@
               <td style="line-height: 50px">
                 <span v-if="type == 1"> {{ item.warehousing_count }}</span>
                 <span v-if="type == 2">
-                  <span  v-if="org_id == 3907 || org_id == 9919 || org_id == 9583 || org_id == 0">
+                  <span  v-if="org_id == 3907 || org_id == 9919 || org_id == 9583 || org_id == 0 || org_id == 10402">
                     <!-- {{getStockCount(item.good_id) }} -->
                     {{getMySelfCount(item.good_id) }}
                   </span>
                    <span  v-if="org_id == 10265 || org_id == 10215">{{getMySelfCount(item.good_id) }}</span>
                    <span v-if="org_id == 10210 || org_id == 9671 || org_id == 9675 || org_id == 9679 || org_id == 10188 || org_id == 10217 || org_id == 9956 || org_id == 10191">{{getWarehouseOut(item.good_id)}}</span>
-                  <span v-if="org_id!=3907&&org_id!=10265 &&org_id!=9919&&org_id!=10285&&org_id!=9583&&org_id!=10215&&org_id!=10210&&org_id!=9671 &&org_id!=9679 &&org_id!=9675 && org_id!=10188&& org_id!=10217&& org_id!=9956&& org_id!=10191 && org_id!=0">{{getStockCount(item.good_id) }}</span>
+                  <span v-if="org_id!=3907&&org_id!=10265 &&org_id!=9919&&org_id!=10285&&org_id!=9583&&org_id!=10215&&org_id!=10210&&org_id!=9671 &&org_id!=9679 &&org_id!=9675 && org_id!=10188&& org_id!=10217&& org_id!=9956&& org_id!=10191 && org_id!=0 && org_id!=10402">{{getStockCount(item.good_id) }}</span>
                 </span>
 
                 <span v-if="type == 4"> {{ item.count }}</span>
@@ -78,14 +78,14 @@
               <td style="line-height:50px">
                 <span v-if="type == 1">{{(item.warehousing_count * item.price).toFixed(2)}}</span>
                 <span v-if="type == 2">
-                  <span v-if="org_id == 3907 || org_id ==9919 || org_id == 0">
+                  <span v-if="org_id == 3907 || org_id ==9919 || org_id == 0 || org_id ==10402">
                     <!-- {{(getStockCount(item.good_id) * item.buy_price).toFixed(2)}} -->
                      {{(getMySelfCount(item.good_id) * item.buy_price).toFixed(2)}}
                      
                   </span>
                   <span v-if="org_id == 10265 || org_id == 10215  ">{{(getMySelfCount(item.good_id)*item.packing_price).toFixed(2)}}</span>
                    <span v-if="org_id == 10210 || org_id == 9671 || org_id == 9675 || org_id == 9679 || org_id == 10188 || org_id == 10217 || org_id == 9956 || org_id == 10191">{{(getWarehouseOut(item.good_id)*item.packing_price).toFixed(2)}}</span>
-                  <span v-if="org_id!=3907&&org_id!=10265&&org_id!=9919&&org_id!=10215&&org_id!=9671 && org_id!=9675 && org_id!=9679 && org_id!=10188 && org_id!=10217 && org_id!= 9956 && org_id!=10191">{{(getStockCount(item.good_id) * item.packing_price).toFixed(2)}}</span>
+                  <span v-if="org_id!=3907&&org_id!=10265&&org_id!=9919&&org_id!=10215&&org_id!=9671 && org_id!=9675 && org_id!=9679 && org_id!=10188 && org_id!=10217 && org_id!= 9956 && org_id!=10191 && org_id!=10402&& org_id!=0">{{(getStockCount(item.good_id) * item.packing_price).toFixed(2)}}</span>
                 </span>
                 <span v-if="type == 4">{{(item.count * item.price).toFixed(2)}}</span>
               </td>
@@ -106,9 +106,9 @@
               <td style="line-height: 50px"  width="80">
                 <span v-if="type == 1">{{getWareInfoTotal().toFixed(2)}}</span>
                 <span v-if="type == 2">
-                  <span v-if="org_id == 3907 || org_id == 9919">{{getWareOutTotalOne().toFixed(2)}}</span>
+                  <span v-if="org_id == 3907 || org_id == 9919 || org_id == 10402">{{getWareOutTotalOne().toFixed(2)}}</span>
                   <span v-if="org_id == 10265 || org_id == 10215">{{getWareOutTotalSix().toFixed(2)}}</span>
-                  <span v-if="org_id!=3907 && org_id!=9919 && org_id!=10265 && org_id!=10215"> {{getWareOutTotal().toFixed(2)}}</span>
+                  <span v-if="org_id!=3907 && org_id!=9919 && org_id!=10265 && org_id!=10215 && org_id!=10402"> {{getWareOutTotal().toFixed(2)}}</span>
                  </span>
                 <span v-if="type == 4">{{getWareOutTotal().toFixed(2)}}</span>
               </td>

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -809,7 +809,7 @@ export default {
         this.tableOut[i].specification_name = this.tableOut[i].specification_name
         this.tableOut[i].packing_unit = this.tableOut[i].packing_unit
         this.tableOut[i].ctime = this.getTime(this.tableOut[i].ctime)
-        if(this.orgId == 9919){
+        if(this.orgId == 9919 || this.orgId == 10402 || this.orgId == 0){
           this.tableOut[i].total_price = (this.tableOut[i].count * this.tableOut[i].buy_price).toFixed(2)
           this.tableOut[i].packing_price = this.tableOut[i].buy_price
         }else if(this.orgId == 10265){
@@ -834,7 +834,7 @@ export default {
           this.tableOut[i].total_price = (this.getStockCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }
 
-        if(this.orgId  == 10265 || this.orgId ==10215 || this.orgId == 9919 || this.orgId == 9671 || this.orgId == 0){
+        if(this.orgId  == 10265 || this.orgId ==10215 || this.orgId == 9919 || this.orgId == 9671 || this.orgId == 0 || this.orgId == 10402){
 
          this.tableOut[i].out_count = this.getMySelfCount(this.tableOut[i].good_id)
         }
@@ -842,7 +842,7 @@ export default {
           this.tableOut[i].out_count = this.getWarehouseOut(this.tableOut[i].good_id)
           console.log("out_count232233232332",this.tableOut[i].out_count)
         }
-        if(this.orgId!=10265 && this.orgId !=10215  && this.orgId != 9671 &&this.orgId!=10210&&this.orgId!=9675 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191 && this.orgId!=9919 && this.orgId!=0){
+        if(this.orgId!=10265 && this.orgId !=10215  && this.orgId != 9671 &&this.orgId!=10210&&this.orgId!=9675 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191 && this.orgId!=9919 && this.orgId!=0&& this.orgId!=10402){
           this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
         }
        }

src/xt_pages/stock/inventoryTransfer/Addtrans.vue

@@ -59,6 +59,7 @@
               v-model="storehouse_in_id"
               filterable
               placeholder="请选择调入仓库"
+              @change="changeHouseInfoList"
             >
               <el-option
                 v-for="(option, index) in houseList"
@@ -156,6 +157,7 @@
                 <el-input
                   v-model="scope.row.count"
                   style="width: 100px"
+                  oninput="value=value.replace(/\D|^0/g,'')"
                   @input="
                     selectCount(
                       scope.row.project_id,
@@ -315,7 +317,7 @@ export default {
       var array = [];
       array.push(this.id);
       var ids = array.join(",");
-
+      
       checkSecondOrder(ids).then((response) => {
         if (response.data.state == 1) {
           var msg = response.data.data.msg;
@@ -459,7 +461,10 @@ export default {
       this.$refs["tableForm"].validate((valid) => {
         if (valid) {
           const array = this.recordInfo.recordData;
-
+          if(array!=null && array.length ==0 ){
+             this.$message.error("请新增药品或者耗材")
+             return false
+          }
           for (let i = 0; i < array.length; i++) {
             array[i].count = parseInt(array[i].count);
             array[i].second_total = array[i].second_total.toString();
@@ -562,10 +567,38 @@ export default {
       }
       return total_count;
     },
+    changeHouseInfoList(){
+      if(this.storehouse_in_id == this.storehouse_out_id){
+         this.$message.error("调出仓库和调入仓库不能是同一个仓库!")
+         this.storehouse_in_id = ""
+         return false
+      }
+    },
     changeHouseList() {
+      const tempObj = {};
+      tempObj["id"] = 0;
+      tempObj["name"] = "";
+      tempObj["project_name"] = "";
+      tempObj["project_type"] = "";
+      tempObj["second_specification_name"] = "";
+      tempObj["sencond_unit"] = "";
+      tempObj["count"] = "";
+      tempObj["second_total"] = "";
+      tempObj["is_source"] = 0;
+      tempObj["remake"] = "";
+      tempObj["project_id"] = 0;
+      tempObj["min_price"] = 0;
+      this.recordInfo.recordData = []
+      this.recordInfo.recordData.push(tempObj);
+      if(this.storehouse_in_id == this.storehouse_out_id){
+         this.$message.error("调出仓库和调入仓库不能是同一个仓库!")
+         this.storehouse_out_id = ""
+         return false
+      }
       var params = {
         storehouse_out_id: this.storehouse_out_id,
       };
+
       this.tabList = [];
       getStoreHouseGoodList(params).then((response) => {
         var drugList = response.data.data.drugList;

src/xt_pages/stock/inventoryTransfer/transEdit.vue

@@ -63,6 +63,7 @@
               filterable
               placeholder="请选择调入仓库"
               :disabled="store_disabled"
+              @change="changeHouseInfoList"
             >
               <el-option
                 v-for="(option, index) in houseList"
@@ -154,6 +155,7 @@
               <el-form-item
                 style="padding-top: 20px"
                 :prop="'recordData.' + scope.$index + '.count'"
+                oninput="value=value.replace(/\D|^0/g,'')"
                 :rules="tableRules.count"
               >
                 <el-input
@@ -747,6 +749,10 @@ export default {
           });
           this.loading = true;
           const array = this.recordInfo.recordData;
+          if(array!=null && array.length ==0){
+             this.$message.error("请新增药品或者耗材")
+             return false
+          }
           if (this.storehouse_in_id <= 0) {
             this.$message.error("调入仓库不能为空!");
             this.loading = false;
@@ -819,8 +825,33 @@ export default {
         }
       });
     },
+    changeHouseInfoList(){
+      if(this.storehouse_in_id == this.storehouse_out_id){
+         this.$message.error("调出仓库和调入仓库不能是同一个仓库!")
+         this.storehouse_in_id = ""
+         return false
+      }
+    },
 
     changeHouseList() {
+      const tempObj = {};
+      tempObj["id"] = 0;
+      tempObj["name"] = "";
+      tempObj["project_name"] = "";
+      tempObj["project_type"] = "";
+      tempObj["second_specification_name"] = "";
+      tempObj["sencond_unit"] = "";
+      tempObj["count"] = "";
+      tempObj["second_total"] = "";
+      tempObj["is_source"] = 0;
+      tempObj["remake"] = "";
+      tempObj["project_id"] = 0;
+      tempObj["min_price"] = 0;
+      if(this.storehouse_in_id == this.storehouse_out_id){
+         this.$message.error("调出仓库和调入仓库不能是同一个仓库!")
+         this.storehouse_out_id = ""
+         return false
+      }
       var params = {
         storehouse_out_id: this.storehouse_out_id,
       };

src/xt_pages/stock/stockOutOrder.vue

@@ -338,7 +338,7 @@
                <tr style="background: none" v-for="(item,index) in scope.row.childOne" :key="index">
                   <td style="border-right: none; border-inline-end: none;text-align: center">
                       <!-- {{(getAllStockCount(scope.row.child,item.warehousing_id) * getAllStockCountPrice(scope.row.child,item.warehousing_id)).toFixed(2)}} -->
-                       {{(getAllStockCount(scope.row.child,item.warehousing_id) - getCancelInfo(item.warehousing_id,item.good_id)) *  getAllStockCountPrice(scope.row.child,item.warehousing_id)}}
+                       {{((getAllStockCount(scope.row.child,item.warehousing_id) - getCancelInfo(item.warehousing_id,item.good_id)) *  getAllStockCountPrice(scope.row.child,item.warehousing_id)).toFixed(2)}}
                   </td>
                </tr>
             </template>

src/xt_pages/user/components/PatientDetail.vue

@@ -160,7 +160,7 @@
               </el-form-item>
             </el-col>
 
-            <el-col :span="8">
+            <el-col :span="8" v-if="org_id!=0 && org_id!=10138 && org_id!=10278">
               <el-form-item
                 label="首次肾脏治疗时间 : "
                 label-width="150px"
@@ -179,6 +179,21 @@
               </el-form-item>
             </el-col>
 
+            <el-col :span="6" :style="isEdit ? 'width:380px' : ''" v-if="org_id==0||org_id == 10138 || org_id == 10278">
+                <el-form-item
+                  label="首次进入本院时间:"
+                  prop="firstDialysisDate"
+                  label-width="150px"
+                >
+                  <el-date-picker
+                    v-model="form.firstDialysisDate"
+                    type="date"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                  ></el-date-picker>
+                </el-form-item>
+              </el-col>
+
             <el-col :span="8">
               <el-form-item label="本人电话: " class="is-required" prop="phone">
                 <el-input
@@ -206,8 +221,8 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-            
-        
+
+
             <el-col :span="6">
               <el-form-item
                 label="本院首次透析 : "
@@ -301,7 +316,7 @@
                 ></el-date-picker>
               </el-form-item>
             </el-col>
-   
+
             <el-col :span="8" style="height: 59px">
               <el-form-item
                 label="患者来源 : "
@@ -790,14 +805,14 @@
         </el-col> -->
       </el-row>
 
-      <el-col :span="24">
+      <!-- <el-col :span="24">
         <el-form-item>
           <el-button type="text" @click="treat_info_fold = !treat_info_fold"
             >{{ treat_info_fold ? "更多治疗信息" : "收起"
             }}<i class="el-icon--right" :class="treat_fold_icon"></i
           ></el-button>
         </el-form-item>
-      </el-col>
+      </el-col> -->
 
       <el-col :span="24">
         <el-form-item label="登记人员 : ">
@@ -807,7 +822,7 @@
 
        <el-col :span="6">
         <el-form-item label="医生 : ">
-       
+
            <el-select v-model="form.doctor"    disabled>
               <el-option
                 v-for="item in adminUserOptions"
@@ -930,7 +945,7 @@
                     <div class="td_proj_title">现<br />病<br />史</div>
                   </td>
                   <td colspan="7">
-                    <div 
+                    <div
                       class="td_proj_content td_align_left"
                       v-html="patientPrint.present_history"
                     ></div>
@@ -1034,7 +1049,7 @@
         </div>
       </div>
     </div>
-    
+
     <div hidden="hidden">
       <div id="print-card-info">
         <div
@@ -1272,7 +1287,7 @@ export default {
     this.org_id = this.$store.getters.xt_user.org.id;
     this.form.doctor = this.$store.getters.xt_user.user.id
     console.log("owowow",this.$store.getters.xt_user.user.id)
-  
+
     this.styleOptions = this.$store.getters.patient_types;
     // this.partitionOptions = this.$store.getters.partitions;
     this.maritalOptions = getDataConfig("patient", "marital_options");
@@ -1365,9 +1380,9 @@ export default {
             if(this.form.doctor == 0){
               this.form.doctor = ""
             }
-            if (patietInfo.is_infectious == 1) {
-              this.form.remind_cycle = 0;
-            }
+            // if (patietInfo.is_infectious == 1) {
+            //   this.form.remind_cycle = 0;
+            // }
             console.log("222222", this.form.remind_cycle);
             this.form.user_sys_before_count = patietInfo.user_sys_before_count;
 
@@ -1875,7 +1890,7 @@ export default {
         }
       }
     }
-  
+
     return url
    },
    getDcotorNameOne(admin_user_id){
@@ -1982,10 +1997,12 @@ export default {
       });
     },
     checkIdCardNo() {
-      if (!isCardNo(this.form.idCardNo)) {
-        this.$message.error("身份证号码信息有误!");
-        this.form.birth = "";
-        return false;
+      if(this.$store.getters.xt_user.org_id != 10278 && this.$store.getters.xt_user.org_id != 10138) {
+        if (!isCardNo(this.form.idCardNo)) {
+          this.$message.error("身份证号码信息有误!");
+          this.form.birth = "";
+          return false;
+        }
       }
       var thisLen = this.form.idCardNo.length;
       var birth = "";

src/xt_pages/user/components/PatientForm.vue

@@ -1823,9 +1823,9 @@ export default {
            
             this.form.is_infectious = patietInfo.is_infectious;
             console.log("哈哈哈哈",patietInfo.is_infectious)
-            if(this.form.is_infectious == 1){
-              this.form.remind_cycle = 0
-            }
+            // if(this.form.is_infectious == 1){
+            //   this.form.remind_cycle = 0
+            // }
             this.form.tell_phone = patietInfo.tell_phone;
             this.form.dialysis_age = patietInfo.dialysis_age;
             this.form.contact_name = patietInfo.contact_name;

src/xt_pages/user/ktv.vue

@@ -162,7 +162,7 @@
               <el-form-item
                 :label="item.item_name"
                 :key="item.item_id"
-                :rules="item.item_name != 'URR(%)'?[
+                :rules="item.item_name != 'URR(%)' || item.item_name != 'KT/V' ?[
                 { required: true, message: '请输入数值', trigger: 'blur' }
               ]:[]"
                 :prop="'formItem.' + index + '.value'"
@@ -172,6 +172,7 @@
                   v-model="item.value"
                   style="width:95%"
                   type="number"
+                  :disabled="item.item_name == 'URR(%)' || item.item_name == 'KT/V'"
                   @input='changeInput(item)'
                 >
                   <template slot="append" v-if="item.item_name == 'URR(%)'"><el-button style="background-color: #409eff; color: #000;" type="primary" @click="calURR(form.formItem,item.value)">点击计算URR</el-button></template>
@@ -783,7 +784,16 @@ export default {
       })
     },
     submitNew(formName) {
-
+      let valueSix = 0
+      for(let i = 0; i < items.length; i++){
+        if(items[i].item_name == "KT/V"){
+          valueSix = items[i].value
+        }
+      }
+      if(valueSix.length == 0){
+        this.$message.error("KT/V不能为空")
+        return
+      }
 
 
       this.$refs[formName].validate(valid => {

src/xt_pages/user/sickHistory.vue

@@ -393,7 +393,7 @@ export default {
         id:this.edit_current_id,
         patient_id: this.patient_id,
         content: this.edit_new_content,
-        record_time: this.edit_sick_history_time,
+        record_time: this.edit_sick_history_time + " 00:00:00",
         title: this.edit_title,
         is_shenyizhishi:this.edit_is_shenyizhishi,
         is_fumotouxishi:this.edit_is_fumotouxishi,

src/xt_pages/workforce/template.vue

@@ -112,7 +112,7 @@
       <!-- </el-col> -->
     </div>
     <div class="app-container">
-      
+
       <!-- <el-tabs v-model="activeName" tab-position="top" @tab-click="handleClick"> -->
 <!--        <el-tab-pane name="schedules">-->
 <!--          <span slot="label"> 排班信息 </span>-->
@@ -178,8 +178,8 @@
 
       <!-- </el-tabs> -->
       <template-table  v-loading="dataloading"  ref="table"  :is_editing="is_editing" :editable="true" :device_numbers="device_numbers" :template="template"
-                        :modes="modes"  :patients="patients" @cancel_sch="refresh" :data="data"  :template_mode="template_mode" 
-                         @cur_info="cur_info" @saveData="saveData" @event1="changeZone" @saveSuccessTwo="refresh" 
+                        :modes="modes"  :patients="patients" @cancel_sch="refresh" :data="data"  :template_mode="template_mode"
+                         @cur_info="cur_info" @saveData="saveData" @event1="changeZone" @saveSuccessTwo="refresh"
                          @setTemplate="setTemplate" @changeLoading="changeLoading">
             <div class="position">
               <div>
@@ -192,6 +192,18 @@
              <span v-if="schedule.mode ==1">(本周)</span>
              <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">(下一周)</span>
              <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">(本周)</span>
+
+             <span v-if="schedule.mode == 3 && schedule.execute_times%3 ==0">(下下周)</span>
+             <span v-if="schedule.mode == 3 && schedule.execute_times%3 ==1">(下周)</span>
+             <span v-if="schedule.mode == 3 && schedule.execute_times%3 ==2">(本周)</span>
+
+
+             <span v-if="schedule.mode == 4 && schedule.execute_times%4 ==0">(下下周)</span>
+             <span v-if="schedule.mode == 4 && schedule.execute_times%4 ==1">(下周)</span>
+             <span v-if="schedule.mode == 4 && schedule.execute_times%4 ==2">(本周)</span>
+             <span v-if="schedule.mode == 4 && schedule.execute_times%4 ==3">(上周)</span>
+
+
           </span>
 
         </el-tab-pane>
@@ -202,6 +214,17 @@
 
               <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">(本周)</span>
              <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">(下一周)</span>
+
+             <span v-if="schedule.mode == 3 && schedule.execute_times%3 ==0">(本周)</span>
+             <span v-if="schedule.mode == 3 && schedule.execute_times%3 ==1">(下周)</span>
+             <span v-if="schedule.mode == 3 && schedule.execute_times%3 ==2">(下下周)</span>
+
+
+              <span v-if="schedule.mode == 4 && schedule.execute_times%4 ==0">(下下周)</span>
+             <span v-if="schedule.mode == 4 && schedule.execute_times%4 ==1">(下周)</span>
+             <span v-if="schedule.mode == 4 && schedule.execute_times%4 ==2">(本周)</span>
+             <span v-if="schedule.mode == 4 && schedule.execute_times%4 ==3">(上周)</span>
+
           </span>
         </el-tab-pane>
 
@@ -485,19 +508,15 @@ export default {
         if(templates.length > 1){
           this.secondWeekData = templates[1].items
           this.second_template = templates[1]
-
         }
         if(templates.length > 2){
           this.thirdWeekData = templates[2].items
           this.third_template = templates[2]
-
         }
         if(templates.length > 3){
           this.fourWeekData = templates[3].items
           this.four_template = templates[3]
-
         }
-
         var patients = resp.data.patients
         this.template_mode = mode
         this.origin_mode = mode.mode
@@ -505,17 +524,12 @@ export default {
         this.patients = patients
         this.tar_template = this.first_template
         this.$refs.table.setEditData(this.patients,this.first_template,this.device_numbers,this.templates,  this.activeName)
-
         var fakeTemplateItems = []
-
         this.this_week_schedules.items = fakeTemplateItems
-
       } else {
         this.$message(resp.msg)
       }
     })
-
-
   },
   methods: {
     changeLoading(){
@@ -3472,7 +3486,7 @@ export default {
         this.schedulingTableVisible=false
         this.$message.success("保存成功")
         this.$router.back()
-        
+
       }
 
     },

src/xt_permission.js

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