10月26日

src/App.vue

@@ -36,7 +36,6 @@ export default {
   created() {}
 };
 </script>
-
 <style lang="scss" scoped>
 #app {
   height: 100%;

src/pages/advice/AdvicePage.vue

@@ -1,39 +1,6 @@
 .<template>
   <div>
     <van-row class="top_row" style="display:none">
-      <!-- <van-col :span="9">
-        <div style="visibility: hidden">
-          <span class="title"></span>
-        </div>
-      </van-col>
-      <van-col :span="14">
-        <div class="department">
-          <ul>
-            <li
-              v-for="(item,i) in ['透析临嘱','普通医嘱']"
-              :key="i"
-              :class="index == i? 'active':'' "
-              @click="ClickTab(i)"
-            >{{item}}</li>
-          </ul>
-        </div>
-      </van-col>
-
-      <van-col :span="4">
-        <router-link to="/add_urgent_schedule"></router-link>
-        <div class="search" style="visibility: hidden">
-          <van-field v-model="search_input" ref="search_field" placeholder="透析号/姓名" class="field">
-            <i class="iconfont" slot="left-icon">&#xe741;</i>
-            <van-button
-              slot="button"
-              size="small"
-              type="info"
-              style="border: none;"
-              @click="searchWithKeyword"
-            >搜索</van-button>
-          </van-field>
-        </div>
-      </van-col>-->
       <div class="newSearch1">
         <el-input
           prefix-icon="el-icon-search"

src/pages/advice/DialysiAdive.vue

@@ -100,7 +100,7 @@
            
             <th width="60px">医嘱内容</th>
           </tr>
-          <template v-for="(schedules, zone_name, index) in filtedScheduals">
+          <template v-for="(schedules, zone_name, index) in filtedScheduals" >
             <tr :key="index">
               <td>{{ zone_name }}</td>
               <td></td>

src/pages/advice/DialysisAdviceDialog.vue

@@ -28,13 +28,10 @@
                     <van-icon name="arrow-down" />
                 </div>
             </div>
-        
         </div>
-
       
         <div class="consumablesList">
           
-             
           <el-table
             :data="tableDataList"
             border
@@ -82,10 +79,8 @@
               </span>
             </template>
           </el-table-column>
-        </el-table>
-        
+        </el-table>     
         </div>
-
         <!-- 弹出层 -->
         <div>
             <van-popup
@@ -625,7 +620,6 @@ export default {
   created () {
     this.getAllZone()
   }
-
 }
 </script>
 

src/pages/advice/DialysisAdviceOne.vue

@@ -27,14 +27,10 @@
                     {{ area }}
                     <van-icon name="arrow-down" />
                 </div>
-            </div>
-        
+            </div> 
         </div>
-
       
-        <div class="consumablesList">
-          
-             
+        <div class="consumablesList">                   
           <el-table
             :data="tableDataList"
             border
@@ -95,10 +91,8 @@
               </span>
             </template>
           </el-table-column>
-        </el-table>
-        
+        </el-table>       
         </div>
-
         <!-- 弹出层 -->
         <div>
             <van-popup

src/pages/advice/NormalAdviceTable.vue

@@ -62,23 +62,13 @@
                 v-for="scheduleType in schedule_types"
                 :key="scheduleType.value"
                 @click="handletimeType(scheduleType.value)"
-                :class="
-                  schedule_type_selected == scheduleType.value ? 'tick' : ''
-                "
+                :class=" schedule_type_selected == scheduleType.value ? 'tick' : ''"
               >
                 {{ scheduleType.text }}
               </li>
             </ul>
           </div>
         </el-popover>
-        <!--<el-popover placement="bottom" trigger="click" v-model="show_advice_type_selector">-->
-        <!--<li slot="reference">{{advice_types[advice_type_selected].text}}<span class="iconfont">&#xe74a;</span></li>-->
-        <!--<div class="popover-demo-content">-->
-        <!--<ul>-->
-        <!--<li v-for="type in advice_types" :key="type.value" @click="handleAdviceType(type.value)" :class="advice_type_selected == type.value ? 'tick' : ''" >{{type.text}}</li>-->
-        <!--</ul>-->
-        <!--</div>-->
-        <!--</el-popover>-->
 
         <li @click="openPicker()">
           {{ selected_date_str }}
@@ -203,7 +193,6 @@
         />
       </div>
     </div>
-    <!--<div class="NoData" v-show="zones.length <= 1"><img src="@/assets/login/data.jpg" alt=""></div>-->
 
     <mt-datetime-picker
       v-model="selected_date"
