Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

src/xt_pages/data/prescription.vue

@@ -134,16 +134,14 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" v-if="anticoagulant.gaimingcheng != -1">
-                  <el-form-item :label="'钙（'+anticoagulant.gaimingcheng_unit+'）: '" prop="anticoagulant_gaimingcheng">
+                  <el-form-item label="钙名称:" prop="anticoagulant_gaimingcheng">
                     <el-input v-model="addPlan.anticoagulant_gaimingcheng"
-                              :disabled="anticoagulant.gaimingcheng==1?false:true"
-                              placeholder="钙名称"></el-input>
+                              :disabled="anticoagulant.gaimingcheng==1?false:true" placeholder="钙名称"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" v-if="anticoagulant.gaijiliang != -1">
-                  <el-form-item prop="anticoagulant_gaijiliang">
-                    <el-input v-model="addPlan.anticoagulant_gaijiliang"
-                              :disabled="anticoagulant.gaijiliang==1?false:true"
+                  <el-form-item  :label="'钙剂量（'+anticoagulant.gaimingcheng_unit+'）: '"  prop="anticoagulant_gaijiliang">
+                    <el-input v-model="addPlan.anticoagulant_gaijiliang" :disabled="anticoagulant.gaijiliang==1?false:true"
                               placeholder="钙剂量"></el-input>
                   </el-form-item>
                 </el-col>

src/xt_pages/upload/fast/One.vue

@@ -735,17 +735,17 @@ export default {
             );
           } else {
             console.log("patient get err state");
-            this.$notify.error({
-              title: "错误",
-              message: "网络异常"
-            });
+            // this.$notify.error({
+            //   title: "错误",
+            //   message: "网络异常"
+            // });
           }
         })
         .catch(err => {
-          this.$notify.error({
-            title: "错误",
-            message: "网络异常"
-          });
+          // this.$notify.error({
+          //   title: "错误",
+          //   message: "网络异常"
+          // });
         });
     },
     fetchAllAdminUsers() {

src/xt_pages/user/dialysisSolution.vue

@@ -253,13 +253,13 @@
             </el-form-item>
           </el-col>
           <el-col :span="8" v-if="anticoagulant.gaimingcheng != -1&&isShows('钙名称')">
-            <el-form-item :label="'钙（'+anticoagulant.gaimingcheng_unit+'）: '" prop="anticoagulant_gaimingcheng">
+            <el-form-item label="钙名称:" prop="anticoagulant_gaimingcheng">
               <el-input v-model="addPlan.anticoagulant_gaimingcheng"
                         :disabled="anticoagulant.gaimingcheng==1?false:true" placeholder="钙名称"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8" v-if="anticoagulant.gaijiliang != -1&&isShows('钙剂量')">
-            <el-form-item prop="anticoagulant_gaijiliang">
+            <el-form-item  :label="'钙剂量（'+anticoagulant.gaimingcheng_unit+'）: '"  prop="anticoagulant_gaijiliang">
               <el-input v-model="addPlan.anticoagulant_gaijiliang" :disabled="anticoagulant.gaijiliang==1?false:true"
                         placeholder="钙剂量"></el-input>
             </el-form-item>

src/xt_pages/user/doctorAdvice.vue

@@ -139,7 +139,6 @@
           type="selection"
           fixed
         ></el-table-column>
-
         <!--<el-table-column type="index" :index="indexMethod"  label="序号" width="60px" align="center"></el-table-column>-->
         <el-table-column
           label="期效"
@@ -1912,7 +1911,6 @@ import {
   getDoctorAdviceList,
   StopDoctorAdvice,
   StopGroupAdvice,
-  getPrintInfo
 } from "@/api/advice";
 
 import { fetchPatient, PostRemind } from "@/api/patient";
@@ -4109,7 +4107,7 @@ export default {
       var id = 0;
       var parentid = 0;
       for (const i in this.multipleSelection) {
-        arr.push(this.multipleSelection[i].id);
+        arr.push(this.multipleSelection[i]);
         id = this.multipleSelection[i].patient_id;
         parentid = this.multipleSelection[i].parent_id;
       }