Merge branch 'master' of http://git.shengws.com/csx/Pad_New

src/api/advice.js

@@ -7,27 +7,31 @@ export function getAdviceConfig () {
   })
 }
 
-export function CreateDoctorAdvice (id, advice) {
+export function CreateDoctorAdvice (id, advice, mode) {
   console.log('id', id)
   return request({
-    url: '/m/api/advice/create?id=' + id,
+    url: '/m/api/advice/create?id=' + id +"&mode="+mode,
     method: 'post',
     data: advice
   })
 }
-export function EditDoctorAdvice (id, advice) {
+export function EditDoctorAdvice (id, advice,mode) {
   return request({
-    url: '/m/api/advice/edit?id=' + id,
+    url: '/m/api/advice/edit?id=' + id+"&mode="+mode,
     method: 'put',
-    data: advice
+    data: advice,
+    headers:{"Permission":1},
+
   })
 }
 
-export function StopDoctorAdvice (id, advice) {
+export function StopDoctorAdvice (id, advice,mode) {
   return request({
-    url: '/m/api/advice/stop?id=' + id,
+    url: '/m/api/advice/stop?id=' + id+"&mode="+mode,
     method: 'Post',
-    data: advice
+    data: advice,
+    headers:{"Permission":1},
+
   })
 }
 
@@ -35,7 +39,9 @@ export function ExecDoctorAdvice (params) {
   return request({
     url: '/m/api/advice/exec',
     method: 'Post',
-    params: params
+    params: params,
+    headers:{"Permission":1},
+
   })
 }
 
@@ -43,24 +49,31 @@ export function CheckDoctorAdvice (params) {
   return request({
     url: '/m/api/advice/check',
     method: 'Post',
-    params: params
+    params: params,
+    headers:{"Permission":1},
+
   })
 }
 
 export function DeleteDoctorAdvice (id) {
   return request({
-    url: '/m/api/advice/delete?id=' + id,
-    method: 'Delete'
+    url: '/m/api/advice/delete?id=' + id+"&mode="+mode,
+    method: 'Delete',
+    headers:{"Permission":1},
+
   })
 }
 
-export function DeleteDoctorAdviceNew (group_no, advice_id) {
+export function DeleteDoctorAdviceNew (group_no, advice_id,mode,is_sub) {
   return request({
     url: '/m/api/newadvice/delete',
     method: 'Delete',
+    headers:{"Permission":1},
     params: {
       groupno: group_no,
-      advice_id: advice_id
+      advice_id: advice_id,
+      mode:mode,
+      is_sub:is_sub,
     }
   })
 }
@@ -73,25 +86,29 @@ export function getSchedualDoctors (params) {
   })
 }
 
-export function batchCreateAdvices (patient_id, group_no, data) {
+export function batchCreateAdvices (patient_id, group_no, data,mode) {
   return request({
     url: '/m/api/advice/creategroup',
     method: 'post',
+    headers:{"Permission":1},
     params: {
       id: patient_id,
-      group_no: group_no
+      group_no: group_no,
+      mode:mode,
     },
     data: data
   })
 }
 
-export function modifyAdviceGroupStartTime (group_no, start_time_str) {
+export function modifyAdviceGroupStartTime (group_no, start_time_str,mode) {
   return request({
     url: '/m/api/advice/group/modify_starttime',
     method: 'post',
+    headers:{"Permission":1},
     params: {
       group_no: group_no,
-      start_time: start_time_str
+      start_time: start_time_str,
+      mode:mode,
     }
   })
 }
@@ -100,6 +117,7 @@ export function ExecSingleDoctorAdvice (params) {
   return request({
     url: '/m/api/advice/exec/single',
     method: 'Post',
+    headers:{"Permission":1},
     params: params
   })
 }
@@ -107,7 +125,9 @@ export function ExecSingleDoctorAdvice (params) {
 export function DeleteSubDoctorAdvice (params) {
   return request({
     url: '/m/api/delete/subadvice?advice_id=' + params,
-    method: 'Delete'
+    method: 'Delete',
+    headers:{"Permission":1},
+
   })
 }
 
@@ -122,7 +142,9 @@ export function ModifyExecDoctorAdvice (params) {
   return request({
     url: '/m/api/advice/exec/modify',
     method: 'Post',
-    params: params
+    params: params,
+    headers:{"Permission":1},
+
   })
 }
 

src/api/home.js

@@ -28,4 +28,16 @@ export function createOrg(params) {
 }
 
 
+export function modifyPassword(params) {
+  return request({
+    url: '/m/api/modifypsw',
+    method: 'post',
+    params:params,
+  })
+}
+
+
+
+
+
 

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

@@ -7,7 +7,7 @@
     </div>
     <div class="roleDescription">
       <van-field v-model="name" class="input1" required label="角色名称" placeholder="请填写角色名称" readonly>
-        <van-button slot="button" size="small" @click="del()">删除角色</van-button>
+        <van-button slot="button" size="small" @click="del()" v-if="is_system == 0">删除角色</van-button>
       </van-field>
       <van-field v-model="desc" label="角色描述" placeholder="请填写角色描述"/>
     </div>
@@ -50,10 +50,12 @@
         checked: false,
         allPurview: [],
         rolePurview:null,
+        is_system:0,
         ids:[],
       };
     }, created() {
       setRem()
+
       this.GetAllPurview()
 
 
@@ -162,6 +164,8 @@
             this.rolePurview = response.data.data.role_purview
             this.name =  response.data.data.role.name
             this.desc = response.data.data.role.intro
+            this.is_system = response.data.data.role.is_system
+
             this.ids = this.rolePurview.PurviewIds.split(',')
 
             for(let a = 0; a < this.ids.length; a++ ){
@@ -179,7 +183,26 @@
           }
         });
 
-      }, GetAllPurview() {
+      },GetOtherPurview(){
+        let params = {
+          module: 7,
+          id: 0,
+        }
+        GetAllPurview(params).then(response => {
+          if (response.data.state === 1) {
+            for (let i = 0; i < response.data.data.purviews.length; i++) {
+              response.data.data.purviews[i]["no_sub"] = true
+              this.allPurview.push(response.data.data.purviews[i])
+            }
+
+          } else {
+            this.$toast({
+              message: response.data.msg
+            });
+          }
+        });
+
+      } ,GetAllPurview() {
         let params = {
           module: 3,
           id: 0,
@@ -212,15 +235,15 @@
               desc: "品牌建设，营销工具",
               no_sub: false
             })
-            this.allPurview.push({
-              module: 0,
-              name: "分销商城",
-              id: 0,
-              icon_url: "https://kuyi.shengws.com/S10.png",
-              desc: "一键开店，分销商品",
-              no_sub: true
-            })
-
+            // this.allPurview.push({
+            //   module: 7,
+            //   name: "分销商城",
+            //   id: 0,
+            //   icon_url: "https://kuyi.shengws.com/S10.png",
+            //   desc: "一键开店，分销商品",
+            //   no_sub: true
+            // })
+            this.GetOtherPurview()
             this.GetRoleInfo(this.$route.query.id)
 
 

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

@@ -59,7 +59,6 @@
             }
           }
 
-
           let type = ""
           if (val){
             type = 1 //打开
@@ -70,6 +69,8 @@
             id : this.$route.query.id,
             purview_id:purview_ids,
             type : type,
+            is_all : 1,
+            pid: this.pid,
           }
           EditFuncPurview(params).then(response => {
             if (response.data.state === 1) {
@@ -87,9 +88,6 @@
             }
           });
 
