Merge branch 'new_pad_branch' of http://git.shengws.com/zhangbj/xt_pad into new_pad_branch

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

@@ -1,12 +1,12 @@
 <template>
   <div v-loading="loading">
-    <div class="Dialog" style="width: 11.8rem;" v-show="show_dialog_key == 0">
+    <div class="Dialog" style="width: 16.8rem;" v-show="show_dialog_key == 0">
       <div class="DialogTit">
         <div class="back" @click="backAction">
           <span class="iconfont">&#xe720;</span>返回
         </div>
         <h1 class="name">新增医嘱</h1>
-        <span class="success" @click="comfirmAction">保存</span>
+        <span class="success" @click="comfirmAction">完成</span>
       </div>
       <div class="yzNav" style="width:100%;">
         <span class="newSpan" @click="addOrderByTemplateAction">选择模板</span>
@@ -18,12 +18,7 @@
         <div style="overflow: hidden;">
           <div class="cell" style="margin-top: 0;">
             <label>医嘱类型</label>
-            <el-input
-              class="typeInput"
-              ref="advice_type"
-              value="临时"
-              disabled
-            ></el-input>
+            <el-input class="typeInput" ref="advice_type" value="临时" disabled></el-input>
           </div>
           <div class="cell" style="margin-top: 0;">
             <label>开始时间</label>
@@ -34,61 +29,12 @@
               @focus="selectStartTimeAction"
             ></el-input>
           </div>
