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

src/api/dialysis.js

     url: '/api/dialysis/soulution',
     method: 'Post',
     params: params,
-    headers:{"Permission":3},
+    headers:{"Permission":2},
 
   })
 }

src/api/patient.js

     url: '/api/patients/dialysissolution/create?patient=' + id +"&mode="+mode,
     method: 'post',
     data: solution,
-    headers:{"Permission":2},
+    headers:{"Permission":3},
 
 
   })
     url: '/api/patients/dialysissolution/edit?patient=' + patient + '&id=' + id+"&mode="+mode,
     method: 'put',
     data: solution,
-    headers:{"Permission":2},
+    headers:{"Permission":3},
 
   })
 }
   return request({
     url: '/api/patient/updatedryweightdata',
     method: 'Post',
-    params: params
+    params: params,
+    headers:{"Permission":3},
+
   })
 }
 

src/router/modules/stock.js

   },
   children: [
     {
-      path: "/warehouseReceipt/",
+      path: "/stock/warehouseReceipt/",
       component: Layout,
       redirect: "/stock/in",
       name: "warehouseReceipt",
       }
     },
     {
-      path: "/warehouseReceiptOther/",
+      path: "/stock/warehouseReceiptOther/",
       component: Layout,
       redirect: "/stock/in/other",
       name: "warehouseReceiptOther",

src/styles/sidebar.scss

     .scrollbar-wrapper {
       overflow-x: hidden !important;
       .el-scrollbar__view {
-        height: 100%;
+        height: 96%;
         .hamburger-container {
           padding: 20px 10px 10px 10px;
           color: #fff;
     }
     .el-menu {
       border: none;
-      min-height: 130%;
+      // min-height: 130%;
       width: 100% !important;
     }
   }

src/views/layout/components/Navbar.vue

     justify-content: space-between;
     min-width: 200px;
     margin-right: 10px;
+    font-size: 14px;
     .right-menu {
       float: right;
       height: 100%;
 }
 .dropdownBox {
     .el-dropdown-link{
-      font-size: 18px;
+      font-size: 14px;
       color:#fff;
     }
   }

src/views/layout/components/Sidebar/SidebarItem.vue

 .menu-wrapper{
   .el-menu-item{
    background-color:#1F2D3D !important;
+   color: #fff !important;
   }
   .el-menu{
     background-color:#1F2D3D !important;
   }
   .el-submenu__title{
     background-color:#1F2D3D !important;
+    color: #fff !important;
+  }
+  .router-link-exact-active{
+    color: rgb(64, 158, 255) !important;
+    .el-menu-item{
+      color: rgb(64, 158, 255) !important;
+    }
   }
 }
 

src/views/layout/components/Sidebar/index.vue

         :index="index"
         @a="b"
       ></sidebar-item>
+      <el-menu-item v-if="this.$store.getters.xt_user.cdm_role_exist" index="100">
+        <a :href="CDMWebsit()">
+          <i class="icon iconfont icon-manbing-xuanzhong" style="margin-right:4px"></i>
+          <span
+            slot="title"
+          >慢病管理</span>
+        </a>
+      </el-menu-item>
+      <el-menu-item v-if="this.$store.getters.xt_user.scrm_role_exist" index="101">
+        <a :href="SCRMWebsit()">
+          <i class="icon iconfont icon-pengyou" style="margin-right:4px"></i>
+          <span
+            slot="title"
+          >SCRM</span>
+        </a>
+      </el-menu-item>
+      <el-menu-item v-if="this.$store.getters.xt_user.mall_role_exist" index="102">
+        <a :href="MircoMallWebsit()">
+          <i class="icon iconfont icon-service_fill" style="margin-right:4px"></i>
+          <span
+            slot="title"
+          >微商城</span>
+        </a>
+      </el-menu-item>
     </el-menu>
+    
   </el-scrollbar>
   <!-- <div class="mianLeft">
     <div class="logo">
       // this.index = index;
       // this.activeClass = index;
       this.$emit("callBackIndex", index, num);
-    }
+    },
+    CDMWebsit() {
+      return process.env.CDM_HOST;
+    },
+    SCRMWebsit() {
+      return process.env.SRCM_HOST;
+    },
+    MircoMallWebsit() {
+      return process.env.MIRCO_MALL_HOST;
+    },
   },
   created() {
-    console.log(1111111121121111111, this.permission_routers);
+    // console.log(1111111121121111111, this.permission_routers);
     // this.permission_routers.map(item => {
     //   console.log(item.children);
     // });
 <style lang="scss">
 .scrollbar-wrapper {
   background-color: #1F2D3D;
+  .el-menu{
+    background-color: #1F2D3D !important;
+  }
+  .el-menu-item{
+    height: 40px !important;
+    line-height: 40px !important;
+    background-color: #1F2D3D !important;
+    color: #fff !important;
+    i{
+      color: #fff;
+    }
+  }
 }
 </style>

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

                    >
           新增医嘱
         </el-button>
-        <el-button round @click="openGroupFrom" :loading="deleLoading"
-                   disabled>新增医嘱
-        </el-button>
-
 
         <el-button v-if="currentRow != null" round
                    @click="execAdvice" :loading="deleLoading">执行医嘱
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
+          console.log(this.currentRow)
           let mode ="4"
           if(this.currentRow.advice_doctor != this.$store.getters.xt_user.user.id){
             mode = "5"
           type: 'warning'
         }).then(() => {
           this.deleLoading = true
-          let mode = "4"
+
+
+          let mode ="4"
+          if(this.currentRow.advice_doctor != this.$store.getters.xt_user.user.id) {
+            mode = "5"
+          }
+
           DeleteDoctorAdvice(this.currentRow.id,mode).then(response => {
             this.deleLoading = false
             if (response.data.state == 0) {
         }).then(() => {
           this.deleLoading = true
           let mode ="4"
+          if(this.currentRow.advice_doctor != this.$store.getters.xt_user.user.id) {
+            mode = "5"
+          }
           DeleteDoctorAdvice(this.currentRow.id,mode).then(response => {
             this.deleLoading = false
             if (response.data.state == 0) {

src/xt_pages/dialysis/details/dialog/adviceDialog/EditGroupAdvice.vue

                   }
                 }
               }
-            }
-          })
-
-          if (isChild) {
-            for (const index in this.groupForm.adviceNames) {
-              if (this.groupForm.adviceNames[index].row_key == this.groupSelectRow.parent_row) {
-                for (const j in this.groupForm.adviceNames[index].children) {
-                  if (this.groupForm.adviceNames[index].children[j].row_key == this.groupSelectRow.row_key) {
-                    this.groupForm.adviceNames[index].children.splice(j, 1)
-                    this.$set(this.groupForm.adviceNames, index, this.groupForm.adviceNames[index])
+              if (isChild) {
+                for (const index in this.groupForm.adviceNames) {
+                  if (this.groupForm.adviceNames[index].row_key == this.groupSelectRow.parent_row) {
+                    for (const j in this.groupForm.adviceNames[index].children) {
+                      if (this.groupForm.adviceNames[index].children[j].row_key == this.groupSelectRow.row_key) {
+                        this.groupForm.adviceNames[index].children.splice(j, 1)
+                        this.$set(this.groupForm.adviceNames, index, this.groupForm.adviceNames[index])
+                        this.toggleRowExpansion()
+                        break
+                      }
+                    }
+                  }
+                }
+              } else {
+                for (const index in this.groupForm.adviceNames) {
+                  if (this.groupForm.adviceNames[index].row_key == this.groupSelectRow.row_key) {
+                    this.groupForm.adviceNames.splice(index, 1)
                     this.toggleRowExpansion()
                     break
                   }
                 }
               }
             }
-          } else {
-            for (const index in this.groupForm.adviceNames) {
-              if (this.groupForm.adviceNames[index].row_key == this.groupSelectRow.row_key) {
-                this.groupForm.adviceNames.splice(index, 1)
-                this.toggleRowExpansion()
-                break
-              }
-            }
-          }
+          })
+
+
         }).catch(() => {
         })
       },
           return false
         }
 
+        console.log(groups[0].advice_doctor)
         this.adminusername = this.getXuserName(groups[0].advice_doctor)
         this.groupForm = {
           advice_type: groups[0].advice_type,

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

             const ParamsQuery = this.dialysisPrescription
             ParamsQuery['patient'] = this.patient.id
             ParamsQuery['record_date'] = this.record_date
+            ParamsQuery['mode'] = 1
             postSoulution(ParamsQuery).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
             const ParamsQuery = this.dialysisPrescription
             ParamsQuery['patient'] = this.patient.id
             ParamsQuery['record_date'] = this.record_date
+            ParamsQuery['mode'] = 1
+
             postSoulution(ParamsQuery).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)

src/xt_pages/user/dryWeight.vue

           doctors: this.dryWeightForm.doctors,
           remarks: this.dryWeightForm.remarks,
           patient_id: this.patientID,
-          dryweight: this.dryweight
+          dryweight: this.dryweight,
+          mode : "1"
         }
 
         this.$refs[formName].validate((valid) => {
                 const id = this.$route.params && this.$route.params.id
                 this.getAllData(id)
                 this.getDryWeightData(id)
+              }else{
+                this.$message.error(response.data.msg)
+                return false
               }
             })
           }