新分支

src/xt_pages/dialysis/doctorAdvicePrint.vue

@@ -281,6 +281,7 @@ export default {
             patient_type: 0,
             advice_type: 2,
             delivery_way:this.delivery_way,
+            excution_way:this.$route.query.excution_way,
             }).then(rs => {
                 var resp = rs.data
                 if (resp.state == 1) {

src/xt_pages/dialysis/newDoctorAdvice.vue

@@ -1372,11 +1372,11 @@ export default {
        }
 
        if(this.org_id == 9671 || this.org_id == 10340){
-        this.$router.push({ path: "/dialysis/doctorAdvicePrint/one",query:{time: new Date(this.time).getTime(),delivery_way:name} });
+        this.$router.push({ path: "/dialysis/doctorAdvicePrint/one",query:{time: new Date(this.time).getTime(),delivery_way:name,excution_way:this.excution_way} });
        }
 
        if(this.org_id != 9671 && this.org_id != 10340){
-        this.$router.push({ path: "/dialysis/doctorAdvicePrint",query:{time: new Date(this.time).getTime(),delivery_way:name} });
+        this.$router.push({ path: "/dialysis/doctorAdvicePrint",query:{time: new Date(this.time).getTime(),delivery_way:name,excution_way:this.excution_way} });
        }
 
 

src/xt_pages/management/components/UserForm.vue

@@ -828,6 +828,7 @@
                   透析方式
                 </td>
                 <td
+                 v-if="org_id!=10495 && org_id!=0"
                   :rowspan="2"
                   style="text-align:center;min-width:40px;font-size:15px"
                 >
@@ -931,7 +932,7 @@
                 <td style="text-align:center;font-size:15px;height:30px">
                   {{ item.dialysis_mode }}
                 </td>
-                <td style="text-align:center;font-size:15px;height:30px">
+                <td style="text-align:center;font-size:15px;height:30px"  v-if="org_id!=10495 && org_id!=0"> 
                   {{ item.user_total }}
                 </td>
                 <td style="text-align:center;font-size:15px;height:30px">

src/xt_pages/role/components/AdminInfoForm.vue

@@ -536,7 +536,8 @@ export default {
         { id: 31, name: '大专' },
         { id: 21, name: '本科' },
         { id: 14, name: '硕士' },
-        { id: 11, name: '博士' }
+        { id: 11, name: '博士' },
+        { id: 12, name:"中专"},
       ],
       roleList: [
         { id: 1, name: '医师' },
@@ -729,7 +730,7 @@ export default {
                 this.form.role_ids.push(parseInt(this.form.role.split(',')[i]))
               }
             }
-
+            this.form.intro = ""
             this.form.intro = admin.intro
             this.form.user_title_name = admin.user_title_name
 

src/xt_pages/role/components/EditAdminInfo.vue

@@ -167,6 +167,7 @@ export default {
                     this.form.user_type = admin.user_type
                     this.form.user_title = admin.user_title
                     this.form.role = admin.role_id
+                    this.form.intro = ""
                     this.form.intro = admin.intro
                     this.form.deparment_id = admin.deparment_id
                 } else {