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

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

           @click="openGroupFrom"
           :loading="deleLoading"
           :disabled="!is_has_create"
-        >
-          新增医嘱
-        </el-button>
+        >新增医嘱</el-button>
 
         <el-button
           v-if="currentRow != null"
           :disabled="!is_has_exce"
           @click="execAdvice"
           :loading="deleLoading"
-          >执行医嘱
-        </el-button>
-        <el-button
-          v-else
-          disabled
-          round
-          @click="execAdvice"
-          :loading="deleLoading"
-          >执行医嘱</el-button
-        >
+        >执行医嘱</el-button>
+        <el-button v-else disabled round @click="execAdvice" :loading="deleLoading">执行医嘱</el-button>
 
         <el-button
           v-if="currentRow != null"
           :disabled="!is_has_check"
           @click="checkAdvice"
           :loading="deleLoading"
-          >医嘱核对
-        </el-button>
-        <el-button
-          v-else
-          disabled
-          round
-          @click="checkAdvice"
-          :loading="deleLoading"
-          >医嘱核对</el-button
-        >
+        >医嘱核对</el-button>
+        <el-button v-else disabled round @click="checkAdvice" :loading="deleLoading">医嘱核对</el-button>
 
         <el-button
           v-if="groupSelectRow != null"
           round
           @click="openEditGroupAdvice"
           :loading="deleLoading"
-          >修改医嘱
-        </el-button>
-        <el-button
-          v-else
-          disabled
-          round
-          @click="openEditGroupAdvice"
-          :loading="deleLoading"
-          >修改医嘱</el-button
-        >
+        >修改医嘱</el-button>
+        <el-button v-else disabled round @click="openEditGroupAdvice" :loading="deleLoading">修改医嘱</el-button>
 
         <el-button
           v-if="groupSelectRow != null"
           round
           @click="openDeleteGroupAdvice"
           :loading="deleLoading"
-          >删除医嘱
-        </el-button>
-        <el-button
-          v-else
-          disabled
-          round
-          @click="openDeleteGroupAdvice"
-          :loading="deleLoading"
-          >删除医嘱</el-button
-        >
+        >删除医嘱</el-button>
+        <el-button v-else disabled round @click="openDeleteGroupAdvice" :loading="deleLoading">删除医嘱</el-button>
 
         <!--<el-button round @click="openNewChild" :loading="deleLoading">新增子药</el-button>-->
       </div>
         highlight-current-row
         @current-change="handleCurrentChange"
       >
-        <el-table-column
-          prop="date"
-          label="开嘱医生"
-          align="center"
-          min-width="26px"
-        >
+        <el-table-column prop="date" label="开嘱医生" align="center" min-width="26px">
           <template slot-scope="scope">
             <span>{{ getXuserName(scope.row.advice_doctor) }}</span>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="start_time"
-          label="开始时间"
-          align="center"
-          min-width="35px"
-        >
+        <el-table-column prop="start_time" label="开始时间" align="center" min-width="35px">
           <template slot-scope="scope">
-            <span>{{
+            <span>
+              {{
               scope.row.start_time | parseTime("{y}-{m}-{d} {h}:{i}")
-            }}</span>
+              }}
+            </span>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="advice_name"
-          min-width="50px"
-          label="医嘱内容"
-          align="center"
-        >
+        <el-table-column prop="advice_name" min-width="50px" label="医嘱内容" align="center">
           <template slot-scope="scope">
             <el-dropdown trigger="click" v-if="scope.row.parent_id == 0">
