Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

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

@@ -210,7 +210,7 @@
       <!--   @row-click="cellMouseEnter" -->
       <!--&lt;!&ndash;:header-cell-style="{ backgroundColor: 'rgb(64, 158, 255)', color: 'white'}"&ndash;&gt;@current-change="selectRow"-->
       <el-table
-        v-if="his_is_open !=1"
+        v-if="his_is_open !=1 && is_advice_open!=1"
         :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
         :data="doctor_advices"
         border
@@ -303,6 +303,10 @@
       </el-table>
 
 
+
+
+
+
       <el-table
         v-if="his_is_open  == 1 || is_advice_open == 1"
         :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
@@ -404,87 +408,6 @@
 
       </el-table>
 
-      <!-- 医嘱列表 end -->
-
-      <!-- 新医嘱列表 -->
-      <!-- <div class="orderTable">
-        <table class="table">
-          <tr @click="cancelAdviceSelect" class="tableTh">
-            <th width="8%">开嘱医生</th>
-            <th width="12%">开始时间</th>
-            <th width="52%">医嘱内容</th>
-            <th width="12%">执行时间</th>
-            <th width="8%">执行护士</th>
-            <th v-if="template_id != 6" width="8%">核对人员</th>
-          </tr>
-          <template v-for="(group, group_index) in advice_groups">
-            <tr
-              v-for="(advice, advice_index) in group.advices"
-              :key="advice.id"
-              :class="{ 'row-class-active': current_group_index == group_index && current_advice_index < 0 }"
-            >
-              <td
-                v-if="advice_index == 0"
-                :rowspan="group.advices.length"
-                @click="selectGroupAdviceAction(group_index, -1, null,group)"
-              >
-                <span v-if="advice.parent_id==0">{{getXuserName(advice.advice_doctor)}}</span>
-                <span v-else></span>
-              </td>
-
-              <td
-                v-if="advice_index == 0"
-                :rowspan="group.advices.length"
-                @click="selectGroupAdviceAction(group_index, -1, null,group)"
-              >
-                <span>{{uParseTime(advice.start_time, '{m}-{d} {h}:{i}')}}</span>
-              </td>
-
-              <td
-                :class="{ 'advice_content': advice.parent_id == 0, 'subadvice_content': advice.parent_id > 0, 'td-active':current_group_index == group_index  && advice.is_selected == 1 }"
-                @click="selectAdviceAction(group_index, advice_index, advice)"
-              >
-                <div class="txt">
-                  <span>{{advice.advice_name }}</span>
-                  <span
-                    v-if="advice.advice_desc"
-                  >({{ advice.advice_desc }}{{advice.drug_spec_unit}})</span>
-                  <span
-                    v-if="advice.prescribing_number"
-                  >&nbsp;&nbsp;{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
-                  <span
-                    v-if="advice.single_dose && template_id == 6"
-                  >{{advice.single_dose}}{{advice.single_dose_unit}}</span>
-                  <span
-                    v-if="advice.single_dose && template_id != 6"
-                  >单次用量{{advice.single_dose}}{{advice.single_dose_unit}}</span>
-
-                  <span v-if="advice.parent_id == 0">{{advice.delivery_way}}</span>
-                  <span v-if="advice.parent_id == 0">{{advice.execution_frequency}}</span>
-                  <span v-if="advice.parent_id == 0 && advice.remark.length > 0">({{advice.remark}})</span>
-                </div>
-              </td>
-
-              <td
-                :class="{'td-active':current_group_index == group_index  && advice.is_selected == 1}"
-                @click="selectAdviceAction(group_index,advice_index, advice)"
-              >{{uParseTime(advice.execution_time, '{m}-{d} {h}:{i}')}}</td>
-
-              <td
-                :class="{'td-active':current_group_index == group_index  && advice.is_selected == 1}"
-                @click="selectAdviceAction(group_index,advice_index, advice)"
-              >{{getXuserName(advice.execution_staff)}}</td>
-              <td
-                v-if="template_id != 6"
-                :class="{'td-active':current_group_index == group_index  && advice.is_selected == 1}"
-                @click="selectAdviceAction(group_index,advice_index, advice)"
-              >{{getXuserName(advice.checker)}}</td>
-            </tr>
-          </template>
-        </table>
-      </div>-->
-      <!-- 新医嘱列表 -->
-
 
       <!-- 新增医嘱(子药)表单 || 新增子药表单 -->
       <!-- 医嘱表单 -->
@@ -2055,6 +1978,8 @@
       }
       ,
       show(his_is_open,is_advice_open) {
+        console.log("his_is_open233232323232323322323",his_is_open)
+        console.log("is_advice_open233232323232323322323",is_advice_open)
         this.his_is_open = his_is_open
         this.is_advice_open = is_advice_open
         this.isVisibility = true