-
-
-
         }else {
           let purview_ids = ""
 
@@ -114,6 +112,8 @@
             id : this.$route.query.id,
             purview_id:purview_ids,
             type : type,
+            is_all : 1,
+            pid: this.pid,
           }
           EditFuncPurview(params).then(response => {
             if (response.data.state === 1) {
@@ -165,6 +165,7 @@
             id : this.$route.query.id,
             purview_id:purview_ids,
             type : type,
+            pid : this.pid
           }
           EditFuncPurview(params).then(response => {
             if (response.data.state === 1) {
@@ -199,6 +200,8 @@
             id : this.$route.query.id,
             purview_id:purview_ids,
             type : type,
+            pid : this.pid
+
           }
           EditFuncPurview(params).then(response => {
             if (response.data.state === 1) {

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

@@ -6,7 +6,7 @@
     </div>
     <div class="allTitle">
       <van-cell center title="全部权限">
-        <van-switch v-model="checked" slot="right-icon" size="24" />
+        <van-switch v-model="checked" slot="right-icon" size="24" @change="allChange"/>
       </van-cell>
     </div>
     <div class="allTitle1">
@@ -20,7 +20,7 @@
         :title="item.name"
         v-for="(item, index) in allPurview"
         :key="index"
-        v-if="!item.no_sub"
+        v-if="!item.no_sub&&item.pid == 0"
         @click="toSubPurview(item)"
       >
       </van-cell>
@@ -32,143 +32,273 @@
         :key="index"
         v-if="item.no_sub"
       >
-        <van-switch v-model="item.isCheck" slot="right-icon" size="24" />
+        <van-switch v-model="item.isCheck" slot="right-icon" size="24"/>
       </van-cell>
     </div>
   </div>
 </template>
 
 <script>
-import { setRem } from "@/libs/functionRem";
-import {
-  GetAllPurview,
-  GetRoleInfo,
-  EditRoleInfo,
-  DeleteRoleInfo
-} from "@/api/admin_user";
-
-export default {
-  data() {
-    return {
-      title: "",
-      desc: "",
-      name: "",
-      checked: false,
-      allPurview: [],
-      ids: [],
-      pid: 0,
-      module: 0
-    };
-  },
-  created() {
-    this.title = this.$route.query.title;
-    this.pid = this.$route.query.pid;
-    this.module = this.$route.query.module;
-    setRem();
-    this.GetAllPurview();
-
-    this.GetRoleInfo(this.$route.query.id);
-  },
-  methods: {
-    toSubPurview(purview) {
-      this.$router.push({
-        path:
-          "/role/subpurview?id=" +
-          this.$route.query.id +
-          "&pid=" +
-          purview.id +
-          "&module=" +
-          purview.module +
-          "&title=" +
-          purview.name
-      });
-    },
-    del() {
-      let params = {
-        role_id: this.$route.query.id,
-        enable: false
-      };
-      DeleteRoleInfo(params).then(response => {
-        if (response.data.state === 1) {
-          this.$toast({
-            message: "删除成功"
-          });
-          this.$router.go(-1);
-        } else {
-          this.$toast({
-            message: response.data.msg
-          });
-        }
-      });
-    },
-    editRole() {
-      let params = {
-        id: this.$route.query.id,
-        desc: this.desc
+  import {setRem} from "@/libs/functionRem";
+  import {DeleteRoleInfo, EditPurview, EditRoleInfo, GetAllPurview, GetRoleInfo} from "@/api/admin_user";
+
+  export default {
+    data() {
+      return {
+        title: "",
+        desc: "",
+        name: "",
+        checked: false,
+        allPurview: [],
+        ids: [],
+        pid: 0,
+        module: 0,
+        subPurview: [],
       };
-      EditRoleInfo(params).then(response => {
-        if (response.data.state === 1) {
-          this.$toast({
-            message: "修改成功"
-          });
-        } else {
-          this.$toast({
-            message: response.data.msg
-          });
-        }
-      });
     },
-    GetRoleInfo(role_id) {
-      let params = {
-        id: role_id
-      };
-      GetRoleInfo(params).then(response => {
-        if (response.data.state === 1) {
-          this.rolePurview = response.data.data.role_purview;
-          this.name = response.data.data.role.name;
-          this.desc = response.data.data.role.intro;
-          this.ids = this.rolePurview.PurviewIds.split(",");
-        } else {
-          this.$toast({
-            message: response.data.msg
-          });
-        }
-      });
+    created() {
+      this.title = this.$route.query.title;
+      this.pid = this.$route.query.pid;
+      this.module = this.$route.query.module;
+      setRem();
+      this.GetAllPurview();
+
+      // this.GetRoleInfo(this.$route.query.id);
     },
+    methods: {
+      allChange(val) {
+        if (val) {
+          let purview_ids = ""
 
-    GetAllPurview() {
-      let params = {
-        module: this.module,
-        id: this.pid
-      };
-      GetAllPurview(params).then(response => {
-        if (response.data.state === 1) {
-          for (let i = 0; i < response.data.data.purviews.length; i++) {
-            var purview = response.data.data.purviews[i].sub_purview;
-            if (purview.length > 1) {
-              response.data.data.purviews[i]["no_sub"] = false;
+          for (let i = 0; i < this.subPurview.length; i++) {
+            if (purview_ids.length > 0) {
+              purview_ids = purview_ids + "," + this.subPurview[i].id.toString() + "," + this.subPurview[i].pid.toString()
             } else {
-              response.data.data.purviews[i]["no_sub"] = true;
+              purview_ids = this.subPurview[i].id.toString() + "," + this.subPurview[i].pid.toString()
+
             }
-            response.data.data.purviews[i]["isCheck"] = false;
-            this.allPurview.push(response.data.data.purviews[i]);
           }
+
+          const obj = {}
+          // 去重复
+          var purview_arr = purview_ids.split(",").reduce((cur, next) => {
+            obj[next] ? '' : obj[next] = true && cur.push(next)
+            return cur
+          }, [])
+
+          purview_ids = purview_arr.join(",")
+
+
+          let type = ""
+          if (val) {
+            type = 1 //打开
+          } else {
+            type = 2 //关闭
+          }
+          let params = {
+            id: this.$route.query.id,
+            purview_id: purview_ids,
+            type: type,
+          }
+          EditPurview(params).then(response => {
+            if (response.data.state === 1) {
+              this.checked = true
+
+            } else {
+              if(type == 1){
+                this.checked = false
+              }else{
+                this.checked = true
+              }
+              this.$toast({
+                message: response.data.msg
+              });
+            }
+          });
+
+
         } else {
-          this.$toast({
-            message: response.data.msg
+          let purview_ids = ""
+
+          for (let i = 0; i < this.subPurview.length; i++) {
+            if (purview_ids.length > 0) {
+              purview_ids = purview_ids + "," + this.subPurview[i].id.toString() + "," + this.subPurview[i].pid.toString()
+            } else {
+              purview_ids = this.subPurview[i].id.toString() + "," + this.subPurview[i].pid.toString()
+
+            }
+          }
+
+          const obj = {}
+          // 去重复
+          var purview_arr = purview_ids.split(",").reduce((cur, next) => {
+            obj[next] ? '' : obj[next] = true && cur.push(next)
+            return cur
+          }, [])
+
+          purview_ids = purview_arr.join(",")
+
+          let type = ""
+          if (val) {
+            type = 1 //打开
+          } else {
+            type = 2 //关闭
+          }
+          let params = {
+            id: this.$route.query.id,
+            purview_id: purview_ids,
+            type: type,
+          }
+
+          EditPurview(params).then(response => {
+            if (response.data.state === 1) {
+              this.checked = false
+
+            } else {
+              if(type == 1){
+                val.isCheck = false
+              }else{
+                val.isCheck = true
+              }
+              this.$toast({
+                message: response.data.msg
+              });
+            }
           });
+
+
         }
-      });
+      },
+
+      toSubPurview(purview) {
+        this.$router.push({
+          path:
+            "/role/subpurview?id=" +
+            this.$route.query.id +
+            "&pid=" +
+            purview.id +
+            "&module=" +
+            purview.module +
+            "&title=" +
+            purview.name
+        });
+      },
+      del() {
+        let params = {
+          role_id: this.$route.query.id,
+          enable: false
+        };
+        DeleteRoleInfo(params).then(response => {
+          if (response.data.state === 1) {
+            this.$toast({
+              message: "删除成功"
+            });
+            this.$router.go(-1);
+          } else {
+            this.$toast({
+              message: response.data.msg
+            });
+          }
+        });
+      },
+      editRole() {
+        let params = {
+          id: this.$route.query.id,
+          desc: this.desc
+        };
+        EditRoleInfo(params).then(response => {
+          if (response.data.state === 1) {
+            this.$toast({
+              message: "修改成功"
+            });
+          } else {
+            this.$toast({
+              message: response.data.msg
+            });
+          }
+        });
+      },
+      GetRoleInfo(role_id) {
+        let params = {
+          id: role_id
+        };
+        GetRoleInfo(params).then(response => {
+          if (response.data.state === 1) {
+            this.rolePurview = response.data.data.role_purview;
+            this.name = response.data.data.role.name;
+            this.desc = response.data.data.role.intro;
+            this.ids = this.rolePurview.PurviewIds.split(",");
+
+            console.log(this.subPurview)
+            for (let a = 0; a < this.ids.length; a++) {
+              for (let i = 0; i < this.subPurview.length; i++) {
+                if (parseInt(this.ids[a]) == this.subPurview[i].id) {
+                  this.subPurview[i]["isCheck"] = true
+                }
+              }
+            }
+
+            //设置全选按键
+            var b = 0
+            for (let i = 0; i < this.subPurview.length; i++) {
+              if (this.subPurview[i].isCheck) {
+                b++
+              }
+            }
+            if (b == this.subPurview.length) {
+              this.checked = true
+            } else {
+              this.checked = false
+            }
+
+
+          } else {
+            this.$toast({
+              message: response.data.msg
+            });
+          }
+        });
+      },
+
+      GetAllPurview() {
+        this.pid = 0;
+        let params = {
+          module: this.module,
+          id: this.pid
+        };
+        GetAllPurview(params).then(response => {
+          if (response.data.state === 1) {
+            for (let i = 0; i < response.data.data.purviews.length; i++) {
+              var purview = response.data.data.purviews[i].sub_purview;
+              for (let b = 0; b < purview.length; b++) {
+                this.subPurview.push(purview[b])
+              }
+              if (purview.length > 1) {
+                response.data.data.purviews[i]["no_sub"] = false;
+              } else {
+                response.data.data.purviews[i]["no_sub"] = true;
+              }
+              response.data.data.purviews[i]["isCheck"] = false;
+              this.allPurview.push(response.data.data.purviews[i]);
+              this.GetRoleInfo(this.$route.query.id)
+            }
+          } else {
+            this.$toast({
+              message: response.data.msg
+            });
+          }
+        });
+      }
     }
-  }
-};
+  };
 </script>
 
 <style lang="scss" scoped>
-.page_qualityControlManagement {
-  height: 100%;
-  overflow-y: auto;
-  background: #fafafa;
+  .page_qualityControlManagement {
+    height: 100%;
+    overflow-y: auto;
+    background: #fafafa;
+
   .qualityControlManagementTitle {
     background: #fff;
     padding: 0 1.125rem;
@@ -176,36 +306,45 @@ export default {
     display: flex;
     align-items: center;
   }
+
   .jiantou {
     font-size: 1.5rem;
     font-weight: 600;
     margin-right: 7rem;
   }
+
   .titleName {
     font-size: 1.125rem;
     font-weight: 600;
   }
+
   .allTitle {
     margin: 1rem 0;
-    .van-cell__title {
-      font-weight: bold;
-      font-size: 1rem;
-      color: #313234;
-    }
+
+  .van-cell__title {
+    font-weight: bold;
+    font-size: 1rem;
+    color: #313234;
+  }
+
   }
   .allTitle1 {
-    .van-cell__title {
-      font-weight: bold;
-      font-size: 1rem;
-      color: #313234;
-    }
+
+  .van-cell__title {
+    font-weight: bold;
+    font-size: 1rem;
+    color: #313234;
+  }
+
   }
   .allBox {
     margin-bottom: 1rem;
-    .van-cell__title {
-      font-size: 1rem;
-      color: #313234;
-    }
+
+  .van-cell__title {
+    font-size: 1rem;
+    color: #313234;
+  }
+
+  }
   }
-}
 </style>

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

@@ -5,7 +5,7 @@
       <span class="titleName">{{title}}</span>
     </div>
     <div class="allTitle">
-      <van-cell center title="全部权限">
+      <van-cell center title="全部权限" v-if="title != '透析管理'">
         <van-switch v-model="checked" @change="allChange" slot="right-icon" size="24" />
       </van-cell>
     </div>
@@ -13,7 +13,7 @@
       <van-cell center title="功能权限配置"></van-cell>
     </div>
     <div class="allBox">
-      <van-cell center :title="item.name" v-for="(item, index) in allPurview" :key="index" v-if="item.name == '透析记录'" @click="toFunctonPurview()">
+      <van-cell center :title="item.name" v-for="(item, index) in allPurview" :key="index" v-if="item.name == '透析记录'" @click="toFunctonPurview(item)">
       </van-cell>
       <van-cell center :title="item.name" v-for="(item, index) in allPurview" :key="index" v-if="item.name != '透析记录'">
         <van-switch v-model="item.isCheck" slot="right-icon" size="24"  @change="changeStatus(item)" />
@@ -24,7 +24,7 @@
 
 <script>
   import {setRem} from "@/libs/functionRem";
-  import {GetAllPurview,GetRoleInfo,EditRoleInfo,DeleteRoleInfo,EditPurview} from "@/api/admin_user";
+  import {GetAllPurview,GetRoleInfo,EditRoleInfo,DeleteRoleInfo,EditPurview,GetFunctionRoleInfo} from "@/api/admin_user";
 
   export default {
     data() {
@@ -45,10 +45,16 @@
       this.pid = this.$route.query.pid
       this.module = this.$route.query.module
       this.GetAllPurview()
-      this.GetRoleInfo(this.$route.query.id)
+      // this.GetRoleInfo(this.$route.query.id)
+
 
 
     }, methods: {
+      isShow(){
+
+
+
+      },
       allChange(val){
         if (val){
           let purview_ids = ""
@@ -251,18 +257,18 @@
         }
 
       },
-      toFunctonPurview(){
-        this.$router.push({path:"/role/functionpurview?id="+this.$route.query.id})
-
-      },
-
-      GetRoleInfo(role_id) {
+      toFunctonPurview(item){
+        this.$router.push({path:"/role/functionpurview?id="+this.$route.query.id+"&pid="+item.id})
+      }, GetRoleInfo(role_id) {
         let params = {
           id: role_id,
         }
         GetRoleInfo(params).then(response => {
           if (response.data.state === 1) {
             this.rolePurview = response.data.data.role_purview
+
+            // this.rolePurview = response.data.data.role_purview
+
             this.name =  response.data.data.role.name
             this.desc = response.data.data.role.intro
             this.ids = this.rolePurview.PurviewIds.split(',')
@@ -284,6 +290,7 @@
                 b++
               }
             }
+
             if (b == this.allPurview.length){
               this.checked = true
             }else{
@@ -318,6 +325,8 @@
             }
 
             this.GetRoleInfo(this.$route.query.id)
+            // this.GetFuncRoleInfo(this.$route.query.id)
+
 
 
 

src/pages/home/verifyToken.vue

@@ -39,6 +39,11 @@ export default {
           //未登录
           this.$router.replace("/login");
         }
+      }else{
+        this.$toast({
+          message: "数据加载错误，请重新登录"
+        });
+        this.$router.replace("/login");
       }
     });
   },methods:{

src/pages/homeIndex/index.vue

@@ -185,7 +185,12 @@
         ChangeOrg(params).then(response => {
           if (response.data.state === 1) {
             //清除之前的数据
-
+            this.$store.dispatch("SetScheduals", {
+             scheduals: []
+            });
+            this.$store.dispatch("SetWaitScheduals", {
+              waitscheduals: []
+            });
 
             var user = response.data.data.user;
             var admin = response.data.data.admin;
@@ -221,8 +226,10 @@
         }
         if(app.open_status == 0){
           Toast.success('敬请期待')
+
           return
         }
+        console.log(app.name)
         switch (app.app_type) {
           case 6:
             this.toPatients()

src/pages/main/DialysisArea.vue

@@ -290,11 +290,12 @@ export default {
   },
 
   created () {
-    this.user_id = this.$store.getters.user.user.id
+    this.user_id = this.$store.getters.user.admin.id
 
     var storedata = this.$store.getters.scheduals
+    console.log(storedata)
     var scheduals = storedata.scheduals
-    if (Object.keys(storedata).length > 0) {
+    if (scheduals.length > 0) {
       var zoneMap = {}
       var schedualMap = {}
       for (let index = 0; index < scheduals.length; index++) {

src/pages/main/dialog/AcceptsDialog.vue

@@ -333,6 +333,8 @@ export default {
         } else {
           for (const key in response.data.data.receiveTreatmentAsses) {
             this.accepts[key] = response.data.data.receiveTreatmentAsses[key];
+            this.accepts['id'] = 0
+            this.accepts['creater'] = 0
             this.receiveTreatmentAsses.way = this.accepts.way;
             this.receiveTreatmentAsses.consciousness =
               this.accepts.consciousness;
@@ -391,6 +393,9 @@ export default {
           } else {
             for (const key in response.data.data.receiveTreatmentAsses) {
               this.accepts[key] = response.data.data.receiveTreatmentAsses[key];
+              this.accepts['id'] = 0
+              this.accepts['creater'] = 0
+
               this.receiveTreatmentAsses.way = this.accepts.way;
               this.receiveTreatmentAsses.consciousness =
                 this.accepts.consciousness;
@@ -489,8 +494,10 @@ export default {
       ParamsQuery["record_date"] = this.record_date;
       if (this.accepts.id > 0){
         mode = 2
+        if(this.accepts.creater  != this.$store.getters.user.admin.id){
+          mode = 3
+        }
       }
-
       ParamsQuery["mode"] = mode;
       commitAcceptsAssessment(ParamsQuery).then(response => {
         if (response.data.state == 0) {

src/pages/main/dialog/AssessmentDialog.vue

@@ -1463,9 +1463,13 @@ export default {
       // if (this.formValue.dry_weight == ""){
       //   this.formValue.
       // }
+      console.log(this.predialysis)
 
       if(this.predialysis.id > 0){
         mode = 2
+        if(this.predialysis.creater != this.$store.getters.user.admin.id){
+          mode = 3
+        }
       }
 
 
@@ -1487,9 +1491,6 @@ export default {
       });
     },
     showDryWeight: function () {
-      if (this.$store.getters.user.user.user_type == 3) {
-        return
-      }
       this.isShowDialog = false
       this.$refs.dry.open()
       this.propDryForm.doctor = []

src/pages/main/dialog/ComputerDialog.vue

@@ -5,8 +5,8 @@
       <div class="DialogTit">
         <span @click="close()" class="iconfont">&#xe6e9;</span>
         <h1 class="name">透析上机</h1>
-        <span class="success" v-if="this.record.id == 0 || this.$store.getters.user.user.id != this.creator"></span>
-        <span class="success" @click="modify()" v-if="isPremission|| this.$store.getters.user.user.id == this.creator">修改</span>
+        <span class="success" v-if="this.record.id ==0"></span>
+        <span class="success" @click="modify()" v-else>修改</span>
       </div>
 
       <div class="DialogContent ">
@@ -43,7 +43,7 @@
         <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"/>
+            <input type="tel" @focus="inputFocus" id="xll" v-model="blood_drawing"/>
           </div>
         </div>
 
@@ -56,8 +56,6 @@
         </div>
 
 
-
-
         <div class="perform">
           <button @click="commitInfo" v-if="(record == null || record.id == '')">执行上机</button>
           <button :disabled="true" style="background-color:lightgray;" v-else>已上机</button>
@@ -77,7 +75,7 @@
 
 
 <script>
-  import {startDialysis,PostModifyStartDialysis,GetSchedualNumber} from '@/api/dialysis'
+  import {GetSchedualNumber, PostModifyStartDialysis, startDialysis} from '@/api/dialysis'
   import {Toast} from 'vant'
   import {parseTime} from '@/utils'
 
@@ -88,25 +86,26 @@
     components: {
       TwoMenu
     },
-    data () {
+    data() {
       return {
         start_time: new Date(),
         selecting: false,
         start_time_str: '',
         bed_id: 0,
+        isShow:false,
         nurse_id: 0,
         puncture_nurse_id: 0,
         isPremission: false,
         zone_beds: [], // 该排班的区里的床位
         creator: 0,
         template_id: 0,
-        temp_device_numbers:[],
-        blood_drawing:100,
-        schedual_type:0,
+        temp_device_numbers: [],
+        blood_drawing: 100,
+        schedual_type: 0,
         schedules_type: [
-          {id: 1, name:"上午"},
-          {id: 2, name:"下午"},
-          {id: 3, name:"晚上"},
+          {id: 1, name: "上午"},
+          {id: 2, name: "下午"},
+          {id: 3, name: "晚上"},
         ], // 该排班的区里的床位
       }
     },
@@ -135,32 +134,34 @@
       special_premission: {
         type: Array,
       },
-    }, mounted () {
+    }, mounted() {
 
 
     },
-    created () {
+    created() {
       this.temp_device_numbers = this.device_numbers
 
 
-
       if (this.record.id == 0) {
+        this.isShow = false
         this.start_time_str = parseTime(this.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
         let now = new Date()
         let hour = now.getHours()
 
-        if (hour >= 6 && hour < 12){
+        if (hour >= 6 && hour < 12) {
           this.schedual_type = 1
 
-        }else if(hour >= 12 && hour < 18){
+        } else if (hour >= 12 && hour < 18) {
 
           this.schedual_type = 2
 
 
-        }else if(hour >= 18){
+        } else if (hour >= 18) {
           this.schedual_type = 3
         }
       } else {
+        this.isShow = true
+
         if (this.record.start_time == 0) {
           this.start_time_str = parseTime(this.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
           this.schedual_type = this.record.schedual_type
@@ -191,11 +192,11 @@
       this.record_date = y + '-' + (m < 10 ? '0' + m : m) + '-' + (d < 10 ? '0' + d : d)
 
       this.bed_id = (this.record == null || this.record.id == '') ? this.schedule.bed_id : this.record.bed_id
-      this.nurse_id = (this.record == null || this.record.id == '') ? this.$store.getters.user.user.id : this.record.start_nurse
-      this.puncture_nurse_id = (this.record == null || this.record.id == '') ? this.$store.getters.user.user.id : this.record.puncture_nurse
+      this.nurse_id = (this.record == null || this.record.id == '') ? this.$store.getters.user.admin.id : this.record.start_nurse
+      this.puncture_nurse_id = (this.record == null || this.record.id == '') ? this.$store.getters.user.admin.id : this.record.puncture_nurse
 
       if (this.puncture_nurse_id == 0) {
-        this.puncture_nurse_id = this.$store.getters.user.user.id
+        this.puncture_nurse_id = this.$store.getters.user.admin.id
       }
 
       // var beds = []
@@ -209,13 +210,13 @@
 
       for (let index = 0; index < this.temp_device_numbers.length; index++) {
         const device_number = this.temp_device_numbers[index]
-        this.temp_device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
+        this.temp_device_numbers[index]['number'] = device_number['zone_name'] + '-' + device_number['number']
       }
       this.zone_beds = this.temp_device_numbers
 
       if (this.record.id > 0) {
         for (let i = 0; i < this.special_premission.length; i++) {
-          if (this.$store.getters.user.user.id == this.special_premission[i].admin_user_id) {
+          if (this.$store.getters.user.admin.id == this.special_premission[i].admin_user_id) {
             this.isPremission = true
           }
         }
@@ -230,53 +231,43 @@
       }
 
 
-
     },
     methods: {
-      getSchedualType:function(type){
-        for (let i = 0; i < this.schedules_type.length; i++){
-          if(this.schedules_type[i].id == type){
-            return  this.schedules_type[i].name
+      getSchedualType: function (type) {
+        for (let i = 0; i < this.schedules_type.length; i++) {
+          if (this.schedules_type[i].id == type) {
+            return this.schedules_type[i].name
           }
         }
       },
-      select_type:function(){
+      select_type: function () {
         if (this.record.id != 0) {
-          var creator = 0
-          if (this.record.creator == 0) {
-            creator = this.record.start_nurse
-          } else {
-            creator = this.record.creator
-          }
 
-          if (this.$store.getters.user.user.id == creator || this.isPremission) {
-            this.selecting = true
-            var t = this
-            this.$refs.selector.showSingleSelect(this.schedules_type, this.schedual_type, '选择班次', 'name', 'id', function (select_id) {
-              t.schedual_type = select_id
-
-              let ParamsQuery = {}
-              ParamsQuery['schedual_type'] = select_id
-              GetSchedualNumber(ParamsQuery).then(response => {
-                if (response.data.state == 0) {
-                  Toast.fail(response.data.msg)
-                  return false
-                } else {
-                  t.temp_device_numbers = response.data.data.number
-                  for (let index = 0; index < t.temp_device_numbers.length; index++) {
-                    const device_number = t.temp_device_numbers[index]
-                    t.temp_device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
-                  }
-                  t.zone_beds = t.temp_device_numbers
-                  t.bed_id = t.zone_beds[0].id
+          this.selecting = true
+          var t = this
+          this.$refs.selector.showSingleSelect(this.schedules_type, this.schedual_type, '选择班次', 'name', 'id', function (select_id) {
+            t.schedual_type = select_id
+
+            let ParamsQuery = {}
+            ParamsQuery['schedual_type'] = select_id
+            GetSchedualNumber(ParamsQuery).then(response => {
+              if (response.data.state == 0) {
+                Toast.fail(response.data.msg)
+                return false
+              } else {
+                t.temp_device_numbers = response.data.data.number
+                for (let index = 0; index < t.temp_device_numbers.length; index++) {
+                  const device_number = t.temp_device_numbers[index]
+                  t.temp_device_numbers[index]['number'] = device_number['zone_name'] + '-' + device_number['number']
                 }
-              })
-            }, function () {
-              t.selecting = false
+                t.zone_beds = t.temp_device_numbers
+                t.bed_id = t.zone_beds[0].id
+              }
             })
-          } else {
-            return
-          }
+          }, function () {
+            t.selecting = false
+          })
+
         }
         this.selecting = true
         var t = this
@@ -293,7 +284,7 @@
               t.temp_device_numbers = response.data.data.number
               for (let index = 0; index < t.temp_device_numbers.length; index++) {
                 const device_number = t.temp_device_numbers[index]
-                t.temp_device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
+                t.temp_device_numbers[index]['number'] = device_number['zone_name'] + '-' + device_number['number']
               }
               t.zone_beds = t.temp_device_numbers
               t.bed_id = t.zone_beds[0].id
@@ -306,7 +297,7 @@
         })
 
       },
-      GetSchedualNumber:function(){
+      GetSchedualNumber: function () {
         let ParamsQuery = {}
         ParamsQuery['schedual_type'] = this.schedual_type
         GetSchedualNumber(ParamsQuery).then(response => {
@@ -317,7 +308,7 @@
             this.temp_device_numbers = response.data.data.number
             for (let index = 0; index < this.temp_device_numbers.length; index++) {
               const device_number = this.temp_device_numbers[index]
-              this.temp_device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
+              this.temp_device_numbers[index]['number'] = device_number['zone_name'] + '-' + device_number['number']
             }
             this.zone_beds = this.temp_device_numbers
           }
@@ -340,8 +331,13 @@
           rng.select()
         }
       },
-      modify(){
+      modify() {
         let ParamsQuery = {}
+        if (this.$store.getters.user.admin.id == this.record.creator) {
+          ParamsQuery['mode'] = "2"
+        } else {
+          ParamsQuery['mode'] = "3"
+        }
         ParamsQuery['schedual_type'] = this.schedual_type
         ParamsQuery['id'] = this.record.id
         ParamsQuery['nurse'] = this.nurse_id
@@ -376,17 +372,15 @@
             creator = this.record.creator
           }
 
-          if (this.$store.getters.user.user.id == creator || this.isPremission) {
-            this.$refs.start_time_picker.open()
-          } else {
-            return
-          }
+          this.$refs.start_time_picker.open()
+
         }
         this.$refs.start_time_picker.open()
       },
       commitInfo: function () {
         Toast.loading({forbidClick: true, duration: 0})
         let ParamsQuery = {}
+        ParamsQuery['mode'] = "1"
         ParamsQuery['schedual_type'] = this.schedual_type
         ParamsQuery['patient_id'] = this.patient_prop.id
         ParamsQuery['record_date'] = this.record_date
@@ -426,8 +420,6 @@
           } else {
             creator = this.record.creator
           }
-
-          if (this.$store.getters.user.user.id == creator || this.isPremission) {
             this.selecting = true
             var t = this
             this.$refs.selector.showSingleSelect(this.zone_beds, this.bed_id, '选择床位号', 'number', 'id', function (select_id) {
@@ -435,9 +427,7 @@
             }, function () {
               t.selecting = false
             })
-          } else {
-            return
-          }
+
         }
 
         this.selecting = true
@@ -456,7 +446,7 @@
           } else {
             creator = this.record.creator
           }
-          if (this.$store.getters.user.user.id == creator || this.isPremission) {
+
             this.selecting = true
             var t = this
             this.$refs.selector.showSingleSelect(this.admins, this.nurse_id, '选择上机护士', 'name', 'id', function (select_id) {
@@ -464,9 +454,7 @@
             }, function () {
               t.selecting = false
             })
-          } else {
-            return
-          }
+
         }
         this.selecting = true
         var t = this
@@ -483,7 +471,7 @@
           } else {
             creator = this.record.creator
           }
-          if (this.$store.getters.user.user.id == creator || this.isPremission) {
+
             this.selecting = true
             var t = this
             this.$refs.selector.showSingleSelect(this.admins, this.puncture_nurse_id, '选择穿刺护士', 'name', 'id', function (select_id) {
@@ -491,9 +479,7 @@
             }, function () {
               t.selecting = false
             })
-          } else {
-            return
-          }
+
         }
         this.selecting = true
         var t = this
@@ -510,11 +496,6 @@
     }, watch: {
       'record.id': function (val) {
         if (val > 0) {
-          for (let i = 0; i < this.special_premission.length; i++) {
-            if (this.$store.getters.user.user.id == this.special_premission[i].admin_user_id) {
-              this.isPremission = true
-            }
-          }
           if (this.record.creator == 0) {
             this.creator = this.record.start_nurse
           } else {
@@ -531,23 +512,23 @@
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>
-.perform {
+  .perform {
   text-align: center;
   font-size: 0.3rem;
   padding-top: 2rem;
   .crew {
-    color: $pgh-color;
+  color: $pgh-color;
   }
   button {
-    background: $main-color;
-    color: #fff;
-    font-size: 0.45rem;
-    text-align: center;
-    width: 3rem;
-    height: 1.2rem;
-    line-height: 1.2rem;
-    border-radius: 4px;
-    margin-top: 10px;
+  background: $main-color;
+  color: #fff;
+  font-size: 0.45rem;
+  text-align: center;
+  width: 3rem;
+  height: 1.2rem;
+  line-height: 1.2rem;
+  border-radius: 4px;
+  margin-top: 10px;
+  }
   }
-}
 </style>

src/pages/main/dialog/DoubleDialog.vue

@@ -281,6 +281,7 @@ export default {
       ParamsQuery["patient"] = this.$route.query.patient_id;
       ParamsQuery["record_date"] = this.record_date;
       ParamsQuery["check_time"] = this.check_time_str;
+      console.log(this.record)
      if(this.record.id > 0){
        ParamsQuery['mode'] = "2"
      }

src/pages/main/dialog/MonitDialog.vue

@@ -491,7 +491,8 @@ export default {
         dispose: '', // 处理
         result: '', // 结果,
         blood_oxygen_saturation: '',
-        monitoring_nurse: this.$store.getters.user.user.id // 监测人
+        monitoring_nurse: this.$store.getters.user.admin.id, // 监测人
+        creator:0,
       },
       doctor: this.$store.getters.user.user.user_name
     }
@@ -776,9 +777,15 @@ export default {
         message: '是否删除该监测记录'
       })
         .then(() => {
+
           let params = {
             record_id: this.currentRow.id,
-            patient_id: this.patient.id
+            patient_id: this.patient.id,
+            mode : "4"
+          }
+          if(this.$store.getters.user.admin.id  != this.form.creator && this.form.creator != 0){
+
+            params.mode = "5"
           }
           deleteMonitorRecord(params).then(rs => {
             var resp = rs.data
@@ -952,6 +959,8 @@ export default {
       this.form.result = this.currentRow.result
       this.form.id = this.currentRow.id
       this.form.operate_time = this.currentRow.operate_time * 1000
+      this.form.creator = this.currentRow.creator
+
       // this.monitor_time_str =
       //   parseTime(this.form.monitor_date, "{y}-{m}-{d}") +
       //   " " +
@@ -1016,6 +1025,11 @@ export default {
       params.displacement_flow_quantity = this.form.displacement_flow_quantity
       params.blood_oxygen_saturation = this.form.blood_oxygen_saturation
       params.id = this.form.id
+      params.mode = "2"
+
+      if (this.form.creator != this.$store.getters.user.admin.id && this.form.creator != 0){
+        params.mode = "3"
+      }
       editMonitorRecord(params).then(rs => {
         var resp = rs.data
         if (resp.state == 1) {
@@ -1092,6 +1106,7 @@ export default {
       params.dispose = this.form.dispose
       params.result = this.form.result
       params.monitoring_nurse = this.form.monitoring_nurse
+      params.mode = "1"
 
       addMonitorRecord(params)
         .then(rs => {

src/pages/main/dialog/OrdersDialog.vue

@@ -9,12 +9,11 @@
        <div class="yzNav" style="width:100%;">
         <span
           @click="openNewAdvice"
-          :class="{ forbid: this.$store.getters.user.user.user_type == 3 }"
         >新增</span>
         <span
           v-if="isShowExce"
           @click="execAdvice"
-          :class="{ forbid: (current_advice&& current_advice.parent_id > 0)||(this.$store.getters.user.user.user_type == 2 && !isPremission) }"
+          :class="{ forbid: (current_advice&& current_advice.parent_id > 0) }"
         >执行</span>
 
         <span
@@ -28,12 +27,12 @@
         <span
           v-if="template_id != 6"
           @click="checkAdvice"
-          :class="{ forbid: (current_advice&& current_advice.parent_id > 0) || (this.$store.getters.user.user.user_type == 2 && !isPremission) }"
+          :class="{ forbid: (current_advice&& current_advice.parent_id > 0)  }"
         >核对</span>
         <span
         id="fontSize"
           @click="openNewChild"
-          :class="{ forbid: current_advice == null || current_advice.parent_id > 0 ||  currentAdvices.length != 1 || this.$store.getters.user.user.user_type == 3 }"
+          :class="{ forbid: current_advice == null || current_advice.parent_id > 0 ||  currentAdvices.length != 1  }"
         >添加子药</span>
         <span
           v-if="currentSubAdvices.length <= 0"
@@ -46,8 +45,8 @@
           :class="{ forbid: current_group_index < 0 || currentAdvices.length <= 0 }"
         >删除</span>
 
-        <span id="fontSize" :class="{ forbid:this.$store.getters.user.user.user_type == 3}" v-if="currentSubAdvices.length > 0" @click="modifySubdviceAction">修改子医嘱</span>
-        <span id="fontSize" :class="{ forbid:this.$store.getters.user.user.user_type == 3}" v-if="currentSubAdvices.length > 0" @click="deleteSubAdviceAction">删除子医嘱</span>
+        <span id="fontSize"  v-if="currentSubAdvices.length > 0" @click="modifySubdviceAction">修改子医嘱</span>
+        <span id="fontSize"  v-if="currentSubAdvices.length > 0" @click="deleteSubAdviceAction">删除子医嘱</span>
       </div>
       <div class="DialogContent choose" id="dialogTop" style="height:6.5rem;">
 
@@ -316,7 +315,6 @@
         currentAdviceIdsStr: '',
         currentAdvices: [],
         currentSubAdvices: [],
-        isPremission:false,
 
       }
     },
@@ -349,12 +347,6 @@
         this.unitsObj[this.unitsOption[index].id] = this.unitsOption[index]
       }
 
-      for (let i = 0; i < this.special_premission.length; i++) {
-        if (this.$store.getters.user.user.id == this.special_premission[i].admin_user_id) {
-          this.isPremission = true
-        }
-      }
-
 
     },
     watch: {
@@ -388,15 +380,9 @@
 
     methods: {
       modifyExecAdvice: function () {
-        // if(!this.isPremission){
-        //   Toast.fail('你没有权限修改医嘱！')
-        // }else{
-
-
         this.nowExecTime = new Date(this.currentAdvices[0].execution_time * 1000)
           this.$refs.mofify_exec_time.open()
 
-        // }
 
       },
       didCreateAdvices: function (advices) {
@@ -438,6 +424,14 @@
 
       },
       didModifyAdvice: function (advice) {
+        let mode = "2"
+        console.log(advice.doctor_advice)
+        console.log( this.$store.getters.user.admin.id )
+
+        if (advice.doctor_advice != this.$store.getters.user.admin.id && advice.doctor_advice > 0){
+          mode = "3"
+          console.log("1111111")
+        }
         Toast.loading({forbidClick: true, duration: 0})
         EditDoctorAdvice(advice.id, {
           advice_name: advice.title,
@@ -452,7 +446,7 @@
           single_dose_unit: advice.single_dose_unit,
           prescribing_number: String(advice.prescribing_number),
           prescribing_number_unit: advice.prescribing_number_unit
-        })
+        },mode)
           .then(rs => {
             if (rs.data.state == 1) {
               var resp_advice = rs.data.data.advice
@@ -550,7 +544,8 @@
       },
       didAddSubdrug: function (subdrug) {
         Toast.loading({forbidClick: true, duration: 0})
-        CreateDoctorAdvice(this.patient.id, {
+        let mode = "1"
+        CreateDoctorAdvice(this.patient.id,{
           parent_id: subdrug.parent_id,
           advice_type: 2,
           advice_date: subdrug.record_time,
@@ -565,7 +560,7 @@
           prescribing_number_unit: subdrug.prescribing_number_unit
           // delivery_way: subdrug.delivery_way,
           // execution_frequency: subdrug.execution_frequency
-        })
+        }, mode)
           .then(response => {
             if (response.data.state == 0) {
               Toast.fail(response.data.msg)
@@ -673,7 +668,7 @@
             execution_time: exceTime
           }
         }
-
+        exceParams['mode'] = 8
         ModifyExecDoctorAdvice(exceParams)
           .then(response => {
             if (response.data.state == 0) {
@@ -729,6 +724,7 @@
           }
         }
         Toast.loading({forbidClick: true, duration: 0})
+        exceParams['mode'] = "6"
         ExecDoctorAdvice(exceParams)
           .then(response => {
             if (response.data.state == 0) {
@@ -795,7 +791,14 @@
           message: '确认删除医嘱吗?'
         }).then(() => {
           Toast.loading({forbidClick: true, duration: 0})
-          DeleteSubDoctorAdvice(this.currentSubAdvices[0].id)
+          let is_sub = 1
+          let mode = "4"
+          console.log(this.currentSubAdvices)
+          if (this.currentSubAdvices[0].advice_doctor != this.$store.getters.user.admin.id&& this.currentSubAdvices[0].advice_doctor>0) {
+            mode = "5"
+          }
+
+          DeleteDoctorAdviceNew(0,this.currentSubAdvices[0].id,mode,is_sub)
             .then(rs => {
               if (rs.data.state == 1) {
                 Toast.success('删除成功')
@@ -815,7 +818,6 @@
                 }
 
               } else {
-
                 Toast.fail(rs.data.msg)
               }
             })
@@ -843,29 +845,33 @@
             }
             advice_id = ids.join(',')
 
-            DeleteDoctorAdviceNew(group_no, advice_id)
+            let mode = "4"
+            if (this.currentAdvices[0].advice_doctor != this.$store.getters.user.admin.id&& this.currentAdvices[0].advice_doctor>0) {
+              mode = "5"
+            }
+            let is_sub = 2
+            DeleteDoctorAdviceNew(group_no, advice_id,mode,is_sub)
               .then(rs => {
                 if (rs.data.state == 1) {
-                  Toast.success('删除成功')
-                  var adviceArr = this.advice_groups[this.current_group_index].advices
+                    Toast.success('删除成功')
+                    var adviceArr = this.advice_groups[this.current_group_index].advices
 
-                  for (let y = ids.length - 1; y >= 0; y--) {
-                    for (let i = adviceArr.length - 1; i >= 0; i--) {
-                      if (adviceArr[i].id == ids[y] || adviceArr[i].parent_id == ids[y]) {
-                        adviceArr.splice(i, 1)
+                    for (let y = ids.length - 1; y >= 0; y--) {
+                      for (let i = adviceArr.length - 1; i >= 0; i--) {
+                        if (adviceArr[i].id == ids[y] || adviceArr[i].parent_id == ids[y]) {
+                          adviceArr.splice(i, 1)
+                        }
                       }
                     }
-                  }
-                  this.currentSubAdvices = []
-                  this.currentAdvices = []
-                  for (let i = 0; i < this.advice_groups.length; i++) {
-                    for (let y = 0; y < this.advice_groups[i].advices.length; y++) {
-                      var advices = this.advice_groups[i].advices[y]
-                      advices.is_selected = 0
+                    this.currentSubAdvices = []
+                    this.currentAdvices = []
+                    for (let i = 0; i < this.advice_groups.length; i++) {
+                      for (let y = 0; y < this.advice_groups[i].advices.length; y++) {
+                        var advices = this.advice_groups[i].advices[y]
+                        advices.is_selected = 0
+                      }
                     }
-                  }
-
-                } else {
+                }else{
                   Toast.fail(rs.data.msg)
                 }
               })
@@ -893,7 +899,12 @@
               advice_id = this.current_advice.id
             }
 
-            DeleteDoctorAdviceNew(group_no, advice_id)
+            let mode = "4"
+            if (group.advices[0].advice_doctor != this.$store.getters.user.admin.id&&  group.advices[0].advice_doctor>0) {
+              mode = "5"
+            }
+            let is_sub = 2
+            DeleteDoctorAdviceNew(group_no, advice_id,mode,is_sub)
               .then(rs => {
                 if (rs.data.state == 1) {
                   Toast.success('删除成功')
@@ -944,9 +955,7 @@
         }
       },
       checkAdvice () {
-        if (this.$store.getters.user.user.user_type == 2 && !this.isPremission){
-          return
-        }
+
         if (this.currentAdvices.length <= 0) {
           return
         }
@@ -965,7 +974,7 @@
           }
 
           for (let i = 0; i < adviceArr.length; i++) {
-            if (adviceArr[i].is_selected == 1 && adviceArr[i].execution_staff > 0 && adviceArr[i].execution_staff == this.$store.getters.user.user.id) {
+            if (adviceArr[i].is_selected == 1 && adviceArr[i].execution_staff > 0 && adviceArr[i].execution_staff == this.$store.getters.user.admin.id) {
               Toast.fail('核对与执行不能是同一人')
               return false
             }
@@ -1001,7 +1010,7 @@
           }
 
           for (let i = 0; i < adviceArr.length; i++) {
-            if (adviceArr[i].is_selected == 1 && adviceArr[i].execution_staff > 0 && adviceArr[i].execution_staff == this.$store.getters.user.user.id) {
+            if (adviceArr[i].is_selected == 1 && adviceArr[i].execution_staff > 0 && adviceArr[i].execution_staff == this.$store.getters.user.admin.id) {
               Toast.fail('核对与执行不能是同一人')
               return false
             }
@@ -1035,6 +1044,7 @@
             }
           }
 
+          params['mode'] = "7"
           CheckDoctorAdvice(params)
             .then(response => {
               if (response.data.state == 0) {
@@ -1077,9 +1087,6 @@
         // });
       },
       execAdvice () {
-        if (this.$store.getters.user.user.user_type == 2 && !this.isPremission){
-          return
-        }
 
         if (this.currentAdvices.length <= 0) {
           return
@@ -1098,7 +1105,7 @@
           }
 
           for (let i = 0; i < adviceArr.length; i++) {
-            if (adviceArr[i].is_selected == 1 && adviceArr[i].checker > 0 && adviceArr[i].checker == this.$store.getters.user.user.id) {
+            if (adviceArr[i].is_selected == 1 && adviceArr[i].checker > 0 && adviceArr[i].checker == this.$store.getters.user.admin.id) {
               Toast.fail('核对与执行不能是同一人')
               return false
             }
@@ -1131,7 +1138,7 @@
           }
 
           for (let i = 0; i < adviceArr.length; i++) {
-            if (adviceArr[i].is_selected == 1 && adviceArr[i].checker > 0 && adviceArr[i].checker == this.$store.getters.user.user.id) {
+            if (adviceArr[i].is_selected == 1 && adviceArr[i].checker > 0 && adviceArr[i].checker == this.$store.getters.user.admin.id) {
               Toast.fail('核对与执行不能是同一人')
               return false
             }
@@ -1142,10 +1149,6 @@
         this.$refs.exec_time.open()
       },
       openNewChild () {
-        if (this.$store.getters.user.user.user_type == 3) {
-          Toast.fail('你没有权限添加子药！')
-          return
-        }
 
         if (this.current_advice == null){
           return
@@ -1181,11 +1184,6 @@
         return
       },
       openNewAdvice () {
-        if (this.$store.getters.user.user.user_type == 3) {
-          Toast.fail('你没有权限新增医嘱！')
-          return
-        }
-
         this.currentAdvices = []
         this.currentSubAdvices = []
         for (let i = 0; i < this.advice_groups.length; i++) {
@@ -1207,11 +1205,13 @@
         if (this.current_advice_index >= 0) {
           this.index = 3
           var advice = this.currentSubAdvices[0]
+          console.log(advice)
           this.$refs.modify_advice_form.showWithModify({
             id: advice.id,
             parent_id: advice.parent_id,
             title: advice.advice_name,
             advice_desc: advice.advice_desc,
+            advice_doctor: advice.advice_doctor,
             remark: advice.remark,
             drug_spec: advice.drug_spec,
             drug_spec_unit: advice.drug_spec_unit,
@@ -1242,6 +1242,7 @@
             parent_id: advice.parent_id,
             title: advice.advice_name,
             advice_desc: advice.advice_desc,
+            advice_doctor: advice.advice_doctor,
             remark: advice.remark,
             start_time: advice.start_time,
             drug_spec: advice.drug_spec,

src/pages/main/dialog/OrdersDialog_olddddd.vue

@@ -709,7 +709,7 @@ export default {
 
       if (
         this.currentRow.execution_staff > 0 &&
-        this.currentRow.execution_staff == this.$store.getters.user.user.id
+        this.currentRow.execution_staff == this.$store.getters.user.admin.id
       ) {
         Toast.fail('核对与执行不能是同一人')
         return false
@@ -777,7 +777,7 @@ export default {
 
       if (
         this.currentRow.checker > 0 &&
-        this.currentRow.checker == this.$store.getters.user.user.id
+        this.currentRow.checker == this.$store.getters.user.admin.id
       ) {
         Toast.fail('核对与执行不能是同一人')
         return false

src/pages/main/dialog/PlaneDialog.vue

@@ -7,17 +7,13 @@
 
         <span
           class="success"
-          v-if="
-            this.record.state == 1 ||
-              this.$store.getters.user.user.id != this.creator
-          "
+          v-if="this.record.stage == 1"
         ></span>
         <span
+          v-else
           class="success"
           @click="modify()"
-          v-if="isPremission || this.$store.getters.user.user.id == this.creator"
-          >修改</span
-        >
+          >修改</span>
       </div>
 
       <div class="DialogContent">
@@ -184,21 +180,12 @@ export default {
     if (this.record == null || this.record.id == "") {
       this.nurse_id = 0;
     } else if (this.record.stage == 1) {
-      this.nurse_id = this.$store.getters.user.user.id;
+      this.nurse_id = this.$store.getters.user.admin.id;
     } else {
       this.nurse_id = this.record.finish_nurse;
     }
 
-    if (this.record.id > 0) {
-      for (let i = 0; i < this.special_premission.length; i++) {
-        if (
-          this.$store.getters.user.user.id ==
-          this.special_premission[i].admin_user_id
-        ) {
-          this.isPremission = true;
-        }
-      }
-    }
+
 
     if (this.record.id > 0) {
       if (this.record.finish_creator == 0) {
@@ -222,6 +209,11 @@ export default {
       ParamsQuery["id"] = this.record.id;
       ParamsQuery["nurse"] = this.nurse_id;
       ParamsQuery["end_time"] = this.end_time_str;
+      ParamsQuery["mode"] = "2";
+      if(this.$store.getters.user.admin.id != this.record.finish_creator){
+        ParamsQuery["mode"] = "3";
+      }
+
       PostModifyEndDialysis(ParamsQuery).then(response => {
         if (response.data.state == 0) {
           Toast.fail(response.data.msg);
@@ -244,20 +236,9 @@ export default {
     selectStartTimeAction: function() {
       if (this.record.id != 0) {
         if (this.record.end_time > 0) {
-          var creator = 0;
-          if (this.record.finish_creator == 0) {
-            creator = this.record.finish_nurse;
-          } else {
-            creator = this.record.finish_creator;
-          }
-          if (
-            this.$store.getters.user.user.id == creator ||
-            this.isPremission
-          ) {
-            this.$refs.start_time_picker.open();
-          } else {
-            return;
-          }
+
+          this.$refs.start_time_picker.open();
+
         } else {
           this.$refs.start_time_picker.open();
         }
@@ -272,6 +253,8 @@ export default {
       ParamsQuery["record_date"] = this.record_date;
       ParamsQuery["nurse"] = this.nurse_id;
       ParamsQuery["end_time"] = this.end_time_str;
+      ParamsQuery["mode"] = "1";
+
 
       finish(ParamsQuery).then(response => {
         if (response.data.state == 0) {
@@ -314,16 +297,7 @@ export default {
             }
           );
         } else {
-          var creator = 0;
-          if (this.record.finish_creator == 0) {
-            creator = this.record.finish_nurse;
-          } else {
-            creator = this.record.finish_creator;
-          }
-          if (
-            this.$store.getters.user.user.id == creator ||
-            this.isPremission
-          ) {
+
             this.selecting = true;
             var t = this;
             this.$refs.selector.showSingleSelect(
@@ -340,9 +314,7 @@ export default {
                 t.selecting = false;
               }
             );
-          } else {
-            return;
-          }
+
         }
       }
     },
@@ -354,23 +326,12 @@ export default {
   watch: {
     "record.stage": function(val) {
       if (val == 2) {
-        for (let i = 0; i < this.special_premission.length; i++) {
-          if (
-            this.$store.getters.user.user.id ==
-            this.special_premission[i].admin_user_id
-          ) {
-            this.isPremission = true;
-          }
-        }
         if (this.record.finish_nurse == 0) {
           this.creator = this.record.finish_nurse;
         } else {
           this.creator = this.record.finish_creator;
         }
       }
-
-      console.log(this.creator);
-      console.log(this.$store.getters.user.user.id);
     }
   }
 };

src/pages/main/dialog/PrescriptionDialog.vue

@@ -232,13 +232,15 @@
           <div class="item" v-if="isShow('钾')">
             <label class="name" for="j">钾(mmol/L)</label>
             <div class="content">
-              <input type="number" @click="newClick($event)" @focus="inputFocus" id="j" v-model="dialysisPrescription.kalium" />
+              <input type="number" @click="newClick($event)" @focus="inputFocus" id="j"
+                     v-model="dialysisPrescription.kalium"/>
             </div>
           </div>
           <div class="item" v-if="isShow('钠')">
             <label class="name" for="n">钠(mmol/L):</label>
             <div class="content">
-              <input type="number" @click="newClick($event)" @focus="inputFocus" id="n" v-model="dialysisPrescription.sodium" />
+              <input type="number" @click="newClick($event)" @focus="inputFocus" id="n"
+                     v-model="dialysisPrescription.sodium"/>
             </div>
           </div>
           <div class="item" v-if="isShow('钙')">
@@ -346,7 +348,7 @@
           <div class="item" v-if="isShow('体液过多其他症状')">
             <label class="name" for="knj">体液过多其他症状</label>
             <div class="content">
-              <input @focus="inputFocus" id="dt" v-model="dialysisPrescription.body_fluid_other" />
+              <input @focus="inputFocus" id="dt" v-model="dialysisPrescription.body_fluid_other"/>
             </div>
           </div>
 
@@ -397,7 +399,6 @@
           </div>
 
 
-
           <div class="item" v-if="isShow('置换液总量')" v-show="totalShow">
             <label class="name" for="knj">置换液总量(L)</label>
             <div class="content">
@@ -412,7 +413,7 @@
           <div class="item" v-if="isShow('目标KT/V')">
             <label class="name" for="knj">目标KT/V</label>
             <div class="content">
-              <input @focus="inputFocus" id="dt" v-model="dialysisPrescription.target_ktv" />
+              <input @focus="inputFocus" id="dt" v-model="dialysisPrescription.target_ktv"/>
             </div>
           </div>
 
@@ -432,7 +433,7 @@
           <div class="item" v-if="isShow('实际超滤量')">
             <label class="name" for="knj">实际超滤量(L)</label>
             <div class="content">
-              <input @focus="inputFocus" id="dt" v-model="dialysisPrescription.ultrafiltration" />
+              <input @focus="inputFocus" id="dt" v-model="dialysisPrescription.ultrafiltration"/>
             </div>
           </div>
 
@@ -544,7 +545,7 @@
   import CheckBoxSubMenu from './subMenu/checkBoxSubMenu'
   import MultipleSubMenu from './subMenu/multipleSubMenu'
   import {commitDialysisPrescription, CreateGroupAdvice, GetSolution, postSign, postSolution} from '@/api/dialysis'
-  import { calculateAnticoagulantZL} from '@/utils/tools'
+  import {calculateAnticoagulantZL} from '@/utils/tools'
 
   import {Toast} from 'vant'
   import {getDataConfig} from '@/utils/data'
@@ -562,7 +563,7 @@
           return new Array()
         }
       },
-      system_prescription:{
+      system_prescription: {
         type: Object
       },
       predialysis: {
@@ -632,7 +633,7 @@
         }
       }
     },
-    data () {
+    data() {
       return {
         is_pre: 0,
         template_id: 0,
@@ -643,7 +644,7 @@
         msgtip_visibility: false,
         time: '03:00',
         timeValue: '',
-        tempTimeValue:'',
+        tempTimeValue: '',
         isShowSign: false,
         anticoagulantsConfit: {},
         dialysateFormulationOptions: [],
@@ -767,22 +768,22 @@
       // 计算属性的 getter
 
     }, methods: {
-      newClick(event){
+      newClick(event) {
         event.currentTarget.select();
       },
-      showmsgtip () {
+      showmsgtip() {
         this.msgtip_visibility = true
         this.isShowDialog = false
 
       },
-      isPermission () {
+      isPermission() {
         if (this.$store.getters.user.user.user_type == 3 && (this.$store.getters.user.template_info.template_id == 2 || this.$store.getters.user.template_info.template_id == 6)) {
           return false
         } else {
           return true
         }
       },
-      isShow (name) {
+      isShow(name) {
         var filedList = this.$store.getters.user.fileds
 
         for (let i = 0; i < filedList.length; i++) {
@@ -1052,7 +1053,7 @@
                 if (minites < 10) {
                   minites = "0" + minites;
                 }
-                var nowDate = year + "-" + month + "-" + day +" " +hours+":"+ minites;
+                var nowDate = year + "-" + month + "-" + day + " " + hours + ":" + minites;
 
                 Toast.success('提交成功')
                 let params = {
@@ -1068,7 +1069,7 @@
                 CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(rs => {
                   var resp = rs.data
                   if (resp.state == 1) {
-                    this.$emit('prescription', response.data.data.prescription,resp.data.advices)
+                    this.$emit('prescription', response.data.data.prescription, resp.data.advices)
 
                   } else {
 
@@ -1087,6 +1088,7 @@
             let ParamsQuery = this.dialysisPrescription
             ParamsQuery['patient'] = this.$route.query.patient_id
             ParamsQuery['record_date'] = this.record_date
+            ParamsQuery['mode'] = "1"
             postSolution(ParamsQuery).then(response => {
               if (response.data.state == 0) {
                 Toast.fail(response.data.msg)
@@ -1113,7 +1115,7 @@
                 if (minites < 10) {
                   minites = "0" + minites;
                 }
-                var nowDate = year + "-" + month + "-" + day +" " +hours+":"+ minites;
+                var nowDate = year + "-" + month + "-" + day + " " + hours + ":" + minites;
 
 
                 let params = {
@@ -1128,8 +1130,8 @@
                 CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(rs => {
                   var resp = rs.data
                   if (resp.state == 1) {
-                    this.$emit('prescription', response.data.data.prescription,resp.data.advices)
-                    this.$emit('longSolution', response.data.data.solution,resp.data.advices)
+                    this.$emit('prescription', response.data.data.prescription, resp.data.advices)
+                    this.$emit('longSolution', response.data.data.solution, resp.data.advices)
                   } else {
 
                   }
@@ -1163,6 +1165,8 @@
             let ParamsQuery = this.dialysisPrescription
             ParamsQuery['patient'] = this.$route.query.patient_id
             ParamsQuery['record_date'] = this.record_date
+            ParamsQuery['mode'] = "1"
+
             postSolution(ParamsQuery).then(response => {
               if (response.data.state == 0) {
                 Toast.fail(response.data.msg)
@@ -1215,7 +1219,7 @@
                         this.dialysisPrescription[key] = response.data.data.prescription[key]
                       }
                     }
-                  } else if(response.data.data.system_prescription != null){
+                  } else if (response.data.data.system_prescription != null) {
 
                     for (const key in response.data.data.system_prescription) {
                       if (key != 'target_ultrafiltration') {
@@ -1235,8 +1239,6 @@
               }
 
 
-
-
               if (this.dialysisPrescription.dialysis_duration_hour === '' || this.dialysisPrescription.dialysis_duration_minute === '') {
                 this.timeValue = ''
                 this.time = '03:00'
@@ -1300,16 +1302,16 @@
         for (let keys in treatment_mode) {
           if (treatment_mode[keys].id == val) {
             treatment_mode_name = treatment_mode[keys].name
-          var treatment_mode_id = treatment_mode[keys].id
-          console.log("treatment_mode_id",treatment_mode_id)
-            if(treatment_mode_id === 1 || treatment_mode_id === 3 || treatment_mode_id === 4  || treatment_mode_id === 6 || treatment_mode_id === 7 || treatment_mode_id === 8 || treatment_mode_id === 9 || treatment_mode_id === 10 || treatment_mode_id === 11 || treatment_mode_id === 13 || treatment_mode_id === 14 || treatment_mode_id === 15 || treatment_mode_id === 16){
-                 this.zhiShow = false
-                 this.totalShow = false
-                 this.huShow =false
-            }else{
+            var treatment_mode_id = treatment_mode[keys].id
+            console.log("treatment_mode_id", treatment_mode_id)
+            if (treatment_mode_id === 1 || treatment_mode_id === 3 || treatment_mode_id === 4 || treatment_mode_id === 6 || treatment_mode_id === 7 || treatment_mode_id === 8 || treatment_mode_id === 9 || treatment_mode_id === 10 || treatment_mode_id === 11 || treatment_mode_id === 13 || treatment_mode_id === 14 || treatment_mode_id === 15 || treatment_mode_id === 16) {
+              this.zhiShow = false
+              this.totalShow = false
+              this.huShow = false
+            } else {
               this.zhiShow = true
               this.totalShow = true
-              this.huShow  = true
+              this.huShow = true
 
             }
           }
@@ -1373,7 +1375,7 @@
         return anticoagulan_name
       },
       commitInfo: function () {
-        if(this.dialysisPrescription.anticoagulant == 1){
+        if (this.dialysisPrescription.anticoagulant == 1) {
           this.dialysisPrescription.anticoagulant_weichi = '0'
           this.dialysisPrescription.anticoagulant_shouji = '0'
           this.dialysisPrescription.anticoagulant_zongliang = '0'
@@ -1478,7 +1480,7 @@
                   if (minites < 10) {
                     minites = "0" + minites;
                   }
-                  var nowDate = year + "-" + month + "-" + day +" " +hours+":"+ minites;
+                  var nowDate = year + "-" + month + "-" + day + " " + hours + ":" + minites;
 
                   let params = {
                     advices: this.waitUploadAdvices,
@@ -1534,6 +1536,7 @@
               let ParamsQuery = this.dialysisPrescription
               ParamsQuery['patient'] = this.$route.query.patient_id
               ParamsQuery['record_date'] = this.record_date
+
               ParamsQuery['mode'] = "2"
 
               commitDialysisPrescription(ParamsQuery).then(response => {
@@ -1624,7 +1627,7 @@
                     if (minites < 10) {
                       minites = "0" + minites;
                     }
-                    var nowDate = year + "-" + month + "-" + day +" " +hours+":"+ minites;
+                    var nowDate = year + "-" + month + "-" + day + " " + hours + ":" + minites;
 
 
                     let params = {
@@ -1685,6 +1688,13 @@
             ParamsQuery['patient'] = this.$route.query.patient_id
             ParamsQuery['record_date'] = this.record_date
             ParamsQuery['mode'] = "2"
+            console.log(this.$store.getters.user.admin.id)
+            console.log(this.prescription_prop)
+
+            if (this.$store.getters.user.admin.id != this.prescription_prop.creater) {
+              ParamsQuery['mode'] = "3"
+            }
+
 
             commitDialysisPrescription(ParamsQuery).then(response => {
               if (response.data.state == 0) {
@@ -1813,7 +1823,7 @@
                   if (minites < 10) {
                     minites = "0" + minites;
                   }
-                  var nowDate = year + "-" + month + "-" + day +" " +hours+":"+ minites;
+                  var nowDate = year + "-" + month + "-" + day + " " + hours + ":" + minites;
 
 
                   let params = {
@@ -1877,7 +1887,8 @@
               let ParamsQuery = this.dialysisPrescription
               ParamsQuery['patient'] = this.$route.query.patient_id
               ParamsQuery['record_date'] = this.record_date
-              ParamsQuery['mode'] = "2"
+              ParamsQuery['mode'] = "1"
+
 
               postSolution(ParamsQuery).then(response => {
                 if (response.data.state == 0) {
@@ -1915,6 +1926,8 @@
                 let ParamsQuery = this.dialysisPrescription
                 ParamsQuery['patient'] = this.$route.query.patient_id
                 ParamsQuery['record_date'] = this.record_date
+                ParamsQuery['mode'] = "1"
+
                 postSolution(ParamsQuery).then(response => {
                   if (response.data.state == 0) {
                     Toast.fail(response.data.msg)
@@ -1940,7 +1953,7 @@
                 let ParamsQuery = this.dialysisPrescription
                 ParamsQuery['patient'] = this.$route.query.patient_id
                 ParamsQuery['record_date'] = this.record_date
-                ParamsQuery['mode'] = "2"
+                ParamsQuery['mode'] = "1"
 
                 postSolution(ParamsQuery).then(response => {
                   if (response.data.state == 0) {
@@ -1970,7 +1983,7 @@
                     if (minites < 10) {
                       minites = "0" + minites;
                     }
-                    var nowDate = year + "-" + month + "-" + day +" " +hours+":"+ minites;
+                    var nowDate = year + "-" + month + "-" + day + " " + hours + ":" + minites;
 
                     let params = {
                       advices: this.waitUploadAdvices,
@@ -1985,8 +1998,8 @@
                       var resp = rs.data
                       if (resp.state == 1) {
                         this.doctorAdvices = resp.data.advices
-                        this.$emit('longSolution', response.data.data.solution,resp.data.advices)
-                        this.$emit('prescription', response.data.data.prescription,resp.data.advices)
+                        this.$emit('longSolution', response.data.data.solution, resp.data.advices)
+                        this.$emit('prescription', response.data.data.prescription, resp.data.advices)
                       } else {
 
                       }
@@ -2003,7 +2016,7 @@
                 let ParamsQuery = this.dialysisPrescription
                 ParamsQuery['patient'] = this.$route.query.patient_id
                 ParamsQuery['record_date'] = this.record_date
-                ParamsQuery['mode'] = "2"
+                ParamsQuery['mode'] = "1"
 
                 postSolution(ParamsQuery).then(response => {
                   if (response.data.state == 0) {
@@ -2027,7 +2040,11 @@
             let ParamsQuery = this.dialysisPrescription
             ParamsQuery['patient'] = this.$route.query.patient_id
             ParamsQuery['record_date'] = this.record_date
-            ParamsQuery['mode'] = "2"
+            ParamsQuery['mode'] = "1"
+            //
+            // if (this.$store.getters.user.admin.id != this.prescription_prop.creator) {
+            //   ParamsQuery['mode'] = "3"
+            // }
 
             postSolution(ParamsQuery).then(response => {
               if (response.data.state == 0) {
@@ -2205,7 +2222,7 @@
 
       }
     },
-    created () {
+    created() {
       this.template_id = this.$store.getters.user.template_info.template_id
 
       this.modeOption = this.$store.getters.treatment_mode
@@ -2236,23 +2253,23 @@
 
       } else if (this.solution_prop != null && typeof this.solution_prop.id != 'undefined' && this.solution_prop.id) {
         for (const key in this.solution_prop) {
-          if(key != "target_ultrafiltration") {
+          if (key != "target_ultrafiltration") {
             this.dialysisPrescription[key] = this.solution_prop[key]
           }
         }
       } else if (this.last_prescription != null && typeof this.last_prescription.id != 'undefined' && this.last_prescription.id) {
         for (const key in this.last_prescription) {
-          if(key != "target_ultrafiltration") {
+          if (key != "target_ultrafiltration") {
             this.dialysisPrescription[key] = this.last_prescription[key]
           }
         }
-      } else if(this.system_prescription != null && typeof this.system_prescription.id != 'undefined' && this.system_prescription.id){
+      } else if (this.system_prescription != null && typeof this.system_prescription.id != 'undefined' && this.system_prescription.id) {
         for (const key in this.system_prescription) {
           if (key != "target_ultrafiltration") {
             this.dialysisPrescription[key] = this.system_prescription[key]
           }
         }
-      }else{
+      } else {
 
         this.dialysisPrescription.mode_id = this.schedual.mode_id
 
@@ -2293,15 +2310,15 @@
       this.dialysisPrescription.ultrafiltration = this.getFloat(this.dialysisPrescription.ultrafiltration)
       this.dialysisPrescription.target_ultrafiltration = this.getFloat(this.dialysisPrescription.target_ultrafiltration)
 
-      if(this.dialysisPrescription.anticoagulant_shouji == ''){
+      if (this.dialysisPrescription.anticoagulant_shouji == '') {
         this.dialysisPrescription.anticoagulant_shouji = '0'
       }
 
-      if(this.dialysisPrescription.anticoagulant_weichi == ''){
+      if (this.dialysisPrescription.anticoagulant_weichi == '') {
         this.dialysisPrescription.anticoagulant_weichi = '0'
       }
 
-      if(this.dialysisPrescription.anticoagulant_zongliang == ''){
+      if (this.dialysisPrescription.anticoagulant_zongliang == '') {
         this.dialysisPrescription.anticoagulant_weichi = '0'
       }
 
@@ -2316,38 +2333,38 @@
       CheckBoxSubMenu
     },
     watch: {
-      "dialysisPrescription.dialysis_duration":function(){
+      "dialysisPrescription.dialysis_duration": function () {
         console.log(this.dialysisPrescription.dialysis_duration)
-        this.dialysisPrescription.anticoagulant_zongliang=calculateAnticoagulantZL(1,
+        this.dialysisPrescription.anticoagulant_zongliang = calculateAnticoagulantZL(1,
           this.dialysisPrescription.anticoagulant_shouji,
           this.dialysisPrescription.dialysis_duration,
           this.dialysisPrescription.anticoagulant_weichi
         );
-        if(isNaN(this.dialysisPrescription.anticoagulant_zongliang)){
+        if (isNaN(this.dialysisPrescription.anticoagulant_zongliang)) {
           this.dialysisPrescription.anticoagulant_zongliang = ''
         }
       },
-      "dialysisPrescription.anticoagulant_shouji":function(){
-        this.dialysisPrescription.anticoagulant_zongliang=calculateAnticoagulantZL(1,
+      "dialysisPrescription.anticoagulant_shouji": function () {
+        this.dialysisPrescription.anticoagulant_zongliang = calculateAnticoagulantZL(1,
           this.dialysisPrescription.anticoagulant_shouji,
           this.dialysisPrescription.dialysis_duration,
           this.dialysisPrescription.anticoagulant_weichi
         );
-        if(isNaN(this.dialysisPrescription.anticoagulant_zongliang)){
+        if (isNaN(this.dialysisPrescription.anticoagulant_zongliang)) {
           this.dialysisPrescription.anticoagulant_zongliang = ''
         }
       },
-      "dialysisPrescription.anticoagulant_weichi":function(){
-        this.dialysisPrescription.anticoagulant_zongliang=calculateAnticoagulantZL(1,
+      "dialysisPrescription.anticoagulant_weichi": function () {
+        this.dialysisPrescription.anticoagulant_zongliang = calculateAnticoagulantZL(1,
           this.dialysisPrescription.anticoagulant_shouji,
           this.dialysisPrescription.dialysis_duration,
           this.dialysisPrescription.anticoagulant_weichi
         );
-        if(isNaN(this.dialysisPrescription.anticoagulant_zongliang)){
+        if (isNaN(this.dialysisPrescription.anticoagulant_zongliang)) {
           this.dialysisPrescription.anticoagulant_zongliang = ''
         }
       },
-      isShowDialog (val) {
+      isShowDialog(val) {
         if (val) {
           this.advice_visibility = false
         }
@@ -2357,23 +2374,22 @@
 </script>
 
 
-
 <style style="stylesheet/scss" lang="scss" scoped>
-.DialogContent {
+  .DialogContent {
   // padding-bottom:2rem !important;
 
   .textarea {
-    width: 100%;
-    height: 2.4rem;
-    line-height: 0.6rem;
-    color: $pgh-color;
-    font-size: 0.45rem;
-    padding-left: 0.36rem;
-    border: none;
-    border-bottom: 1px #e5e5e5 solid;
+  width: 100%;
+  height: 2.4rem;
+  line-height: 0.6rem;
+  color: $pgh-color;
+  font-size: 0.45rem;
+  padding-left: 0.36rem;
+  border: none;
+  border-bottom: 1px #e5e5e5 solid;
+  }
   }
-}
-.newButton {
+  .newButton {
   background: #258ffc;
   padding: 0 0.2rem;
   height: 0.85rem;
@@ -2381,19 +2397,19 @@
   border-radius: 5px;
   color: #fff;
   margin-right: -3.5rem;
-}
-.newName {
+  }
+  .newName {
   margin-right: -3rem;
-}
-.newDialogContent {
+  }
+  .newDialogContent {
   display: flex;
   flex-direction: column;
   height: 100%;
   overflow: hidden;
   > :first-child {
-    flex: 1;
-    overflow: auto;
+  flex: 1;
+  overflow: auto;
+  }
   }
-}
 </style>
 

src/pages/main/dialog/ThorougDialog.vue

@@ -1403,6 +1403,13 @@ export default {
       let ParamsQuery = this.formValue
       ParamsQuery['patient'] = this.$route.query.patient_id
       ParamsQuery['record_date'] = this.record_date
+      ParamsQuery['mode'] = "1"
+      if(this.record.creater > 0){
+        ParamsQuery['mode'] = "2"
+        if(this.$store.getters.user.admin.id != this.record.creater){
+          ParamsQuery['mode'] = "3"
+        }
+      }
       commitAssessmentAfterDislysis(ParamsQuery).then(response => {
         if (response.data.state == 0) {
           Toast.fail(response.data.msg)

src/pages/main/dialog/TreatmentDialog.vue

@@ -287,6 +287,15 @@ export default {
       let ParamsQuery = this.dialysisSummary;
       ParamsQuery["patient"] = this.$route.query.patient_id;
       ParamsQuery["record_date"] = this.record_date;
+      ParamsQuery["mode"] = "1";
+
+      if (this.record.id > 0){
+        ParamsQuery["mode"] = "2";
+        if(this.record.creater != this.$store.getters.user.admin.id){
+          ParamsQuery["mode"] = "3";
+        }
+      }
+
       commitTreatmentSummary(ParamsQuery).then(response => {
         if (response.data.state == 0) {
           Toast.fail(response.data.msg);

src/pages/main/dialog/modify_order/ModifyAdviceGroup.vue

@@ -295,6 +295,15 @@ export default {
     },
     didModifyAdvice: function(advice) {
       this.loading = true;
+
+      let mode = "2"
+      console.log(advice.advice_doctor)
+      console.log(console.log(advice.advice_doctor))
+
+      if(advice.advice_doctor != this.$store.getters.user.admin.id && advice.advice_doctor>0){
+         mode = "3"
+      }
+
       EditDoctorAdvice(advice.id, {
         advice_name: advice.title,
         advice_desc: advice.advice_desc,
@@ -307,7 +316,7 @@ export default {
         prescribing_number: String(advice.prescribing_number),
         prescribing_number_unit: advice.prescribing_number_unit,
         drug_spec_unit: advice.drug_spec_unit
-      })
+      },mode)
         .then(rs => {
           if (rs.data.state == 1) {
             var resp_advice = rs.data.data.advice;

src/pages/main/dialog/modify_order/modify_order_form.vue

@@ -235,6 +235,7 @@ export default {
         parent_id: 0,
         // start_time: "",
         // record_time: "",
+        advice_doctor:0,
         title: "",
         advice_desc: "",
         drug_spec: "",
@@ -274,6 +275,7 @@ export default {
       this.order.title = order.title;
       this.order.advice_desc = order.advice_desc;
       this.order.remark = order.remark;
+      this.order.advice_doctor = order.advice_doctor
 
       this.start_time_str =
         parseTime(order.start_time, "{y}-{m}-{d} {h}:{i}") + ":00";
@@ -324,7 +326,8 @@ export default {
           prescribing_number_unit: this.order.prescribing_number_unit,
           start_time: this.start_time_str,
           drug_spec: this.order.drug_spec,
-          drug_spec_unit: this.order.drug_spec_unit
+          drug_spec_unit: this.order.drug_spec_unit,
+          doctor_advice: this.order.advice_doctor,
         });
       }
     },

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

@@ -347,7 +347,8 @@ export default {
       // console.log(adviceJSONs)
 
       this.loading = true;
-      batchCreateAdvices(this.patient_id, this.group_no, data)
+      let mode = "1"
+      batchCreateAdvices(this.patient_id, this.group_no, data,mode)
         .then(rs => {
           this.loading = false;
           var resp = rs.data;

src/pages/main/dialog/subMenu/dryWeightMenu.vue

@@ -50,6 +50,7 @@
 <script>
 import TwoMenu from "../TwoMenu";
 import { CreateDryWeight } from "@/api/dialysis";
+import { Toast } from 'vant'
 
 export default {
   name: "dryWeightMenu",
@@ -69,7 +70,7 @@ export default {
   },
   methods: {
     open() {
-      this.creator = this.$store.getters.user.user.id;
+      this.creator = this.$store.getters.user.admin.id;
       this.dry_weight = this.propsForm.weight;
       this.visibility = true;
     },
@@ -84,13 +85,18 @@ export default {
         id: this.$route.query.patient_id,
         dry_weight: this.dry_weight,
         remark: this.remark,
-        doctor_id: this.creator
+        doctor_id: this.creator,
+        mode: "1",
       };
       CreateDryWeight(params).then(rs => {
         var res = rs.data;
         if (res.state == 1) {
-          this.$message.success("提交成功");
+          Toast("提交成功");
           this.$emit("menu-comfirm-two", res.data.weight);
+        }else {
+          // this.$message.success("提交成功");
+
+          Toast(rs.data.msg)
         }
       });
     },

src/pages/main/dialysis/AdviceTable.vue

@@ -1508,7 +1508,7 @@ export default {
     // this.fetchAllAdminUsers();
     this.queryParams.id = this.$route.query.patient_id;
     this.doctor = this.$store.getters.user.user.user_name;
-    this.doctor_id = this.$store.getters.user.user.id;
+    this.doctor_id = this.$store.getters.user.admin.id;
     this.patient_id = this.$route.query.patient_id;
 
     var date = new Date();

src/pages/my/index.vue

@@ -73,7 +73,7 @@
       </div>
     </div>
     <div class="myBox">
-      <router-link to="/createorg">
+      <router-link to="/perfectOrg">
         <div class="myBoxOne">
           <div class="myInfoLeft">
             <img src="../../assets/images/myIcon3.png" alt />
@@ -82,7 +82,7 @@
           <van-icon class="arrow" name="arrow" />
         </div>
       </router-link>
-      <router-link to="/forget">
+      <router-link to="/modifypsw">
         <div class="myBoxOne">
           <div class="myInfoLeft">
             <img src="../../assets/images/myIcon4.png" alt />

src/pages/my/modifyPassword.vue

@@ -0,0 +1,451 @@
+<template>
+  <div class="page_noPassword">
+    <div class="nopasswordTitle">
+      <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
+      <span class="titleName">修改密码</span>
+    </div>
+    <div class="forgetmyInput">
+      <el-form ref="forgetForm" :model="forgetForm" :rules="rules">
+        <el-form-item required prop="phone">
+          <div class="phoneLine">
+            <i class="el-icon-mobile mobile"></i>
+            <el-input
+              class="phoneInput"
+              placeholder="请填写手机号码"
+              v-model="forgetForm.phone"
+              v-on:input="watchNum"
+              maxlength="11"
+              @input="change(forgetForm.phone)"
+            ></el-input>
+          </div>
+        </el-form-item>
+        <el-form-item required prop="code">
+          <div class="code">
+            <i class="iconfont icon-dunpai dunpai"></i>
+            <el-input v-model="forgetForm.code" placeholder="请填写验证码" v-on:input="watchNum"></el-input>
+            <div class="getCode" @click="getVerifyCode()">{{ code_btn_title }}</div>
+          </div>
+        </el-form-item>
+        <el-form-item>
+          <div class="phoneLine">
+            <i class="el-icon-lock lock"></i>
+            <el-input
+              class="phoneInput"
+              v-model="psd"
+              placeholder="请填写新密码"
+              show-password
+              v-on:input="watchNum"
+              clearable
+            ></el-input>
+          </div>
+        </el-form-item>
+      </el-form>
+    </div>
+
+    <div class="login" @click="modifyAndLogin()" v-show="loginshow">登录</div>
+    <div class="logintwo" v-show="loginshowtwo">登录</div>
+    <div class="problem">
+      遇到问题？点击
+      <span @click="contact = true">联系客服</span>
+    </div>
+
+    <!-- 弹窗 联系客服 -->
+    <el-dialog
+      title="客服电话"
+      :visible.sync="contact"
+      width="19.1875rem"
+      top="12.5rem"
+      center
+      class="myDialog"
+    >
+      <span class="telephone">0755-86526342</span>
+      <span slot="footer" class="dialog-footer">
+        <span @click="contact = false">取消</span>
+        <span>|</span>
+        <span type="primary" @click="callPhone()">拨打</span>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  // import { getCode, NextStep } from "@/api/login/login";
+  import "@/styles/newStyle.scss";
+  import { getCodeInit, getVerifyCode, forgetPassWord } from "@/api/login";
+  import { checkMobile } from "@/utils/tools";
+  import { hex_md5 } from "@/utils/md5";
+
+  export default {
+    data() {
+      var checkMobileRule = (rule, value, callback) => {
+        if (!checkMobile(value)) {
+          callback(new Error("请填写正确的手机号"));
+        } else {
+          callback();
+        }
+      };
+      return {
+        phone: "",
+        code: "",
+        psd: "",
+        contact: false,
+        count_downing: false,
+        count_down: 0,
+        aespass: "",
+        forgetForm: {
+          phone: "",
+          code: ""
+        },
+        rules: {
+          phone: [
+            { required: true, message: "手机号码不能为空" },
+            { validator: checkMobileRule }
+          ],
+          code: [{ required: true, message: "验证码不能为空" }]
+        },
+        loginshow: false,
+        loginshowtwo: true,
+        codeshow: false,
+        codeshowtwo: true
+      };
+    },
+    created() {
+      this.GetCodeInit();
+      this.forgetForm.phone = this.$store.getters.user.admin.mobile
+    },
+    methods: {
+      modifyAndLogin() {
+        if (this.forgetForm.phone.trim().length == 0) {
+          this.$toast({
+            message: "手机号码不能为空!"
+          });
+          return;
+        }
+        if (!checkMobile(this.forgetForm.phone)) {
+          this.$toast({
+            message: "请填写正确的手机号码!"
+          });
+          return;
+        }
+        if (this.forgetForm.code.trim().length == 0) {
+          this.$toast({
+            message: "验证码不能为空!"
+          });
+          return;
+        }
+
+        let params = {
+          mobile: this.forgetForm.phone,
+          code: this.forgetForm.code,
+          password: hex_md5(this.psd)
+        };
+        forgetPassWord(params).then(response => {
+          if (response.data.state === 1) {
+            this.$router.go(-1)
+          }else{
+
+            this.$toast({
+              message: response.data.msg
+            });
+          }
+        });
+      },
+      GetCodeInit() {
+        getCodeInit().then(response => {
+          if (response.data.state === 1) {
+            this.aespass = response.data.data.aespass;
+          }
+        });
+      },
+      getVerifyCode() {
+        if (this.forgetForm.phone.length == 0) {
+          this.$toast({
+            message: "手机号码不能为空!"
+          });
+          return;
+        }
+        if (!checkMobile(this.forgetForm.phone)) {
+          this.$toast({
+            message: "请填写正确的手机号码!"
+          });
+          return;
+        }
+
+        if (!this.count_downing) {
+          let parms = {
+            phone: this.forgetForm.phone,
+            aespass: this.aespass
+          };
+          getVerifyCode(parms).then(response => {
+            if (response.data.state === 1) {
+              this.count_downing = true;
+              this.count_down = 61;
+              this.countDown();
+            }
+          });
+        }
+      },
+
+      callPhone() {
+        window.location.href = "tel://075586526342";
+      },
+      countDown: function() {
+        this.count_down = this.count_down - 1;
+        if (this.count_down === 0) {
+          this.count_downing = false;
+          return;
+        }
+        var t = this;
+        setTimeout(() => {
+          this.countDown();
+        }, 1000);
+      },
+      watchNum() {
+        if (this.forgetForm.phone.length === 11) {
+          this.codeshow = true;
+          this.codeshowtwo = false;
+        } else {
+          this.codeshow = false;
+          this.codeshowtwo = true;
+        }
+
+        if (
+          this.forgetForm.phone === "" ||
+          this.forgetForm.code === "" ||
+          this.psd === ""
+        ) {
+          this.loginshow = false;
+          this.loginshowtwo = true;
+        } else {
+          this.loginshow = true;
+          this.loginshowtwo = false;
+        }
+      },
+      change(value) {
+        this.forgetForm.phone = value.replace(/[^0-9]+/g, "");
+      }
+    },
+    computed: {
+      code_btn_title: function() {
+        if (this.count_down == 0) {
+          return "获取验证码";
+        } else {
+          return "重新发送(" + this.count_down + ")";
+        }
+      }
+    }
+  };
+</script>
+
+<style lang="scss" scoped>
+  .page_noPassword {
+    overflow: hidden;
+    height: 100%;
+  .nopasswordTitle {
+    height: 3.125rem;
+    line-height: 3.125rem;
+    display: flex;
+    align-items: center;
+  }
+  .jiantou {
+    margin-left: 1.25rem;
+    font-size: 1.5rem;
+    font-weight: 600;
+    margin-right: 7rem;
+  }
+  .titleName {
+    font-size: 1.125rem;
+    font-weight: 600;
+  }
+  .forgetmyInput {
+    margin-top: 4rem;
+  .phoneLine {
+    width: 84%;
+    margin: 0 auto;
+    display: flex;
+    border-bottom: 1px solid #e6e6e6;
+  .mobile {
+    float: left;
+    color: #acacac;
+    font-size: 1.5rem;
+    margin-left: 0.375rem;
+    line-height: 3.375rem;
+    width: 1.5rem;
+  }
+  .phoneInput {
+    width: 95%;
+  }
+  }
+
+  .lock {
+    float: left;
+    color: #acacac;
+    font-size: 1.5rem;
+    margin-left: 0.375rem;
+    line-height: 3.375rem;
+    width: 1.5rem;
+  }
+  .code {
+    line-height: 3.375rem;
+    width: 84%;
+    height: 3.375rem;
+    margin: 0 auto;
+    border-bottom: 1px solid #e6e6e6;
+    display: flex;
+    align-items: center;
+
+  .dunpai {
+    float: left;
+    color: #acacac;
+    font-size: 1.5rem;
+    margin-left: 0.375rem;
+  }
+  .el-input {
+    float: left;
+    width: 10.6rem;
+    border: none;
+    padding: 0;
+  }
+  .el-input__inner {
+    padding: 0;
+    padding-left: 0.75rem;
+  }
+  .getCode {
+  // float: left;
+    width: 5.75rem;
+    height: 2rem;
+    line-height: 2rem;
+    text-align: center;
+    color: #fff;
+    background: #338afb;
+    border-radius: 1.4375rem;
+    font-size: 0.8125rem;
+  }
+  .getCodetwo {
+    width: 5.75rem;
+    height: 2rem;
+  // line-height: 2rem;
+    text-align: center;
+    color: #fff;
+    background: #e5e5e5;
+    border-radius: 1.4375rem;
+    font-size: 0.8125rem;
+  }
+
+  .el-button--primary {
+    border-color: transparent;
+  }
+  }
+  }
+  .login {
+    width: 19.25rem;
+    height: 2.875rem;
+    background: linear-gradient(
+      -90deg,
+      rgba(129, 159, 246, 1),
+      rgba(81, 119, 238, 1),
+      rgba(75, 102, 234, 1)
+    );
+    border-radius: 1.4375rem;
+    margin: 0 auto;
+    line-height: 2.875rem;
+    text-align: center;
+    color: #fff;
+    margin-top: 2.875rem;
+  }
+  .problem {
+    width: 84%;
+    font-size: 0.8125rem;
+    margin: 15rem auto 0;
+    text-align: center;
+  span {
+    color: #338afb;
+  }
+  }
+  }
+
+  .el-form-item__error {
+    margin-left: 2.5rem;
+  }
+
+  .logintwo {
+    width: 19.25rem;
+    height: 2.875rem;
+    background: #e5e5e5;
+    border-radius: 1.4375rem;
+    margin: 0 auto;
+    line-height: 2.875rem;
+    text-align: center;
+    color: #fff;
+    margin-top: 2.875rem;
+  }
+  .el-button--medium {
+    padding: 0;
+  }
+</style>
+<style lang="scss">
+  .forgetmyInput {
+  .el-form-item {
+    margin-bottom: 0;
+  }
+  .el-input {
+    display: flex;
+    align-items: center;
+    margin: 0 auto;
+    color: rgba(155, 155, 155, 1);
+    padding-left: 0.75rem;
+    box-sizing: border-box;
+    height: 3.375rem;
+    line-height: 3.375rem;
+  }
+  .el-input__inner {
+    border: none;
+    font-size: 1rem;
+    padding-left: 0;
+  }
+  .el-input__prefix {
+    font-size: 1.5rem;
+    color: #acacac;
+  }
+
+  .phoneLine {
+  .el-input__clear {
+    margin-right: 0.625rem;
+  }
+  .el-input__icon {
+    line-height: 3.375rem;
+    font-size: 1.5rem;
+  }
+  }
+  }
+  .myDialog {
+    line-height: 50%;
+    height: 100%;
+  .el-dialog {
+    border-radius: 10px;
+  }
+  .el-dialog__title {
+    color: #000000;
+  }
+  .telephone {
+    width: 12.5rem;
+    height: 1.125rem;
+    font-size: 1.5rem;
+    font-weight: 500;
+    color: #338afb;
+    margin-left: 2.5rem;
+  }
+  .dialog-footer {
+  > span:nth-of-type(1) {
+    color: #9b9b9b;
+  }
+  > span:nth-of-type(2) {
+    padding: 0 3.125rem;
+    color: #e6e6e6;
+  }
+  > span:nth-of-type(3) {
+    color: #000000;
+  }
+  }
+  }
+</style>

src/pages/waitingRoom/components/dialog/addMonitor.vue

@@ -194,7 +194,7 @@ export default {
         symptom: "", // 症状
         dispose: "", // 处理
         result: "", // 结果
-        monitoring_nurse: this.$store.getters.user.user.id // 监测人
+        monitoring_nurse: this.$store.getters.user.admin.id // 监测人
       },
       doctor: this.$store.getters.user.user.user_name
     };

src/permission.js

@@ -8,7 +8,6 @@ router.beforeEach((to, from, next) => {
   // 线上注释
   //   next()
   //   return
-  console.log(store.getters.user.admin)
   if (store.getters.user.admin == null) {
     if (loginWhiteList.indexOf(to.path) !== -1) {
       next();

src/router/index.js

@@ -394,6 +394,10 @@ export default new Router({
       path: '/userAgreement',
       name: 'userAgreement',
       component: () => import('@/pages/userAgreement/index')
-    }
+    }, {
+      path: '/modifypsw',
+      name: 'modifyPassword',
+      component: () => import('@/pages/my/modifyPassword')
+    },
   ]
 })

src/utils/request.js

@@ -1,5 +1,6 @@
 import axios from 'axios'
-import { Toast } from 'mint-ui'
+// import { Toast } from 'mint-ui'
+import { Toast } from "vant";
 
 // create an axios instance
 const service = axios.create({
@@ -26,7 +27,8 @@ service.interceptors.response.use(
         //     location.reload() // 为了重新实例化vue-router对象 避免bug
         //   })
         // })
-        // location.reload()
+        Toast("登录超时")
+        location.reload()
         return Promise.reject('error')
       } else {
         return response