@@ -230,7 +219,6 @@ export default {
     return {
       selected_date: new Date(),
       admin_user: [],
-
       show_sch_type_selector: false,
       schedule_type_selected: 0,
       schedule_types: [
@@ -239,12 +227,10 @@ export default {
         { value: 2, text: '下午' },
         { value: 3, text: '晚上' }
       ],
-
       show_zone_selector: false,
       zone_selected: 0,
       show_patient_type_selector: false,
       zones: [{ value: 0, text: '全部分区', select: true }],
-
       show_advice_type_selector: false,
       advice_type_selected: 0,
       advice_types: [
@@ -252,14 +238,12 @@ export default {
         { value: 1, text: '长期医嘱' },
         { value: 3, text: '临时医嘱' }
       ],
-
       patient_types: [
         { value: 0, text: '全部病人' },
         { value: 1, text: '我的病人' },
         { value: 2, text: '未执行病人' }
       ],
       patient_selected: 0,
-
       scheduleMap: {}
     }
   },

src/pages/allDoctorAdvice/indexs.vue

@@ -270,7 +270,7 @@ export default {
             }
           }
           this.childList = objarr
-          console.log('childList', this.childList)
+          // console.log('childList', this.childList)
           let dataInfo = {}
           doctorAdvicedetail.forEach((item, index) => {
             let { start_time } = item
@@ -285,36 +285,7 @@ export default {
           let list = Object.values(dataInfo) // list 转换成功的数据
           let arr = []
 
-          // list.map(item => {
-          //   let arr2 = [];
-          //   if (item.child.length > 1) {
-          //     item.child.map(it => {
-          //       if (arr.indexOf(it.advice_date) == -1) {
-          //         arr.push(it.advice_date);
-          //       } else {
-          //         delete it["advice_date"];
-          //       }
-          //     });
-          //     for (var i = item.child.length - 1; i != -1; i--) {
-          //       let obj = {};
-          //       obj.checker = item.child[i].checker;
-          //       obj.execution_staff = item.child[i].execution_staff;
-          //       obj.user_name = item.child[i].advice_doctor;
-          //       if (
-          //         JSON.stringify(arr2).includes(JSON.stringify(obj)) == false
-          //       ) {
-          //         arr2.push(obj);
-          //       } else {
-          //         console.log("删除");
-          //         delete item.child[i]["checker"];
-          //         delete item.child[i]["execution_staff"];
-          //         delete item.child[i]["advice_doctor"];
-          //       }
-          //     }
-          //   }
-          // });
-
-          console.log('list是 ', list)
+          // console.log('list是 ', list)
           this.doctorAdvicedetail = list
         }
       })
@@ -330,7 +301,7 @@ export default {
       getAllDoctor().then(response => {
         if (response.data.state === 1) {
           var doctor = response.data.data.doctor
-          console.log('doctor', doctor)
+          // console.log('doctor', doctor)
           this.doctor = doctor
         }
       })

src/pages/businessCenter/components/addCustomers.vue

@@ -410,7 +410,6 @@ export default {
   .active {
     background: rgba(51, 138, 251, 1);
     color: #fff;
-    // border: 1px solid #338afb;
   }
 
   }
@@ -424,12 +423,6 @@ export default {
     font-size: 0.875rem;
     border-radius: 30px;
   }
-  /*.toolBox {*/
-
-  /*/ / display: flex;*/
-  /*/ / height: 2.5 rem;*/
-  /*/ / align-items: center;*/
-
   .toolOne {
     width: 6.25rem;
     height: 1.875rem;
@@ -441,10 +434,8 @@ export default {
     display: flex;
     align-items: center;
     justify-content: space-around;
-    /*/ / margin-left: 0.8125 rem;*/
   }
 
-  /*}*/
   .chart {
     font-size: 1rem;
     font-weight: bold;

src/pages/businessCenter/components/project.vue

@@ -14,22 +14,6 @@
               </div>
             </div>
         </div>
-        <!-- <div class="quarterBox" v-if="type == '按季度统计对比'">
-            <p :class="Num == 1 ? 'active' : ''" @click="onClick(1)">第一季度</p>
-            <p :class="Num == 2 ? 'active' : ''" @click="onClick(2)">第二季度</p>
-            <p :class="Num == 3 ? 'active' : ''" @click="onClick(3)">第三季度</p>
-            <p :class="Num == 4 ? 'active' : ''" @click="onClick(4)">第四季度</p>
-        </div> -->
-        <!-- <div class="month" v-if="type == '按月份统计对比'">
-            <div class="monthBox" ref="nav">
-                <p
-                v-for="(item, index) in monthArr"
-                :key="index"
-                :class="month == index ? 'active' : ''"
-                @click="clickMonth(index)"
-                >{{ item }}</p>
-            </div>
-        </div> -->
 
         <div class="chart2">统计图</div>
         <bar-chart :options="options"></bar-chart>
@@ -1590,6 +1574,7 @@ export default {
 }
 </script>
 
+
 <style lang="scss" scoped>
 .page_project{
     .optionsBox {
@@ -1690,7 +1675,6 @@ export default {
     font-weight: bold;
     margin-left: 0.8125rem;
     color: #000;
-    // margin-top: 1.375rem;
   }
   .rangeBox {
     margin-left: 0.8125rem;
@@ -1730,5 +1714,4 @@ export default {
   height: 0 !important;
   width: 0;
 }
-
 </style>

src/pages/businessCenter/components/returnGoods.vue

@@ -32,7 +32,6 @@
           </template>
         </el-table-column>
         <!--style="color: #579ef8"-->
-
         <el-table-column label="数量" align="center" width="80">
           <template slot-scope="scope">
             <span
@@ -120,7 +119,6 @@
                 }
               }
 
-
             } else {
               this.$toast({
                 message: resp.msg
@@ -130,10 +128,7 @@
           .catch(error => {
 
           })
-
-
       },
-
       onClick(id) {
         if (id == 1) {
           this.Num = 1;
@@ -142,9 +137,7 @@
         } else if (id == 3) {
           this.Num = 3;
         }
-
         switch (this.Num) {
-
           case 1: //近1个月
             this.currentDate1 = new Date(new Date().setMonth(new Date().getMonth() + 1)),
               this.currentDate2 = new Date()
@@ -174,7 +167,6 @@
             this.GetStockInfo(this.query)
             break
         }
-
       },
       getstartTime(value) {
         this.Num = 0

src/pages/businessCenter/components/time1.vue

@@ -149,17 +149,11 @@ export default {
       currentDate: new Date(),
       startTime: '请选择',
       endTime: '请选择',
-      // minDate: new Date(1970, 0, 1),
-      // maxDate: new Date(2025, 10, 1),
       options: {
         title: {
           text: 'ECharts 入门示例'
         },
         tooltip: {},
-        // legend: {
-        //   data: ["达标率%"],
-        //   left: 0
-        // },
         xAxis: {
           data: [],
           axisLabel: {
@@ -208,7 +202,6 @@ export default {
             // 配置样式
             itemStyle: {
               // 通常情况下：
-
               // 每个柱子的颜色即为colorList数组里的每一项，如果柱子数目多于colorList的长度，则柱子颜色循环使用该数组
               normal: {
                 color: function (params) {
@@ -224,7 +217,6 @@ export default {
                     ['#D7C3FD', '#B3A8F7'],
                     ['#D7C3FD', '#B3A8F7']
                   ]
-
                   var index = params.dataIndex
                   if (params.dataIndex >= colorList.length) {
                     index = params.dataIndex % colorList.length

src/pages/businessCenter/components/warehouseOut.vue

@@ -35,7 +35,6 @@
 
             </template>
           </el-table-column>
-          <!--style="color: #579ef8"-->
 
           <el-table-column label="数量" align="center" width="80">
             <template slot-scope="scope">
@@ -46,13 +45,8 @@
           </el-table-column>
           <el-table-column label="总价" align="center" width="80">
             <template slot-scope="scope">
-              <!--<span>{{scope.row}}</span>-->
-              <!--<span>{{scope.row.query_warehouseout_info.total_price}}</span>-->
               <span v-if="scope.row.is_total == 1">{{getTotal(scope.row)}}</span>
               <span v-if="scope.row.is_total == 2">{{scope.row.total}}</span>
-
-
-
             </template>
           </el-table-column>
         </el-table>
@@ -162,8 +156,6 @@
           .catch(error => {
 
           })
-
-
       },
 
       onClick(id) {
@@ -174,9 +166,7 @@
         } else if (id == 3) {
           this.Num = 3;
         }
-
         switch (this.Num) {
-
           case 1: //近1个月
             this.currentDate1 = new Date(new Date().setMonth(new Date().getMonth() + 1)),
               this.currentDate2 = new Date()

src/pages/businessCenter/components/warehousing.vue

@@ -291,8 +291,6 @@
 
   }
 
-
-
   .toolOne {
     width: 6.25rem;
     height: 1.875rem;

src/pages/businessCenter/components/withdrawal.vue

@@ -4,7 +4,6 @@
       <p :class="Num == 1 ? 'active' : ''" @click="onClick(1)">近一月</p>
       <p :class="Num == 2 ? 'active' : ''" @click="onClick(2)">近三月</p>
       <p :class="Num == 3 ? 'active' : ''" @click="onClick(3)">近半年</p>
-      <!-- <div class="toolBox"> -->
       <div class="toolOne" @click="startShow = true">
         <div style="display: flex;align-items: center;">
           {{ query.start_time }}
@@ -17,7 +16,6 @@
           <van-icon name="arrow-down"/>
         </div>
       </div>
-      <!-- </div> -->
     </div>
     <div>
       <el-table ref="tab" :data="tableData" style="width: 100%" :height="tableHeight" border :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
@@ -31,7 +29,6 @@
             <span>{{ scope.row.specification_name }}</span>
           </template>
         </el-table-column>
-        <!--style="color: #579ef8"-->
 
         <el-table-column label="数量" align="center" width="80">
           <template slot-scope="scope">
@@ -72,7 +69,6 @@
 <script>
   const moment = require('moment')
   import {GetStockInfo} from "@/api/statistics";
-
   export default {
     data() {
       return {
@@ -129,8 +125,6 @@
           .catch(error => {
 
           })
-
-
       },
 
       onClick(id) {
@@ -210,7 +204,8 @@
         this.GetStockInfo(this.query)
 
       },
-    }, created() {
+    },
+    created() {
       this.tableHeight = (document.documentElement.clientHeight - (Number(document.documentElement.style.fontSize.slice(0, -2)) * 2.75)) + 'px'
       this.query.start_time = moment().subtract('month', 1).format('YYYY-MM-DD')
       // 本月的结束时间

src/pages/businessCenter/index.vue

@@ -4,11 +4,6 @@
             <i class="iconfont icon-zuojiantou jiantou" @click="goBack"></i>
             <span class="titleName">经营中心</span>
       </div>
-      <!-- <div>
-          <van-cell title="患者统计" is-link @click="toCustomClick" />
-          <van-cell title="质量统计" is-link @click="toClick" />
-          <van-cell title="库存统计" is-link @click="toStockClick"/>
-      </div> -->
       <div class="consoleBox">
       <div class="consoleOne" @click="toCustomClick">
         <img src="../../assets/images/A1.jpg" alt />
@@ -57,7 +52,6 @@ export default {
     },
     toCustomClick(){
       this.$router.push('/bus/quality?tabName=' + '患者统计')
-
     },
     toClick () {
       this.$router.push('/bus/quality?tabName=' + '质量统计')

src/pages/businessCenter/quality.vue

@@ -18,9 +18,9 @@
 </template>
 
 <script>
-import Project from './components/project.vue'
-import Time1 from './components/time1.vue'
-import Patient from './components/patient.vue'
+import Project from './components/project'
+import Time1 from './components/time1'
+import Patient from './components/patient'
 export default {
   components: {
     Project,

src/pages/console/managementConsole/index.vue

@@ -25,16 +25,6 @@
           <van-icon name="arrow" />
         </div>
       </div>
-      <!--<div class="consoleOne">-->
-      <!--<img src="../../../assets/images/A3.jpg" alt="" />-->
-      <!--<div class="consoleRight">-->
-      <!--<div>-->
-      <!--<p class="rightName">应用管理</p>-->
-      <!--<p class="rightTip">管理员可以添加或者停用应用</p>-->
-      <!--</div>-->
-      <!--<van-icon name="arrow" />-->
-      <!--</div>-->
-      <!--</div>-->
       <div class="consoleOne" @click="toOrgSetting()">
         <img src="../../../assets/images/A4.jpg" alt="" />
         <div class="consoleRight">
@@ -56,13 +46,7 @@
         </div>
       </div>
     </div>
-    <!--<div class="transfer">-->
-    <!--<img src="../../../assets/images/A6.jpg" alt="" />-->
-    <!--<div class="transferRight">-->
-    <!--<p class="rightName">员工管理</p>-->
-    <!--<van-icon name="arrow" />-->
-    <!--</div>-->
-    <!--</div>-->
+
   </div>
 </template>
 <script>

src/pages/console/managementConsole/staff_role/editRole/index.vue

@@ -5,26 +5,13 @@
       <span class="titleName">模块权限配置</span>
     </div>
 
-    <!--<div class="roleDescription">-->
-      <!--&lt;!&ndash;<van-field v-if="!isShow" v-model="desc" rows="1" autosize label="角色描述" type="textarea" placeholder="请填写角色描述"/>&ndash;&gt;-->
-      <!--&lt;!&ndash;<van-field v-else v-model="desc" rows="1" autosize label="角色描述" type="textarea" placeholder="请填写角色描述"/>&ndash;&gt;-->
-    <!--</div>-->
     <div class="disposeBox">
       <p class="disposeTitle">模块权限配置</p>
 
       <div v-for="(item, index) in allPurview" :key="index">
         <div class="disposeOne" v-if="!item.no_sub" @click="toSubPurview(item)">
           <van-cell :title="item.name" is-link center />
-          <!-- <div class="disposeImg" style="visibility: hidden">
-            <img :src="item.icon_url" alt/>
-          </div>
-          <div class="disposeTxt">
-            <div>
-              <p class="disposeName">{{ item.name }}</p>
-              <p class="disposeTip">{{ item.desc }}</p>
-            </div>
-            <van-icon class="arrow" name="arrow"/>
-          </div> -->
+  
         </div>
         <van-cell center :title="item.name" v-if="item.no_sub">
           <template #right-icon>

src/pages/console/managementConsole/staff_role/editStaff/index.vue

@@ -64,8 +64,6 @@
     <div class="staffBox">
       <van-field v-model="title" label="职位" placeholder="请填写"/>
     </div>
-    <!--<div v-if="isShow()" class="stop" @click="onClick(2)">禁用该员工账号</div>-->
-    <!--<div v-if="isShow()" class="stop" @click="onClick(2)">禁用该员工账号</div>-->
 
     <div v-if="adminInfo.status == 1  &&  isShow()" class="stop" @click="onClick(2)">禁用该员工账号</div>
     <div v-if="adminInfo.status != 1  &&  isShow()" class="stop1" @click="onClick(1)">恢复该员工账号</div>
@@ -194,9 +192,6 @@
           }
         }
 
-        // if(this.adminInfo.admin_user_id)
-
-
       },
       onUserTypeConfirm(value, index) {
         this.type_name = value
@@ -206,12 +201,8 @@
           if (this.user_types[i].name == value) {
             this.user_type = this.user_types[i].index
             this.type_name = this.user_types[i].name
-
           }
-
         }
-
-
       },
       onUserTitleConfirm(value, index) {
         this.titles_name = value
@@ -224,15 +215,11 @@
 
           }
         }
-
-
       },
       onCancel() {
         this.show1 = false
         this.show2 = false
         this.show3 = false
-
-
       },
       save() {
 
@@ -318,7 +305,6 @@
               }
             }
 
-
             for (let i = 0; i < this.user_department_name.length; i++) {
               if (this.user_department_name[i] == this.adminInfo.department) {
                 this.department_name = this.user_department_name[i]
@@ -331,7 +317,6 @@
               }
             }
 
-
             //如果当前用户是超级管理员，而且是在编辑自己的信息的时候，将子管理员角色去除
             for (let i = 0; i < this.roles.length; i++) {
               if (this.adminInfo.admin.id == this.$store.getters.user.admin.id && this.$store.getters.user.admin.is_super_admin && this.roles[i].is_system == 1 && this.roles[i].name == "子管理员") {
@@ -340,7 +325,6 @@
               }
             }
 
-
           } else {
             this.$toast({
               message: response.data.msg
@@ -402,7 +386,6 @@
 
             this.GetAdminUserInfo(this.$route.query.id)
 
-
           } else {
             this.$toast({
               message: response.data.msg
@@ -418,24 +401,19 @@
           }).then(() => {
             this.StopAdminUser(id)
 
-
           });
         } else if (id == 1) {
           Dialog.confirm({
             message: "是否确定要恢复该员工账号？"
           }).then(() => {
             this.StopAdminUser(id)
-
-
           });
         }
       }
     }, created() {
       this.GetDepartment();
       this.GetAdminUserInitData()
-
       setRem()
-
     }
   };
 </script>

src/pages/console/managementConsole/staff_role/userManage/index.vue

@@ -111,31 +111,7 @@ export default {
       });
     },
     goEditStaff: function(is_sub_admin, user_id) {
-      // if (this.isShow(is_sub_admin,user_id)){
         this.$router.push({ path: "/staff/editstaff?id=" + user_id });
-      // }
-      // else{
-      //   if (!this.isSubSuperAdmin){
-
-
-      //   }else {
-      //     if (is_sub_admin) {
-      //       if (user_id == this.$store.getters.user.admin.id) {
-
-      //       }else{
-      //         Toast("无法修改其他子管理员或者管理员信息");
-      //       }
-      //     } else {
-      //       if (user_id != this.$store.getters.user.org.creator) {
-
-      //       } else {
-      //         Toast("无法修改其他子管理员或者管理员信息");
-      //       }
-      //     }
-      //   }
-
-
-      // }
     },
     goAddStaff: function() {
       this.$router.push({ path: "/staff/addstaff" });

src/pages/doctorAdvice/components/Contagion.vue

@@ -58,11 +58,6 @@
         <img src="../../../assets/images/none.png" alt />
       </div>
     </div>
-    <!-- <div class="add">
-      <div style="display: flex;align-items: center;">
-        <van-icon class="addIcon" name="add" />新增
-      </div>
-    </div>-->
 
     <!-- 弹出层 -->
     <div>
@@ -263,7 +258,7 @@ export default {
       getAllInspection().then(response => {
         if (response.data.state === 1) {
           var inspection = response.data.data.inspection
-          console.log('inspection9999', inspection)
+          // console.log('inspection9999', inspection)
           this.checkdata = inspection
           for (let i = 0; i < inspection.length; i++) {
             this.columns.push(inspection[i].project_name)
@@ -289,7 +284,7 @@ export default {
             }
           }
           var total = response.data.data.total
-           console.log("inspection2222", inspection);
+          //  console.log("inspection2222", inspection);
           let dataInfo = {}
           inspection.forEach((item, index) => {
             let { inspect_date } = item

src/pages/doctorAdvice/components/CourseManagement.vue

@@ -58,11 +58,6 @@
         <img src="../../../assets/images/none.png" alt />
       </div>
     </div>
-<!--    <div class="add">-->
-<!--      <div style="display: flex;align-items: center;margin: 0 auto;width: 15%;" @click="addCourse">-->
-<!--        <van-icon class="addIcon" name="add" />新增-->
-<!--      </div>-->
-<!--    </div>-->
 
     <!-- 弹出层 -->
     <div>

src/pages/doctorAdvice/components/DoctorManagement.vue

@@ -171,7 +171,6 @@
                 </div>
             </div>
          </div>
-
             <div class="all" @click="toDoctorAdviceDetail(item.start_time)">全部</div>
           </div>
         </van-list>
@@ -181,11 +180,6 @@
         <img src="../../../assets/images/none.png" alt />
       </div>
     </div>
-    <!-- <div class="add">
-      <div style="display: flex;align-items: center;">
-        <van-icon class="addIcon" name="add" />新增
-      </div>
-    </div>-->
 
     <!-- 弹出层 -->
     <div id='screen'>
@@ -441,7 +435,7 @@ export default {
           this.childList = objarr
           let arr = this.doctorAdvice
           arr.push(...list.reverse())
-          console.log('arr', arr)
+          // console.log('arr', arr)
           this.doctorAdvice = arr
 
           this.loading = false
@@ -452,7 +446,7 @@ export default {
       getPatientDetail(patientid).then(response => {
         if (response.data.state === 1) {
           var patientDetail = response.data.data.patientDetail
-          console.log('patientDetail', patientDetail)
+          // console.log('patientDetail', patientDetail)
           if (patientDetail.blood_patients == 0) {
             this.doctorAdvice = []
             this.showOne = false
@@ -477,7 +471,7 @@ export default {
       getAllDoctor().then(response => {
         if (response.data.state === 1) {
           var doctor = response.data.data.doctor
-          console.log('doctor是', doctor)
+          // console.log('doctor是', doctor)
           this.doctor = doctor
         }
       })

src/pages/doctorAdvice/components/Education.vue

@@ -51,11 +51,6 @@
         <img src="../../../assets/images/none.png" alt />
       </div>
     </div>
-    <!-- <div class="add">
-      <div style="display: flex;align-items: center;">
-        <van-icon class="addIcon" name="add" />新增
-      </div>
-    </div>-->
 
     <!-- 弹出层 -->
     <div>

src/pages/doctorAdvice/components/Inspection.vue

@@ -27,6 +27,7 @@
           v-model="loading"
           :finished="finished"
           finished-text="没有更多了"
+          style="width: 100%;height: 100%;overflow-y: auto;"
         >
           <div class="adviceMain">
             <div class="adviceOne" v-for="(item, index) in Inspection" :key="index" >
@@ -312,6 +313,7 @@ export default {
           })
           this.Inspection = list.reverse()
           console.log('this', this.Inspection)
+          this.loading = false
         }
       })
       this.finished = true

src/pages/doctorAdvice/components/RescueRecord.vue

@@ -55,11 +55,6 @@
         <img src="../../../assets/images/none.png" alt />
       </div>
     </div>
-    <!-- <div class="add">
-      <div style="display: flex;align-items: center;">
-        <van-icon class="addIcon" name="add" />新增
-      </div>
-    </div>-->
 
     <!-- 弹出层 -->
     <div>

src/pages/doctorAdvice/components/Scheduling.vue

@@ -56,11 +56,6 @@
         <img src="../../../assets/images/none.png" alt />
       </div>
     </div>
-    <!-- <div class="add">
-      <div style="display: flex;align-items: center;">
-        <van-icon class="addIcon" name="add" />新增
-      </div>
-    </div> -->
 
     <!-- 弹出层 -->
     <div>

src/pages/doctorAdvice/components/deviceManagement.vue

@@ -18,30 +18,7 @@
       <div class="noimgBox">
         <img src="../../../assets/images/none.png" alt />
       </div>
-      <!-- <div class="adviceBox">
-        <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
-          <div class="adviceOne" v-for="item in 3" :key="index">
-            <div class="adviceTitle">
-              <p>2019.09.01</p>
-              <van-icon class="ellipsis" name="ellipsis" @click="newShow = true" />
-            </div>
-            <div class="orderContent">
-              <p>血压</p>
-              <p>血糖</p>
-              <p>体重</p>
-              <p>体温</p>
-              <p>心率</p>
-            </div>
-            <div class="all">全部</div>
-          </div>
-        </van-list>
-      </div>-->
     </div>
-    <!-- <div class="add">
-      <div style="display: flex;align-items: center;">
-        <van-icon class="addIcon" name="add" />新增
-      </div>
-    </div>-->
 
     <!-- 弹出层 -->
     <div>

src/pages/doctorAdvice/components/medicationPlan.vue

@@ -18,30 +18,7 @@
       <div class="noimgBox">
         <img src="../../../assets/images/none.png" alt />
       </div>
-      <!-- <div class="adviceBox">
-        <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
-          <div class="adviceOne" v-for="item in 3" :key="index">
-            <div class="adviceTitle">
-              <p>2019.09.01</p>
-              <van-icon class="ellipsis" name="ellipsis" @click="newShow = true" />
-            </div>
-            <div class="orderContent">
-              <p>血压</p>
-              <p>血糖</p>
-              <p>体重</p>
-              <p>体温</p>
-              <p>心率</p>
-            </div>
-            <div class="all">全部</div>
-          </div>
-        </van-list>
-      </div>-->
     </div>
-    <!-- <div class="add">
-      <div style="display: flex;align-items: center;">
-        <van-icon class="addIcon" name="add" />新增
-      </div>
-    </div>-->
 
     <!-- 弹出层 -->
     <div>

src/pages/doctorAdvice/components/recoverNotes.vue

@@ -18,30 +18,7 @@
       <div class="noimgBox">
         <img src="../../../assets/images/none.png" alt />
       </div>
-      <!-- <div class="adviceBox">
-        <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
-          <div class="adviceOne" v-for="item in 3" :key="index">
-            <div class="adviceTitle">
-              <p>2019.09.01</p>
-              <van-icon class="ellipsis" name="ellipsis" @click="newShow = true" />
-            </div>
-            <div class="orderContent">
-              <p>血压</p>
-              <p>血糖</p>
-              <p>体重</p>
-              <p>体温</p>
-              <p>心率</p>
-            </div>
-            <div class="all">全部</div>
-          </div>
-        </van-list>
-      </div>-->
     </div>
-    <!-- <div class="add">
-      <div style="display: flex;align-items: center;">
-        <van-icon class="addIcon" name="add" />新增
-      </div>
-    </div>-->
 
     <!-- 弹出层 -->
     <div>

src/pages/doctorAdvice/components/signsRecord.vue

@@ -24,31 +24,8 @@
       <div class="noimgBox">
         <img src="../../../assets/images/none.png" alt />
       </div>
-      <!-- <div class="adviceBox">
-        <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
-          <div class="adviceOne" v-for="item in 3" :key="index">
-            <div class="adviceTitle">
-              <p>2019.09.01</p>
-              <van-icon class="ellipsis" name="ellipsis" @click="newShow = true" />
-            </div>
-            <div class="orderContent">
-              <p>血压</p>
-              <p>血糖</p>
-              <p>体重</p>
-              <p>体温</p>
-              <p>心率</p>
-            </div>
-            <div class="all">全部</div>
-          </div>
-        </van-list>
-      </div>-->
     </div>
-    <!-- <div class="add">
-      <div style="display: flex;align-items: center;">
-        <van-icon class="addIcon" name="add" />新增
-      </div>
-    </div>-->
-
+    
     <!-- 弹出层 -->
     <div>
       <van-popup v-model="typeShow" get-container="#app" position="bottom" :style="{ height: '40%' }">

src/pages/doctorAdvice/index.vue

@@ -59,22 +59,6 @@
       <van-tab title="设备管理">
         <device-management :active="active"></device-management>
       </van-tab>
-
-      <!-- <van-tab v-for="(item, index) in title" :title="item" :key="index">
-        <doctor-management :dryId="patient_id"></doctor-management>
-        <long-dialysis :active="active"></long-dialysis>
-        <dialysis-record></dialysis-record>
-        <dry-weight :active="active" :dryId="patient_id"></dry-weight>
-        <inspection></inspection>
-        <course-management :active="active"></course-management>
-        <rescue-record :active="active"></rescue-record>
-        <scheduling :active="active" :schedulingId="patient_id"></scheduling>
-        <education :active="active"></education>
-        <signs-record :active="active"></signs-record>
-        <recover-notes :active="active"></recover-notes>
-        <medication-plan :active="active"></medication-plan>
-        <device-management :active="active"></device-management>
-      </van-tab>-->
     </van-tabs>
     <van-popup v-model="show" position="top" :style="{ height: '100%' }">
       <div
@@ -387,7 +371,7 @@ export default {
           this.nowdate = nowdate
           this.id = patientDetail.blood_id
           this.name = patientDetail.name
-          console.log('patientDetail详情', patientDetail)
+          // console.log('patientDetail详情', patientDetail)
           this.patientName = patientDetail.name
         }
       })
@@ -568,7 +552,6 @@ export default {
       this.$router.push('/editPatient?patientid=' + this.patient_id)
     },
     toReturn () {
-      console.log('this.restatus', this.restatus)
       if (this.restatus == 1) {
         this.$router.push(
           '/details?patient_id=' +

src/pages/dqc/basicInfo.vue

@@ -475,7 +475,7 @@
             this.outtotal = patienttwo.length
             // var rollout =  response.data.data.rollout
             // this.outtotal = rollout.length
-            console.log("转出人数22222",rollout)
+            // console.log("转出人数22222",rollout)
           }
         })
       },

src/pages/dqc/components/BarChart.vue

@@ -50,42 +50,10 @@ export default {
   },
   mounted() {
     this.initChart();
-    // if (this.autoResize) {
-    //   this.__resizeHanlder = debounce(() => {
-    //     if (this.chart) {
-    //       this.chart.resize()
-    //     }
-    //   }, 100)
-    //   window.addEventListener('resize', this.__resizeHanlder)
-    // }
-
-    // // 监听侧边栏的变化
-    // const sidebarElm = document.getElementsByClassName('sidebar-container')[0]
-    // sidebarElm.addEventListener('transitionend', this.__resizeHanlder)
   },
   beforeDestroy() {
-    // if (!this.chart) {
-    //   return;
-    // }
-    // if (this.autoResize) {
-    //   window.removeEventListener("resize", this.__resizeHanlder);
-    // }
-    // const sidebarElm = document.getElementsByClassName("sidebar-container")[0];
-    // sidebarElm.removeEventListener("transitionend", this.__resizeHanlder);
-    // this.chart.dispose();
-    // this.chart = null;
   },
   watch: {
-    // "options":function(){
-    //   this.chartOptions = this.options;
-    //   this.initChart()
-    //   this.__resizeHanlder = debounce(() => {
-    //     if (this.chart) {
-    //       this.chart.resize()
-    //     }
-    //   }, 100)
-    //   window.addEventListener('resize', this.__resizeHanlder)
-    // },
     options:{
       handler(newValue,oldValue){
         this.getInitChart();
@@ -104,24 +72,15 @@ export default {
   },
   created() {
     this.chartOptions = this.options;
-    console.log("this.chartOptions", this.chartOptions, this.options);
+    // console.log("this.chartOptions", this.chartOptions, this.options);
   },
   methods: {
     getInitChart() {
       this.chartOptions = this.options;
       this.initChart();
-      // this.__resizeHanlder = debounce(() => {
-      //   if (this.chart) {
-      //     this.chart.resize();
-      //   }
-      // }, 100);
-      // window.addEventListener("resize", this.__resizeHanlder);
     },
     setOptions({ expectedData, actualData } = {}) {
       this.chart.setOption({
-        // title: {
-        //   text: this.title
-        // },
         xAxis: {
           data: this.chartOptions.xAxis.data,
           // boundaryGap: false
@@ -134,33 +93,6 @@ export default {
             }
           },
           axisLabel: this.chartOptions.xAxis.axisLabel
-          // axisLabel: {
-          //   interval: 0,
-          //   formatter: function(value) {
-          //     var ret = ""; //拼接加\n返回的类目项
-          //     var maxLength = 8; //每项显示文字个数
-          //     var valLength = value.length; //X轴类目项的文字个数
-          //     var rowN = Math.ceil(valLength / maxLength); //类目项需要换行的行数
-          //     if (rowN > 1) {
-          //       //如果类目项的文字大于3,
-          //       for (var i = 0; i < rowN; i++) {
-          //         var temp = ""; //每次截取的字符串
-          //         var start = i * maxLength; //开始截取的位置
-          //         var end = start + maxLength; //结束截取的位置
-          //         //这里也可以加一个是否是最后一行的判断，但是不加也没有影响，那就不加吧
-          //         temp = value.substring(start, end) + "\n";
-          //         ret += temp; //凭借最终的字符串
-          //       }
-          //       return ret;
-          //     } else {
-          //       return value;
-          //     }
-          //   },
-          //   textStyle: {
-          //     color:"#2F3133"
-          //   }
-          // }
-          
         },
         grid: {
           left: 0,
@@ -169,13 +101,6 @@ export default {
           top: 30,
           containLabel: true
         },
-        // tooltip: {
-        //   trigger: "axis",
-        //   axisPointer: {
-        //     type: "cross"
-        //   },
-        //   padding: [5, 10]
-        // },
         yAxis: {
           axisTick: {
             show: true

src/pages/dqc/components/DepartmentProject.vue

@@ -1,12 +1,6 @@
 <template>
   <div class="page_departmentTime">
     <div class="optionsBox">
-      <!-- <div class="optionsOne" @click="stateShow = true">
-        <div style="display: flex;align-items: center;">
-          {{ state }}
-          <van-icon name="arrow-down" />
-        </div>
-      </div> -->
       <div class="optionsOne" @click="typeShow = true">
         <div style="display: flex;align-items: center;">
           {{ type }}
@@ -30,10 +24,6 @@
       <span>指标正常范围值</span>
     </div>
     <div class="rangeMain">
-      <!-- <p v-for="(item,index) in normData" :key="index">
-        <span v-if="item.range_type == 1">{{item.item_name}}({{item.min_range}}-{{item.large_range}})</span>
-        <span v-if="item.range_type == 2">{{item.item_name}}({{item.range_value}})</span>
-     </p> -->
       <p v-for="(item,index) in this.normData" :key="index">
           <span v-if="item.is_status == 1">{{item.item_name}}</span>
           <span v-if="item.is_status == 0 && item.inspection_major == 0  && item.inspection_minor == -1">收缩压</span>
@@ -109,10 +99,6 @@ export default {
           text: 'ECharts 入门示例'
         },
         tooltip: {},
-        // legend: {
-        //   data: ['达标率%'],
-        //   left: 0
-        // },
         xAxis: {
           data: [],
           axisLabel: {
@@ -257,53 +243,8 @@ export default {
           this.getlist()
         }
       }
-      // this.type = val
-      // this.typeShow = false
-      // if (val == '按季度统计对比') {
-      //   this.getlist()
-      //   this.options.dataZoom = []
-      // }
-      // if (val == '按月份统计对比') {
-      //   this.getMonthList()
-      //   this.options.dataZoom = [
-      //     {
-      //       // Y轴固定,让内容滚动
-      //       type: 'slider',
-      //       show: false,
-      //       xAxisIndex: [0],
-      //       start: 1,
-      //       end: 50, // 设置X轴刻度之间的间隔(根据数据量来调整)
-      //       zoomLock: true // 锁定区域禁止缩放(鼠标滚动会缩放,所以禁止)
-      //     },
-      //     {
-      //       type: 'inside',
-      //       xAxisIndex: [0],
-      //       start: 1,
-      //       end: 40,
-      //       zoomLock: true // 锁定区域禁止缩放
-      //     }
-      //   ]
-      // }
     },
     chooseProject (val) {
-      // this.project = val
-      // this.projectShow = false
-      // // console.log('数组源', this.normData)
-      // var rangetype = 0
-      // for (let i = 0; i < this.normData.length; i++) {
-      //   if (val == this.normData[i].item_name) {
-      //     rangetype = this.normData[i].range_type
-      //   }
-      // }
-      // this.range_type = rangetype
-
-      // if (this.type == '按月份统计对比') {
-      //   this.getMonthList()
-      // }
-      // if (this.type == '按季度统计对比') {
-      //   this.getlist()
-      // }
-
       this.project = val
       this.projectShow = false
 
@@ -450,7 +391,6 @@ export default {
           var list = response.data.data.list
           // console.log('list', list)
           var standList = response.data.data.standList
-          //  console.log('standList', standList)
 
           var newArr = [
             {Total: '第一季度', Count: 1, NoCount: 0},
@@ -458,7 +398,6 @@ export default {
             {Total: '第三季度', Count: 1, NoCount: 0},
             {Total: '第四季度', Count: 1, NoCount: 0}
           ]
-
           // 获取2个数组不同的部分
           var arrTwo = this.arrayDate(list, newArr)
           arrTwo.map(item => {
@@ -530,8 +469,6 @@ export default {
       })
     },
     arrayDate (array1, array2) {
-      //  console.log("array1",array1)
-      //  console.log("array2",array2)
       var array1 = array1
       var array2 = array2
       var result = []
@@ -555,8 +492,6 @@ export default {
       return result
     },
     arrayDateTwo (array1, array2) {
-      //   console.log("array1",array1)
-      //   console.log("array2",array2)
       var array1 = array1
       var array2 = array2
       var result = []
@@ -580,8 +515,6 @@ export default {
       return result
     },
     arrayDateThree (array1, array2) {
-      // console.log("array1",array1)
-      // console.log("array2",array2)
       var array1 = array1
       var array2 = array2
       var result = []
@@ -605,8 +538,6 @@ export default {
       return result
     },
     arrayDateFour (array1, array2) {
-      //   console.log("array1",array1)
-      //   console.log("array2",array2)
       var array1 = array1
       var array2 = array2
       var result = []

src/pages/dqc/components/DepartmentTime.vue

@@ -1,12 +1,6 @@
 <template>
   <div class="page_departmentTime">
     <div class="optionsBox">
-      <!-- <div class="optionsOne" @click="stateShow = true">
-        <div style="display: flex;align-items: center;">
-          {{ state }}
-          <van-icon name="arrow-down" />
-        </div>
-      </div> -->
       <div class="optionsOne" @click="typeShow = true">
         <div style="display: flex;align-items: center;">
           {{ type }}
@@ -58,10 +52,6 @@
       <span>指标正常范围值</span>
     </div>
     <div class="rangeMain">
-      <!-- <p v-for = "(item,index) in normData" :key="index">
-        <span v-if="item.range_type == 1">{{item.item_name}}({{item.min_range}}-{{item.large_range}})</span>
-        <span v-if="item.range_type == 2">{{item.item_name}}({{item.range_value}})</span>
-       </p> -->
         <p v-for="(item,index) in this.normData" :key="index">
           <span v-if="item.is_status == 1">{{item.item_name}}</span>
           <span v-if="item.is_status == 0 && item.inspection_major == 0  && item.inspection_minor == -1">收缩压</span>
@@ -168,10 +158,6 @@ export default {
           text: 'ECharts 入门示例'
         },
         tooltip: {},
-        // legend: {
-        //   data: ["达标率%"],
-        //   left: 0
-        // },
         xAxis: {
           data: [],
           axisLabel: {

src/pages/dqc/components/ScrollTop.vue

@@ -2,8 +2,6 @@
   <van-icon name="upgrade" class="toTop" v-show="toTopShow" @click="backTop" />
 </template>
 
-
-
 <script>
 export default {
   data() {

src/pages/dqc/components/bloodPressure.vue

@@ -271,7 +271,6 @@ export default {
             //配置样式
             itemStyle: {
               //通常情况下：
-
               //每个柱子的颜色即为colorList数组里的每一项，如果柱子数目多于colorList的长度，则柱子颜色循环使用该数组
               normal: {
                 color: function(params) {
@@ -281,12 +280,10 @@ export default {
 
                     ["#FFD7C0", "#FF9994"]
                   ];
-
                   var index = params.dataIndex;
                   if (params.dataIndex >= colorList.length) {
                     index = params.dataIndex % colorList.length;
                   }
-
                   return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
                     { offset: 0, color: colorList[index][0] },
                     // { offset: 0.5, color: colorList[index][1] },
@@ -295,7 +292,6 @@ export default {
                 },
                 barBorderRadius: [5, 5, 0, 0] //柱状角成椭圆形
               },
-
               //鼠标悬停时：
               emphasis: {
                 shadowBlur: 10,
@@ -324,12 +320,10 @@ export default {
     this.query.statistics_type = 1
     this.GetDialysisBloodPressureChartData(this.query)
     this.GetDialysisBloodPressureTableData(this.query)
-
   },
   methods: {
     jumpDetail(patient_id){
       this.$router.push("/dqc/bloodpressure/detail?id="+patient_id)
-
     },
     getTime (time) {
       return uParseTime(time, '{y}-{m}-{d}')
@@ -347,7 +341,6 @@ export default {
               this.options.xAxis.data.push(resp.data.data[i].name)
               this.options.series[0].data.push(resp.data.data[i].total)
               this.percent.push(resp.data.data[i].ratio)
-
             }
           } else {
             this.$toast({
@@ -356,7 +349,6 @@ export default {
           }
         })
         .catch(error => {
-
         })
     },
     GetDialysisBloodPressureTableData(params) {
@@ -418,7 +410,6 @@ export default {
       this.project = val;
       this.projectShow = false;
       this.GetDialysisBloodPressureChartData(this.query)
-
     },
 
     getstartTime(value) {
@@ -433,7 +424,6 @@ export default {
         day = `0${day}`;
       }
       this.startTime = `${year}-${month}-${day}`;
-
       this.query.start_time = `${year}-${month}-${day}`;
       this.GetDialysisBloodPressureChartData(this.query)
       this.GetDialysisBloodPressureTableData(this.query)
@@ -441,7 +431,6 @@ export default {
     },
     getstartTime2(value) {
       this.query.page = 1;
-
       let year = value.getFullYear();
       let month = value.getMonth() + 1;
       let day = value.getDate();
@@ -492,8 +481,6 @@ export default {
 };
 </script>
 
-
-
 <style lang="scss" scoped>
 .page_bloodPressure {
   .searchBox{

src/pages/dqc/components/checkStatisticsPersonal.vue

@@ -106,10 +106,6 @@ export default {
           text: 'ECharts 入门示例'
         },
         tooltip: {},
-        // legend: {
-        //   data: ['次数'],
-        //   left: 0
-        // },
         xAxis: {
           data: [],
           axisLabel: {

src/pages/dqc/components/dialysisProcess.vue

@@ -38,7 +38,6 @@
       </div>
     </div>
     
-
     <div class="chart1">统计图&nbsp;&nbsp;<span style="font-weight:normal">（患者姓名:{{patient_name}}）</span></div>
     <div class="rangeBox" style="margin-top:.625rem">
       <p class="range"></p>
@@ -619,7 +618,7 @@ export default {
         })
     },
     GetDialysisProcessIndexChartData (params) {
-      console.log(params)
+      // console.log(params)
 
       this.options.xAxis.data = []
       this.options.series[0].data = []
@@ -632,7 +631,7 @@ export default {
         .then(rs => {
           var resp = rs.data
           if (resp.state == 1) {
-            console.log(this.query.statistics_type)
+            // console.log(this.query.statistics_type)
 
             if (this.query.statistics_type != 9 && this.query.statistics_type != 10) {
               for (let i = 0; i < resp.data.data.length; i++) {

src/pages/dqc/components/dialysisStatisticsAll.vue

@@ -1,12 +1,6 @@
 <template>
   <div class="page_statisticsAll">
     <div class="options">
-      <!-- <div class="optionsOne" @click="stateShow = true">
-        <div style="display: flex;align-items: center;">
-          {{ state }}
-          <van-icon name="arrow-down" />
-        </div>
-      </div> -->
       <div class="toolOne" @click="startShow = true">
         <div style="display: flex;align-items: center;">
           {{ startTime }}
@@ -86,10 +80,6 @@ export default {
           text: 'ECharts 入门示例'
         },
         tooltip: {},
-        // legend: {
-        //   data: ['次数'],
-        //   left: 0
-        // },
         xAxis: {
           data: [],
           axisLabel: {

src/pages/dqc/components/dialysisStatisticsPersonal.vue

@@ -46,13 +46,11 @@
         <el-table-column prop="dialysis_no" label="透析号" width="80"></el-table-column>
         <el-table-column prop="mode_id" label="透析模式" min-width="300">
           <template slot-scope="scope">
-                <!-- <span>{{ scope.row.mode_id.join("、") }}</span> -->
                 <span>{{getModeCount(scope.row.patient_id)}}</span>
               </template>
         </el-table-column>
         <el-table-column fixed="right" label="透析总次数" width="100">
           <template slot-scope="scope">
-            <!-- {{ scope.row.total_dialysis + scope.row.user_sys_before_count }} -->
             {{getDialysisCount(scope.row.patient_id)}}
           </template>
         </el-table-column>

src/pages/dqc/components/doctor.vue

@@ -29,7 +29,6 @@
         </div>
       </div>
     </div>
-    <!-- </van-sticky> -->
 
     <div class="chart1">统计图</div>
     <div>

src/pages/dqc/components/office.vue

@@ -56,7 +56,6 @@
 
         <el-table-column :label="item_name" align="center">
           <template slot-scope="scope">
-            <!--<div v-if="query.range_type == 1&&parseInt(scope.row.inspect_value) > parseInt(scope.row.inspect_value)">{{scope.row.inspect_value}}↑</div>-->
             <span v-html="getValue(scope.row)"></span>
           </template>
         </el-table-column>
@@ -74,9 +73,7 @@
         </el-table-column>
 
       </el-table>
-
     </div>
-
     <div>
       <van-popup v-model="projectShow" position="bottom" :style="{ height: '40%' }">
         <van-picker
@@ -85,10 +82,8 @@
           @confirm="chooseProject"
           @cancel="projectShow = false"
         />
-
       </van-popup>
 
-
       <van-popup v-model="itemShow" position="bottom" :style="{ height: '40%' }">
         <van-picker
           show-toolbar
@@ -98,16 +93,6 @@
         />
       </van-popup>
 
-      <!--<van-popup v-model="patientShow" position="bottom" :style="{ height: '40%' }">-->
-      <!--<van-picker-->
-      <!--show-toolbar-->
-      <!--:columns="patient_type_columns"-->
-      <!--@confirm="chooseProject"-->
-      <!--@cancel="patientShow = false"-->
-      <!--/>-->
-      <!--</van-popup>-->
-
-
       <van-popup v-model="startShow" position="bottom" :style="{ height: '40%' }">
         <van-datetime-picker
           v-model="currentDate1"
@@ -118,6 +103,7 @@
           @cancel="startShow = false"
         />
       </van-popup>
+
       <van-popup v-model="endShow" position="bottom" :style="{ height: '40%' }">
         <van-datetime-picker
           v-model="currentDate2"
@@ -129,7 +115,6 @@
         />
       </van-popup>
 
-
       <van-popup v-model="sectionShow" position="bottom" :style="{ height: '40%' }">
         <van-picker
           show-toolbar

src/pages/dqc/components/sufferer.vue

@@ -106,8 +106,6 @@
           @cancel="endShow = false"
         />
       </van-popup>
-
-
       <van-popup v-model="sectionShow" position="bottom" :style="{ height: '40%' }">
         <van-picker
           show-toolbar

src/pages/dqc/components/weight.vue

@@ -17,12 +17,10 @@
       </el-autocomplete>
     </div>
 
-
     <div class="optionsBox">
       <div class="toolOne" @click="startShow = true">
         <div style="display: flex;align-items: center;">
           {{  query.start_time }}
-
           <van-icon name="arrow-down" />
         </div>
       </div>
@@ -68,7 +66,6 @@
         <el-table-column label="干体重" align="center">
           <template slot-scope="scope">
             {{scope.row.dry_weight?scope.row.dry_weight:''}}
-
             <!--{{// scope.row.patient.lapseto == 1 ? '留治':'转出'}}-->
           </template>
         </el-table-column>
@@ -76,7 +73,6 @@
         <el-table-column label="前次透后体重" align="center">
           <template slot-scope="scope">
             {{scope.row.last_after_weight?scope.row.last_after_weight:''}}
-
             <!--<div v-if="scope.row.before.systolic_blood_pressure">{{scope.row.before.systolic_blood_pressure}} / {{scope.row.before.diastolic_blood_pressure}}</div>-->
           </template>
         </el-table-column>
@@ -84,7 +80,6 @@
         <el-table-column label="透前体重" align="center">
           <template slot-scope="scope">
             {{scope.row.weight_before?scope.row.weight_before:''}}
-
             <!--<div v-if="scope.row.min_monitor.systolic_blood_pressure">{{ scope.row.min_monitor.systolic_blood_pressure}} /{{ scope.row.min_monitor.diastolic_blood_pressure}}</div>-->
           </template>
         </el-table-column>
@@ -93,8 +88,6 @@
           <template slot-scope="scope">
             <!--<div v-if="scope.row.max_monitor.systolic_blood_pressure">{{ scope.row.max_monitor.systolic_blood_pressure}} /{{ scope.row.max_monitor.diastolic_blood_pressure}}</div>-->
             {{scope.row.after.weight_after?scope.row.after.weight_after:''}}
-
-
           </template>
         </el-table-column>
 
@@ -280,7 +273,6 @@
               //配置样式
               itemStyle: {
                 //通常情况下：
-
                 //每个柱子的颜色即为colorList数组里的每一项，如果柱子数目多于colorList的长度，则柱子颜色循环使用该数组
                 normal: {
                   color: function(params) {
@@ -521,8 +513,6 @@
     width: 37.5rem;
     background: #fff;
   .optionsOne {
-  //   max-width: 8.75rem;
-  //   min-width: 6.25rem;
     padding: 0 0.75rem;
     height: 1.875rem;
     background: rgba(246, 246, 246, 1);

src/pages/dqc/patientStatistics.vue

@@ -22,14 +22,7 @@
         </template>
       </el-autocomplete>
     </div>
-    <!-- <div style="width:100%;overflow-x:auto"> -->
       <div class="options">
-        <!-- <div class="optionsOne" @click="typeShow = true">
-          <div style="display: flex;align-items: center;">
-            {{ type }}
-            <van-icon name="arrow-down" />
-          </div>
-        </div> -->
         <div class="toolOne" @click="startShow = true">
           <div style="display: flex;align-items: center;">
             {{ startTime }}
@@ -43,7 +36,6 @@
           </div>
         </div>
       </div>
-    <!-- </div> -->
 
     <div class="chart1">统计图</div>
     <div>
@@ -478,34 +470,12 @@ export default {
               })
             })
             // console.log('表哥', this.tableData)
-
-            // let projectArr = []
-            // this.newArr.map(item => {
-            //   projectArr.push(item.item_name)
-            // })
-
-            // this.tableData.map(item => {
-            //   let newarr = Object.values(item.data)
-            //   newarr.sort((a, b) => {
-            //     return projectArr.indexOf(a.item_name) - projectArr.indexOf(b.item_name)
-            //   })
-            //   item.data = newarr
-            // })
             let newData = this.tableData
-            // for (let i = 0; i < this.patientsArr.length; i++) {
-            //   for (let j = 0; j < newData.length; j++) {
-            //     if (this.patientsArr[i].name == newData[j].name) {
-            //       newData[j].dialysis_no = this.patientsArr[i].dialysis_no
-            //       newData[j].patient_id = this.patientsArr[i].id
-            //     }
-            //   }
-            // }
 
             this.tableData = []
             newData.map(item => {
               this.tableData.push(item)
             })
-
             if (response.data.data.patients.length <= 0) {
               this.isStop = true
             } else {
@@ -751,21 +721,6 @@ export default {
 
           this.tablePatients = patients
 
-          //  let dataInfothree = {}
-          //   patients.forEach((item, index) => {
-          //     let { inspect_date } = item
-          //     if (!dataInfothree[inspect_date]) {
-          //       dataInfothree[inspect_date] = {
-          //         inspect_date,
-          //         name: item.name,
-          //         child: [],
-          //         patient_id: item.patient_id,
-          //       }
-          //     }
-          //   })
-          // let patientlist = Object.values(dataInfothree)
-          // console.log("patientlist",patientlist)
-
         var total = response.data.data.total
         this.total = total
         var control = response.data.data.control
@@ -776,17 +731,6 @@ export default {
         control.push(item)
       })
 
-
-      //  var newPatinteArr = []
-      //  patientlist.map(item=>{
-      //    for(let i=0;i<control.length;i++){
-      //       if(item.inspect_date == control[i].inspect_date && item.patient_id == control[i].patient_id){
-      //            item.child.push(control[i])
-      //       }
-      //    }
-      //  })
-      //  console.log("patientlist",patientlist)
-
         var newArr = []
         // 分页
         for (let i = 0; i < control.length; i++) {
@@ -914,194 +858,6 @@ export default {
           }
         }
       }
-          // var total = response.data.data.total
-          // var standtotal = response.data.data.standtotal
-          // var standtotalone = response.data.data.standtotalOne
-          // var cartogramlist = response.data.data.cartogramlist
-          // console.log('cartogramlist', cartogramlist)
-          // var infectiouscontrol = response.data.data.infectiouscontrol
-          // console.log('infectiouscontrol', infectiouscontrol)
-          // infectiouscontrol.map(item => {
-          //   cartogramlist.push(item)
-          // })
-          // var totaltwo = response.data.data.total
-          // var cart = []
-          // // 过滤已经配置的选项
-          // for (let i = 0; i < cartogramlist.length; i++) {
-          //   for (let j = 0; j < this.normData.length; j++) {
-          //     if (cartogramlist[i].item_id == this.normData[j].inspection_minor) {
-          //       cart.push(cartogramlist[i])
-          //     }
-          //   }
-          // }
-          // console.log('cart', cart)
-          // // for (let i = 0; i < cartogramlist.length; i++) {
-          // //   if (cartogramlist[i].inspect_value != '') {
-          // //     cart.push(cartogramlist[i])
-          // //   }
-          // // }
-          // // console.log("cart",cart)
-          // let dataInfo = {}
-          // cart.forEach((item, index) => {
-          //   let { patient_id } = item
-          //   if (!dataInfo[patient_id]) {
-          //     dataInfo[patient_id] = {
-          //       patient_id,
-          //       name: item.name,
-          //       child: [],
-          //       inspect_date: item.inspect_date,
-          //       total: 0,
-          //       count: 0,
-          //       infectotal: 0
-          //     }
-          //   }
-          // })
-          // let list = Object.values(dataInfo)
-          // console.log('list', list)
-
-          // var arr = []
-          // list.map(item => {
-          //   for (let i = 0; i < cart.length; i++) {
-          //     if (item.inspect_date == cart[i].inspect_date && item.patient_id == cart[i].patient_id) {
-          //       item.child.push(cart[i])
-          //     }
-          //   }
-          // })
-
-          // list.map(item => {
-          //   item.child.map(it => {
-          //     if (it.range_type == 1 && parseInt(it.range_min) <= parseInt(it.inspect_value) && parseInt(it.inspect_value) <= parseInt(it.range_max)) {
-          //       item.total++
-          //     }
-          //     if (it.range_type == 2 && it.inspect_value == it.range_value) {
-          //       item.infectotal++
-          //     }
-          //   })
-          // })
-          // var standardTotal = 0
-
-          // list.map(item => {
-          //   if ((item.total + item.infectotal) == item.child.length) {
-          //     item.count++
-          //   }
-          // })
-          // list.map(item => {
-          //   standardTotal += item.count
-          // })
-          // var totalCount = list.length
-          // console.log('totalCount', totalCount)
-          // for (let i = 0; i < this.dataCount.length; i++) {
-          //   this.dataCount[0].count = standtotal + standtotalone
-          //   this.dataCount[1].count = total - standtotalone - standtotal
-          //   this.obj.push(this.dataCount[i].count)
-          // }
-          // for (let i = 0; i < this.dataName.length; i++) {
-          //   this.modesData.xAxis.push(this.dataName[i].name)
-          // }
-          // for (let i = 0; i < this.dataCount.length; i++) {
-          //   this.modesData.series.push(((this.dataCount[i].count / total) * 100).toFixed(1))
-          // }
-          // this.options.series[0].data = this.modesData.series
-          // this.options.xAxis.data = this.modesData.xAxis
-          // // var cart = []
-          // for (let i = 0; i < cartogramlist.length; i++) {
-          //   if (cartogramlist[i].inspect_value != '') {
-          //     cart.push(cartogramlist[i])
-          //   }
-          // }
-          // let dataInfo = {}
-          // cart.forEach((item, index) => {
-          //   let { patient_id } = item
-          //   if (!dataInfo[patient_id]) {
-          //     dataInfo[patient_id] = {
-          //       patient_id,
-          //       name: item.name,
-          //       child: [],
-          //       inspect_date: item.inspect_date,
-          //       total: 0
-          //     }
-          //   }
-          // })
-          // let list = Object.values(dataInfo)
-
-          // var arr = []
-          // list.map(item => {
-          //   for (let i = 0; i < cart.length; i++) {
-          //     if (item.inspect_date == cart[i].inspect_date && item.patient_id == cart[i].patient_id) {
-          //       item.child.push(cart[i])
-          //       item.total++
-          //     }
-          //   }
-          // })
-
-          // list.map(item => {
-          //   item.child.map(it => {
-          //     arr.push(it)
-          //   })
-          // })
-
-          // var arrtwo = []
-          // for (let i = 0; i < arr.length; i++) {
-          //   if (parseInt(arr[i].range_min) <= parseInt(arr[i].inspect_value) && parseInt(arr[i].inspect_value) <= parseInt(arr[i].range_max)) {
-          //     arrtwo.push(arr[i])
-          //   }
-          // }
-
-          // let objinfo = {}
-          // arrtwo.forEach((item, index) => {
-          //   let { patient_id } = item
-          //   if (!objinfo[patient_id]) {
-          //     objinfo[patient_id] = {
-          //       patient_id,
-          //       name: item.name,
-          //       child: [],
-          //       inspect_date: item.inspect_date,
-          //       count: 0
-          //     }
-          //   }
-          // })
-          // let newlist = Object.values(objinfo)
-          // newlist.map(item => {
-          //   for (let i = 0; i < arrtwo.length; i++) {
-          //     if (arrtwo[i].patient_id == item.patient_id && arrtwo[i].inspect_date == item.inspect_date) {
-          //       item.child.push(arrtwo[i])
-          //     }
-          //   }
-          // })
-
-          // newlist.map(item => {
-          //   item.child.map(it => {
-          //     if (parseInt(it.range_min) <= parseInt(it.inspect_value) && parseInt(it.inspect_value) <= parseInt(it.range_max)) {
-          //       item.count++
-          //     }
-          //   })
-          // })
-
-          // var newtotal = 0
-
-          // list.map(item => {
-          //   for (let i = 0; i < newlist.length; i++) {
-          //     if (item.patient_id == newlist[i].patient_id && item.total == newlist[i].count) {
-          //       newtotal++
-          //     }
-          //   }
-          // })
-
-          // var totalCount = totaltwo - newtotal
-          // for (let i = 0; i < this.dataName.length; i++) {
-          //   this.modesData.xAxis.push(this.dataName[i].name)
-          // }
-
-          // for (let i = 0; i < this.dataCount.length; i++) {
-          //   this.dataCount[0].count = newtotal
-          //   this.dataCount[1].count = totalCount
-          // }
-
-          // for (let i = 0; i < this.dataCount.length; i++) {
-          //   this.modesData.series.push(((this.dataCount[i].count / totaltwo) * 100).toFixed(1))
-          // }
-          // this.options.series[0].data = this.modesData.series
-          // this.options.xAxis.data = this.modesData.xAxis
         }
       })
     },
@@ -1259,7 +1015,6 @@ export default {
     toReturn () {
       this.$router.push('/dqc/index')
     }
-
   },
   created () {
     // 列表
@@ -1269,7 +1024,6 @@ export default {
     this.tableHeight = (document.documentElement.clientHeight - (Number(document.documentElement.style.fontSize.slice(0, -2)) * 3.125)) + 'px'
     // 获取指标数据
     this.getMobileNormData()
-
     // 获取统计图数据
     this.getMobileCartogramlist()
   }

src/pages/home/active.vue

@@ -1,73 +1,5 @@
 <template>
     <div class="page_kuyishop">
-        <!-- <div class="activeBox">
-            <div class="activeTitleBox">
-                <div class="activeTitle">
-                    <img src="../../assets/images/activeIcon_03.png" alt="">
-                    <p>活 动 详 情</p>
-                </div>
-            </div>
-            <div class="activeOne">
-                <div class="activeTipBox">
-                    <div class="activeTip"></div>
-                    <p>活动介绍</p>
-                </div>
-                <div class="activeTxt">
-                    注册酷医云系统并体验系统即可获得<span>价值69元的精美礼品一份（多功能补水仪/多功能加湿器/保温杯套装）</span>
-                </div>  
-            </div>
-            <div class="activeOne">
-                <div class="activeTipBox">
-                    <div class="activeTip"></div>
-                    <p>参与对象</p>
-                </div>
-                <div class="activeTxt">
-                    <span>民营透析机构医护人员</span>
-                </div>  
-            </div>
-            <div class="activeOne">
-                <div class="activeTipBox">
-                    <div class="activeTip"></div>
-                    <p>活动主题</p>
-                </div>
-                <div class="activeTxt">
-                    自春节以来，新冠肺炎疫情肆虐。疫期，民营透析机构在医护紧缺的情况下，仍辛苦坚守阵地，为透析患者提供服务，逆行并开辟透析患者生命之路；而酷医云现已覆盖全国近500家透析机构，我们深知民营透析机构的压力和辛苦。基于此情况，酷医云决定向广大民营透析机构/单位进行疫期致敬大回馈活动，为每一家民营透析机构赠送一份价值69元的精美礼品
-                </div>  
-            </div>
-            <div class="activeOne">
-                <div class="activeTipBox">
-                    <div class="activeTip"></div>
-                    <p>领取精美礼品满足条件</p>
-                </div>
-                <div class="activeTxt">
-                    <p>1.未使用酷医云系统的新用户机构，注册酷医云账号并完善账号信息</p>
-                    <p>2.注册医护必须为民营透析机构的医护</p>
-                    <p>3.每家机构有且仅有一位医护代表参与领取，先注册先得</p>
-                    <p class="litle">*以上解释权归酷医云所有，谢谢配合</p>
-                    <p class="big">价值69元精美礼品(三选一)</p>
-                    <img src="../../assets/images/goods_03.png" alt="">
-                    <img src="../../assets/images/goods_07.png" alt="">
-                    <img src="../../assets/images/goods_09.png" alt="">
-                    
-                </div>  
-            </div>
-            <div class="activeOne">
-                <div class="activeTipBox">
-                    <div class="activeTip"></div>
-                    <p>【酷医云老用户推荐引导新用户注册者也可领取精美礼品】</p>
-                </div>
-                <div class="activeTxt">
-                    <p>符合以下条件即可领取：</p>
-                    <p>1. 老用户推荐其他民营透析机构医护体验酷医云</p>
-                    <p>2. 推荐的医护为对方透析中心首个注册体验酷医云的用户</p>
-                    <p>3. 推荐者把推荐注册的聊天页面进行截图，并发给酷医云对接人或客服人员，客服微信号：kuyicloud</p>
-                    <p>4. 推荐的新用户和推荐者均可各自获得精美礼品一份，且双方必须在活动页面点击我要报名并填写收货信息，礼品即可发货</p>
-                </div>  
-            </div>
-            <div class="join" @click="toActiveForm">我 要 报 名</div>
-            <div class="joinImg" @click="toActiveForm"><img src="../../assets/images/apply.png" alt=""></div>
-        </div> -->
-        
         <iframe :src='url'></iframe>
 
     </div>

src/pages/home/index.vue

@@ -1,75 +1,5 @@
 <template>
-  <!-- <div class="page_home">
-    <div class="top">
-      <div class="header">
-        <img src="../../assets/images/hospital.png" alt />
-        <van-dropdown-menu>
-          <van-dropdown-item v-model="value" :options="hospitals" />
-        </van-dropdown-menu>
-      </div>
-      <div class="search" @click="ToSearch()">
-        <el-input
-          placeholder=" 姓名 / 首拼 / 透析号"
-          prefix-icon="el-icon-search"
-          v-model="searchVal"
-        ></el-input>
-      </div>
-      <div class="banner">
-        <img src="../../assets/images/homebanner.jpg" alt />
-      </div>
-      <div class="myDesk">
-        <h2>我的工作台</h2>
-        <div class="list">
-          <ul class="all">
-            <li class="one">
-              <img src="../../assets/images/m09.png" alt />
-              <p @click="patientManagement()">病人管理</p>
-            </li>
-            <li class="one">
-              <img src="../../assets/images/m02.png" alt />
-              <p>透析记录</p>
-            </li>
-            <li class="one">
-              <img src="../../assets/images/m04.png" alt />
-              <p>质控分析</p>
-            </li>
-            <li class="one">
-              <img src="../../assets/images/m05.png" alt />
-              <p>院感管理</p>
-            </li>
-            <li class="one">
-              <img src="../../assets/images/m06.png" alt />
-              <p>微商城</p>
-            </li>
-            <li class="one">
-              <img src="../../assets/images/m07.png" alt />
-              <p>微官网</p>
-            </li>
-            <li class="one">
-              <img src="../../assets/images/m08.png" alt />
-              <p>医院二维码</p>
-            </li>
-            <li class="one">
-              <img src="../../assets/images/m03.png" alt />
-              <p>基础配置</p>
-            </li>
-          </ul>
-        </div>
-      </div>
-    </div>
-
-    <div class="tab">
-      <div class="btn">
-        <i class="iconfont icon-zhuye"></i>
-        <span>首页</span>
-      </div>
-      <div class="btn">
-        <i class="iconfont icon-wode"></i>
-        <span>我的</span>
-      </div>
-    </div>
 
-  </div>-->
   <div class="page_home">
     <div>
       <router-view />
@@ -82,24 +12,6 @@
             <div>首页</div>
           </van-tabbar-item>
         </router-link>
-        <!-- <router-link to="/active">
-          <van-tabbar-item>
-            <i class="iconfont icon-yisheng iconOne"></i>
-            <div>致敬医护</div>
-          </van-tabbar-item>
-        </router-link> -->
-        <!--<router-link to="/service">-->
-          <!--<van-tabbar-item>-->
-            <!--<i class="iconfont icon-fuwu2 iconOne"></i>-->
-            <!--<div>服务</div>-->
-          <!--</van-tabbar-item>-->
-        <!--</router-link>-->
-       <!-- <router-link to="/active" replace>
-         <van-tabbar-item>
-           <i class="iconfont icon-shangcheng iconOne"></i>
-           <div>商城</div>
-         </van-tabbar-item>
-       </router-link> -->
         <router-link to="/newMy" replace>
           <van-tabbar-item>
             <i class="iconfont icon-wode iconOne"></i>
@@ -135,13 +47,6 @@ export default {
     }
   },
   methods: {
-    // patientManagement() {
-    //   var id = this.$route.query.id;
-    //   this.$router.push("/patientmanagement?id=" + id);
-    // },
-    // ToSearch() {
-    //   this.$router.push("/search");
-    // }
     getToken(orgId,adminUserId){
       axios.get('/api/index/gettoken/'+ orgId + '/'+ adminUserId
         ).then((res) => {
@@ -202,9 +107,7 @@ export default {
     } else if (currenttabbar === "newMy") {
       this.active = 1;
     }
-    // else if (currenttabbar === "active") {
-    //   this.active = 1;
-    // }
+
   }
 };
 </script>
@@ -248,152 +151,5 @@ export default {
       color: #1989fa;
     }
   }
-
-  // .header {
-  //   padding: 0 15px;
-  //   box-sizing: border-box;
-  //   height: 3.125rem;
-  //   width: 100%;
-  //   line-height: 3.125rem;
-  //   img {
-  //     float: left;
-  //     width: 1.375rem;
-  //     height: 1.375rem;
-  //     margin-top: 0.625rem;
-  //   }
-  //   .van-dropdown-menu {
-  //     width: 8.5rem;
-  //     height: 3.125rem;
-  //   }
-  //   .van-dropdown-menu__item {
-  //     flex: none;
-  //   }
-  //   .van-ellipsis {
-  //     width: 6.25rem;
-  //     height: 3.125rem;
-  //     line-height: 3.125rem;
-  //     font-size: 0.875rem;
-  //     white-space: nowrap;
-  //     text-overflow: ellipsis;
-  //     overflow: hidden;
-  //   }
-  // }
-  // .search {
-  //   width: 21.5625rem;
-  //   height: 2.125rem;
-  //   padding: 0 15px;
-  //   box-sizing: border-box;
-  //   .el-input__inner {
-  //     width: 21.5625rem;
-  //     height: 2.125rem;
-  //     border: none;
-  //     background: rgba(244, 244, 244, 1);
-  //     border-radius: 17px;
-  //     color: #999999;
-  //   }
-  //   .el-input__prefix {
-  //     margin-top: -0.125rem;
-  //     color: #999999;
-  //   }
-  // }
-  // .banner {
-  //   overflow: hidden;
-  //   margin-top: 1.25rem;
-  //   // width: 21.4375rem;
-  //   // height: 8.3125rem;
-  //   // border-radius: 10px;
-  //   width: 23.4375rem;
-  //   height: 8.3125rem;
-  //   // background: rgba(188, 188, 188, 0.1);
-  //   // opacity: 0.2;
-  //   img {
-  //     margin: 0 15px;
-  //     width: 21.4375rem;
-  //     height: 8.3125rem;
-  //     box-sizing: border-box;
-  //   }
-  // }
-  // .myDesk {
-  //   padding: 0 15px;
-  //   box-sizing: border-box;
-  //   padding-top: 1.5625rem;
-  //   width: 23.4375rem;
-  //   height: 17.0625rem;
-  //   // background: rgba(188, 188, 188, 0.1);
-  //   h2 {
-  //     height: 1.1875rem;
-  //     font-size: 1.25rem;
-  //     font-weight: 600;
-  //     color: rgba(0, 0, 0, 1);
-  //     line-height: 0.9375rem;
-  //   }
-  //   .list {
-  //     margin-top: 0.9375rem;
-  //     width: 21.4375rem;
-  //     height: 14rem;
-  //     background: rgba(255, 255, 255, 1);
-  //     border-radius: 10px;
-  //     box-shadow: 0px 3px 12px 0px rgba(188, 188, 188, 0.2);
-  //     display: flex;
-  //     align-items: center;
-  //     .all {
-  //       display: flex;
-  //       justify-content: space-around;
-  //       flex-wrap: wrap;
-  //     }
-  //     .one {
-  //       width: 25%;
-  //       display: flex;
-  //       flex-direction: column;
-  //       align-items: center;
-  //       justify-content: space-around;
-  //       height: 6.25rem;
-  //       img {
-  //         width: 2.8125rem;
-  //         height: 2.8125rem;
-  //       }
-  //       p {
-  //         margin-top: -0.625rem;
-  //         height: 0.8125rem;
-  //         font-size: 0.8125rem;
-  //         color: rgba(60, 60, 60, 1);
-  //         line-height: 0.9375rem;
-  //       }
-  //     }
-  //   }
-  // }
-  // .tab {
-  //   display: flex;
-  //   width: 23.4375rem;
-  //   height: 3.0625rem;
-  //   background: rgba(255, 255, 255, 1);
-  //   justify-content: space-around;
-  //   box-shadow: 3px 0px 12px 3px rgba(188, 188, 188, 0.2);
-
-  //   > div:last-child {
-  //     span {
-  //       color: #bfbfbf;
-  //     }
-  //   }
-  //   .btn {
-  //     display: flex;
-  //     flex-direction: column;
-  //     align-items: center;
-  //     align-self: center;
-  //     i {
-  //       font-size: 1.5rem;
-  //       color: rgba(79, 115, 254, 1);
-  //     }
-  //     .icon-wode {
-  //       color: #bfbfbf;
-  //     }
-
-  //     span {
-  //       font-size: 0.75rem;
-  //       color: rgba(79, 115, 254, 1);
-  //       margin-top: 0.25rem;
-  //     }
-  //   }
-  // }
 }
 </style>

src/pages/home/register/register.vue

@@ -48,14 +48,6 @@
           </div>
         </el-form-item>
       </el-form>
-      <!-- <el-input placeholder="请输入手机号码" prefix-icon="el-icon-mobile" v-model="phone"></el-input>
-
-      <div class="code">
-        <i class="iconfont icon-dunpai dunpai"></i>
-        <el-input v-model="code" placeholder="请输入验证码"></el-input>
-        <div class="getCode">获取验证码</div>
-      </div>
-      <el-input placeholder="请输入密码" prefix-icon="el-icon-lock" v-model="psd" show-password></el-input>-->
     </div>
     <div
       class="login"

src/pages/home/verifyToken.vue

@@ -43,13 +43,6 @@ export default {
           });
           this.$store.dispatch("SetConfigList", config_list);
           this.$store.dispatch("SetDictConfigList", dict_config_list);
-          // if(org.id == 9504 || org.id == 3907 || org.id == 3877 || org.id == 10121 || org.id == 9914 || org.id == 9566 || org.id == 10138 || org.id == 10088 || org.id == 9538 || org.id ==9747){
-          //   this.$router.push({path: '/homeIndex'})
-            // location.replace("http://mobile.kuyicloud.com/index22.html#/homeIndex")
-          // }else{
-          //   location.replace("http://mobile.kuyicloud.com/#/homeIndex")
-          // }
-
          this.$router.replace("/homeIndex");
         } else {
           //未登录
@@ -65,7 +58,6 @@ export default {
   },methods:{
     callJsFunction(cookieStr) {
       console.log(cookieStr)
-
     }
   },
 };

src/pages/main/DetailsPage.vue

@@ -23,12 +23,6 @@
           </ul>
         </div>
 
-        <!-- <div @click="openPicker()" class="time">
-                  {{pickerVisible}}<span class="iconfont">&#xe74a;</span>
-        </div>-->
-        <!-- <div class="time" style="width:1.49rem;">
-                  <span class="iconfont">2018-01-01&#xe74a;</span>
-        </div>-->
         <div class="previewBox">
           <i class="el-icon-printer printerIcon" @click="print"></i>
           <!-- <span class="preview" @click="print">预览</span> -->
@@ -40,34 +34,12 @@
       </div>
 
       <div class="Tab">
-        <!-- <CaseHistory v-show="index == 0" title="病历"></CaseHistory> -->
-        <!--<check-tab v-show="index==1" title="化验单"></check-tab>-->
+
         <dialysis-tab v-if="index == 1" title="透析" v-on:records="jump(val)"></dialysis-tab>
         <today-tab ref="today" v-show="index == 0 && !showView" title="今日" @show_patient_list="showPatientList"></today-tab>
-        <!-- <div v-if="showView" style="text-align:center;font-size:0.6rem;">
-          <p style="margin-top:20px;">当前叫号</p>
-          <p style="margin-top:20px;">{{ $route.query.patient_name ? $route.query.patient_name : ""}}</p>
-          <p style="margin-top:20px;">签到时间：{{ $route.query.curPatientTime ? getDates($route.query.curPatientTime) : '' }}</p>
-          <p style="color:red;margin-top:20px;">提示：当前患者无排班，请先排班</p>
-        </div> -->
       </div>
     </div>
-    <!-- <div class="add" @click="print">
-      <p>打印预览</p>
-    </div> -->
-    <!-- <div class="fixedCalling" v-if="queueConfig.txxqyxs == 1">
-      <div class="nowCalling">
-        <div class="callingName">{{ fisrtQueueInfo && fisrtQueueInfo.patient_name ? fisrtQueueInfo.patient_name : '暂无叫号' }}</div>
-        <p v-if="fisrtQueueInfo != null && fisrtQueueInfo.patient_name">当前叫号</p>
-      </div>
-      <div class="fixedVolume" @click="call">
-        <van-icon name="volume" />
-      </div>
-      <div class="callingName" @click="next">下一位</div>
-    </div> -->
-    <!-- <div class="callFamilyBox" @click="callFamily" v-if="queueConfig.txxqyxs == 1">
-      <img src="../../assets/images/callFamily.png" alt="">
-    </div> -->
+
     <div class="callFamilyBox" @click="callFamily" ref="callBtn" v-if="queueConfig.txxqyxs == 1" @touchstart="down" @mousedown="down"
       @mousemove="move"
       @touchmove="move"
@@ -76,19 +48,7 @@
       @touchcancel="end">
       <img src="../../assets/images/callFamily.png" alt="">
     </div>
-    <!-- <div class="printBox" @click="print">
-      <img src="../../assets/images/print.png" alt="">
-    </div> -->
-    <!-- <side-bar :active_index="0"></side-bar> -->
-    <!-- <mt-datetime-picker
-            v-model="pickerVisible"
-            type="date"
-            ref="picker"
-            year-format="{value} "
-            month-format="{value} "
-            date-format="{value} ">
-    </mt-datetime-picker>-->
-
+    <!-- 病人弹窗 -->
     <div class="showBox">
       <van-popup v-model="show" position="top" :style="{ height: '100%' }">
       <div
@@ -330,7 +290,6 @@ export default {
 
     this.GetPatientInfoWithDiseases(this.patient_id)
     // this.requestDialysisScheduals()
-
     this.users.name = this.$store.getters.user.user.user_name
     this.users.id = this.$store.getters.user.admin.id
     this.users.user_type = this.$store.getters.user.user.user_type
@@ -704,6 +663,7 @@ export default {
         .then(response => {
           if (response.data.state == 1) {
             this.patient = response.data.data.patient
+            console.log('cccc',this.patient);
           } else {
             Toast.fail(response.data.msg)
             return false
@@ -732,7 +692,7 @@ export default {
         this.dialysisGlobalConfig(patient)
       }
 
-      // console.log(222222, patient)
+      console.log(222222, patient)
       this.allSearchArr = patient
 
       let newPatients = []
@@ -1061,7 +1021,8 @@ export default {
       if (this.active == 0) {
         let arr = []
         this.searchArr.map(item => {
-          if (item.patient.name.indexOf(val) != -1) {
+          if (item.patient.name.indexOf(val) != -1 ||
+          item.patient.first_letter.indexOf(val) !=-1) {
             arr.push(item)
           }
         })
@@ -1091,7 +1052,9 @@ export default {
       } else if (this.active == 1) {
         let arr = []
         this.allSearchArr.map(item => {
-          if (item.patient.name.indexOf(val) != -1) {
+          console.log('cxvxvnvbncvxvvgf',item.patient.first_letter);
+          if (item.patient.name.indexOf(val) != -1 ||
+          item.patient.first_letter.indexOf(val) !=-1) {
             arr.push(item)
           }
         })

src/pages/main/DialysisArea.vue

@@ -1638,7 +1638,9 @@ export default {
           var filtedSchedules = []
           for (let s_i = 0; s_i < originSchedules.length; s_i++) {
             const schedule = originSchedules[s_i]
-            if (schedule.patient.name.indexOf(search_keyword) != -1 || schedule.patient.dialysis_no.indexOf(search_keyword) != -1) {
+            if (schedule.patient.name.indexOf(search_keyword) != -1 || 
+                schedule.patient.dialysis_no.indexOf(search_keyword) != -1 ||
+                schedule.patient.first_letter.indexOf(search_keyword) != -1) {
               filtedSchedules.push(schedule)
             }
           }

src/pages/main/PatientBox.vue

@@ -2402,21 +2402,6 @@ export default {
       console.log('total', total)
       this.select_time_str = this.getTimeTwo(total)
       this.select_time = this.getTimeTwo(total)
-
-      // let oldTime = this.start_time_str
-      // var time = new Date(oldTime.replace('-', '/'))
-      // var b = parseInt(this.disinfec_time) // 分钟数
-      // time.setMinutes(time.getMinutes() + b)
-
-      // this.end_time = ''
-      // this.end_time = parseTime(time, '{y}-{m}-{d} {h}:{i}')
-      // this.end_time_one = ''
-      // this.end_time_one = parseTime(time, '{y}-{m}-{d} {h}:{i}')
-
-      // this.select_time = parseTime(time, '{y}-{m}-{d} {h}:{i}')
-      // console.log('select_time23323233223', this.select_time)
-      // this.select_time_str = parseTime(time, '{y}-{m}-{d} {h}:{i}')
-      // console.log('select_time_str', this.select_time_str)
     },
     modeColor (id) {
       if (id == 1) {
@@ -2478,11 +2463,11 @@ export default {
 
   },
   created () {
-    console.log("thiso2ooow",this.newIndex)
+    // console.log("thiso2ooow",this.newIndex)
     if (this.$store.getters.user.template_info.org_id != 10340 && this.$store.getters.user.template_info.org_id != 9829 &&  this.$store.getters.user.template_info.org_id != 10490) {
       this.start_time_str = parseTime(this.start_time, '{y}-{m}-{d} {h}:{i}')
       this.select_time_str = parseTime(this.select_time, '{y}-{m}-{d} {h}:{i}')
-      console.log('this.select_time_str3232323', this.select_time_str)
+      // console.log('this.select_time_str3232323', this.select_time_str)
       
     }
   },

src/pages/main/RecordPage.vue

@@ -160,7 +160,7 @@ import { getDialysisOrWaitSelectedConfig } from '@/utils/data_config'
 import monitoring from '../monitoring/index'
 // import control from '../control/index.vue'
 import DialysisAdviceTable from '../advice/DialysisAdviceTable'
-import DialysisAdvice from '../advice/DialysiAdive.vue'
+import DialysisAdvice from '../advice/DialysiAdive'
 import beforeDialysis from './beforeDialysis/index'
 import calling from './calling/index'
 import schedule from './schedule/index'
@@ -405,18 +405,6 @@ export default {
       }
     },
     onClick (tabIndex) {
-      // if(this.$store.getters.user.tab_index == 0){
-      //   this.$refs.waitingArea.removeEventListener()
-      // }
-      // if(tabIndex == 0){
-      //   this.$refs.waitingArea.addEventListener()
-      // }
-      // if(this.$store.getters.user.tab_index == 1){
-      //   this.$refs.dialysisArea.removeEventListener()
-      // }
-      // if(tabIndex == 1){
-      //   this.$refs.dialysisArea.addEventListener()
-      // }
 
       this.$store.getters.user.tab_index = tabIndex
       this.index = tabIndex
@@ -435,14 +423,12 @@ export default {
       // this.$refs.search_field.blur();
       this.search_keyword = this.search_input
       if (this.index == 0) {
-
         this.$refs.waitingArea.searchVal(this.search_keyword)
       } else if (this.index == 1) {
-
         this.$refs.dialysisArea.searchVal(this.search_keyword)
       } else if (this.index == 2) {
         this.$refs.monitoring.searchWithKeyword(1, this.search_keyword)
-      } else if (this.index == 4) {
+      } else if (this.index == 5) {
         this.$refs.dialysisParameters.getKeyword(this.search_keyword)
       }
     },

src/pages/main/WaitingArea.vue

@@ -360,83 +360,8 @@ export default {
           //   });
           // }
         }
-
         // console.log(111, filtedSchedules)
         return this.processScheduals(filtedSchedules)
-        // eslint-disable-next-line no-unreachable
-        if (this.select_index == 2) {
-          var scheduals = []
-          for (let index = 0; index < this.scheduals.length; index++) {
-            const schedual = this.scheduals[index]
-            if (
-              schedual.assessment_before_dislysis == null ||
-              schedual.assessment_before_dislysis.weight_before == 0
-            ) {
-              if (
-                this.cur_zone_selected > 0 &&
-                schedual.device_number.zone.id != this.cur_zone_selected
-              ) {
-                continue
-              }
-              if (
-                timetype_selected > 0 &&
-                schedual.schedule_type != timetype_selected
-              ) {
-                continue
-              }
-              scheduals.push(schedual)
-            }
-          }
-          return this.processScheduals(scheduals)
-          // return scheduals;
-        } else if (this.select_index == 1) {
-          var scheduals = []
-          for (let index = 0; index < this.scheduals.length; index++) {
-            const schedual = this.scheduals[index]
-            if (
-              schedual.prescription == null ||
-              schedual.prescription.creater == 0
-            ) {
-              if (
-                this.cur_zone_selected > 0 &&
-                schedual.device_number.zone.id != this.cur_zone_selected
-              ) {
-                continue
-              }
-              if (
-                timetype_selected > 0 &&
-                schedual.schedule_type != timetype_selected
-              ) {
-                continue
-              }
-              scheduals.push(schedual)
-            }
-          }
-          // return scheduals;
-          return this.processScheduals(scheduals)
-        } else {
-          var scheduals = []
-          for (let index = 0; index < this.scheduals.length; index++) {
-            const schedual = this.scheduals[index]
-            if (schedual.dialysis_order == null) {
-              if (
-                this.cur_zone_selected > 0 &&
-                schedual.device_number.zone.id != this.cur_zone_selected
-              ) {
-                continue
-              }
-              if (
-                timetype_selected > 0 &&
-                schedual.schedule_type != timetype_selected
-              ) {
-                continue
-              }
-              scheduals.push(schedual)
-            }
-          }
-          // return scheduals;
-          return this.processScheduals(scheduals)
-        }
       }
 
       if (this.select_index == 2) {
@@ -984,21 +909,11 @@ export default {
     },
 
     requestScheduals: function () {
-      // this.loading = true;
-      // var date = parseTime(Date.parse(new Date()), '{y}-{m}-{d}')
-      // getWaitingScheduals({ date: date }).then(rs => {
-      // var resp = rs.data
-      // if (resp.state == 1) {
-
       this.loading = false
       var storedata = this.$store.getters.waitscheduals
 
       var scheduals = storedata.waitscheduals
       console.log('我的时间我做主', scheduals)
-      // var scheduals = resp.data.scheduals
-      // this.$store.dispatch('SetWaitScheduals', {
-      //   waitscheduals: scheduals
-      // })
       var totalCount = scheduals.length
       var prescription_count = 0
       var assessment_before_dislysis_count = 0
@@ -1011,8 +926,6 @@ export default {
           prescription_count += 1
         }
       }
-      // this.menuList[2].count = assessment_before_dislysis_count;
-      // this.menuList[1].count = prescription_count;
       this.scheduals = scheduals
 
       var zoneMap = {}
@@ -1058,10 +971,6 @@ export default {
         }
       }
       this.zonesList = zones
-
-      // this.zone_options = zones
-
-      // eslint-disable-next-line camelcase
       var dialysis_scheduals = []
       for (let index = 0; index < zones.length; index++) {
         const zone = zones[index]
@@ -1092,35 +1001,8 @@ export default {
       this.zone_options = zones
 
       this.zone_scheduals = dialysis_scheduals
-      this.getData()
-
-      // this.zone_options = this.makeZones(scheduals);
-      // this.zone_scheduals = this.processScheduals(scheduals);
-      // console.log('this.zone_options',this.zone_options)
-      // console.log('this.zone_scheduals',this.dialysis_scheduals)
-      // } else {
-      //   this.loading = false
-
-      //   this.$toast({
-      //     message: resp.msg
-      //   })
-      // }
-      // }).catch(error => {
-      //     this.loading = false
-
-      //     // 超时之后在这里捕抓错误信息.
-      //     if (error.response) {
-      //       this.networkStates = false
-      //     } else if (error.request) {
-      //       this.networkStates = false
-      //       // if(error.request.readyState == 4 && error.request.status == 0){
-      //       //   //我在这里重新请求
-      //       //   this.networkStates = false
-      //       // }
-      //     } else {
-      //       this.networkStates = false
-      //     }
-      //   })
+      // this.getData()
+      // return 
     },
     makeZones: function (scheduals) {
       console.log('schedualsjianmie', scheduals)
@@ -1473,7 +1355,9 @@ export default {
         var scheduals = []
         for (let index = 0; index < this.scheduals.length; index++) {
           const schedual = this.scheduals[index]
-          if (schedual.patient.name.indexOf(search_keyword) != -1 || schedual.patient.dialysis_no.indexOf(search_keyword) != -1) {
+          if (schedual.patient.name.indexOf(search_keyword) != -1 || 
+              schedual.patient.dialysis_no.indexOf(search_keyword) != -1 ||
+              schedual.patient.first_letter.indexOf(search_keyword) != -1) {
             scheduals.push(schedual)
           }
         }
@@ -1617,21 +1501,7 @@ export default {
 .screening {
   border-bottom: 1px #e5e5e5 solid;
   width: 100%;
-  // position: fixed;
-  // top: 86px;
-  // @media only screen and (min-width: 768px) {
-  //   top: 143px;
-  // }
-  // @media only screen and (min-width: 415px) and (max-width: 767px) {
-  //   top: 114px;
-  // }
-  // right: 0;
-  // z-index: 66;
-  // left: 0;
   background: #fff;
-  // @media only screen and (max-width: 812px) {
-  //   top: 50px !important;
-  // }
   ul {
     @include display-flex;
     @include align-items-center;

src/pages/main/add_urgent_schedule.vue

@@ -104,10 +104,6 @@
         </van-row>
         <van-row class="row">
           <van-col :span="24">
-            <!-- <span class="title">&nbsp;</span>
-            <div class="field_panel">
-              <van-button type="info" size="normal" @click="submitAction">立即排班</van-button>
-            </div>-->
             <div class="nowScheduling" @click="submitAction">立即排班</div>
           </van-col>
         </van-row>
@@ -307,6 +303,7 @@ export default {
   },
   methods: {
     handleSelect (val) {
+      console.log('3333',val);
       this.patient_name = val.name
       this.patient_id = val.id
     },
@@ -316,6 +313,7 @@ export default {
         key = keyword
       }
       let searchArray = []
+      let newArr=[]
       PostSearch(key).then(response => {
         if (response.data.state == 1) {
           searchArray = response.data.data.patient

src/pages/main/all/doctorAdvice.vue

@@ -290,36 +290,7 @@ export default {
           let list = Object.values(dataInfo) // list 转换成功的数据
           let arr = []
 
-          // list.map(item => {
-          //   let arr2 = [];
-          //   if (item.child.length > 1) {
-          //     item.child.map(it => {
-          //       if (arr.indexOf(it.advice_date) == -1) {
-          //         arr.push(it.advice_date);
-          //       } else {
-          //         delete it["advice_date"];
-          //       }
-          //     });
-          //     for (var i = item.child.length - 1; i != -1; i--) {
-          //       let obj = {};
-          //       obj.checker = item.child[i].checker;
-          //       obj.execution_staff = item.child[i].execution_staff;
-          //       obj.user_name = item.child[i].advice_doctor;
-          //       if (
-          //         JSON.stringify(arr2).includes(JSON.stringify(obj)) == false
-          //       ) {
-          //         arr2.push(obj);
-          //       } else {
-          //         console.log("删除");
-          //         delete item.child[i]["checker"];
-          //         delete item.child[i]["execution_staff"];
-          //         delete item.child[i]["advice_doctor"];
-          //       }
-          //     }
-          //   }
-          // });
-
-          console.log('list是 ', list)
+          // console.log('list是 ', list)
           this.doctorAdvicedetail = list
         }
       })

src/pages/main/all/dryWeight.vue

@@ -62,7 +62,7 @@ export default {
     setHeight()
     var id = this.$route.query.id
     var patientid = this.$route.query.patientid
-    console.log('为啥', patientid)
+    // console.log('为啥', patientid)
     this.patientid = patientid
     this.getDryWeightDetail(id)
     this.date = this.$route.query.date

src/pages/main/beforeDialysis/index.vue

@@ -427,7 +427,9 @@
         this.keywords = val
         let arr = []
         for (let i = 0; i < this.all_list.length; i++){
-          if(this.all_list[i].good_type[0].name.indexOf(val) != -1 || this.all_list[i].good_type[0].dialysis_no.indexOf(val) != -1){
+          if(this.all_list[i].good_type[0].name.indexOf(val) != -1 || 
+            this.all_list[i].good_type[0].dialysis_no.indexOf(val) != -1 ||
+            this.all_list[i].good_type[0].first_letter.indexOf(val) != -1){
             arr = arr.concat(this.all_list[i])
           }
         }

src/pages/main/dialog/AcceptsDialog.vue

@@ -21,54 +21,15 @@
                       :label="item.id" v-model="receiveTreatmentAsses.way">{{item.name}}
             </el-radio>
 
-            <!--<el-radio v-model="receiveTreatmentAsses.way" label="1"-->
-              <!--&gt;步行</el-radio-->
-            <!--&gt;-->
-            <!--<el-radio v-model="receiveTreatmentAsses.way" label="2"-->
-              <!--&gt;扶行</el-radio-->
-            <!--&gt;-->
-            <!--<el-radio v-model="receiveTreatmentAsses.way" label="3"-->
-              <!--&gt;轮椅</el-radio-->
-            <!--&gt;-->
-            <!--<el-radio v-model="receiveTreatmentAsses.way" label="4"-->
-              <!--&gt;平车</el-radio-->
-            <!--&gt;-->
-            <!--</el-radio-group>-->
           </el-form-item>
           <el-form-item label="病人意识: " v-if="isShow('病人意识')">
-            <!--<el-radio v-model="receiveTreatmentAsses.consciousness" label="1"-->
-              <!--&gt;清醒</el-radio-->
-            <!--&gt;-->
-            <!--<el-radio v-model="receiveTreatmentAsses.consciousness" label="2"-->
-              <!--&gt;嗜睡</el-radio-->
-            <!--&gt;-->
-            <!--<el-radio v-model="receiveTreatmentAsses.consciousness" label="3"-->
-              <!--&gt;昏迷</el-radio-->
-            <!--&gt;-->
-            <!--<el-radio v-model="receiveTreatmentAsses.consciousness" label="4"-->
-              <!--&gt;模糊</el-radio-->
-            <!--&gt;-->
+
             <el-radio v-for="(item,index) in consciousness_arr" :key="index"
                       :label="item.id" v-model="receiveTreatmentAsses.consciousness">{{item.name}}
             </el-radio>
 
           </el-form-item>
           <el-form-item label="病人食欲: " v-if="isShow('病人食欲')">
-            <!--<el-radio v-model="receiveTreatmentAsses.appetite" label="1"-->
-              <!--&gt;正常</el-radio-->
-            <!--&gt;-->
-            <!--<el-radio v-model="receiveTreatmentAsses.appetite" label="2"-->
-              <!--&gt;减退</el-radio-->
-            <!--&gt;-->
-            <!--<el-radio v-model="receiveTreatmentAsses.appetite" label="3"-->
-              <!--&gt;恶心</el-radio-->
-            <!--&gt;-->
-            <!--<el-radio v-model="receiveTreatmentAsses.appetite" label="4"-->
-              <!--&gt;呕吐</el-radio-->
-            <!--&gt;-->
-            <!--<el-radio v-model="receiveTreatmentAsses.appetite" label="5"-->
-              <!--&gt;腹泻</el-radio-->
-            <!--&gt;-->
 
             <el-radio v-for="(item,index) in appetite_arr" :key="index"
                       :label="item.id" v-model="receiveTreatmentAsses.appetite">{{item.name}}
@@ -113,35 +74,13 @@
           </el-form-item>
 
           <el-form-item label="体位: " v-if="isShow('体位')">
-            <!--<el-radio v-model="receiveTreatmentAsses.posture" label="1"-->
-              <!--&gt;自动体位</el-radio-->
-            <!--&gt;-->
-            <!--<el-radio v-model="receiveTreatmentAsses.posture" label="2"-->
-              <!--&gt;平卧位</el-radio-->
-            <!--&gt;-->
-            <!--<el-radio v-model="receiveTreatmentAsses.posture" label="3"-->
-              <!--&gt;半卧位</el-radio-->
-            <!--&gt;-->
-            <!--<el-radio v-model="receiveTreatmentAsses.posture" label="4"-->
-              <!--&gt;端坐位</el-radio-->
-            <!--&gt;-->
-            <!--<el-radio v-model="receiveTreatmentAsses.posture" label="5"-->
-              <!--&gt;躁动不安</el-radio-->
-            <!--&gt;-->
+
             <el-radio v-for="(item,index) in posture_arr" :key="index"
                       :label="item.id" v-model="receiveTreatmentAsses.posture">{{item.name}}
             </el-radio>
           </el-form-item>
           <el-form-item label="病情: " v-if="isShow('病情')">
-            <!--<el-radio v-model="receiveTreatmentAsses.sick_condition" label="1"-->
-              <!--&gt;一般</el-radio-->
-            <!--&gt;-->
-            <!--<el-radio v-model="receiveTreatmentAsses.sick_condition" label="2"-->
-              <!--&gt;严重</el-radio-->
-            <!--&gt;-->
-            <!--<el-radio v-model="receiveTreatmentAsses.sick_condition" label="3"-->
-              <!--&gt;危</el-radio-->
-            <!--&gt;-->
+
             <el-radio v-for="(item,index) in sick_condition_arr" :key="index"
                       :label="item.id" v-model="receiveTreatmentAsses.sick_condition">{{item.name}}
             </el-radio>
@@ -188,18 +127,6 @@
             label="跌倒风险预防措施: "
             v-if="isShow('跌倒风险预防措施')"
           >
-            <!--<el-radio v-model="receiveTreatmentAsses.precaution" label="1"-->
-            <!--&gt;镇定剂</el-radio-->
-            <!--&gt;-->
-            <!--<el-radio v-model="receiveTreatmentAsses.precaution" label="2"-->
-            <!--&gt;约束带</el-radio-->
-            <!--&gt;-->
-            <!--<el-radio v-model="receiveTreatmentAsses.precaution" label="3"-->
-            <!--&gt;床栏</el-radio-->
-            <!--&gt;-->
-            <!--<el-radio v-model="receiveTreatmentAsses.precaution" label="4"-->
-            <!--&gt;加强宣教</el-radio-->
-            <!--&gt;-->
             <el-checkbox-group v-model="precautionTwo">
               <el-checkbox
                 v-for="item in precaution_arr"
@@ -208,10 +135,6 @@
               >{{ item.name }}</el-checkbox
               >
             </el-checkbox-group>
-
-<!--            <el-radio v-for="(item,index) in precaution_arr" :key="index"-->
-<!--                      :label="item.id" v-model="receiveTreatmentAsses.precaution">{{item.name}}-->
-<!--            </el-radio>-->
           </el-form-item>
           <el-form-item
             label-width="110dp"
@@ -271,13 +194,8 @@
             ></el-input>
           </el-form-item>
         </el-form>
-        <!-- <div class="button">
-          <button @click="commitInfo" class="submitButton">提交</button>
-        </div>-->
       </div>
-      <!-- <div class="footer">
-          处方医生：刘小军 医生
-      </div>-->
+
     </div>
   </div>
 </template>

src/pages/main/dialog/AssessmentDialog.vue

@@ -51,18 +51,6 @@
           </div>
         </div>
 
-<!--        <div class="item" ref="symptom_before_dialysis" v-if="isShow('透析机型号')">-->
-<!--          <h2 class="name">透析机型号</h2>-->
-<!--          <div class="content">-->
-<!--            <input-->
-<!--              type="text"-->
-<!--              @click="newClick($event)"-->
-<!--              @focus="inputFocus"-->
-<!--              v-model="formValue.machine_type"-->
-<!--            />-->
-<!--          </div>-->
-<!--        </div>-->
-
         <div
           @click="showSubMenu('machine_type')"
           class="item"

src/pages/main/dialog/ComputerDialog.vue

@@ -12,156 +12,7 @@
       </div>
 
       <div class="DialogContent newDialogContent">
-        <!-- <div class="item" @click="select_type" v-if="isShowFiled('班次')">
-          <h2 class="name">班次</h2>
-          <div class="content">
-            <span class="text" style="width: 100px">{{getSchedualType(this.schedual_type)}}</span>
-            <span class="iconfont">&#xe6f9;</span>
-          </div>
-        </div>
-        <div class="item" @click="select_bed" v-if="isShowFiled('上机床位')">
-          <h2 class="name">上机床位</h2>
-          <div class="content">
-            <span class="text" style="width: 100px">{{ device_number_map[bed_id].number }}</span>
-            <span class="iconfont">&#xe6f9;</span>
-          </div>
-        </div>
-        <div class="item" @click="select_nurse" v-if="isShowFiled('上机护士')">
-          <h2 class="name">上机护士</h2>
-          <div class="content">
-            <span class="text" style="width: 100px">{{ admin_map[nurse_id].name }}</span>
-            <span class="iconfont">&#xe6f9;</span>
-          </div>
-        </div>
-
-        <div class="item" @click="select_puncture_nurse" v-if="isShowFiled('穿刺者')">
-          <h2 class="name">穿刺者</h2>
-          <div class="content">
-            <span class="text" style="width: 100px" v-if="admin_map[puncture_nurse_id]">{{ admin_map[puncture_nurse_id].name}}</span>
-            <span class="iconfont">&#xe6f9;</span>
-          </div>
-        </div>
-
-         <div class="item" @click="select_change_nurse_nurse"  v-if="isShowFiled('换药护士')">
-          <h2 class="name">换药护士</h2>
-          <div class="content">
-            <span class="text" style="width: 100px" v-if="admin_map[change_nurse]">{{ admin_map[change_nurse].name}}</span>
-            <span class="iconfont">&#xe6f9;</span>
-          </div>
-        </div>
-
-        <div class="item" @click="select_washpipe_nurse_nurse"  v-if="isShowFiled('冲管护士')">
-          <h2 class="name">冲管护士</h2>
-          <div class="content">
-            <span class="text" style="width: 100px" v-if="admin_map[washpipe_nurse]">{{ admin_map[washpipe_nurse].name}}</span>
-            <span class="iconfont">&#xe6f9;</span>
-          </div>
-        </div>
-
-       <div class="item" @click="select_difficult_puncture_nurse"  v-if="isShowFiled('疑难穿刺护士')">
-          <h2 class="name">疑难穿刺护士</h2>
-          <div class="content">
-            <span class="text" style="width: 100px" v-if="admin_map[difficult_puncture_nurse]">{{ admin_map[difficult_puncture_nurse].name}}</span>
-            <span class="iconfont">&#xe6f9;</span>
-          </div>
-        </div>
-
-         <div class="item" @click="select_new_fistula_nurse"  v-if="isShowFiled('新开瘘护士')">
-          <h2 class="name">新开瘘护士</h2>
-          <div class="content">
-            <span class="text" style="width: 100px" v-if="admin_map[new_fistula_nurse]">{{ admin_map[new_fistula_nurse].name}}</span>
-            <span class="iconfont">&#xe6f9;</span>
-          </div>
-        </div>
-
-       <div class="item" @click="quality_nurse_id_nurse"  v-if="isShowFiled('质控护士')">
-          <h2 class="name">质控护士</h2>
-          <div class="content">
-            <span class="text" style="width: 100px" v-if="admin_map[quality_nurse_id]">{{ admin_map[quality_nurse_id].name}}</span>
-            <span class="iconfont">&#xe6f9;</span>
-          </div>
-        </div>
-
-         <div
-            @click="showSubMenu('puncture_needle')"
-            class="item"
-            ref="puncture_needle"
-            v-if="isShowFiled('穿刺针')"
-          >
-            <label class="name" for="knj">穿刺针</label>
-            <div class="content">
-              <span
-                class="text"
-                id="knjaa"
-              >{{getPunctureNeedle(puncture_needle)}}</span>
-              <span class="iconfont">&#xe6f9;</span>
-            </div>
-          </div>
-
-          <div
-          @click="showSubMenu('puncture_way')"
-          class="item"
-          ref="puncture_way"
-          v-if="isShowFiled('穿刺方式')"
-        >
-          <h2 class="name">穿刺方式</h2>
-           <div class="content">
-            <span class="text" style="width: 100px">{{getPunctureWay(puncture_way)}}</span>
-            <span class="iconfont">&#xe6f9;</span>
-          </div>
-        </div>
-
-        <div @click="showSubMenu('dialysis_dialyszers')" class="item" ref="mode" v-if="isShowFiled('透析器')">
-            <label class="name" for="txms">透析器</label>
-            <div class="content">
-              <span class="text" id="txms">{{getDialysis(dialysis_dialyszers)}}</span>
-              <span class="iconfont">&#xe6f9;</span>
-            </div>
-          </div>
-
-          <div @click="showSubMenu('dialysis_irrigation')" class="item" ref="mode" v-if="isShowFiled('灌流器')">
-            <label class="name" for="txms">灌流器</label>
-            <div class="content">
-              <span class="text" id="txms">{{getDialysisIrrigation(dialysis_irrigation)}}</span>
-              <span class="iconfont">&#xe6f9;</span>
-            </div>
-          </div>
-
-         <div @click="showSubMenu('blood_access_id')" class="item" ref="mode" v-if="isShowFiled('血管通路')">
-            <label class="name" for="txms">血管通路</label>
-            <div class="content">
-              <span class="text" id="txms">{{getBloodAccessTwo(blood_access_id)}}</span>
-              <span class="iconfont">&#xe6f9;</span>
-            </div>
-          </div>
-
-          <div class="item" v-if="isShowFiled('核酸检测日期')">
-          <h2 class="name">核酸检测日期</h2>
-          <div class="content">
-            <span class="text" style="width: 100px" @click="selectNucleinDateAction">{{ nuclein_date_str }}</span>
-            <span class="iconfont">&#xe6f9;</span>
-          </div>
-        </div>
-
-        <div class="item" v-if="template_id == 6">
-          <label class="name" for="xll">引血(ml/min)</label>
-          <div class="content">
-            <input type="tel" @focus="inputFocus" id="xll" v-model="blood_drawing"/>
-          </div>
-        </div>
-
-        <div class="item" v-if="isShowFiled('上机时间')">
-          <h2 class="name">上机时间</h2>
-          <div class="content">
-            <span class="text" style="width: 100px" @click="selectStartTimeAction">{{ start_time_str }}</span>
-            <span class="iconfont">&#xe6f9;</span>
-          </div>
-        </div>
-
-        <div class="perform">
-          <button @click="commitInfo" v-if="(record == null || record.id == '')">执行上机</button>
-          <button :disabled="true" style="background-color:lightgray;" v-else>已上机</button>
-        </div> -->
+ 
         <van-collapse v-model="activeNames" accordion @change="showSubMenu">
           <van-collapse-item v-if="isShowFiled('班次')" title="班次" name="1">
             <template #value>
@@ -176,14 +27,6 @@
               >
             </van-radio-group>
           </van-collapse-item>
-          <!-- <van-collapse-item v-if="isShowFiled('上机床位')" title="上机床位" name="2">
-                    <template #value>
-                        <div v-if="device_number_map[bed_id]">{{device_number_map[bed_id].zoneNumber}}</div>
-                    </template>
-                    <van-radio-group v-model="bed_id" @change="changeBed">
-                        <van-radio :name="item.id" v-for='(item,index) in zone_beds' :key="index">{{ item.zoneNumber }}</van-radio>
-                    </van-radio-group>
-                </van-collapse-item> -->
           <van-collapse-item
             v-if="isShowFiled('上机床位')"
             title="上机分区"

src/pages/main/dialog/DialysisConsumables.vue

@@ -118,7 +118,7 @@ export default {
 
           for (let i = 0; i < res.data.dialysis_goods.length; i++) {
             if (res.data.dialysis_goods[i].good_user.length > 0) {
-              console.log('~~~~~')
+              // console.log('~~~~~')
 
               for (let b = 0; b < res.data.dialysis_goods[i].good_user.length; b++) {
                 let obj = {
@@ -130,7 +130,7 @@ export default {
                 this.list.push(obj)
               }
             } else {
-              console.log('~~~~~22222')
+              // console.log('~~~~~22222')
 
               if (res.data.dialysis_goods[i].good_user_detail.length > 0) {
                 for (let b = 0; b < res.data.dialysis_goods[i].good_user_detail.length; b++) {
@@ -143,9 +143,9 @@ export default {
                   this.list.push(obj)
                 }
               } else {
-                console.log('~~~~~44444444')
+                // console.log('~~~~~44444444')
 
-                console.log('res.data.dialysis_goods[i].project')
+                // console.log('res.data.dialysis_goods[i].project')
                 console.log(res.data.dialysis_goods[i].project)
                 if (res.data.dialysis_goods[i].project.length > 0) {
                   for (let b = 0; b < res.data.dialysis_goods[i].project.length; b++) {
@@ -159,7 +159,7 @@ export default {
                     this.list.push(obj)
                   }
                 } else {
-                  console.log('~~~~~55555555')
+                  // console.log('~~~~~55555555')
 
                   if (res.data.dialysis_goods[i].last_good_user != null) {
                     for (let b = 0; b < res.data.dialysis_goods[i].last_good_user.length; b++) {
@@ -178,12 +178,6 @@ export default {
             }
           }
 
-          // var obj = {}
-          // this.list =  this.list.reduce((cur, next) => {
-          //   obj[next.good_id] ? '' : obj[next.good_id]  = true && cur.push(next)
-          //   return cur
-          // }, []) // 设置cur默认类型为数组，并且初始值为空的数组
-
           var prescription = res.data.prescribe
           var goodInfo = res.data.good_info
           var dialyszerArr = []

src/pages/main/dialog/DoubleDialog.vue

@@ -7,291 +7,7 @@
         <span @click="commitInfo" class="success">保存</span>
       </div>
       <div style="height: 8rem" class="DialogContent choose">
-        <!-- <el-form
-          :inline="true"
-          class="demo-form-inline doubleForm"
-          :model="doubleReview"
-          label-width="3.5rem"
-        >
-          <el-form-item label="透析物品核查 :">
-            <el-radio
-              v-model="doubleReview.dialysis_item_check"
-              label="1"
-              @change="changeRadio"
-              >正确
-            </el-radio>
-          </el-form-item>
-          <el-form-item class="newItem" label="差错描述 :" label-width="3.5rem">
-            <el-input
-              class="doubleInput"
-              v-model="doubleReview.dialysis_item_desc"
-            ></el-input>
-          </el-form-item>
-
-          <el-form-item>
-            <van-checkbox-group v-model="result" @change="toCheck">
-              <van-checkbox shape="square" name="a"
-                >透析器/灌流器:<span v-if="prescription_prop != null">{{
-                  prescription_prop.dialyzer_perfusion_apparatus
-                }}</span></van-checkbox
-              >
-              <van-checkbox shape="square" name="b"
-                >穿刺针:<span v-if="predialysis != null">{{
-                  predialysis.puncture_needle
-                }}</span></van-checkbox
-              >
-              <van-checkbox shape="square" name="c"
-                >透析液配方:<span v-if="prescription_prop != null">{{
-                  GetDialysateFormulationById(
-                    prescription_prop.dialysate_formulation
-                  )
-                }}</span></van-checkbox
-              >
-              <van-checkbox shape="square" name="d"
-                >钾:<span v-if="prescription_prop != null">{{
-                  prescription_prop.kalium
-                }}</span></van-checkbox
-              >
-              <van-checkbox shape="square" name="e"
-                >钙:<span v-if="prescription_prop != null">{{
-                  prescription_prop.calcium
-                }}</span></van-checkbox
-              >
-            </van-checkbox-group>
-          </el-form-item>
-        </el-form>
-
-        <el-form
-          :inline="true"
-          class="demo-form-inline doubleForm"
-          :model="doubleReview"
-          label-width="3.5rem"
-        >
-          <el-form-item label="透析参数核查 :">
-            <el-radio
-              v-model="doubleReview.dialysis_parameter_check"
-              label="1"
-              @change="changeRadioTwo"
-              >正确
-            </el-radio>
-          </el-form-item>
-          <el-form-item class="newItem" label="差错描述 :" label-width="3.5rem">
-            <el-input
-              class="doubleInput"
-              v-model="doubleReview.dialysis_parameter_desc"
-            ></el-input>
-          </el-form-item>
-
-          <el-form-item>
-            <van-checkbox-group v-model="resultOne" @change="toCheckOne">
-              <van-checkbox name="a" shape="square"
-                >透析模式:<span v-if="prescription_prop != null">{{
-                  getMode(prescription_prop.mode_id)
-                }}</span></van-checkbox
-              >
-              <van-checkbox name="b" shape="square"
-                >透析时长:<span v-if="prescription_prop != null">{{
-                  prescription_prop.dialysis_duration_hour +
-                  "小时" +
-                  prescription_prop.dialysis_duration_minute +
-                  "分"
-                }}</span></van-checkbox
-              >
-              <van-checkbox name="c" shape="square"
-                >目标超滤量:<span v-if="prescription_prop != null">{{
-                  prescription_prop.target_ultrafiltration
-                    ? prescription_prop.target_ultrafiltration
-                    : ""
-                }}</span></van-checkbox
-              >
-              <van-checkbox name="d" shape="square"
-                >抗凝剂:<span v-if="prescription_prop != null">{{
-                  getAnticoagulant(prescription_prop.anticoagulant)
-                }}</span></van-checkbox
-              >
-              <van-checkbox name="e" shape="square"
-                >首剂:<span v-if="prescription_prop != null">{{
-                  prescription_prop.anticoagulant_shouji
-                }}</span></van-checkbox
-              >
-              <van-checkbox name="f" shape="square"
-                >维持:<span v-if="prescription_prop != null">{{
-                  prescription_prop.anticoagulant_weichi
-                }}</span></van-checkbox
-              >
-              <van-checkbox name="g" shape="square"
-                >总量:<span v-if="prescription_prop != null">{{
-                  prescription_prop.anticoagulant_zongliang
-                }}</span></van-checkbox
-              >
-              <van-checkbox name="h" shape="square"
-                >置换液:<span v-if="prescription_prop != null">{{
-                  prescription_prop.displace_liqui_part
-                    ? prescription_prop.displace_liqui_part
-                    : ""
-                }}</span></van-checkbox
-              >
-              <van-checkbox name="i" shape="square"
-                >置换总量:<span v-if="prescription_prop != null">{{
-                  prescription_prop.replacement_total
-                    ? prescription_prop.replacement_total
-                    : ""
-                }}</span></van-checkbox
-              >
-              <van-checkbox name="j" shape="square"
-                >处方血流量:<span v-if="prescription_prop != null">{{
-                  prescription_prop.blood_flow_volume
-                    ? prescription_prop.blood_flow_volume
-                    : ""
-                }}</span></van-checkbox
-              >
-              <van-checkbox name="k" shape="square"
-                >透析液流量:<span v-if="prescription_prop != null">{{
-                  prescription_prop.dialysate_flow
-                    ? prescription_prop.dialysate_flow
-                    : ""
-                }}</span></van-checkbox
-              >
-            </van-checkbox-group>
-          </el-form-item>
-        </el-form>
-
-        <el-form
-          :inline="true"
-          class="demo-form-inline doubleForm"
-          :model="doubleReview"
-          label-width="3.5rem"
-        >
-          <el-form-item label="血管通路核查 :">
-
-            <el-radio
-              v-model="doubleReview.vascular_access_verification"
-              label="1"
-              @change="changeRadioThree"
-              >正确
-            </el-radio>
-          </el-form-item>
-          <el-form-item class="newItem" label="差错描述 :" label-width="3.5rem">
-            <el-input
-              class="doubleInput"
-              v-model="doubleReview.vascular_access_desc"
-            ></el-input>
-          </el-form-item>
-
-          <el-form-item>
-            <van-checkbox-group v-model="resultThree" @change="toCheckTwo">
-              <van-checkbox name="a" shape="square"
-                >通路类型:<span v-if="predialysis != null">{{
-                  getBloodAccess(predialysis.blood_access_part_opera_id)
-                }}</span></van-checkbox
-              >
-              <van-checkbox name="b" shape="square">动静脉接错</van-checkbox>
-              <van-checkbox name="c" shape="square">渗血</van-checkbox>
-              <van-checkbox name="d" shape="square">压迫</van-checkbox>
-              <van-checkbox name="e" shape="square">折叠</van-checkbox>
-              <van-checkbox name="f" shape="square">滑脱</van-checkbox>
-            </van-checkbox-group>
-          </el-form-item>
-        </el-form>
-        <el-form
-          :inline="true"
-          class="demo-form-inline doubleForm"
-          :model="doubleReview"
-          label-width="3.5rem"
-        >
-          <el-form-item label="管道连接核查 :">
-            <el-radio
-              v-model="doubleReview.pipeline_connection_check"
-              label="1"
-              @change="changeRdioFour"
-              >正确
-            </el-radio>
-          </el-form-item>
-          <el-form-item class="newItem" label="差错描述 :" label-width="3.5rem">
-            <el-input
-              class="doubleInput"
-              v-model="doubleReview.pipeline_connection_desc"
-            ></el-input>
-          </el-form-item>
-
-          <el-form-item>
-            <van-checkbox-group v-model="resultFour" @change="toCheckThree">
-              <van-checkbox name="a" shape="square"
-                >泵前补液测管未夹</van-checkbox
-              >
-              <van-checkbox name="b" shape="square"
-                >肝素管夹未开启</van-checkbox
-              >
-              <van-checkbox name="c" shape="square"
-                >透析液连接错误</van-checkbox
-              >
-              <van-checkbox name="d" shape="square"
-                >动静脉壶页面不标准</van-checkbox
-              >
-              <van-checkbox name="e" shape="square"
-                >静脉管道未夹入保护夹</van-checkbox
-              >
-              <van-checkbox name="f" shape="square"
-                >压力传感器夹未打开</van-checkbox
-              >
-              <van-checkbox name="i" shape="square">接口连接松动</van-checkbox>
-              <van-checkbox name="j" shape="square">管路打折</van-checkbox>
-              <van-checkbox name="k" shape="square"
-                >肝素补液口未双保险夹闭</van-checkbox
-              >
-            </van-checkbox-group>
-          </el-form-item>
-        </el-form> -->
-
-        <!-- <div class="item">
-
-          <h2 class="name">第一核对时间</h2>
-          <div class="content">
-            <span
-              class="text"
-              style="width: 3.5rem"
-              @click="selectFirstCheckTimeAction"
-            >{{ first_check_time_str}}</span
-            >
-            <span class="iconfont">&#xe6f9;</span>
-          </div>
-        </div>
-
-        <div class="item" @click="select_first_checker">
-          <h2 class="name">第一核对人员</h2>
-          <div class="content">
-            <span class="text" style="width: 100px" v-if="admin_map[creater]">{{ admin_map[creater].name}}</span>
-            <span class="iconfont">&#xe6f9;</span>
-          </div>
-        </div>
-
-        <div class="item" @click="selectSecondCheckTimeAction">
-          <h2 class="name">第二核对时间</h2>
-          <div class="content">
-            <span
-              class="text"
-              style="width: 3.5rem"
-            >{{ check_time_str }}</span
-            >
-            <span class="iconfont">&#xe6f9;</span>
-          </div>
-        </div>
-
-        <div class="item" @click="select_second_checker">
-          <h2 class="name">第二核对人员</h2>
-          <div class="content">
-            <span class="text" style="width: 100px" v-if="admin_map[modifier]">{{ admin_map[modifier].name}}</span>
-            <span class="iconfont">&#xe6f9;</span>
-          </div>
-        </div>
-
-        <div class="item" v-if="isShow('第二核对人员工号')">
-          <h2 class="name">第二核对人员工号:</h2>
-          <div class="content">
-            <el-input v-model="doubleReview.employee_number" style="with:100px"></el-input>
-          </div>
-        </div> -->
-
+ 
         <van-collapse v-model="activeNames" accordion>
           <div>
             <van-cell title="透析物品核查">

src/pages/main/dialog/LongDialog.vue

@@ -19,8 +19,6 @@
           <h2 class="name">透析时长(h)</h2>
           <div class="content">
             <input type="number" v-model="dialysisSolution.dialysis_duration" />
-            <!-- <span class="text">1</span>   -->
-            <!-- <span class="iconfont">&#xe6f9;</span>  -->
           </div>
         </div>
         <div class="item" @click="showMenu(1)">
@@ -42,16 +40,14 @@
           <h2 class="name">血流量(ml/min)</h2>
           <div class="content">
             <input type="number" v-model="dialysisSolution.blood_flow_volume" />
-            <!-- <span class="text">HD</span>   -->
-            <!-- <span class="iconfont">&#xe6f9;</span> -->
+
           </div>
         </div>
         <div class="item">
           <h2 class="name">脱水量(L)</h2>
           <div class="content">
             <input type="number" v-model="dialysisSolution.dewater" />
-            <!-- <span class="text">HD</span>   -->
-            <!-- <span class="iconfont">&#xe6f9;</span> -->
+ 
           </div>
         </div>
 
@@ -61,8 +57,6 @@
           <h2 class="name">置换液(L)</h2>
           <div class="content">
             <input type="number" v-model="dialysisSolution.displace_liqui" />
-            <!-- <span class="text">HD</span>   -->
-            <!-- <span class="iconfont">&#xe6f9;</span> -->
           </div>
         </div>
         <div class="item">

src/pages/main/dialog/MonitDialog.vue

@@ -648,30 +648,7 @@ export default {
     this.template_id = this.$store.getters.user.template_info.template_id
     this.org_id = this.$store.getters.user.template_info.org_id
 
-    // date *= 1000;
-    // var newDate = new Date(date);
-    // var cDate = new Date();
-
-    // var y = newDate.getFullYear();
-    // var m = newDate.getMonth() + 1;
-    // var d = newDate.getDate();
-    // if (isNaN(y) || isNaN(m) || isNaN(d)) {
-    //   // newDate = new Date();
-    //   y = cDate.getFullYear();
-    //   m = cDate.getMonth() + 1;
-    //   d = cDate.getDate();
-    // }
-
-    // var h = cDate.getHours();
-    // var mi = cDate.getMinutes();
-
-    // var pickertime = (h < 10 ? "0" + h : h) + ":" + (mi < 10 ? "0" + mi : mi);
-    // var monitor_date_str =
-    //   y + "-" + (m < 10 ? "0" + m : m) + "-" + (d < 10 ? "0" + d : d);
-    // this.form.monitor_date = Math.round(
-    //   new Date(monitor_date_str + " 00:00:00").getTime() / 1000
-    // );
-    // this.form.monitor_date = parseInt((new Date(date.getFullYear, date.getMonth, date.getDate, 0, 0, 0, 0)).getTime()) //parseTime(date, "{y}-{m}-{d}") + " 00:00:00"
+
     this.form.monitor_date = date
     this.form.operate_time = this.pickertime.getTime()
     console.log('监测时间', this.form.operate_time)
@@ -698,15 +675,6 @@ export default {
       } else {
         this.form.venous_pressure_type = 1
       }
-      // if (this.value == 0) {
-      // this.form.venous_pressure = Math.ceil(Math.round(this.form.venous_pressure * 7.5))
-      // this.value = 1
-      // return false
-      // }
-      // if (this.value == 1) {
-      //   this.form.venous_pressure = Math.ceil(Math.round(this.form.venous_pressure / 7.5))
-      //   this.value = 0
-      // }
     },
     venousPressureChangeTwo () {
       if (this.form.transmembrane_pressure_type == 1) {
@@ -714,16 +682,7 @@ export default {
       } else {
         this.form.transmembrane_pressure_type = 1
       }
-      // if (this.valueOne == 0) {
-      // this.form.transmembrane_pressure = Math.ceil(Math.round(this.form.transmembrane_pressure * 7.5))
-      // this.valueOne = 1
-      // return false
-      // }
-      // if (this.valueOne == 1) {
-      //   this.form.transmembrane_pressure = Math.ceil(Math.round(this.form.transmembrane_pressure / 7.5))
-      //   this.valueOne = 0
-      //   return false
-      // }
+
     },
     venousPressureChangeThree () {
       if (this.form.arterial_pressure_type == 1) {
@@ -731,16 +690,6 @@ export default {
       } else {
         this.form.arterial_pressure_type = 1
       }
-      // if (this.valueTwo == 0) {
-      // this.form.arterial_pressure = Math.ceil(Math.round(this.form.arterial_pressure * 7.5))
-      // this.valueTwo = 1
-      // return false
-      // }
-      // if (this.valueTwo == 1) {
-      //   this.form.arterial_pressure = Math.ceil(Math.round(this.form.arterial_pressure / 7.5))
-      //   this.valueTwo = 0
-      //   return false
-      // }
     },
     isShow (name) {
       var filedList = this.$store.getters.user.fileds
@@ -811,8 +760,6 @@ export default {
         this.form.temperature = resp.monitor.temperature ? resp.monitor.temperature : ''
         this.form.urr = resp.monitor.urr ? resp.monitor.urr : ''
         this.form.conductivity = resp.monitor.conductivity ? resp.monitor.conductivity : ''
-        // this.form.monitor_anticoagulant = resp.monitor.monitor_anticoagulant?resp.monitor.monitor_anticoagulant:''
-        // this.form.monitor_anticoagulant_value = resp.monitor.monitor_anticoagulant_value?resp.monitor.monitor_anticoagulant_value:''
       })
     },
 
@@ -972,15 +919,6 @@ export default {
         input.parentNode.scrollIntoView()
       }, 0)
 
-      // if (input.setSelectionRange) {
-      //   setTimeout(function () {
-      //     input.setSelectionRange(0, input.value.length);
-      //   }, 0);
-      // } else if (input.createTextRange) {
-      //     var rng = input.createTextRange();
-      //     rng.move('character', input.value.length);
-      //     rng.select();
-      // }
     },
     lastInputFocus: function (event) {
       var input = event.target
@@ -1045,16 +983,7 @@ export default {
     },
     handleConfirm (time) {
       this.form.operate_time = time.getTime()
-      // var timeMap = time.split(":");
-      // this.form.monitor_time = time;
-      // this.monitor_time_str =
-      //   parseTime(this.form.monitor_date, "{y}-{m}-{d}") +
-      //   " " +
-      //   this.form.monitor_time;
-
-      // this.monitor_time_str = this.handleTime(time);
-      // this.form.monitor_time =  parseTime(time, "{h}:{i}")
-      // this.form.monitor_date = Math.round(new Date(parseTime(time, "{y}-{m}-{d}") + " 00:00:00").getTime()/1000);
+
     },
     handleTime (time) {
       var year = time.getFullYear()
@@ -1240,10 +1169,7 @@ export default {
 
       this.form.monitor_anticoagulant = this.GetAnticoagulantById(this.currentRow.monitor_anticoagulant)
       this.form.monitor_anticoagulant_value = this.currentRow.monitor_anticoagulant_value
-      // this.monitor_time_str =
-      //   parseTime(this.form.monitor_date, "{y}-{m}-{d}") +
-      //   " " +
-      //   this.form.monitor_time;
+
     },
     openForm () {
       if (this.is_has_create == false) {
@@ -1270,9 +1196,6 @@ export default {
       var record_date = y + '/' + (m < 10 ? '0' + m : m) + '/' + (d < 10 ? '0' + d : d)
       this.form.monitor_date = new Date(record_date + ' 00:00:00').getTime() / 1000
       var nowTime = new Date()
-      // this.form.monitor_time = parseTime(nowTime, "{h}:{i}");
-      // this.monitor_time_str = this.handleTime(nowTime);
-      // this.monitor_time_str = record_date + " " + this.form.monitor_time;
 
       this.getLastRecordTody()
 
@@ -1347,7 +1270,6 @@ export default {
 
             this.$emit('did_edit_monitor', monitor)
             //
-
             Toast.success('修改成功')
             this.selectRow(-1, null)
             this.form.pulse_frequency = ''
@@ -1454,10 +1376,6 @@ export default {
             var monitor = resp.data.monitor
             this.$emit('did_add_monitor', monitor)
 
-            // this.monitor_records.unshift(monitor)
-
-            // this.monitor_records= this.quickSort(this.monitor_records,"operate_time",false)
-
             this.form.pulse_frequency = ''
             this.form.breathing_rated = ''
             this.form.systolic_bp = ''

src/pages/main/dialog/OrdersDialog.vue

@@ -146,51 +146,6 @@
               </template>
             </table>
           </div>
-          <!-- <el-table
-              :data="tableData"
-              border
-              style="width: 100%">
-              <el-table-column  fixed  prop="date" label="开嘱医生"  width="180" align="center">
-                 <template slot-scope="scope">
-                     {{getXuserName(scope.row.advice_doctor)}}
-                 </template>
-              </el-table-column>
-              <el-table-column    prop="name"  label="开始时间"  width="180" align="center">
-                <template slot-scope="scope">
-                   {{uParseTime(scope.row.start_time, '{m}-{d} {h}:{i}')}}
-                </template>
-             </el-table-column>
-             <el-table-column prop="address" label="医嘱内容" align="center">
-               <template slot-scope="scope">
-                    <span>{{scope.row.advice_name }}</span>
-                    <span
-                      v-if="scope.row.advice_desc"
-                    >({{ scope.row.advice_desc }}{{scope.row.drug_spec_unit}})</span>
-                    <span
-                      v-if="scope.row.prescribing_number"
-                    >&nbsp;&nbsp;{{scope.row.prescribing_number}}{{scope.row.prescribing_number_unit}})</span>
-                    <span
-                      v-if="scope.row.single_dose && template_id != 6"
-                    >单次用量{{scope.row.single_dose}}{{scope.row.single_dose_unit}}</span>
-
-                    <span v-if="scope.row.parent_id == 0">{{scope.row.delivery_way}}</span>
-                    <span v-if="scope.row.parent_id == 0">{{scope.row.execution_frequency}}</span>
-                    <span
-                      v-if="scope.row.parent_id == 0 && scope.row.remark.length > 0"
-                    >({{scope.row.remark}})</span>
-               </template>
-            </el-table-column>
-             <el-table-column   prop="address" label="执行时间" align="center">
-               <template slot-scope="scope">
-                     {{uParseTime(scope.row.execution_time, '{m}-{d} {h}:{i}')}}
-               </template>
-            </el-table-column>
-             <el-table-column prop="address" label="执行护士" align="center">
-               <template slot-scope="scope">
-                    {{getXuserName(scope.row.checker)}}
-               </template>
-            </el-table-column>
-          </el-table>-->
         </div>
       </div>
     </div>
@@ -242,11 +197,8 @@
                 <th width="15%">给药途径</th>
                 <th width="15%">执行频率</th>
               </tr>
-              <template v-for="(advice, advice_index) in other_doctor_advices">
-                <tr
-                  :key="advice_index"
-
-                >
+              <template v-for="(advice, advice_index) in other_doctor_advices"  :key="advice_index">
+                <tr>
                   <td
                     style="text-align: left;padding-left:5px;padding-right:5px;"
                   >{{ advice.advice_name }}
@@ -318,14 +270,6 @@
       @did-create-advices="didCreateAdvices"
     ></add-new-order-dialog>
 
-    <!--<advice-form-->
-      <!--ref="subdrug_form"-->
-      <!--@back="index = 0"-->
-      <!--@did-create-subdrug="didAddSubdrug"-->
-      <!--:single_dose_unit_options="unitsOption"-->
-      <!--:prescribing_number_unit_options="unitsOption"-->
-      <!--:drug_spec_unit_options="unitsOption"-->
-    <!--&gt;</advice-form>-->
     <sub-order-form
       ref="subdrug_form"
       @back="index = 0"
@@ -447,7 +391,7 @@ import AddNewOrderDialog from './new_order/AddNewOrders'
 import AdviceForm from './new_order/order_form'
 import ModifyAdviceForm from './modify_order/modify_order_form'
 import ModifyAdviceGroupDialog from './modify_order/ModifyAdviceGroup'
-import InforSubMenu from "../dialog/subMenu/InforSubMenu.vue"
+import InforSubMenu from "../dialog/subMenu/InforSubMenu"
 import request from '@/utils/request'
 import {parseTime} from '@/utils'
 import SubOrderForm from './new_order/sub_order_form'

src/pages/main/dialog/OrdersDialog_olddddd.vue

@@ -5,13 +5,11 @@
         <span class="iconfont">&#xe6e9;</span>
         <h1 class="name">临时医嘱</h1>
         <span class="success">&nbsp;</span>
-        <!-- <span class="success" @click="$emit('orderDialog')">完成</span> -->
       </div>
       <div class="DialogContent choose" id="dialogTop">
         <div class="content clearfix">
           <div class="yzNav" style="width:80%;">
             <span @click="openNewAdvice">新增医嘱</span>
-            <!-- <span>修改医嘱</span> -->
             <span @click="deleteAdvice">删除医嘱</span>
             <span @click="execAdvice">执行医嘱</span>
             <span @click="checkAdvice">医嘱核对</span>
@@ -48,7 +46,6 @@
                 <span
                   v-if="advice.prescribing_number"
                 >{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
-                <!-- <span >{{advice.advice_desc}}</span> -->
                 <span
                   v-if="advice.single_dose"
                 >单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
@@ -85,32 +82,19 @@
           <div>
             <div class="cell">
               <label>医嘱类型</label>
-              <!-- <input type="text" class="inputBox" disabled value="临时"> -->
-
               <el-input ref="advice_type" value="临时" disabled></el-input>
             </div>
             <div class="cell">
               <label>医嘱时间</label>
               <el-input v-model="adviceForm.advice_date" readonly></el-input>
-              <!-- <input type="text" class="inputBox"  v-model="adviceForm.advice_date" readonly> -->
             </div>
             <div class="cell">
               <label>开始时间</label>
               <el-input v-model="adviceForm.start_time" readonly @focus="chooseTime"></el-input>
-              <!-- <input type="text" class="inputBox"  v-model="adviceForm.start_time" readonly @click="chooseTime"> -->
             </div>
             <div class="cell">
               <label>医嘱名称</label>
               <el-input v-model="adviceForm.advice_name"></el-input>
-
-              <!-- <el-input v-model="adviceForm.advice_name" readonly  @focus="showSubMenu('advice_name')" ></el-input> -->
-
-              <!-- <el-select v-model="adviceForm.advice_name" @change="changeAdviceName" filterable placeholder="请选择(输入可搜索)"  >
-                  <el-option v-for="item in drugOptions" :key="item.id" :label="item.name" :value="item.id">
-                    <span >{{ item.name }}</span>
-                    <span >{{ item.spec }}</span>
-                  </el-option>
-              </el-select>-->
             </div>
             <div class="cell">
               <label>给药途径</label>
@@ -121,19 +105,9 @@
                 @focus="showSubMenu('delivery_way')"
                 :disabled="adviceForm.parent_id==0?false:true"
               ></el-input>
-
-              <!-- <el-select v-model="adviceForm.delivery_way" :disabled="adviceForm.parent_id==0?false:true" filterable placeholder="请选择(输入可搜索)" >
-                  <el-option v-for="item in deliveryWayOptions" :key="item.id" :label="item.name " :value="item.name">
-                  </el-option>
-              </el-select>-->
             </div>
             <div class="cell">
               <label>执行频率</label>
-              <!-- <el-select v-model="adviceForm.execution_frequency" :disabled="adviceForm.parent_id==0?false:true" filterable placeholder="请选择(输入可搜索)" >
-                  <el-option v-for="item in executionFrequencyOptions" :key="item.id" :label="item.name " :value="item.name">
-                  </el-option>
-              </el-select>-->
-
               <el-input
                 v-model="adviceForm.execution_frequency"
                 readonly
@@ -143,7 +117,6 @@
             </div>
             <div class="cell">
               <label>医嘱描述</label>
-              <!-- <input type="text" class="inputBox" v-model="adviceForm.advice_desc"> -->
               <el-input v-model="adviceForm.advice_desc"></el-input>
             </div>
             <div class="cell">
@@ -184,15 +157,8 @@
               <label>开嘱医生：</label>
               <span>{{doctor}}</span>
             </div>
-            <!-- <div class="cell width center">
-                  <button @click="submitNewAdvice">提交</button>
-                  <button class="smt-danger" @click="index=0">返回</button>
-            </div>-->
           </div>
         </div>
-        <!-- <div class="footer">
-            开嘱医生：{{doctor}} 医生
-        </div>-->
       </div>
     </div>
 

src/pages/main/dialog/PlaneDialog.vue

@@ -13,80 +13,7 @@
       </div>
 
       <div class="DialogContent">
-        <!-- <div class="item" @click="select_nurse">
-          <h2 class="name">下机护士</h2>
-          <div class="content">
-            <span class="text" style="width: 100px">{{
-              nurse_id == 0 ? "" : admin_map[nurse_id].name
-            }}</span>
 
-            <span class="iconfont">&#xe6f9;</span>
-          </div>
-        </div>
-
-        <div class="item">
-          <h2 class="name">下机时间</h2>
-          <div class="content">
-            <span
-              class="text"
-              style="width: 100px"
-              @click="selectStartTimeAction"
-              >{{ end_time_str }}</span
-            >
-            <span class="iconfont">&#xe6f9;</span>
-          </div>
-        </div>
-
-       <div class="item" v-if="isShow('穿刺处血肿')" @click="showSubMenu('puncture_point_haematoma')">
-          <h2 class="name">穿刺处血肿</h2>
-          <div class="content">
-              <span class="text" id="txms">{{getPuncturePoint(puncture_point_haematoma)}}</span>
-              <span class="iconfont">&#xe6f9;</span>
-          </div>
-        </div>
-
-       <div @click="showSubMenu('internal_fistula')" class="item"  ref="internal_fistula"  v-if="isShow('内瘘')" >
-          <h2 class="name">内瘘</h2>
-          <div class="content">
-            <span class="text" style="width: 100px">{{internal_fistula}}</span>
-            <span class="iconfont">&#xe6f9;</span>
-          </div>
-        </div>
-
-       <div @click="showSubMenu('catheter')" class="item" ref="catheter" v-if="isShow('导管')">
-          <h2 class="name">导管</h2>
-          <div class="content">
-            <span class="text">{{catheter}}</span>
-            <span class="iconfont">&#xe6f9;</span>
-          </div>
-        </div>
-
-       <div @click="showSubMenu('cruor')" class="item" ref="cruor" v-if="isShow('透析器凝血')">
-          <h2 class="name">透析器凝血</h2>
-          <div class="content">
-            <span class="text">{{cruor}}</span>
-            <span class="iconfont">&#xe6f9;</span>
-          </div>
-        </div>
-
-       <div @click="showSubMenu('education')" class="item" ref="education" v-if="isShow('宣教知识')">
-        <h2 class="name">宣教知识:</h2>
-              <el-input
-                class="treatmentInput"
-                readonly
-                v-model="propagandaAndEducationContentSelect"
-                placeholder="请选择"
-                @focus="showSubMenu('education')"
-              ></el-input>
-       </div>
-      <div>
-          <el-input
-            class="newTextarea treatmentInput"
-            type="textarea"
-            v-model="propagandaAndEducationContent"
-            :rows="5"
-          ></el-input>
-        </div> -->
         <van-collapse v-model="activeNames" accordion @change="showSubMenu">
           <van-collapse-item
             title="下机护士"

src/pages/main/dialog/PrescriptionDialog.vue

@@ -5,8 +5,6 @@
         <span @click="close()" class="iconfont">&#xe6e9;</span>
         <h1 class="name newName">透析处方</h1>
         <button class="newButton" @click="showmsgtip">{{patient.name}}</button>
-        <!-- <span @click="commitInfo" class="success" v-if="isPermission()">保存</span> -->
-        <!-- <span @click="commitInfo" class="success" v-if="!isPermission()"></span> -->
         <span @click="commitInfo" class="success" v-if="hasPermission">保存</span>
         <span @click="commitInfo" class="success" v-if="!hasPermission"></span>
       </div>

src/pages/main/dialog/ThorougDialog.vue

@@ -120,8 +120,6 @@
               id="ml"
               v-model="formValue.other_complication"
             />
-            <!--<span class="text">HD</span>-->
-            <!--<span class="iconfont">&#xe6f9;</span>-->
           </div>
         </div>
 
@@ -256,17 +254,6 @@
             <span class="iconfont">&#xe6f9;</span>
           </div>
         </div>
-
-        <!--        <div @click="showSubMenu('dialyzer')" class="item" ref="dialyzer" v-if="isShow('透析器凝血')">-->
-        <!--          <label class="name" for="dg">透析器凝血</label>-->
-        <!--          <div class="content">-->
-        <!--            <span class="text" id="dg">{{getDialyzer(formValue.dialyzer)}}</span>-->
-        <!--            <span class="iconfont">&#xe6f9;</span>-->
-        <!--          </div>-->
-        <!--        </div>-->
-
-      
-
         <div class="item" v-if="this.$store.getters.user.template_info.template_id == 6">
           <label class="name" for="sjcll">透后净体重(kg)</label>
           <div class="content">
@@ -280,13 +267,6 @@
           </div>
         </div>
 
-        <!--<div class=item" v-if="isShow('透后体重')">-->
-        <!--<label class="name" for="thtz">透后体重(kg)</label>-->
-        <!--<div class="content">-->
-        <!--<input type="tel" @focus="inputFocus" id="thtz" v-model="formValue.weight_after"/>-->
-        <!--</div>-->
-        <!--</div>-->
-
         <div @click="showSubMenu('cruor')" class="item" ref="cruor" v-if="isShow('透析器凝血')">
           <label class="name" for="nx">透析器凝血</label>
           <div class="content">
@@ -302,8 +282,6 @@
         >
           <h2 class="name">拔针后穿刺点渗血</h2>
           <div class="content">
-            <!--<span class="text" style="width: 50px;"><div style="padding-top: 0.08rem; height: 0.8rem;">-->
-            <!--<van-switch v-model="puncture_point_oozing_blood_state" @change="puncturePointOozingBlood"/></div></span>-->
             <div class="content">
               <span
                 v-if="formValue.puncture_point_oozing_blood == 0"
@@ -408,8 +386,6 @@
           <div class="content">
             <input type="tel" @focus="inputFocus" id="sjzhl" v-model="formValue.actual_displacement"/>
 
-            <!--&lt;!&ndash;<span class="text">HD</span>&ndash;&gt;-->
-            <!--&lt;!&ndash;<span class="iconfont">&#xe6f9;</span>&ndash;&gt;-->
           </div>
         </div>
 
@@ -424,8 +400,6 @@
               v-model="formValue.temperature"
             />
 
-            <!--<span class="text">HD</span>-->
-            <!--<span class="iconfont">&#xe6f9;</span>-->
           </div>
         </div>
         <div class="item" v-if="isShow('收缩压')">
@@ -438,8 +412,7 @@
               id="ssy"
               v-model="formValue.systolic_blood_pressure"
             />
-            <!--<span class="text">HD</span>-->
-            <!--<span class="iconfont">&#xe6f9;</span>-->
+
           </div>
         </div>
 
@@ -453,8 +426,7 @@
               id="szy"
               v-model="formValue.diastolic_blood_pressure"
             />
-            <!--<span class="text">HD</span>-->
-            <!--<span class="iconfont">&#xe6f9;</span>-->
+
           </div>
         </div>
 
@@ -519,8 +491,7 @@
               id="ml"
               v-model="formValue.breathing_rate"
             />
-            <!--<span class="text">HD</span>-->
-            <!--<span class="iconfont">&#xe6f9;</span>-->
+
           </div>
         </div>
 
@@ -534,8 +505,7 @@
               id="ml"
               v-model="formValue.pulse_frequency"
             />
-            <!--<span class="text">HD</span>-->
-            <!--<span class="iconfont">&#xe6f9;</span>-->
+
           </div>
         </div>
 
@@ -609,15 +579,6 @@
           </div>
         </div>
 
-        <!-- <div @click="showSubMenu('sealing_fluid_dispose')" class="item" ref="sealing_fluid_dispose"
-             v-if="isShow('封管液配置')">
-          <label class="name" for="fgypz">封管液配置</label>
-          <div class="content">
-            <span class="text" id="fgypz">{{QuerySealingFluidDisposeById(formValue.sealing_fluid_dispose)}}</span>
-            <span class="iconfont">&#xe6f9;</span>
-          </div>
-        </div> -->
-
          <div
           @click="showSubMenu('sealing_fluid_dispose')"
           class="item"
@@ -722,8 +683,7 @@
               id="ml"
               v-model="formValue.cvc_a"
             />
-            <!--<span class="text">HD</span>-->
-            <!--<span class="iconfont">&#xe6f9;</span>-->
+
           </div>
         </div>
 

src/pages/main/dialog/TreatmentDialog.vue

@@ -207,11 +207,11 @@ export default {
     this.getPermission();
     // this.summary = this.$store.getters.summary;
     this.summary = getDataConfig("summary", "summary");
-    console.log("透后选叫", getDataConfig("summary", "summary"));
+    // console.log("透后选叫", getDataConfig("summary", "summary"));
     // console.log("this.summary",this.summary)
     // this.teach = this.$store.getters.teach;
     this.teach = getDataConfig("education", "education");
-    console.log("this", this.teach);
+    // console.log("this", this.teach);
     if (this.teach.length > 0) {
       var tlen = this.teach.length;
       for (let index = 0; index < tlen; index++) {
@@ -227,7 +227,7 @@ export default {
       }
     }
     this.nursingRecord = getDataConfig("nursing_record", "nursing_record");
-    console.log("透析护理记录", this.nursingRecord);
+    // console.log("透析护理记录", this.nursingRecord);
 
     if (this.nursingRecord.length > 0) {
       var tlen = this.nursingRecord.length;

src/pages/main/dialog/TwoMenu.vue

@@ -5,7 +5,6 @@
         <span class="iconfont">&#xe720;</span>返回
       </div>
       <h1 class="name">{{ title }}</h1>
-      <!-- <span class="success" @click="handle_selected()">完成</span> -->
       <span v-if="type == 1" class="success"></span>
       <span v-if="type == 2" @click="handle_selected" class="success"
         >确定</span
@@ -61,9 +60,6 @@ export default {
   name: "TwoMenu",
   data() {
     return {
-      // list: ["复选框1", "复选框2"],
-      // result: ["复选框1"],
-
       show: false,
       type: 1, // 1.单选 2.复选
       handle_select: null, // function
@@ -112,16 +108,6 @@ export default {
       this.handle_select = handle_select;
       this.handle_hide = handle_hide;
     },
-    // showMutableSelect(list_options, selected_values, title, show_key, id_key, handle_select) {
-    //   this.show = true
-    //   this.type = 2
-    //   this.title = title
-    //   this.mutable.options = list_options
-    //   this.mutable.selected_values = selected_values
-    //   this.mutable.show_key = show_key
-    //   this.mutable.id_key = id_key
-    //   this.handle_select = handle_select
-    // },
     hide() {
       if (this.handle_hide != null && this.handle_hide != undefined) {
         this.handle_hide();

src/pages/main/dialog/new_order/AddNewOrders.vue

@@ -49,9 +49,8 @@
                 <th width="15%">给药途径</th>
                 <th width="15%">执行频率</th>
               </tr>
-              <template v-for="(advice, advice_index) in advices">
-                <tr
-                  :key="advice_index"
+              <template v-for="(advice, advice_index) in advices" :key="advice_index">
+                <tr     
                   @click="clickAdviceAction(advice_index)"
                   :class="{
                     'row-class-active':

src/pages/main/dialysis/AdviceTable.vue

@@ -1,5 +1,4 @@
 <template>
-
   <div class="newDoctorManagement">
     <div style="height:100%;display:flex;flex-direction: column;">
       <div class="toolBox">
@@ -192,11 +191,6 @@
         <img src="../../../assets/images/none.png" alt />
       </div>
     </div>
-    <!-- <div class="add">
-      <div style="display: flex;align-items: center;">
-        <van-icon class="addIcon" name="add" />新增
-      </div>
-    </div>-->
 
     <!-- 弹出层 -->
     <div>

src/pages/main/dialysis/CourseManagement.vue

@@ -469,37 +469,3 @@ export default {
   width: 0;
 }
 </style>
-<style lang="scss">
-// #app{
-// .newPopup{
-//   .van-picker__toolbar{
-//     height: 1.46rem;
-//     line-height: 1.46rem;
-//   }
-//   .van-picker__cancel, .van-picker__confirm{
-//     padding: 0 0.53rem;
-//     font-size: 0.46rem;
-//   }
-//   .van-picker-column{
-//     font-size: 0.53rem;
-//   }
-//   .van-picker-column__item{
-//     padding: 0 0.14rem;
-//   }
-//   .van-action-sheet__item{
-//     height: 1.6rem;
-//   }
-//   .van-action-sheet__cancel, .van-action-sheet__item{
-//     height: 1.6rem;
-//     font-size: 0.53rem;
-//     line-height: 1.6rem;
-//   }
-//   .van-action-sheet__gap{
-//     height: 0.26rem;
-//   }
-//   .van-action-sheet__cancel::before{
-//     height: 0.26rem;
-//   }
-// }
-// }
-</style>

src/pages/main/dialysis/DialysisTab.vue

@@ -39,17 +39,6 @@
         </van-tab>
       </van-tabs>
   </div>
-<!--    </div>-->
-
-<!--    <div class="tab-content">-->
-<!--      <long-table v-show="index == 0" title="长期透析处方"></long-table>-->
-<!--      <record-table v-show="index == 1" title="透析记录"></record-table>-->
-<!--      <schedul-table v-show="index == 2" class="排班信息"></schedul-table>-->
-<!--      <mission-table v-show="index == 3" class="宣教信息"></mission-table>-->
-<!--    </div>-->
-<!--  </div>-->
-  <!-- <div>
-  </div> -->
 </template>
 
 <script>

src/pages/main/dialysis/DryWeight.vue

@@ -433,25 +433,6 @@ export default {
       display: block;
     }
   }
-  // .add {
-  //   position: fixed;
-  //   bottom: 0;
-  //   left: 0;
-  //   width: 100%;
-  //   height: 2.75rem;
-  //   background: rgba(255, 255, 255, 1);
-  //   box-shadow: 0px -1px 0px 0px rgba(0, 0, 0, 0.1);
-  //   display: flex;
-  //   align-items: center;
-  //   justify-content: space-around;
-  //   font-size: 0.9375rem;
-  //   color: #979798;
-  //   .addIcon {
-  //     color: #5b98ff;
-  //     font-size: 1.25rem;
-  //     margin-right: 0.25rem;
-  //   }
-  // }
   .van-popup {
     border-radius: 0;
     transform: translate3d(0, 0, 0);

src/pages/main/dialysis/MissionTable.vue

@@ -1,69 +1,5 @@
 <template>
-  <!-- <div>
-    <div class="choice">
-      <ul>
-        <li>
-          日期查询：
-          <div @click="openStartPicker" class>
-            {{ parseTime(startTime.getTime() / 1000, "{y}-{m}-{d}") }}
-            <span class="iconfont">&#xe74a;</span>
-          </div>
-          <span class="line"></span>
-          <div @click="openEndPicker" class>
-            {{ parseTime(endTime.getTime() / 1000, "{y}-{m}-{d}") }}
-            <span class="iconfont">&#xe74a;</span>
-          </div>
-        </li>
-      </ul>
-    </div>
-    <div class="blueBorder"></div>
-    <van-list
-      width="100%"
-      v-model="loading"
-      :finished="finished"
-      @load="onLoad"
-    >
-      <div class="tableTit">
-        <ul>
-          <li style="width:10%;">序号</li>
-          <li style="width:25%;">日期</li>
-          <li style="width:65%;">宣教内容</li>
-        </ul>
-      </div>
-      <div class="tableDate">
-        <ul v-for="(item, index) in tableDate" :key="index" :value="item.value">
-          <li style="width:10%;">{{ index + 1 }}</li>
-          <li style="width:25%;">
-            {{ parseTime(item.assessment_date, "{y}-{m}-{d}") }}
-          </li>
-          <li style="width:65%;">{{ item.mission }}</li>
-        </ul>
-      </div>
-      <div class="NoData" v-show="tableDate.length == 0">
-        <img
-          style="margin-top: 50px; margin-bottom: 50px"
-          src="@/assets/login/data.jpg"
-          alt
-        />
-      </div>
-    </van-list>
-
-    <mt-datetime-picker
-      ref="start_date_picker"
-      type="date"
-      @confirm="handleStartDateConfirm"
-      :endDate="new Date()"
-      v-model="startTime"
-    ></mt-datetime-picker>
 
-    <mt-datetime-picker
-      ref="end_date_picker"
-      type="date"
-      @confirm="handleEndDateConfirm"
-      :endDate="new Date()"
-      v-model="endTime"
-    ></mt-datetime-picker>
-  </div> -->
   <div class="newEducation">
     <div>
       <div class="toolBox">
@@ -162,152 +98,6 @@
   </div>
 </template>
 
-<script>
-// import { parseTime } from "@/utils";
-// import { getAllEducationList } from "@/api/patient";
-
-// import { Popover } from "vux";
-// export default {
-//   name: "LongTable",
-//   created() {
-//     this.tableDate = [];
-
-//     this.queryParams.start_time = this.parseTime(
-//       new Date().getTime() / 1000,
-//       "{y}-{m}-{d}"
-//     );
-//     this.queryParams.end_time = this.parseTime(
-//       new Date().getTime() / 1000,
-//       "{y}-{m}-{d}"
-//     );
-//     this.queryParams.patient_id = this.$route.query.patient_id;
-//     this.queryParams.page = this.queryParams.page + 1;
-//     this.queryParams.limit = 15;
-//     this.tableDate = [];
-
-//     getAllEducationList(this.queryParams).then(response => {
-//       if (response.data.state == 0) {
-//         return false;
-//       } else {
-//         if (response.data.data.total == 0) {
-//         } else {
-//           for (let i = 0; i < response.data.data.edus.length; i++) {
-//             this.tableDate.push(response.data.data.edus[i]);
-//           }
-//         }
-//       }
-//     });
-//   },
-//   data() {
-//     return {
-//       tableDate: [],
-//       loading: false,
-//       finished: false,
-
-//       startTime: new Date(),
-//       endTime: new Date(),
-
-//       queryParams: {
-//         mode_id: "",
-//         start_time: "",
-//         end_time: "",
-//         page: 0,
-//         patient_id: 0,
-//         limit: 15
-//       }
-//     };
-//   },
-//   methods: {
-//     parseTime(time, layout) {
-//       return parseTime(time, layout);
-//     },
-//     onLoad() {
-//       this.queryParams.start_time = this.parseTime(
-//         this.startTime.getTime() / 1000,
-//         "{y}-{m}-{d}"
-//       );
-//       this.queryParams.end_time = this.parseTime(
-//         this.endTime.getTime() / 1000,
-//         "{y}-{m}-{d}"
-//       );
-//       this.queryParams.patient_id = this.$route.query.patient_id;
-//       this.queryParams.page = this.queryParams.page + 1;
-//       this.queryParams.limit = 15;
-
-//       getAllEducationList(params).then(response => {
-//         if (response.data.state == 0) {
-//           this.finished = true;
-//           this.loading = false;
-//           return false;
-//         } else {
-//           if (response.data.data.edus.length == 0) {
-//             this.finished = true;
-//             this.loading = false;
-//           } else {
-//             for (let i = 0; i < response.data.data.edus.length; i++) {
-//               this.tableDate.push(response.data.data.edus[i]);
-//             }
-//             this.loading = false;
-//           }
-//         }
-//       });
-//     },
-//     handleStartDateConfirm: function(val) {
-//       this.queryParams.start_time = this.parseTime(
-//         this.startTime / 1000,
-//         "{y}-{m}-{d}"
-//       );
-//       this.queryParams.end_time = this.parseTime(
-//         this.endTime / 1000,
-//         "{y}-{m}-{d}"
-//       );
-//       this.queryParams.page = 1;
-//       this.queryParams.limit = 15;
-
-//       this.getRecordList(this.queryParams);
-//     },
-//     handleEndDateConfirm: function(val) {
-//       this.queryParams.start_time = this.parseTime(
-//         this.startTime / 1000,
-//         "{y}-{m}-{d}"
-//       );
-//       this.queryParams.end_time = this.parseTime(
-//         this.endTime / 1000,
-//         "{y}-{m}-{d}"
-//       );
-//       this.queryParams.page = 1;
-//       this.queryParams.limit = 15;
-//       this.getRecordList(this.queryParams);
-//     },
-//     openStartPicker: function() {
-//       this.$refs.start_date_picker.open();
-//     },
-//     openEndPicker: function() {
-//       this.$refs.end_date_picker.open();
-//     },
-//     getRecordList: function(val) {
-//       this.tableDate = [];
-//       getAllEducationList(val).then(response => {
-//         if (response.data.state == 0) {
-//           return false;
-//         } else {
-//           if (response.data.data.edus.length == 0) {
-//           } else {
-//             for (let i = 0; i < response.data.data.edus.length; i++) {
-//               this.tableDate.push(response.data.data.edus[i]);
-//             }
-//           }
-//         }
-//       });
-//     }
-//   },
-
-//   components: {
-//     Popover
-//   }
-// };
-</script>
-
 <script>
 import {
   getNewPatientId,
@@ -647,94 +437,3 @@ export default {
 }
 </style>
 
-
-<style style="stylesheet/scss" lang="scss" scoped>
-// .choice {
-//   border-bottom: 1px #e5e5e5 solid;
-//   ul {
-//     @include display-flex;
-//     @include align-items-center;
-//     @include text-align;
-//     @include justify-content-between;
-//     width: 80%;
-//     margin: 0 auto;
-//     font-size: 0.45rem;
-//     color: $pgh-color;
-//     li {
-//       @include display-flex;
-//       @include align-items-center;
-//       @include text-align;
-//       @include justify-content-between;
-//       padding: 0.3rem 0;
-//       margin: 0 auto;
-//       .iconfont {
-//         margin: 0 0.1rem;
-//         // @media only screen and (max-width: 812px) {
-//         //   font-size: 12px !important;
-//         // }
-//       }
-//       .line {
-//         background: #a8b3ba;
-//         width: 0.2rem;
-//         height: 1px;
-//         margin: 0 0.2rem;
-//         display: inline-block;
-//       }
-//     }
-//   }
-// }
-// .tableTit {
-//   background: $main-color;
-//   color: $text-color;
-//   @include box-sizing;
-//   ul {
-//     @include display-flex;
-//     @include align-items-center;
-//     @include text-align;
-//     @include justify-content-center;
-//     li {
-//       border-right: 2px #fff solid;
-//       font-size: 0.45rem;
-//       height: 1.2rem;
-//       line-height: 1.2rem;
-//     }
-//     &:last-child {
-//       border-right: none;
-//     }
-//   }
-// }
-// .tableDate {
-//   background: #ecf5ff;
-//   color: $pgh-color;
-//   @include box-sizing;
-//   ul {
-//     @include display-flex;
-//     @include align-items-center;
-//     @include text-align;
-//     @include justify-content-center;
-//     li {
-//       font-size: 0.45rem;
-//       padding: 0.16rem 0;
-//       line-height: 0.5rem;
-//       border-right: 2px #fff solid;
-//       span {
-//         @include flex;
-//         border-right: 2px #fff solid;
-//         border-bottom: 2px #fff solid;
-//         background: #ecf5ff;
-//         display: inline-block;
-//         height: 1.2rem;
-//         line-height: 1.2rem;
-//         .iconfont {
-//           color: $main-color;
-//           font-size: 0.3rem;
-//           margin-right: 0.1rem;
-//         }
-//       }
-//     }
-//     &:last-child {
-//       border-right: none;
-//     }
-//   }
-// }
-</style>

src/pages/main/dialysis/PassAssesment.vue

@@ -1,8 +1,6 @@
 <template>
   <div class="newDryWeight">
     <div>
-     
-
       <div class="adviceBox" v-if="tableList.length > 0">
         <van-list
           v-model="loading"
@@ -57,9 +55,6 @@
         <img src="../../../assets/images/none.png" alt />
       </div>
     </div>
-   
-   
-   
   </div>
 </template>
 
@@ -256,25 +251,6 @@ export default {
       display: block;
     }
   }
-  // .add {
-  //   position: fixed;
-  //   bottom: 0;
-  //   left: 0;
-  //   width: 100%;
-  //   height: 2.75rem;
-  //   background: rgba(255, 255, 255, 1);
-  //   box-shadow: 0px -1px 0px 0px rgba(0, 0, 0, 0.1);
-  //   display: flex;
-  //   align-items: center;
-  //   justify-content: space-around;
-  //   font-size: 0.9375rem;
-  //   color: #979798;
-  //   .addIcon {
-  //     color: #5b98ff;
-  //     font-size: 1.25rem;
-  //     margin-right: 0.25rem;
-  //   }
-  // }
   .van-popup {
     border-radius: 0;
     transform: translate3d(0, 0, 0);

src/pages/main/dialysis/RecordTable.vue

@@ -1,147 +1,5 @@
 <template>
-  <!-- <div>
-    <van-list width="100%" v-model="loading" :finished="finished" @load="onLoad">
-      <div class="choice">
-        <ul>
-          <li>
-            透析时间：
-            <div @click="openStartPicker" class>
-              {{ parseTime(startTime.getTime() / 1000, "{y}-{m}-{d}") }}
-              <span
-                class="iconfont"
-              >&#xe74a;</span>
-            </div>
-            <span class="line"></span>
-            <div @click="openEndPicker" class>
-              {{ parseTime(endTime.getTime() / 1000, "{y}-{m}-{d}") }}
-              <span
-                class="iconfont"
-              >&#xe74a;</span>
-            </div>
-          </li>
 
-          <el-popover placement="bottom" trigger="click">
-            <li slot="reference">
-              透析模式：{{ modeNameOther(mode_id) }}
-              <span class="iconfont">&#xe74a;</span>
-            </li>
-            <div class="popover-demo-content">
-              <ul>
-                <li
-                  v-for="item in modeOptions"
-                  :key="item.id"
-                  @click="itemClick(item.id)"
-                  :class="mode_id == item.id ? 'tick' : ''"
-                >{{ item.name }}</li>
-              </ul>
-            </div>
-          </el-popover>
-        </ul>
-      </div>
-      <div class="blueBorder"></div>
-      <div style="width:100%;overflow:hildden;overflow-x:auto;" class="RecordTable">
-        <table class="table newRecordTable" style>
-          <tr>
-            <th width="124px">透析日期</th>
-            <th width="72px">班次</th>
-            <th width="80px">分区-机号</th>
-            <th width="110px">透析模式</th>
-            <th width="92px">透析时长(h)</th>
-            <th width="76px">干体重(kg)</th>
-            <th width="76px">透前称重(kg)</th>
-            <th width="76px">透后称重(kg)</th>
-            <th width="92px">透前血压(mmHg)</th>
-            <th width="92px">透后血压(mmHg)</th>
-            <th width="92px">超滤总量(L)</th>
-            <th width="92px">抗凝剂种类 首剂/维持/总量</th>
-            <th width="92px">治疗护士</th>
-            <th width="92px">治疗医生</th>
-          </tr>
-          <tr
-            v-for="(item, index) in tableDate"
-            :key="index"
-            :value="item.value"
-            @click="jump(item)"
-          >
-            <td>{{ parseTime(item.dialysis_date, "{y}-{m}-{d}") }}</td>
-            <td>{{ scheduleType(item.schedule_type) }}</td>
-            <td>{{ item.partition_name }} - {{ item.device_number }}</td>
-            <td>{{ modeName(item.prescription.mode_id) }}</td>
-            <td>
-              {{
-              item.prescription.dialysis_duration
-              ? item.prescription.dialysis_duration
-              : ""
-              }}
-            </td>
-            <td>
-              {{
-              item.prescription.dry_weight ? item.prescription.dry_weight : ""
-              }}
-            </td>
-            <td>
-              {{
-              item.predialysis_evaluation.weight_before
-              ? item.predialysis_evaluation.weight_before
-              : ""
-              }}
-            </td>
-            <td>
-              {{
-              item.assessment_after_dislysis.weight_after
-              ? item.assessment_after_dislysis.weight_after
-              : ""
-              }}
-            </td>
-            <td>
-              {{
-              item.predialysis_evaluation.systolic_blood_pressure
-              ? item.predialysis_evaluation.systolic_blood_pressure
-              : ""
-              }}
-            </td>
-            <td>
-              {{
-              item.assessment_after_dislysis.systolic_blood_pressure
-              ? item.assessment_after_dislysis.systolic_blood_pressure
-              : ""
-              }}
-            </td>
-            <td>
-              {{
-              item.predialysis_evaluation.ultrafiltration_amount
-              ? item.predialysis_evaluation.ultrafiltration_amount
-              : ""
-              }}
-            </td>
-            <td>{{ setAnticoagulantsConfit(item.prescription) }}</td>
-            <td>{{ getName(item.treatment_summary.zl_nurse) }}</td>
-            <td>{{ getName(item.treatment_summary.zl_doctor) }}</td>
-          </tr>
-        </table>
-
-        <div class="NoData" v-show="tableDate.length == 0">
-          <img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt />
-        </div>
-      </div>
-    </van-list>
-
-    <mt-datetime-picker
-      ref="start_date_picker"
-      type="date"
-      @confirm="handleStartDateConfirm"
-      :endDate="new Date()"
-      v-model="startTime"
-    ></mt-datetime-picker>
-
-    <mt-datetime-picker
-      ref="end_date_picker"
-      type="date"
-      @confirm="handleEndDateConfirm"
-      :endDate="new Date()"
-      v-model="endTime"
-    ></mt-datetime-picker>
-  </div> -->
   <div class="newDialysisRecord">
     <div>
       <div class="toolBox">
@@ -353,11 +211,6 @@
         <img src="../../../assets/images/none.png" alt />
       </div>
     </div>
-    <!-- <div class="add">
-      <div style="display: flex;align-items: center;">
-        <van-icon class="addIcon" name="add" />新增
-      </div>
-    </div>-->
 
     <!-- 弹出层 -->
     <div>
@@ -414,308 +267,6 @@
   </div>
 </template>
 
-<script>
-// import { Popover } from "vux";
-// import { parseTime } from "@/utils";
-// import { getRecordList } from "@/api/patient";
-// import { fetchAllDoctorAndNurse, fetchAllAdminUsers } from "@/api/doctor";
-
-// export default {
-//   name: "LongTable",
-//   created() {
-//     var date = new Date();
-//     var year = date.getFullYear();
-//     var month = date.getMonth();
-//     var day = date.getDate();
-//     if (month < 10) {
-//       month = "0" + month;
-//     }
-//     if (day < 10) {
-//       day = "0" + day;
-//     }
-//     var nowDate = year + "-" + month + "-" + day;
-
-//     this.startTime = new Date(nowDate);
-
-//     this.modeOptions = this.$store.getters.treatment_mode;
-
-//     this.modeOptions["0"] = {
-//       id: 0,
-//       name: "全部"
-//     };
-
-//     // console.log(this.modeOptions);
-//     this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit;
-//     this.queryParams.start_time = this.parseTime(
-//       this.startTime.getTime() / 1000,
-//       "{y}-{m}-{d}"
-//     );
-//     this.queryParams.end_time = this.parseTime(
-//       new Date().getTime() / 1000,
-//       "{y}-{m}-{d}"
-//     );
-//     this.queryParams.patient_id = this.$route.query.patient_id;
-//     this.queryParams.page = this.queryParams.page + 1;
-//     this.queryParams.limit = 15;
-//     this.tableDate = [];
-//     // console.log(this.queryParams);
-
-//     getRecordList(this.queryParams).then(response => {
-//       if (response.data.state == 0) {
-//         return false;
-//       } else {
-//         if (response.data.data.records.length == 0) {
-//         } else {
-//           for (let i = 0; i < response.data.data.records.length; i++) {
-//             this.tableDate.push(response.data.data.records[i]);
-//           }
-//         }
-//       }
-//     });
-//     this.fetchAllAdminUsers();
-//     this.fetchAllDoctorAndNurse();
-//   },
-//   data() {
-//     return {
-//       mode_id: "",
-//       loading: false,
-//       finished: false,
-//       startTime: new Date(),
-//       endTime: new Date(),
-//       modeOptions: {},
-//       anticoagulantsConfit: [],
-//       doctorList: [],
-//       nurseList: [],
-//       doctorOptions: [],
-//       adminUserOptions: null,
-
-//       queryParams: {
-//         mode_id: "",
-//         start_time: "",
-//         end_time: "",
-//         page: 0,
-//         patient_id: 0,
-//         limit: 15
-//       },
-
-//       tableDate: []
-//     };
-//   },
-//   methods: {
-//     modeName(mode_id) {
-//       return typeof this.modeOptions[mode_id] != "undefined" &&
-//         typeof this.modeOptions[mode_id].name != "undefined"
-//         ? this.modeOptions[mode_id].name
-//         : "";
-//     },
-//     modeNameOther(mode_id) {
-//       return typeof this.modeOptions[mode_id] != "undefined" &&
-//         typeof this.modeOptions[mode_id].name != "undefined"
-//         ? this.modeOptions[mode_id].name
-//         : "全部";
-//     },
-
-//     parseTime(time, layout) {
-//       return parseTime(time, layout);
-//     },
-//     openStartPicker: function() {
-//       this.$refs.start_date_picker.open();
-//     },
-//     openEndPicker: function() {
-//       this.$refs.end_date_picker.open();
-//     },
-//     handleStartDateConfirm: function(val) {
-//       this.queryParams.start_time = this.parseTime(
-//         this.startTime / 1000,
-//         "{y}-{m}-{d}"
-//       );
-//       this.queryParams.end_time = this.parseTime(
-//         this.endTime / 1000,
-//         "{y}-{m}-{d}"
-//       );
-//       this.queryParams.page = 1;
-//       this.queryParams.limit = 15;
-
-//       this.getRecordList(this.queryParams);
-//     },
-//     handleEndDateConfirm: function(val) {
-//       this.queryParams.start_time = this.parseTime(
-//         this.startTime / 1000,
-//         "{y}-{m}-{d}"
-//       );
-//       this.queryParams.end_time = this.parseTime(
-//         this.endTime / 1000,
-//         "{y}-{m}-{d}"
-//       );
-//       this.queryParams.page = 1;
-//       this.queryParams.limit = 15;
-//       this.getRecordList(this.queryParams);
-//     },
-//     getRecordList: function(val) {
-//       this.tableDate = [];
-//       getRecordList(val).then(response => {
-//         if (response.data.state == 0) {
-//           return false;
-//         } else {
-//           if (response.data.data.records.length == 0) {
-//           } else {
-//             for (let i = 0; i < response.data.data.records.length; i++) {
-//               this.tableDate.push(response.data.data.records[i]);
-//             }
-//           }
-//         }
-//       });
-//     },
-//     onLoad() {
-//       this.queryParams.start_time = this.parseTime(
-//         this.startTime.getTime() / 1000,
-//         "{y}-{m}-{d}"
-//       );
-//       this.queryParams.end_time = this.parseTime(
-//         this.endTime.getTime() / 1000,
-//         "{y}-{m}-{d}"
-//       );
-//       this.queryParams.patient_id = this.$route.query.patient_id;
-//       this.queryParams.page = this.queryParams.page + 1;
-//       this.queryParams.limit = 15;
-
-//       getRecordList(this.queryParams).then(response => {
-//         if (response.data.state == 0) {
-//           this.finished = true;
-//           this.loading = false;
-//           return false;
-//         } else {
-//           if (response.data.data.records.length == 0) {
-//             this.finished = true;
-//             this.loading = false;
-//           } else {
-//             for (let i = 0; i < response.data.data.records.length; i++) {
-//               this.tableDate.push(response.data.data.records[i]);
-//             }
-//             this.loading = false;
-//           }
-//         }
-//       });
-//     },
-//     scheduleType(scheduleType) {
-//       var typeName = "";
-//       switch (scheduleType) {
-//         case 1:
-//           typeName = "上午";
-//           break;
-//         case 2:
-//           typeName = "下午";
-//           break;
-//         case 3:
-//           typeName = "晚上";
-//           break;
-//         default:
-//           break;
-//       }
-//       return typeName;
-//     },
-//     setAnticoagulantsConfit: function(prescription) {
-//       if (
-//         typeof this.anticoagulantsConfit[prescription.anticoagulant] ==
-//         "undefined"
-//       ) {
-//         return "";
-//       } else {
-//         if (this.anticoagulantsConfit[prescription.anticoagulant].shouji != 1) {
-//           return this.anticoagulantsConfit[prescription.anticoagulant].name;
-//         } else {
-//           return (
-//             this.anticoagulantsConfit[prescription.anticoagulant].name +
-//             "/" +
-//             prescription.anticoagulant_shouji +
-//             "/" +
-//             prescription.anticoagulant_weichi +
-//             "/" +
-//             prescription.anticoagulant_zongliang
-//           );
-//         }
-//       }
-//     },
-//     getName: function(id) {
-//       if (id <= 0) {
-//         return "";
-//       }
-//       var name = "";
-//       if (
-//         this.adminUserOptions == null ||
-//         typeof this.adminUserOptions.length == "undefined"
-//       ) {
-//         return name;
-//       }
-//       var leng = this.adminUserOptions.length;
-//       if (leng == 0) {
-//         return name;
-//       }
-//       for (let index = 0; index < leng; index++) {
-//         if (this.adminUserOptions[index].id == id) {
-//           name = this.adminUserOptions[index].name;
-//           break;
-//         }
-//       }
-//       return name;
-//     },
-//     fetchAllAdminUsers() {
-//       fetchAllAdminUsers().then(response => {
-//         if (response.data.state == 1) {
-//           this.adminUserOptions = response.data.data.users;
-//           var alen = this.adminUserOptions.length;
-//           for (let index = 0; index < alen; index++) {
-//             if (this.adminUserOptions[index].user_type == 2) {
-//               this.doctorOptions.push(this.adminUserOptions[index]);
-//             }
-//           }
-//         }
-//       });
-//     },
-//     fetchAllDoctorAndNurse() {
-//       fetchAllDoctorAndNurse().then(response => {
-//         if (response.data.state == 1) {
-//           this.doctorOptions = response.data.data.doctors;
-//         }
-//       });
-//     },
-//     itemClick: function(val) {
-//       if (val == "0") {
-//         this.mode_id = "0";
-//       } else {
-//         this.mode_id = val;
-//       }
-//       this.queryParams.mode_id = val;
-//       this.queryParams.start_time = this.parseTime(
-//         this.startTime / 1000,
-//         "{y}-{m}-{d}"
-//       );
-//       this.queryParams.end_time = this.parseTime(
-//         this.endTime / 1000,
-//         "{y}-{m}-{d}"
-//       );
-//       this.queryParams.page = 1;
-//       this.queryParams.limit = 15;
-//       this.getRecordList(this.queryParams);
-//     },
-//     jump: function(val) {
-//       this.$emit("record", val);
-
-//       this.$router.push({
-//         path: "/details",
-//         query: {
-//           patient_id: val.patient_id,
-//           date: val.dialysis_date
-//         }
-//       });
-//     }
-//   },
-//   components: {
-//     Popover
-//   }
-// };
-</script>
-
 <script>
 import { getNewPatientId,getPatientDetail, getDialysisRecord } from "@/api/patient/patient";
 import { uParseTime } from "@/utils/tools";
@@ -882,23 +433,6 @@ export default {
       );
       this.endShow = false;
     },
-    // getPatientDetail(patientid) {
-    //   getPatientDetail(patientid).then(response => {
-    //     if (response.data.state === 1) {
-    //       var patientDetail = response.data.data.patientDetail;
-    //       this.patient_name = patientDetail.name;
-    //       if (patientDetail.blood_patients == 0) {
-    //         this.showOne = false;
-    //         this.showTwo = true;
-    //       }
-    //       if (patientDetail.blood_patients == 1) {
-    //         this.showOne = true;
-    //         this.showTwo = false;
-    //       }
-    //       this.patientName = patientDetail.name;
-    //     }
-    //   });
-    // },
     getDialysisRecord(id) {
       getDialysisRecord(id,this.limit,this.page,this.startTime,this.endTime,this.types).then(response => {
         if (response.data.state === 1) {
@@ -990,22 +524,7 @@ export default {
         '/details?patient_id=' + this.patientid + '&date=' + date + '&patient_name=' + this.patient_name + '&active1=' + 0
       )
     },
-    // getLastTime(dialysis_date){
-    //   console.log("dialysis_date-------",dialysis_date)
 
-    //   var arr = []
-    //   for(let i=0;i<this.dialysisRecord.length;i++){
-    //     if(this.dialysisRecord[i].dialysis_date < dialysis_date){
-    //        arr.push(this.dialysisRecord[i])
-    //     }
-    //   }
-    //   var newList = arr.sort(this.compareList('dialysis_date'))
-    //   console.log("newList--------",newList)
-    //   if(newList!=null && newList.length >0){
-    //      newList[i].
-    //   }
-    //   // return newList[1].dialysis_date
-    // },
     compareList: function (k) {
       return function (a, b) {
         var M = a[k]
@@ -1109,25 +628,6 @@ export default {
       display: block;
     }
   }
-  // .add {
-  //   position: fixed;
-  //   bottom: 0;
-  //   left: 0;
-  //   width: 100%;
-  //   height: 2.75rem;
-  //   background: rgba(255, 255, 255, 1);
-  //   box-shadow: 0px -1px 0px 0px rgba(0, 0, 0, 0.1);
-  //   display: flex;
-  //   align-items: center;
-  //   justify-content: space-around;
-  //   font-size: 0.9375rem;
-  //   color: #979798;
-  //   .addIcon {
-  //     color: #5b98ff;
-  //     font-size: 1.25rem;
-  //     margin-right: 0.25rem;
-  //   }
-  // }
   .van-popup {
     border-radius: 0;
     transform: translate3d(0, 0, 0);
@@ -1137,67 +637,4 @@ export default {
 ::-webkit-scrollbar {
   width: 0;
 }
-</style>
-
-<style style="stylesheet/scss" lang="scss" scoped>
-// .choice {
-//   border-bottom: 1px #e5e5e5 solid;
-//   ul {
-//     @include display-flex;
-//     @include align-items-center;
-//     @include text-align;
-//     @include justify-content-between;
-//     width: 98%;
-//     margin: 0 auto;
-//     font-size: 0.4rem;
-//     color: $pgh-color;
-//     @media only screen and (min-width: 768px) {
-//       width: 80%;
-//     }
-//     li {
-//       @include display-flex;
-//       @include align-items-center;
-//       @include text-align;
-//       padding: 0.3rem 0;
-//       .iconfont {
-//         margin: 0 0.1rem;
-//         // @media only screen and (max-width: 812px) {
-//         //   font-size: 12px !important;
-//         // }
-//       }
-//       .line {
-//         background: #a8b3ba;
-//         width: 0.2rem;
-//         height: 1px;
-//         margin: 0 0.2rem;
-//         display: inline-block;
-//       }
-//     }
-//   }
-// }
-// .RecordTable {
-//   padding-top: 0;
-//   background: #fff;
-//   min-height: calc(100vh - 180px);
-// }
-// .popover-demo-content {
-//   max-height: 400px;
-//   overflow-y: scroll;
-// }
-// .newRecordTable {
-//   @media only screen and (max-width: 414px) {
-//     width: 1200px;
-//   }
-//   @media only screen and (min-width: 415px) and (max-width: 767px) {
-//     width: 1600px;
-//   }
-// }
-</style>
-// <style lang="scss">
-// .el-table td {
-//   padding: 0;
-// }
-// .el-table th {
-//   padding: 6px 0;
-// }
-// </style>
+</style>

src/pages/main/dialysis/RescueRecord.vue

@@ -414,25 +414,7 @@ export default {
       display: block;
     }
   }
-  // .add {
-  //   position: fixed;
-  //   bottom: 0;
-  //   left: 0;
-  //   width: 100%;
-  //   height: 2.75rem;
-  //   background: rgba(255, 255, 255, 1);
-  //   box-shadow: 0px -1px 0px 0px rgba(0, 0, 0, 0.1);
-  //   display: flex;
-  //   align-items: center;
-  //   justify-content: space-around;
-  //   font-size: 0.9375rem;
-  //   color: #979798;
-  //   .addIcon {
-  //     color: #5b98ff;
-  //     font-size: 1.25rem;
-  //     margin-right: 0.25rem;
-  //   }
-  // }
+  
   .van-popup {
     border-radius: 0;
     transform: translate3d(0, 0, 0);

src/pages/main/dialysis/SchedulTable.vue

@@ -1,41 +1,4 @@
 <template>
-  <!-- <div>
-    <van-list width="100%" v-model="loading" :finished="finished" @load="onLoad" >
-      <div class="blueBorder"></div>
-      <div class="schedulTable">
-        <div class="tableTit">
-          <ul>
-            <li
-              v-for="(item, index) in [
-                '日期',
-                '班次',
-                '分区',
-                '机号',
-                '治疗模式'
-              ]"
-              :key="index"
-              :value="item.value"
-            >{{ item }}</li>
-          </ul>
-        </div>
-        <div class="tableDate">
-          <ul>
-            <li v-for="(item, index) in tableDate" :key="index" :value="item.value">
-              <span>{{ parseTime(item.schedule_date, "{y}-{m}-{d}") }}</span>
-              <span>{{ scheduleType(item.schedule_type) }}</span>
-              <span>{{ item.zone.name }}</span>
-              <span>{{ item.bed.number }}</span>
-              <span>{{ item.mode.name }}</span>
-            </li>
-          </ul>
-        </div>
-      </div>
-    </van-list>
-    <div class="NoData" v-show="tableDate.length == 0">
-      <img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt />
-    </div>
-  </div> -->
-
   <div class="newScheduling">
     <div>
       <div class="toolBox">
@@ -153,91 +116,6 @@
     </div>
 </template>
 
-<script>
-// import { parseTime } from "@/utils";
-// import { getSchedualList } from "@/api/patient";
-// export default {
-//   name: "LongTable",
-//   created() {
-//     this.tableDate = [];
-//     let params = {
-//       page: this.page + 1,
-//       limit: this.limit,
-//       patient_id: this.$route.query.patient_id
-//     };
-//     getSchedualList(params).then(response => {
-//       if (response.data.state == 0) {
-//         return false;
-//       } else {
-//         if (response.data.data.schedules.length == 0) {
-//         } else {
-//           for (let i = 0; i < response.data.data.schedules.length; i++) {
-//             this.tableDate.push(response.data.data.schedules[i]);
-//           }
-//         }
-//       }
-//     });
-//   },
-//   data() {
-//     return {
-//       tableDate: [],
-//       loading: false,
-//       finished: false,
-//       page: 0,
-//       limit: 15
-//     };
-//   },
-//   methods: {
-//     parseTime(time, layout) {
-//       return parseTime(time, layout);
-//     },
-//     onLoad() {
-//       this.page = this.page + 1;
-//       let params = {
-//         page: this.page + 1,
-//         limit: this.limit,
-//         patient_id: this.$route.query.patient_id
-//       };
-//       getAllEducationList(params).then(response => {
-//         if (response.data.state == 0) {
-//           this.finished = true;
-//           this.loading = false;
-//           return false;
-//         } else {
-//           if (response.data.data.schedules.length == 0) {
-//             this.finished = true;
-//             this.loading = false;
-//           } else {
-//             for (let i = 0; i < response.data.data.schedules.length; i++) {
-//               this.tableDate.push(response.data.data.schedules[i]);
-//             }
-//             this.loading = false;
-//           }
-//         }
-//       });
-//     },
-//     scheduleType(scheduleType) {
-//       var typeName = "";
-//       switch (scheduleType) {
-//         case 1:
-//           typeName = "上午";
-//           break;
-//         case 2:
-//           typeName = "下午";
-//           break;
-//         case 3:
-//           typeName = "晚上";
-//           break;
-
-//         default:
-//           break;
-//       }
-//       return typeName;
-//     }
-//   }
-// };
-</script>
-
 <script>
 import {
   getNewPatientId,
@@ -789,25 +667,6 @@ export default {
       display: block;
     }
   }
-  // .add {
-  //   position: fixed;
-  //   bottom: 0;
-  //   left: 0;
-  //   width: 100%;
-  //   height: 2.75rem;
-  //   background: rgba(255, 255, 255, 1);
-  //   box-shadow: 0px -1px 0px 0px rgba(0, 0, 0, 0.1);
-  //   display: flex;
-  //   align-items: center;
-  //   justify-content: space-around;
-  //   font-size: 0.9375rem;
-  //   color: #979798;
-  //   .addIcon {
-  //     color: #5b98ff;
-  //     font-size: 1.25rem;
-  //     margin-right: 0.25rem;
-  //   }
-  // }
   .van-popup {
     border-radius: 0;
     transform: translate3d(0, 0, 0);
@@ -819,67 +678,3 @@ export default {
 }
 </style>
 
-
-<style style="stylesheet/scss" lang="scss" scoped>
-// .schedulTable {
-//   width: 100%;
-//   overflow: auto;
-// }
-// .tableTit {
-//   background: $main-color;
-//   color: $text-color;
-//   @include box-sizing;
-//   width: 768px;
-//   ul {
-//     @include display-flex;
-//     @include align-items-center;
-//     @include text-align;
-//     @include justify-content-center;
-
-//     li {
-//       @include flex;
-//       border-right: 2px #fff solid;
-//       font-size: 0.45rem;
-//       height: 1.2rem;
-//       line-height: 1.2rem;
-//     }
-//     &:last-child {
-//       border-right: none;
-//     }
-//   }
-// }
-// .tableDate {
-//   background: $text-color;
-//   color: $pgh-color;
-//   @include box-sizing;
-//   ul {
-//     width: 768px;
-//     li {
-//       font-size: 0.45rem;
-//       height: 1.2rem;
-//       line-height: 1.2rem;
-//       @include display-flex;
-//       @include align-items-center;
-//       @include text-align;
-//       @include justify-content-center;
-//       span {
-//         @include flex;
-//         border-right: 2px #fff solid;
-//         border-bottom: 2px #fff solid;
-//         background: #ecf5ff;
-//         display: inline-block;
-//         height: 1.2rem;
-//         line-height: 1.2rem;
-//         .iconfont {
-//           color: $main-color;
-//           font-size: 0.3rem;
-//           margin-right: 0.1rem;
-//         }
-//       }
-//     }
-//     &:last-child {
-//       border-right: none;
-//     }
-//   }
-// }
-</style>

src/pages/main/dialysis/TreatSummary.vue

@@ -37,26 +37,6 @@
               <div class="adviceTitle">
                 <p>阶段小结时间:{{getTime(item.record_time)}}</p>
               </div>
-<!--              <div class="adviceTitle">阶段小结概要:</div>-->
-<!--              <div>-->
-<!--                <ul style="display: flex;flex-wrap: wrap;">-->
-<!--                  <li style="width:50%">干体重(kg):{{item.dry_weight}}</li>-->
-<!--                  <li style="width:50%">共透析(次):{{item.dialysis_count}}</li>-->
-<!--                  <li style="width:50%">HD(次):{{item.hd_count}}</li>-->
-<!--                  <li style="width:50%">HDF(次):{{item.hdf_count}}</li>-->
-<!--                  <li style="width:50%">HP(次):{{item.hp_count}}</li>-->
-<!--                  <li style="width:50%">其他(次):{{item.other_count}}</li>-->
-<!--                  <li style="width:50%">透析器:{{item.dialzer_apparatus}}</li>-->
-<!--                  <li style="width:50%">灌流器:{{item.perfusion_apparatus}}</li>-->
-<!--                  <li style="width:50%">抗凝剂:{{getAnticoagulant(item.anticoagulant)}}</li>-->
-<!--                  <li style="width:50%">透析液:(钾：{{item.kalium}}钠：{{item.natrium}}钙：{{item.autunite}})</li>-->
-<!--                  <li style="width:50%">每次透析:{{item.hour}}时<span v-if="item.minute!=0">{{item.minute}}分</span></li>-->
-<!--                  <li style="width:50%">透前体重(kg):{{item.befor_weight}}</li>-->
-<!--                  <li style="width:50%">透后体重(kg):{{item.after_weight}}</li>-->
-<!--                  <li style="width:50%">透前血压(mmHg):{{item.befor_pressure}}</li>-->
-<!--                  <li style="width:50%">透后血压(mmHg):{{item.after_pressure}}</li>-->
-<!--                </ul>-->
-<!--              </div>-->
               <div style="margin-top:10px;">阶段小结化验结果:</div>
               <div v-for="it in item.template_inspection_content ? item.template_inspection_content : []">
                 <p style="font-weight:bold;">{{ it.project_name }}&nbsp;&nbsp;检查日期:{{getTime(it.arr[0].inspect_date)}}</p>
@@ -569,25 +549,6 @@ export default {
       display: block;
     }
   }
-  // .add {
-  //   position: fixed;
-  //   bottom: 0;
-  //   left: 0;
-  //   width: 100%;
-  //   height: 2.75rem;
-  //   background: rgba(255, 255, 255, 1);
-  //   box-shadow: 0px -1px 0px 0px rgba(0, 0, 0, 0.1);
-  //   display: flex;
-  //   align-items: center;
-  //   justify-content: space-around;
-  //   font-size: 0.9375rem;
-  //   color: #979798;
-  //   .addIcon {
-  //     color: #5b98ff;
-  //     font-size: 1.25rem;
-  //     margin-right: 0.25rem;
-  //   }
-  // }
   .van-popup {
     border-radius: 0;
     transform: translate3d(0, 0, 0);

src/pages/main/index.vue

@@ -73,10 +73,6 @@ export default {
     for (var i = 0; i < this.sqls.length; i++) {
       this.sqls[i].addListener(this.mediaMatches);
     }
-    
-   
-
-
     // document.documentElement.style.fontSize = 30 + "px";
     // this.requestScheduals()
     // this.requestDialysisScheduals()
@@ -102,11 +98,7 @@ export default {
             window.clientHeight = document.body.clientHeight
             that.clientHeight = window.clientHeight
         })()
-
-      
     }
-
-    
   },
 
   methods: {
@@ -122,8 +114,6 @@ export default {
         // console.log(this.scheduals);
         let doctorAdvice = [];
         let project = [];
-
-
         for (let i = 0; i < this.scheduals.length; i++) {
           if(this.scheduals[i].doctor_advice!=null){
             for (let y = 0; y < this.scheduals[i].doctor_advice.length; y++) {

src/pages/main/newActionBar/components/adviceTemplate.vue

@@ -194,35 +194,6 @@ export default {
       console.log('advice', advices)
       this.$emit('finish', advices, this.start_time_str)
       this.adviceResult = []
-      // WAIN: 效率低，可以通过在 selecting_advice_ids 加上 template_index 和 advice_index 字段来消除 this.templates 的循环
-      // for (let t_a_i = 0; t_a_i < this.selecting_advice_ids.length; t_a_i++) {
-      //     const tpl_advice = this.selecting_advice_ids[t_a_i];
-      //     for (let t_i = 0; t_i < this.templates.length; t_i++) {
-      //     const tpl = this.templates[t_i];
-      //     if (tpl.id == tpl_advice.template_id) {
-      //         var child_begin = false;
-      //         for (let a_i = 0; a_i < tpl.DoctorAdviceTemplate.length; a_i++) {
-      //         const adv = tpl.DoctorAdviceTemplate[a_i];
-      //         if (adv.id == tpl_advice.advice_id) {
-      //             advices.push(adv);
-      //             child_begin = true;
-      //         } else if (child_begin == true) {
-      //             if (adv.parent_id == tpl_advice.advice_id) {
-      //             advices.push(adv);
-      //             } else {
-      //             break;
-      //             }
-      //         }
-      //         }
-      //     }
-      //     }
-      // }
-      // this.$emit("finish", advices);
-
-      // this.$nextTick(() => {
-      //     this.fold_template_ids = [];
-      //     this.selecting_advice_ids = [];
-      // });
     },
 
     didSelectStartTime: function (time) {
@@ -232,7 +203,6 @@ export default {
       this.$refs.start_time_picker.open()
     }
   }
-
 }
 </script>
 

src/pages/main/newActionBar/components/checkBoxMenu.vue

@@ -4,30 +4,29 @@
     </van-checkbox-group>
 </template>
 
-
 <script>
 export default {
-    props: {
-        propsForm: {
-            type: Object
-        },
-    },
-    data(){
-        return{
+  props: {
+      propsForm: {
+          type: Object
+      },
+  },
+  data(){
+      return{
 
-        }
-    },
-    methods:{
-        getValue: function() {
-            let form = {};
-            form["type"] = this.propsForm.type;
-            form["result"] = this.propsForm.result;
-            return form;
-        },
-        changeVal(){
-            this.$emit("menu-comfirm", this.getValue());
-        }
-    }
+      }
+  },
+  methods:{
+      getValue: function() {
+          let form = {};
+          form["type"] = this.propsForm.type;
+          form["result"] = this.propsForm.result;
+          return form;
+      },
+      changeVal(){
+          this.$emit("menu-comfirm", this.getValue());
+      }
+  }
 }
 </script>
 

src/pages/main/newActionBar/components/lastOrNextAdvice.vue

@@ -43,8 +43,6 @@
                 <div class="lastOrNextBox">
                     <div @click="openLast">上一方</div>
                     <div @click="openNext">下一方</div>
-                    <!-- <van-button @click="openLast" type="info" size="small" style="padding: 0 2rem;font-size:.875rem !important;border-radius:4px">上一方</van-button>
-                    <van-button @click="openNext" type="info" size="small" style="padding: 0 2rem;font-size:.875rem !important;border-radius:4px">下一方</van-button> -->
                 </div>
             </div>
             <mt-datetime-picker

src/pages/main/newActionBar/components/modifyOrder.vue

@@ -111,12 +111,7 @@
                         style="width:100%"
                         v-model="order.remark"
                     ></el-input>
-                </div>
-                
-
-
-
-               
+                </div>  
             </div>
             <mt-datetime-picker
             ref="start_time_picker"

src/pages/main/newActionBar/components/newAddOrder.vue

@@ -140,8 +140,6 @@
                 </div>
             </van-popup>
         </div>
-
-
        <van-popup
         v-model="infor_visibility"
         class="advicePopup"

src/pages/main/newActionBar/components/singature.vue

@@ -1,13 +1,6 @@
 <template>
   <div class="mainBox">
     <div class="mainContent">
-      <!-- <h1 class="title">
-        <div class="GoBack" @click="$router.go(-1)">
-          <span class="iconfont">&#xe720;</span>返回
-        </div>
-        <span class="name">电子签名</span>
-        <div class="GoBack"></div>
-      </h1> -->
       <div class="electronicTitle">
         <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
         <span class="titleName">电子签名</span>

src/pages/main/newActionBar/consumables.vue

@@ -614,41 +614,6 @@ export default {
         patient_id: this.patient_id ? this.patient_id : this.$route.query.patient_id
       }
       console.log('Data0-----', data)
-      // if (count == 0) {
-      //   Dialog.confirm({
-      //     title: '删除',
-      //     message: '是否删除该条耗材'
-      //   }).then(() => {
-      //     deteleAutoReduceDetail(data).then((res) => {
-      //       if (res.data.state == 1) {
-      //         this.list.map((item, index) => {
-      //           if (item.good_id == good_id) {
-      //             this.list.splice(index, 1)
-      //           }
-      //         })
-      //         Toast.success('删除成功')
-      //       }
-      //     })
-      //   }).catch(() => {
-      // if (count == 0) {
-      //   Dialog.confirm({
-      //     title: '删除',
-      //     message: '是否删除该条耗材'
-      //   }).then(() => {
-      //     deteleAutoReduceDetail(data).then((res) => {
-      //       if (res.data.state == 1) {
-      //         this.list.map((item, index) => {
-      //           if (item.good_id == good_id) {
-      //             this.list.splice(index, 1)
-      //           }
-      //         })
-      //         Toast.success('删除成功')
-      //       }
-      //     })
-      //   }).catch(() => {
-
-      //   })
-      // }
 
         updateStockGoods(data).then(response => {
             if (response.data.state == 1) {
@@ -657,14 +622,6 @@ export default {
             }
           })
 
-        // updateStockGoods(data).then((res) => {
-        //   updateStockGoods(data).then(response => {
-        //     if (response.data.state == 1) {
-        //       var msg = response.data.data.msg
-        //       // Toast.success('更新成功')
-        //     }
-        //   })
-        // })
         updateStockGoods(data).then(response => {
           if (response.data.state == 1) {
             var msg = response.data.data.msg

src/pages/main/newActionBar/doctorAdvice.vue

@@ -1324,13 +1324,7 @@ export default {
             return false
           } else {
             // 新版医嘱
-            // Toast.success('修改成功！')
-            // var advice = response.data.data.advice
-            // this.advice_list_prop.map(item => {
-            //     if(item.id == advice.id){
-            //         item.execution_time = advice.execution_time
-            //     }
-            // })
+
 
             Toast.success('修改成功！')
             var advice = response.data.data.advice

src/pages/main/newActionBar/monitoring.vue

@@ -289,23 +289,6 @@
                           <van-field v-model="form.replacement_speed" @focus="inputFocus" @keydown='changeFocus' v-if="isShow('置换液速度')" label="置换液速度(ml/h)" type="number" input-align="right"/>
                           <van-field v-model="form.dicarbonate" @focus="inputFocus" @keydown='changeFocus' v-if="isShow('碳酸氢钠用量')" label="碳酸氢钠用量(ml)" type="number" input-align="right"/>
 
-
-                          <!-- <van-cell title='病情变化' v-if="isShow('病情变化')" @click="symptomsShow = true" is-link value="请选择"></van-cell> -->
-                          <!-- <van-field v-model="form.accumulated_blood_volume" @focus="inputFocus" @keydown='changeFocus' v-if="isShow('血容量')" :required="isShow_title('血容量')" label="血容量(L)" type="number" input-align="right"/> -->
-                          <!-- <van-field v-model="form.blood_temperature" @focus="inputFocus" @keydown='changeFocus' v-if="isShow('血温监测')" :required="isShow_title('血温监测')" label="血温监测" type="number" input-align="right"/>
-                          <van-field v-model="form.urea_monitoring" @focus="inputFocus" @keydown='changeFocus' v-if="isShow('尿素监测')" :required="isShow_title('尿素监测')" label="尿素监测" type="number" input-align="right"/>
-                          <van-field v-model="form.blood_thickness" @focus="inputFocus" @keydown='changeFocus' v-if="isShow('血浓量')" :required="isShow_title('血浓量')" label="血浓量" type="number" input-align="right"/>
-                          <van-field v-model="form.blood_monitor" @focus="inputFocus" @keydown='changeFocus' v-if="isShow('血压监测')" :required="isShow_title('血压监测')" label="血压监测" type="number" input-align="right"/>
-                          <van-field v-model="form.dehydration" @focus="inputFocus" @keydown='changeFocus' v-if="isShow('脱水')" :required="isShow_title('脱水')" label="脱水(L)" type="number" input-align="right"/> -->
-                          <!-- <van-cell title='病情变化' v-if="isShow('病情变化')">
-                              <template #label>
-                                  <van-checkbox-group v-model="symptomsArr" @change='menuComfirmSymptoms'>
-                                      <van-checkbox :name="item.name" v-for='(item,index) in symptoms' :key="index">{{ item.name }}</van-checkbox>
-                                  </van-checkbox-group>
-                              </template>
-                          </van-cell> -->
-                          <!-- <van-cell title='病情变化' v-if="isShow('病情变化')" :required="isShow_title('病情变化')" @click="symptomsShow = true" is-link value="请选择"></van-cell> -->
-
                           <van-cell title='病情变化' v-if="isShow('病情变化')" @click="symptomsShow = true" is-link value="请选择"></van-cell>
                           <van-popup v-model="symptomsShow" class="listBoxPopup newListBoxPopup" style="z-index:5000">
                               <div class="listBox">
@@ -315,13 +298,6 @@
                           </van-popup>
 
                           <van-field class="bgField" v-if="isShow('病情变化')" :required="isShow_title('病情变化')" @focus="inputFocus" v-model="form.symptom" rows="1" autosize type="textarea" placeholder="请输入"/>
-                          <!-- <van-cell title='处理' v-if="isShow('处理')">
-                              <template #label>
-                                  <van-checkbox-group v-model="disposeArr" @change='menuComfirmDispose'>
-                                      <van-checkbox :name="item.name" v-for='(item,index) in dispose' :key="index">{{ item.name }}</van-checkbox>
-                                  </van-checkbox-group>
-                              </template>
-                          </van-cell> -->
                           <van-cell title='处理' v-if="isShow('处理')" :required="isShow_title('处理')" @click="disposeShow = true" is-link value="请选择"></van-cell>
                           <van-popup v-model="disposeShow" class="listBoxPopup newListBoxPopup" style="z-index:5000">
                               <div class="listBox">
@@ -330,13 +306,6 @@
                               </div>
                           </van-popup>
                           <van-field class="bgField" v-if="isShow('处理')" :required="isShow_title('处理')" @focus="inputFocus" v-model="form.dispose" rows="1" autosize type="textarea" placeholder="请输入"/>
-                          <!-- <van-cell title='结果' v-if="isShow('结果')">
-                              <template #label>
-                                  <van-checkbox-group v-model="resultsArr" @change='menuComfirmResults'>
-                                      <van-checkbox :name="item.name" v-for='(item,index) in results' :key="index">{{ item.name }}</van-checkbox>
-                                  </van-checkbox-group>
-                              </template>
-                          </van-cell> -->
                           <van-cell title='结果' v-if="isShow('结果')" :required="isShow_title('结果')" @click="resultsShow = true" is-link value="请选择"></van-cell>
                           <van-popup v-model="resultsShow" class="listBoxPopup newListBoxPopup" style="z-index:5000">
                               <div class="listBox">
@@ -465,7 +434,6 @@
           <span :class="{ forbid: is_has_modify != true && is_has_modify_other != true }" @click="openEidtForm">修改</span>
           <span :class="{ forbid: is_has_del != true && is_has_del_other != true }" class="deleteColor" @click="deleteForm">删除</span>
           <!-- <div @click="commitInfo">保存</div> -->
-
       </div>
 
       <van-popup
@@ -489,7 +457,7 @@ import { addMonitorRecord, deleteMonitorRecord, editMonitorRecord, GetMonitor, G
 import { parseTime } from '@/utils'
 import { Dialog, Toast } from 'vant'
 import { getDataConfig } from '@/utils/data'
-import InforSubMenu from "../dialog/subMenu/InforSubMenu.vue"
+import InforSubMenu from "../dialog/subMenu/InforSubMenu"
 import request from '@/utils/request'
 export default {
 props: {
@@ -701,9 +669,6 @@ methods: {
   },
   inputFocus: function (event) {
     var input = event.target
-    // setTimeout(function () {
-    //     input.scrollIntoView()
-    // }, 0)
 
     if (input.setSelectionRange) {
       setTimeout(function () {

src/pages/main/newActionBar/patientSign.vue

@@ -1,13 +1,7 @@
 <template>
   <div class="mainBox">
     <div class="mainContent">
-      <!-- <h1 class="title">
-        <div class="GoBack" @click="$router.go(-1)">
-          <span class="iconfont">&#xe720;</span>返回
-        </div>
-        <span class="name">电子签名</span>
-        <div class="GoBack"></div>
-      </h1> -->
+
       <div class="electronicTitle">
         <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
         <span class="titleName">电子签名</span>

src/pages/main/today/TodayTab.vue

@@ -3,46 +3,14 @@
          element-loading-text="拼命加载中"
          element-loading-spinner="el-icon-loading"
          element-loading-background="rgba(0, 0, 0, 0.8)">
-  <!-- <div> -->
-    <div>
-      <!-- <div class="patientInfo">
-        <div class="patientInfoBox">
-          <img v-if='patientInfo.avatar' :src="patientInfo.avatar" alt="">
-          <img v-else src="../../../assets/images/man.png" alt="">
-          <div>
-            <div>
-              <span class="patientFontWeight">{{ patientInfo.name }}</span>
-              <span>({{ patientInfo.dialysis_no }})</span>
-              <span v-if="patientInfo.gender > 0">{{ patientInfo.gender == 1 ? '男' : '女' }}/{{ patientInfo.age + '岁' }}</span>
-              <span style="color: #4bb467;">{{ todayDate }}</span>
 
-            </div>
-            <div style="display:flex;align-items:center;">
-              <span style="margin-right:10px">{{ dialysis_mode }}/{{ bedNumber }}</span>
-              <span style="margin-right:10px">{{blood_access_part_opera_name}}</span>
-              <span style="display:flex;align-items:center;">
-                <span v-if="patientInfo.is_infectious == 1 || patientInfo.is_infectious == 0">无</span>
-                <span v-if="patientInfo.is_infectious == 2" style="display:flex;align-items:center;">
-                  <img class="contagionImg" v-if="contagion.indexOf('艾滋病') > -1" src="../../../assets/images/contagion1.png" alt="">
-                  <img class="contagionImg" v-if="contagion.indexOf('丙肝') > -1" src="../../../assets/images/contagion2.png" alt="">
-                  <img class="contagionImg" v-if="contagion.indexOf('肺结核') > -1" src="../../../assets/images/contagion3.png" alt="">
-                  <img class="contagionImg" v-if="contagion.indexOf('梅毒') > -1" src="../../../assets/images/contagion4.png" alt="">
-                  <img class="contagionImg" v-if="contagion.indexOf('乙肝') > -1" src="../../../assets/images/contagion5.png" alt="">
-                </span>
-              </span>
-            </div>
-          </div>
-        </div>
-        <div class="changePatient" @click="choosePatient">切换病人</div>
-      </div> -->
+    <div>
       <div class="infoContent" v-show="keyBoardShow">
         <div style="display:flex;flex:1;margin-right:20px;">
           <span style="color: #4bb467;margin-right:5px;">{{ todayDate }}</span>
           <span style="margin-right:5px">({{ patientInfo.dialysis_no }})</span>
-          <!-- <span>{{ patientInfo.gender == 1 ? '男' : '女' }}｜{{ patientInfo.age + '岁' }}</span> -->
           <span style="margin-right:5px">| {{ dialysis_mode }}/{{ bedNumber }}</span>
           <span style="flex:1;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;width:40px;">{{blood_access_part_opera_name}}</span>
-
         </div>
         <div><i class="el-icon-s-unfold" @click="msgtip_visibility = true"></i></div>
       </div>
@@ -53,28 +21,6 @@
             <van-icon v-if="item.value == 1" class="hook" name="passed" />
             <span class="redpoint" v-if="getUnReadNum() && index == 4">{{getUnReadNum()}}</span>
             <span class="redpoint" v-if="getUnReadNumOne() && index == 11">{{getUnReadNumOne()}}</span>
-            <!-- <span v-if="$store.getters.user.template_info.org_id == 10340">
-              <span v-if="$store.getters.user.user.user_type == 3 && (item.is_show == 0 || item.is_show == 2)">
-                {{ item.title }}
-               <van-icon v-if="item.value == 1" class="hook" name="passed" />
-              <span class="redpoint" v-if="getUnReadNum() && index == 4">{{getUnReadNum()}}</span>
-              <span class="redpoint" v-if="getUnReadNumOne() && index == 11">{{getUnReadNumOne()}}</span>
-             </span>
-              <span v-if="$store.getters.user.user.user_type == 2 && (item.is_show == 0 || item.is_show == 1)">
-                {{ item.title }}
-              <van-icon v-if="item.value == 1" class="hook" name="passed" />
-              <span class="redpoint" v-if="getUnReadNum() && index == 4">{{getUnReadNum()}}</span>
-              <span class="redpoint" v-if="getUnReadNumOne() && index == 11">{{getUnReadNumOne()}}</span>
-              </span>
-
-            </span>
-            <span v-if="$store.getters.user.template_info.org_id != 10340">
-              {{ item.title}}
-              <van-icon v-if="item.value == 1" class="hook" name="passed" />
-              <span class="redpoint" v-if="getUnReadNum() && index == 4">{{getUnReadNum()}}</span>
-              <span class="redpoint" v-if="getUnReadNumOne() && index == 11">{{getUnReadNumOne()}}</span>
-            </span> -->
-
           </div>
         </div>
       </div>
@@ -84,11 +30,6 @@
 
     <div class="todayMain">
       <div v-show="barActive == 0">
-        <!-- <basic-details-info title="基本信息" :patient="patient"
-                    :device_number="getDeviceNumber()"
-                    :step_data="stepData"></basic-details-info>
-
-      <div class="blueBorder"></div> -->
         <van-button type="primary" color="#409eff" block @click="requestDialysisRecord">更新数据</van-button>
         <basic-dialysis-prescription id="prescription" :prescription="prescription" :solution="solution" :admin_map="admin_user_map"  title="透析处方"
                               :device_number_map="device_map" :preparestock="preparestock"></basic-dialysis-prescription>
@@ -249,292 +190,6 @@
         v-on:menu-msg-tip="menuMsgTip"
       ></msg-tip>
     </van-popup>
-
-      <!-- <div class="grid">
-        <div class="list">
-          <ul>
-            <li @click="menuClick(1)">
-              <img src="@/assets/record/2.png"/>
-              <p>透析处方</p>
-            </li>
-            <li @click="menuClick(2)">
-              <img src="@/assets/record/3.png"/>
-              <p>接诊评估</p>
-            </li>
-            <li @click="menuClick(3)">
-              <img src="@/assets/record/4.png"/>
-              <p>透前评估</p>
-            </li>
-            <li style="position: relative;" @click="menuClick(4)">
-              <img src="@/assets/record/5.png"/>
-              <span class="redpoint" v-if="getUnReadNum()">{{getUnReadNum()}}</span>
-              <p>临时医嘱</p>
-            </li>
-            <li @click="menuClick(5)">
-              <img src="@/assets/record/6.png"/>
-              <p>双人核对</p>
-            </li>
-            <li @click="menuClick(0)">
-              <img src="@/assets/record/1.png"/>
-              <p>透析上机</p>
-            </li>
-          </ul>
-        </div>
-        <div class="list">
-          <ul>
-
-            <li @click="menuClick(6)">
-              <img src="@/assets/record/7.png"/>
-              <p>透析监测</p>
-            </li>
-            <li @click="menuClick(7)">
-              <img src="@/assets/record/8.png"/>
-              <p>透析下机</p>
-            </li>
-            <li @click="menuClick(8)">
-              <img src="@/assets/record/9.png"/>
-              <p>透后评估</p>
-            </li>
-            <li @click="menuClick(9)">
-              <img src="@/assets/record/10.png"/>
-              <p>治疗小结</p>
-            </li>
-            <li @click="newMenuClick()">
-              <img src="@/assets/record/17.png"/>
-              <p>耗材出库</p>
-            </li>
-            <li style="visibility: hidden;">
-              <img src="@/assets/record/17.png"/>
-              <p>透析耗材</p>
-            </li>
-          </ul>
-        </div>
-      </div>
-      <div class="blueBorder"></div>
-
-      <details-info title="基本信息" :patient="patient"
-                    :device_number="getDeviceNumber()"
-                    :step_data="stepData"></details-info>
-
-      <div class="blueBorder"></div>
-
-      <dialysis-prescription id="prescription" :prescription="prescription" :solution="solution" title="透析处方"
-                             :device_number_map="device_map" :preparestock="preparestock"></dialysis-prescription>
-
-      <div class="blueBorder"></div>
-
-    <accepts-assessment id="accepts_assessment" :record="receiver_treatment_access" title="接诊评估"></accepts-assessment>
-
-    <div class="blueBorder"></div>
-
-    <assessment-before id="assessment_before" :record="predialysis_evaluation" ref="assessment_before"
-                       title="透前评估" :dry_weights="dryWeight"
-                       :last_predialysis="last_predialysis_evaluation"></assessment-before>
-
-    <div class="blueBorder"></div>
-
-    <stat-order id="stat_order" ref="stat_order" title="临时医嘱" :doctor_map="admin_user_map"
-                :advice_groups="advice_groups"></stat-order>
-
-    <div class="blueBorder"></div>
-
-    <dialysis-computer id="dialysis_computer" ref="dialysis_computer" title="透析上机 " :record="dialysis_order"
-                       :admin_map="admin_user_map" :device_number_map="device_number_map"></dialysis-computer>
-
-    <div class="blueBorder"></div>
-
-    <double-check id="double_check" ref="double_check" title="双人核对 " :record="double_check"  :admin_map="admin_user_map"></double-check>
-
-    <div class="blueBorder"></div>
-
-    <dialysis-monitoring id="monitoring" ref="monitoring" title="透析监测"></dialysis-monitoring>
-
-    <div class="blueBorder"></div>
-
-    <dialysis-off id="dialysis_off" ref="dialysis_off" title="透析下机 " :record="dialysis_order"
-                  :admin_map="admin_user_map"></dialysis-off>
-
-    <div class="blueBorder"></div>
-
-    <assessment-after
-      id="assessment_after"
-      ref="assessment_after"
-      title="透后评估"
-      :record="assessment_after_dislysis"
-      :predialysis="predialysis_evaluation"
-      :prescription_prop="prescription"
-    ></assessment-after>
-
-    <div class="blueBorder"></div>
-
-    <treatment-of id="treatment_of" ref="treatment_of" title="治疗小结" :record="treatment_summary"></treatment-of>
-
-    <van-popup title="透析处方" v-model="menuList[1].showPopup" :overlay="true" :close-on-click-overlay="false">
-      <prescription-dialog v-if="prescription_dialog_reset == true" :patient_prop="patient" :solution_prop="solution" :machines_prop="devices" :config="config"
-                           :prescription_prop="prescription" @finish="closePrescriptionDialog" :operators="operators"
-                           :types="goodTypes" :info="goodInfos" :status="status" :targetAdvices="longAdvices"
-                           :waitUploadAdvices="waitUploadAdvices" :is_open="is_open"
-                           @close="closePrescriptionDialog" @prescription="prescriptionFunc"
-                           :admin_users_prop="admin_users"
-                           :predialysis="predialysis_evaluation"
-                           :last_predialysis="last_predialysis_evaluation"
-                           :record="assessment_after_dislysis"
-                           :last_record="last_assessment_after_dislysis"
-                           :last_prescription="last_prescription"
-                           :dry_weight="dryWeight"
-                           :system_prescription ="system_prescription"
-                           :schedual="schedual"
-                           ref="prescription_dialog"
-                           @longSolution="longSolutionFunc"
-                           :stockType="stockType">
-     </prescription-dialog>
-
-    </van-popup>
-
-    <van-popup
-      title="接诊评估"
-      v-model="menuList[2].showPopup"
-      :overlay="true"
-      :close-on-click-overlay="false"
-    >
-      <accepts-dialog
-        :accepts="receiver_treatment_access"
-        :patient_prop="patient"
-        @finish="closeAcceptsAssessment"
-        @close="closeAcceptsAssessment"
-      ></accepts-dialog>
-    </van-popup>
-
-    <van-popup title="透前评估" v-model="menuList[3].showPopup" :overlay="true" :close-on-click-overlay="false">
-      <assessment-dialog :predialysis="predialysis_evaluation" :last_predialysis="last_predialysis_evaluation"
-                         :dry_weight="dryWeight"
-                         :patient_prop="patient" @evaluation="update_evaluation" @close="closeAssessmentBefore"
-                         :admin_users_prop="admin_users" :lastAssessment="lastAssessment"
-                         ref="assessment_dialog" @weight_update="weightFunc"></assessment-dialog>
-    </van-popup>
-
-    <van-popup
-      title="临时医嘱"
-      v-model="menuList[4].showPopup"
-      :overlay="true"
-      :close-on-click-overlay="false"
-    >
-      <orders-dialog
-        :patient_prop="patient"
-        :advice_groups="advice_groups"
-        :advice_list_prop="doctor_advices"
-        :admin_users_prop="admin_users"
-        :his_is_open="his_is_open"
-        @orderDialog="closeStatOrder"
-        :dialysis_order="dialysis_order"
-        ref="orders_dialog"
-      ></orders-dialog>
-    </van-popup>
-
-    <van-popup
-      title="双人核对"
-      v-model="menuList[5].showPopup"
-      :overlay="true"
-      :close-on-click-overlay="false"
-    >
-      <double-dialog
-        :patient_prop="patient"
-        :record="double_check"
-        :admin_users_prop="admin_users"
-        :admin_map="admin_user_map"
-        @did_update="closeDoubleCheck"
-        @close="closeDoubleCheck"
-        :admins="admin_users"
-        :predialysis="predialysis_evaluation"
-         :prescription_prop="prescription"
-      ></double-dialog>
-    </van-popup>
-
-    <van-popup
-      title="透析上机"
-      v-model="menuList[0].showPopup"
-      :overlay="true"
-      :close-on-click-overlay="false"
-    >
-      <computer-dialog
-        :schedule="schedual"
-        :patient_prop="patient"
-        :record="dialysis_order"
-        :admins="admin_users"
-        :device_numbers="device_numbers"
-        :admin_map="admin_user_map"
-        :admin_staff="admin_staff_map"
-        :device_number_map="device_number_map"
-        @did_start="closeDialysisComputer"
-        @did_add_monitor="didAddMonitor"
-        @close="closeDialysisComputerclose"
-        ref="computer_dialog"
-      ></computer-dialog>
-    </van-popup>
-
-    <van-popup
-      title="透析监测"
-      v-model="menuList[6].showPopup"
-      :overlay="true"
-      :close-on-click-overlay="false"
-    >
-      <monit-dialog v-if="monit_dialog_reset"
-        :monitor_records="monitor_records"
-        :last_monitor_record="last_monitor_record"
-        :patient="patient"
-        :order="dialysis_order"
-        :dialysis_order="dialysis_order"
-        @did_add_monitor="didAddMonitor"
-        @did_edit_monitor="didEditMonitor"
-        @did_delete_monitor="didDelMonitor"
-        @close="closeMonitoring"
-        ref="monit_dialog"
-
-      ></monit-dialog>
-    </van-popup>
-
-    <van-popup title="透析下机" v-model="menuList[7].showPopup" :overlay="true" :close-on-click-overlay="false">
-      <plane-dialog :patient_prop="patient" :record="dialysis_order" :last_monitor_record="last_monitor_record"
-                    :admins="admin_users" :admin_map="admin_user_map"
-                    :prescription_prop="prescription"
-                    @did_off="closeDialysisOff" @close="closeDialysisOffclose" ref="plane_dialog"></plane-dialog>
-    </van-popup>
-
-    <van-popup
-      title="透后评估"
-      v-model="menuList[8].showPopup"
-      :overlay="true"
-      :close-on-click-overlay="false"
-    >
-      <thoroug-dialog
-        v-if="thoroug_dialog_reset == true"
-        :patient_prop="patient"
-        :record="assessment_after_dislysis"
-        :last_record="last_assessment_after_dislysis"
-        :predialysis="predialysis_evaluation"
-        :prescription_prop="prescription"
-        @did_update="closeAssessmentAfter"
-        @close="closeAssessmentAfter"
-
-        ref="thoroug_dialog"
-      ></thoroug-dialog>
-    </van-popup>
-
-    <van-popup title="治疗小结" v-model="menuList[9].showPopup" :overlay="true" :close-on-click-overlay="false">
-      <treatment-dialog :patient_prop="patient" :record="treatment_summary" @did_update="updateTreatmentOf"
-                        @close="closeTreatmentOf" ref="treatment_dialog"></treatment-dialog>
-
-    </van-popup>
-
-    <el-button
-      class="goTop"
-      v-show="goTopShow"
-      @click="goTop"
-      type="primary"
-      icon="el-icon-arrow-up"
-      circle
-      style="position:fixed;right:50px;bottom:50px;"
-    ></el-button>-->
     <div class="checkBox2" @click="goBack" v-show="date<todayTime">
       <img src="../../../assets/images/gotoday.png" alt="">
     </div>
@@ -547,7 +202,6 @@
       @touchcancel="end" alt="">
     </div>
 
-
     <div class="checkBox3"  @click="toExecution" ref="moveBtns" v-if="user_type==3 && ($store.getters.user.template_info.org_id==10340 || $store.getters.user.template_info.org_id==10489)">
         <img src="../../../assets/images/advice.png" @mousedown="downs" @touchstart="downs"
       @mousemove="moves"
@@ -560,36 +214,6 @@
         </span> 
      </div>
 
-
-    
-
-<!--    <van-dialog v-model="dry_visibility"  width="90%"  show-cancel-button>-->
-<!--      <div style="margin:10px;height:100px;overflow: scroll;">-->
-<!--        <table border="1" cellspacing="0" cellpadding="0" width="100%" >-->
-<!--          <tr v-for="(item, index) in remind_lists">-->
-<!--            <th>项目名称</th>-->
-<!--            <th>上次检查日期</th>-->
-<!--            <th>{{item.re.project_name}} </th>-->
-<!--            <th>{{getTimeTwo(item.last_remind_date)}}</th>-->
-<!--          </tr>-->
-<!--        </table>-->
-<!--      </div>-->
-<!--    </van-dialog>-->
-<!--    <van-dialog v-model="dry_visibility"  width="90%"  show-cancel-button>-->
-<!--      <div style="margin:10px;height:100px;overflow: scroll;">-->
-<!--        <table border="1" cellspacing="0" cellpadding="0" width="100%" >-->
-<!--          <tr>-->
-<!--            <th>项目名称</th>-->
-<!--            <th>上次检查日期</th>-->
-<!--          </tr>-->
-<!--          <tr v-for="(item, index) in remind_lists">-->
-<!--            <th>{{item.re.project_name}} </th>-->
-<!--            <th>{{getTimeTwo(item.last_remind_date)}}</th>-->
-<!--          </tr>-->
-
-<!--        </table>-->
-<!--      </div>-->
-<!--    </van-dialog>-->
     <van-dialog v-model="dry_visibility"  width="90%"  show-cancel-button>
       <div style="margin:10px;height:100px; overflow-y: scroll;">
         <div style="">
@@ -641,66 +265,6 @@
         </div>
       </van-popup>
     </div>
-
-    <!-- <el-dialog
-        title="未执行医嘱患者名单"
-        :visible.sync="dialogVisible"
-        width="60%">
-          <el-table
-              :data="adviceList"
-              v-if="drugStockConfig.is_open == 0 || drugStockConfig.is_open == 2"
-              border
-              style="width: 100%">
-              <el-table-column prop="date" label="姓名" width="60" align="center">
-                  <template slot-scope="scope">
-                       {{getPaitenName( scope.row.patient_id) }}
-                  </template>
-              </el-table-column>
-
-              <el-table-column prop="date" label="条数" width="60" align="center">
-                <template slot-scope="scope">
-                       {{scope.row.count }}
-                  </template>
-              </el-table-column>
-
-              <el-table-column prop="date" label="操作" width="160" align="center">
-                <template slot-scope="scope">
-                   <el-button type="primary" size="small" @click="toExecutionPatent(scope.row)">去执行</el-button>
-                  </template>
-              </el-table-column>
-              
-          </el-table>
-
-          <el-table
-              :data="tableData"
-              v-if="drugStockConfig.is_open == 1"
-              border
-              style="width: 100%">
-              <el-table-column prop="date" label="姓名" width="60" align="center">
-                <template slot-scope="scope">
-                    {{getPaitenName( scope.row.patient_id) }}
-                </template>
-              </el-table-column>
-
-              <el-table-column prop="date" label="条数" width="60" align="center">
-                 <template slot-scope="scope">
-                       {{scope.row.total }}
-                 </template>
-              </el-table-column>
-
-              <el-table-column prop="date" label="操作" width="160" align="center">
-                <template slot-scope="scope">
-                   <el-button type="primary" size="small" @click="toExecutionPatent(scope.row)">去执行</el-button>
-                </template>
-              </el-table-column>
-              
-          </el-table>
-
-        <span slot="footer" class="dialog-footer">
-          <el-button @click="dialogVisible = false">取 消</el-button>
-          <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
-        </span>
-      </el-dialog> -->
   </div>
 </template>
 <script>
@@ -717,21 +281,7 @@ import basicDialysisMonitoring from './dialysisMonitoring'
 import basicDialysisOff from './dialysisOff'
 import basicAssessmentAfter from './assessmentAfter'
 import basicTreatmentOf from './treatmentOf'
-// import OperationStaff from './operationStaff'
-
-// import LongDialog from '../dialog/LongDialog'
-// import PrescriptionDialog from '../dialog/PrescriptionDialog'
-// import AssessmentDialog from '../dialog/AssessmentDialog'
-// import ThorougDialog from '../dialog/ThorougDialog'
-// import AcceptsDialog from '../dialog/AcceptsDialog'
-// import PlaneDialog from '../dialog/PlaneDialog'
-// import TreatmentDialog from '../dialog/TreatmentDialog'
-// import DoubleDialog from '../dialog/DoubleDialog'
-// import OrdersDialog from '../dialog/OrdersDialog'
-// import MonitDialog from '../dialog/MonitDialog'
-// import ComputerDialog from '../dialog/ComputerDialog'
 import { Toast } from 'vant'
-
 // new
 import dialysisPrescription from '../newActionBar/dialysisPrescription'
 import accepts from '../newActionBar/accepts'
@@ -964,9 +514,6 @@ export default {
       }
       var datenow = this.$route.query.date
 
-      // if (typeof this.predialysis_evaluation.id !== 'undefined' &&!isNaN(this.predialysis_evaluation.id) &&this.predialysis_evaluation.id > 0 &&this.predialysis_evaluation.creater > 0 &&this.predialysis_evaluation.assessment_date >= datenow) {
-      //   steps[3].value = 1
-      // }
       if (typeof this.predialysis_evaluation.id !== 'undefined' && !isNaN(this.predialysis_evaluation.id) && this.predialysis_evaluation.id > 0 && this.predialysis_evaluation.assessment_date >= datenow) {
         steps[3].value = 1
       }
@@ -990,9 +537,6 @@ export default {
       if (this.monitor_records.length > 0) {
         steps[7].value = 1
       }
-      // if (!isNaN(this.assessment_after_dislysis.id) && this.assessment_after_dislysis.id > 0 && this.assessment_after_dislysis.creater > 0) {
-      //   steps[9].value = 1
-      // }
       if (!isNaN(this.assessment_after_dislysis.id) && this.assessment_after_dislysis.id > 0) {
         steps[9].value = 1
       }
@@ -1093,26 +637,7 @@ export default {
     this.timerDia = window.setInterval(() => {
       setTimeout(this.getAdviceListNoExecution(admin_user_id), 0)
     }, 1000*300)
-    // document.body.addEventListener('focusin', () => {
-    //   //软键盘弹出的事件处理
-    //   if(this.barActive != 3 && this.barActive != 4 && this.barActive != 6){
-    //     if(this.appSourceState == 'ios'){
-    //       console.log('弹起')
-    //       this.keyBoardShow = false
-    //     }
-    //   }
-
-    // })
-    // document.body.addEventListener('focusout', () => {
-    //   //软键盘收起的事件处理
-    //   if(this.barActive != 3 && this.barActive != 4 && this.barActive != 6){
-    //     if(this.appSourceState == 'ios'){
-    //       console.log('收起')
-    //       this.keyBoardShow = true
-    //     }
-    //   }
-
-    // })
+ 
   },
 
   watch: {
@@ -1435,23 +960,6 @@ export default {
 
       this.monitor_records.sort((a, b) => a.operate_time - b.operate_time)
 
-      // if (monitor_index >= 0) {
-      //   var record = this.monitor_records[monitor_index]
-      //
-      //   this.monitor_records.splice(monitor_index, 1)
-      //   if(this.monitor_records.length == 0){
-      //     this.monitor_records.splice(0, 0, monitor)
-      //   }else {
-      //
-      //     for (let index = 0; index < this.monitor_records.length; index++) {
-      //       const temp = this.monitor_records[index];
-      //       if (temp.operate_time <= monitor.operate_time) {
-      //         this.monitor_records.splice(index, 0, monitor)
-      //         break
-      //       }
-      //     }
-      //   }
-      // }
     },
     didDelMonitor (record_id) {
       var mrl = this.monitor_records.length
@@ -2236,136 +1744,10 @@ export default {
       this.prescription = val
       this.prescribeOne = val
       this.newRequestDialysisRecord()
-      // if (advices.length > 0){
-      //
-      //   // if (advices.length > 0) {
-      //   //   var group = this.newAdviceGroupObject()
-      //   //   var initGroupBlock = function (group, advice) {
-      //   //     group.group_no = advice.groupno
-      //   //     // group.start_time = advice.start_time
-      //   //     // group.advice_doctor = advice.advice_doctor
-      //   //     // group.exec_staff = advice.execution_staff
-      //   //     // group.exec_time = advice.execution_time
-      //   //     // group.checker = advice.checker
-      //   //   }
-      //   //   for (let index = 0; index < advices.length; index++) {
-      //   //     const advice = advices[index]
-      //   //     if (advice.groupno == 0) {
-      //   //       // 老版本的医嘱没有分组的概念，所以这一个 if 是解决这个问题的，将每个无分组的医嘱各自归为一组
-      //   //       if (advice.parent_id > 0) {
-      //   //         if (this.advice_groups.length > 0) {
-      //   //           var parent_group = this.advice_groups[
-      //   //           this.advice_groups.length - 1
-      //   //             ]
-      //   //           if (parent_group.advices.length > 0) {
-      //   //             if (parent_group.advices[0].id == advice.parent_id) {
-      //   //               parent_group.advices.push(advice)
-      //   //             }
-      //   //           }
-      //   //         }
-      //   //         continue
-      //   //       } else {
-      //   //         if (group.group_no > 0) {
-      //   //           this.advice_groups.push(group)
-      //   //           group = this.newAdviceGroupObject()
-      //   //         }
-      //   //
-      //   //         initGroupBlock(group, advice)
-      //   //         group.advices.push(advice)
-      //   //         this.advice_groups.push(group)
-      //   //         group = this.newAdviceGroupObject()
-      //   //         continue
-      //   //       }
-      //   //     }
-      //   //
-      //   //     if (group.group_no > 0 && group.group_no != advice.groupno) {
-      //   //       this.advice_groups.push(group)
-      //   //       group = this.newAdviceGroupObject()
-      //   //     }
-      //   //     if (group.group_no == 0) {
-      //   //       initGroupBlock(group, advice)
-      //   //     }
-      //   //     if (group.group_no == advice.groupno) {
-      //   //       group.advices.push(advice)
-      //   //     }
-      //   //   }
-      //   //   if (group.group_no > 0) {
-      //   //     // 上述的算法会导致最后一组没有加到advice_groups，这里要手动加上
-      //   //     this.advice_groups.push(group)
-      //   //   }
-      //   //
-      //   // }
-      //
-      //
-      // }
     },
 
     longSolutionFunc: function (val) {
       this.solution = val
-      // this.requestDialysisRecord()
-
-      // if (advices.length > 0){
-      //
-      //   if (advices.length > 0) {
-      //     var group = this.newAdviceGroupObject()
-      //     var initGroupBlock = function (group, advice) {
-      //       group.group_no = advice.groupno
-      //       // group.start_time = advice.start_time
-      //       // group.advice_doctor = advice.advice_doctor
-      //       // group.exec_staff = advice.execution_staff
-      //       // group.exec_time = advice.execution_time
-      //       // group.checker = advice.checker
-      //     }
-      //     for (let index = 0; index < advices.length; index++) {
-      //       const advice = advices[index]
-      //       if (advice.groupno == 0) {
-      //         // 老版本的医嘱没有分组的概念，所以这一个 if 是解决这个问题的，将每个无分组的医嘱各自归为一组
-      //         if (advice.parent_id > 0) {
-      //           if (this.advice_groups.length > 0) {
-      //             var parent_group = this.advice_groups[
-      //             this.advice_groups.length - 1
-      //               ]
-      //             if (parent_group.advices.length > 0) {
-      //               if (parent_group.advices[0].id == advice.parent_id) {
-      //                 parent_group.advices.push(advice)
-      //               }
-      //             }
-      //           }
-      //           continue
-      //         } else {
-      //           if (group.group_no > 0) {
-      //             this.advice_groups.push(group)
-      //             group = this.newAdviceGroupObject()
-      //           }
-      //
-      //           initGroupBlock(group, advice)
-      //           group.advices.push(advice)
-      //           this.advice_groups.push(group)
-      //           group = this.newAdviceGroupObject()
-      //           continue
-      //         }
-      //       }
-      //
-      //       if (group.group_no > 0 && group.group_no != advice.groupno) {
-      //         this.advice_groups.push(group)
-      //         group = this.newAdviceGroupObject()
-      //       }
-      //       if (group.group_no == 0) {
-      //         initGroupBlock(group, advice)
-      //       }
-      //       if (group.group_no == advice.groupno) {
-      //         group.advices.push(advice)
-      //       }
-      //     }
-      //     if (group.group_no > 0) {
-      //       // 上述的算法会导致最后一组没有加到advice_groups，这里要手动加上
-      //       this.advice_groups.push(group)
-      //     }
-      //
-      //   }
-      //
-      //
-      // }
     },
 
     closePrescriptionDialog: function () {
@@ -3769,10 +3151,7 @@ export default {
           this.total= 0
           this.total = total_one + total_two
         }
-        
-        console.log("时间人民万岁我我我",this.hisAdviceList)
-      
-        
+        // console.log("时间人民万岁我我我",this.hisAdviceList)
         this.patientList =  response.data.data.patientList
 
          this.tableData = []
@@ -3794,7 +3173,6 @@ export default {
           }
            
         }
-
         if(this.tableData!=null && this.tableData.length>0){
             let objinfo = {}
             this.tableData.forEach((item, index) => {

src/pages/main/today/assessmentAfter.vue

@@ -290,29 +290,6 @@ export default {
     return {
       title: '透后评估 ',
       template_id: 0
-      // note: "无明显异常",
-      // doctor: "刘小军  医生",
-      // info1: [
-      //   { value: "1", label: "透后体重 : ", content: "55", unit: "kg" },
-      //   { value: "2", label: "收缩压 : ", content: "174", unit: "mmHg" },
-      //   { value: "3", label: "实际超滤量: ", content: "20", unit: "ml" },
-      //   { value: "4", label: "疑血 : ", content: "无震颤", unit: "" },
-      //   { value: "5", label: "", content: "", unit: "" }
-      // ],
-      // info2: [
-      //   { value: "1", label: "体重减少 : ", content: "3", unit: "kg" },
-      //   { value: "2", label: "舒张压 : ", content: "200", unit: "mmHg" },
-      //   { value: "3", label: "实际置换量 : ", content: "20", unit: "ml" },
-      //   { value: "3", label: "透后症状 : ", content: "无症状", unit: "" },
-      //   { value: "4", label: "导管 : ", content: "导管堵塞", unit: "" }
-      // ],
-      // info3: [
-      //   { value: "1", label: "体温 : ", content: "14", unit: "℃" },
-      //   { value: "2", label: "心率 : ", content: "2", unit: "次/分" },
-      //   { value: "3", label: "实际治疗时长 : ", content: "4时4分", unit: "" },
-      //   { value: "4", label: "透析中入量: ", content: "一般", unit: "" },
-      //   { value: "4", label: "并发症: ", content: "痔疮出血", unit: "" }
-      // ]
     }
   },
   props: {

src/pages/main/today/assessmentBefore.vue

@@ -121,10 +121,6 @@
           <span class="unit"></span>
         </li>
 
-        <!-- </ul>
-
-      <ul> -->
-
         <li v-if="isShow('透析机型号')">
           <label>透析机型号: </label>
           <span class="content">{{ machine_type ? machine_type : "" }}</span>
@@ -559,32 +555,7 @@ export default {
         return '-'
       } else {
         return this.record.internal_fistula
-        // if (this.record != null && this.record.id != undefined && this.record.id  > 0) {
-        //   var internal_fistula_list = getDataConfig(
-        //     "hemodialysis",
-        //     "internal_fistula"
-        //   );
-        //   var value = ""
-        //   if (this.record.internal_fistula.length > 0) {
-        //     var internal_fistula_value_arr = this.record.internal_fistula.split(",")
-        //     for (let a = 0; a < internal_fistula_value_arr.length; a++) {
-        //       for (let i = 0; i < internal_fistula_list.length; i++) {
-        //         console.log(internal_fistula_list[i].name)
-        //         if (internal_fistula_value_arr[a] == internal_fistula_list[i].name) {
-        //           if (value.length == 0) {
-        //             value = internal_fistula_value_arr[a]
-        //           } else {
-        //             value = value + "," + internal_fistula_value_arr[a]
-        //           }
-        //         }
-        //       }
-        //     }
-        //   }
-        //   return value;
-        // }else{
-        //   return "-";
-        //
-        // }
+
       }
     },
     is_hemorrhage: function () {
@@ -816,44 +787,6 @@ export default {
       }
       
     },
-    // setRecord(record) {
-    //   if (record == null) {
-    //     this.info1[0].content = "0"
-    //     this.info1[1].content = "0"
-    //     this.info1[2].content = "0"
-    //     // this.info1[3].content = ""
-
-    //     this.info2[0].content = "0"
-    //     this.info2[1].content = "0"
-    //     this.info2[2].content = ""
-    //     this.info2[3].content = ""
-
-    //     this.info3[0].content = "0"
-    //     this.info3[1].content = "0"
-    //     this.info3[2].content = ""
-    //     this.info3[3].content = ""
-
-    //     this.note = ""
-
-    //   } else {
-    //     this.info1[0].content = record.weight_before
-    //     this.info1[1].content = record.systolic_blood_pressure
-    //     this.info1[2].content = record.last_post_dialysis
-    //     // this.info1[3].content = ""
-
-    //     this.info2[0].content = record.additional_weight
-    //     this.info2[1].content = record.diastolic_blood_pressure
-    //     this.info2[2].content = record.dialysis_interphase
-    //     this.info2[3].content = record.catheter
-
-    //     this.info3[0].content = record.temperature
-    //     this.info3[1].content = record.breathing_rate
-    //     this.info3[2].content = record.symptom_before_dialysis
-    //     this.info3[3].content = record.complication
-
-    //     this.note = record.remark
-    //   }
-    // }
   }
 }
 </script>