-        </div>
-        <div style="overflow: hidden;margin-top: 15px">
-          <div class="cell" style="margin-top: 0;">
-            <label>开嘱医生: {{ $store.getters.user.user.user_name }}</label>
-          </div>
-          <div class="cell" style="margin-top: 0;">
-            <label>开嘱时间 {{ record_date_str }}</label>
-          </div>
-        </div>
-
-        <!-- <el-table :data="advices" border style="width: 100%" :row-class-name="tableRowClassName" @row-click="clickAdviceAction">
-            <el-table-column fixed prop="date" label="医嘱内容" width="150">
-              <template slot-scope="scope">
-                   {{ scope.row.title }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="name" label="药品规格" width="120">
-              <template slot-scope="scope">
-              {{ scope.row.prescribing_number }}{{ scope.row.prescribing_number_unit }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="province" label="开药数量" width="120">
-              <template slot-scope="scope">
-              {{ scope.row.prescribing_number }}{{ scope.row.prescribing_number_unit }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="city" label="单次用量" width="120">
-              <template slot-scope="scope">
-
-              </template>
-            </el-table-column>
-            <el-table-column prop="address" label="给药途径" width="300">
-               <template slot-scope="scope">
-                   {{ scope.row.delivery_way }}
-               </template>
-            </el-table-column>
-            <el-table-column prop="zip" label="执行频率" width="120">
-              <template slot-scope="scope">
-                  {{ scope.row.execution_frequency }}
-              </template>
-            </el-table-column>
-          </el-table>-->
-      </div>
-      <div
-        id="newDialogContent"
-        class="DialogContent choose"
-        style="height: 6.2rem;"
-      >
-        <div class="newAddTable">
           <table class="table">
             <tr>
-              <th width="26%">医嘱内容</th>
+              <th width="30%">医嘱内容</th>
               <th width="20%">药品规格</th>
-              <th width="12%">开药数量</th>
-              <th width="12%">单次用量</th>
+              <th width="10%">开药数量</th>
+              <th width="10%">单次用量</th>
               <th width="15%">给药途径</th>
               <th width="15%">执行频率</th>
             </tr>
@@ -96,65 +42,42 @@
               <tr
                 :key="advice_index"
                 @click="clickAdviceAction(advice_index)"
-                :class="{
-                  'row-class-active':
-                    advice_index == selecting_advice_index &&
-                    selecting_subdrug_index < 0
-                }"
+                :class="{ 'row-class-active': (advice_index == selecting_advice_index && selecting_subdrug_index < 0) }"
               >
                 <td
                   style="text-align: left; padding-left: 5px; padding-right: 5px;"
-                >
-                  {{ advice.title }}
-                </td>
-
-                <td v-if="advice.advice_desc">
-                  {{ advice.advice_desc }}{{ advice.drug_spec_unit }}
-                </td>
-
-                <td v-if="advice.prescribing_number">
-                  {{ advice.prescribing_number
-                  }}{{ advice.prescribing_number_unit }}
-                </td>
+                >{{ advice.title }}</td>
+                <td v-if="advice.advice_desc">{{ advice.advice_desc }}{{advice.drug_spec_unit}}</td>
+                <td
+                  v-if="advice.prescribing_number"
+                >{{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</td>
                 <td v-else></td>
-                <td v-if="advice.single_dose">
-                  {{ advice.single_dose }} {{ advice.single_dose_unit }}
-                </td>
+                <td v-if="advice.single_dose">{{ advice.single_dose }} {{ advice.single_dose_unit }}</td>
                 <td v-else></td>
-
                 <td>{{ advice.delivery_way }}</td>
-
                 <td>{{ advice.execution_frequency }}</td>
               </tr>
               <tr
                 v-for="(subdrug, subdrug_index) in advice.subdrugs"
                 :key="advice_index + '_' + subdrug_index"
                 @click="clickSubdrugAction(advice_index, subdrug_index)"
-                :class="{
-                  'row-class-active':
-                    advice_index == selecting_advice_index &&
-                    subdrug_index == selecting_subdrug_index
-                }"
+                :class="{ 'row-class-active': (advice_index == selecting_advice_index && subdrug_index == selecting_subdrug_index) }"
               >
                 <td
                   style="text-align: left; padding-right: 5px; padding-left: 25px;"
-                >
-                  {{ subdrug.title }}
-                </td>
-                <td>{{ subdrug.advice_desc }} {{ subdrug.drug_spec_unit }}</td>
+                >{{ subdrug.title }}</td>
+                <td>{{ subdrug.advice_desc }} {{subdrug.drug_spec_unit}}</td>
                 <td>
-                  <span v-if="subdrug.prescribing_number"
-                    >{{ subdrug.prescribing_number
-                    }}{{ subdrug.prescribing_number_unit }}</span
-                  >
+                  <span
+                    v-if="subdrug.prescribing_number"
+                  >{{ subdrug.prescribing_number }}{{ subdrug.prescribing_number_unit }}</span>
                 </td>
                 <td>
-                  <span v-if="subdrug.single_dose"
-                    >{{ subdrug.single_dose }}
-                    {{ subdrug.single_dose_unit }}</span
-                  >
+                  <span
+                    v-if="subdrug.single_dose"
+                  >{{ subdrug.single_dose }} {{ subdrug.single_dose_unit }}</span>
                 </td>
-
+                <!--<td v-if="subdrug.single_dose">{{ subdrug.single_dose }} {{ subdrug.single_dose_unit }}</td>-->
                 <td></td>
                 <td></td>
               </tr>
@@ -566,18 +489,7 @@ export default {
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>
-#newDialogContent {
-  @media only screen and (max-width: 415px) {
-    height: 10.8rem !important;
-  }
-  @media only screen and (min-width: 768px) {
-    height: 7.8rem !important;
-  }
-}
-.backgroundColor {
-  background: #fff;
-}
-.newAddTable {
+.table {
   width: 100%;
   // overflow: auto;
 }
@@ -610,7 +522,7 @@ export default {
       height: 0.6rem;
       line-height: 0.6rem;
       color: $pgh-color;
-      font-size: 0.45rem;
+      font-size: 0.32rem;
       margin-bottom: 0.2rem;
     }
     select {

src/pages/personal/index.vue

@@ -72,7 +72,7 @@
         <img class="bannerOne" src="../../assets/my/myBanner.png" alt />
         <div class="avatar">
           <img src="../../assets/my/avatar.png" alt />
-          <p>用户姓名</p>
+          <p>{{user_name}}</p>
         </div>
       </div>
       <div class="list">
@@ -122,7 +122,8 @@ export default {
     return {
       electronicsignature: "",
       myinfo: {},
-      avatar: "@/assets/product/test.jpg"
+      avatar: "@/assets/product/test.jpg",
+      user_name: ""
     };
   },
   created() {
@@ -132,6 +133,9 @@ export default {
     GetMyInfo() {
       GetMyInfo().then(response => {
         if (response.data.state == 1) {
+          var roleInfo = response.data.data.roleInfo;
+          this.user_name = roleInfo.user_name;
+          console.log("hhhhhhhhhhhhh", response.data.data.roleInfo);
           this.electronicsignature =
             response.data.data.electronic_signature === null
               ? ""