-              <span class="el-dropdown-link"
-                >{{ getAdviceContent(scope.row, 1)
-                }}<i class="el-icon-arrow-down el-icon--right"></i
-              ></span>
+              <span class="el-dropdown-link">
+                {{ getAdviceContent(scope.row, 1)
+                }}
+                <i class="el-icon-arrow-down el-icon--right"></i>
+              </span>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item
-                  @click.native="openEdit(scope.$index, scope.row)"
-                  >修改医嘱</el-dropdown-item
-                >
-                <el-dropdown-item
-                  @click.native="openDelete(scope.$index, scope.row)"
-                  >删除医嘱</el-dropdown-item
-                >
-                <el-dropdown-item
-                  @click.native="openNewChildTwo(scope.$index, scope.row)"
-                  >新增子药</el-dropdown-item
-                >
+                <el-dropdown-item @click.native="openEdit(scope.$index, scope.row)">修改医嘱</el-dropdown-item>
+                <el-dropdown-item @click.native="openDelete(scope.$index, scope.row)">删除医嘱</el-dropdown-item>
+                <el-dropdown-item @click.native="openNewChildTwo(scope.$index, scope.row)">新增子药</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
 
             <el-dropdown trigger="click" v-if="scope.row.parent_id > 0">
-              <span class="el-dropdown-link"
-                >&emsp;{{ getAdviceContent(scope.row, 2)
-                }}<i class="el-icon-arrow-down el-icon--right"></i
-              ></span>
+              <span class="el-dropdown-link">
+                &emsp;{{ getAdviceContent(scope.row, 2)
+                }}
+                <i class="el-icon-arrow-down el-icon--right"></i>
+              </span>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item
-                  @click.native="openEdit(scope.$index, scope.row)"
-                  >修改子药
-                </el-dropdown-item>
-                <el-dropdown-item
-                  @click.native="openDelete(scope.$index, scope.row)"
-                  >删除子药
-                </el-dropdown-item>
+                <el-dropdown-item @click.native="openEdit(scope.$index, scope.row)">修改子药</el-dropdown-item>
+                <el-dropdown-item @click.native="openDelete(scope.$index, scope.row)">删除子药</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </template>
           sortable
         >
           <template slot-scope="scope">
-            <span v-if="scope.row.execution_time != 0">{{
+            <span v-if="scope.row.execution_time != 0">
+              {{
               scope.row.start_time | parseTime("{m}-{d} {h}:{i}")
-            }}</span>
+              }}
+            </span>
             <span v-else></span>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="execution_staff"
-          align="center"
-          min-width="30px"
-          label="执行护士"
-        >
+        <el-table-column prop="execution_staff" align="center" min-width="30px" label="执行护士">
           <template slot-scope="scope">
-            <span v-if="scope.row.parent_id == 0">{{
+            <span v-if="scope.row.parent_id == 0">
+              {{
               getXuserName(scope.row.execution_staff)
-            }}</span>
+              }}
+            </span>
             <span v-else></span>
           </template>
         </el-table-column>
           label="核对人员"
         >
           <template slot-scope="scope">
-            <span v-if="scope.row.parent_id == 0">{{
+            <span v-if="scope.row.parent_id == 0">
+              {{
               getXuserName(scope.row.checker)
-            }}</span>
+              }}
+            </span>
             <span v-else></span>
           </template>
         </el-table-column>
       </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>-->
+      <!-- 新医嘱列表 -->
+
       <!-- 医嘱表单 -->
-      <el-form
-        ref="form"
-        :model="form"
-        label-width="100px"
-        v-show="showAdviceForm"
-      >
+      <el-form ref="form" :model="form" label-width="100px" v-show="showAdviceForm">
         <el-row :gutter="20">
           <!--<el-col :span="8">-->
           <!--<el-form-item label="医嘱类型：">-->
 
           <el-col :span="8">
             <el-form-item label="药品规格：">
-              <el-input
-                v-model="form.advice_desc"
-                style="width: 40%;"
-              ></el-input>
+              <el-input v-model="form.advice_desc" style="width: 40%;"></el-input>
               <el-select
                 v-model="form.drug_spec_unit"
                 style="width: 56%;"
                   :key="item.id"
                   :label="item.name"
                   :value="item.name"
-                >
-                </el-option>
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
         <el-row :gutter="20">
           <el-col :span="8">
             <el-form-item label="开药数量：">
-              <el-input
-                v-model="form.prescribing_number"
-                style="width: 40%;"
-              ></el-input>
+              <el-input v-model="form.prescribing_number" style="width: 40%;"></el-input>
               <el-select
                 v-model="form.prescribing_number_unit"
                 style="width: 56%;"
                   :key="item.id"
                   :label="item.name"
                   :value="item.name"
-                >
-                </el-option>
+                ></el-option>
               </el-select>
               <!-- <el-input v-model="form.prescribing_number_unit" style="width: 40%;"></el-input> -->
             </el-form-item>
 
           <el-col :span="8">
             <el-form-item label="单次用量：">
-              <el-input
-                v-model="form.single_dose"
-                style="width: 40%;"
-              ></el-input>
+              <el-input v-model="form.single_dose" style="width: 40%;"></el-input>
               <el-select
                 v-model="form.single_dose_unit"
                 style="width: 56%;"
                   :key="item.id"
                   :label="item.name"
                   :value="item.name"
-                >
-                </el-option>
+                ></el-option>
               </el-select>
 
               <!-- <el-input v-model="form.single_dose_unit" style="width: 40%;"></el-input> -->
                   :key="item.id"
                   :label="item.name"
                   :value="item.name"
-                >
-                </el-option>
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
                   :key="item.id"
                   :label="item.name"
                   :value="item.name"
-                >
-                </el-option>
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
       </el-form>
       <div slot="footer" class="dialog-footer" v-show="showAdviceForm">
         <el-button @click="hideForm">取 消</el-button>
-        <el-button
-          type="primary"
-          v-if="form.id == 0"
-          @click="submitAdvice"
-          :loading="loading"
-          >保 存</el-button
-        >
-        <el-button
-          type="primary"
-          v-else
-          @click="submitEditAdvice"
-          :loading="loading"
-          >保 存</el-button
-        >
+        <el-button type="primary" v-if="form.id == 0" @click="submitAdvice" :loading="loading">保 存</el-button>
+        <el-button type="primary" v-else @click="submitEditAdvice" :loading="loading">保 存</el-button>
       </div>
       <!-- 医嘱表单 end -->
     </el-dialog>
         type="datetime"
         placeholder="选择执行时间"
         style="width:100%"
-      >
-      </el-date-picker>
+      ></el-date-picker>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="closeTimePanel" :loading="exceLoading"
-          >取 消</el-button
-        >
-        <el-button type="primary" @click="submitExce" :loading="exceLoading"
-          >保 存</el-button
-        >
+        <el-button @click="closeTimePanel" :loading="exceLoading">取 消</el-button>
+        <el-button type="primary" @click="submitExce" :loading="exceLoading">保 存</el-button>
       </span>
     </el-dialog>
 
 }
 </style>
 
+<style lang="scss" scoped>
+.table {
+  width: 100%;
+  .tableTh {
+    th {
+      padding: 10px 0px;
+      background-color: rgb(245, 247, 250);
+      color: #909399;
+      font-weight: bold;
+      text-align: center;
+    }
+  }
+  tr {
+    // th {
+    //   background: $main-color;
+    //   color: #fff;
+    //   height: 1.2rem;
+    //   line-height: 1.2rem;
+    // }
+    td {
+      line-height: 0.6rem;
+      .txt {
+        // float: left;
+        padding: 0 10px 0 10px;
+        // width: 75%;
+        text-align: left;
+      }
+      .ico {
+        float: right;
+        width: 60px;
+        text-align: right;
+        padding-right: 3px;
+      }
+      .iconfont {
+        font-size: 20px;
+        padding: 0 2px;
+        color: #7b8a97;
+      }
+      .handle {
+        color: #409eff;
+        // padding: 0 7px;
+      }
+    }
+    .advice_content {
+      // background: #eff6fc;
+    }
+    .subadvice_content {
+      // background: #fafcfe;
+      padding-left: 20px;
+    }
+    .td-active {
+      background: #badcff !important;
+    }
+  }
+  .row-class-active {
+    td {
+      background: #badcff;
+    }
+  }
+}
+</style>
+
 <!--<style scoped>-->
 
 <!--.txsj{-->