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

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

@@ -8,7 +8,7 @@
       :modal-append-to-body="false"
     >
 
-      <!-- <div class="txsj">
+      <div class="txsj">
         <el-button
           round
           @click="openLast(3)"
@@ -20,8 +20,8 @@
           @click="openNext(4)"
         >下一方
         </el-button>
-      </div> -->
-      
+      </div>
+
 
       <!--<el-table-->
       <!--:header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"-->
@@ -146,15 +146,6 @@
 
 
       <div slot="footer" class="dialog-footer">
-        <el-button
-          @click="openLast(3)"
-        >上一方
-        </el-button>
-
-        <el-button
-          @click="openNext(4)"
-        >下一方
-        </el-button>
         <el-button @click="isLastOrNextVisible = false">取 消</el-button>
         <el-button type="primary" @click="AddNewAdvice('adForm')">设为本次临嘱</el-button>
       </div>
@@ -167,8 +158,7 @@
       @close="resetDialog"
       :modal-append-to-body="false"
     >
-    <div style="font-size:16px;">上机时间：{{this.getTime(dialysis_order.start_time,'{h}:{i}')}}</div>
-      <!-- <div class="txsj">
+      <div class="txsj">
         <el-button
           round
           @click="openLast(1)"
@@ -180,7 +170,7 @@
           @click="openNext(2)"
         >下一方
         </el-button>
-      </div> -->
+      </div>
 
       <div class="txsj" v-show="showAdvicePanel">
         <el-button
@@ -558,21 +548,6 @@
         <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>
-      <div slot="footer" class="dialog-footer" v-show="!showAdviceForm">
-        <div class="txsj">
-          <el-button
-            round
-            @click="openLast(1)"
-          >上一方
-          </el-button>
-
-          <el-button
-            round
-            @click="openNext(2)"
-          >下一方
-          </el-button>
-        </div>
-      </div>
       <!-- 医嘱表单 end -->
     </el-dialog>
     <el-dialog
@@ -631,7 +606,6 @@
   import AddGroupAdvice from './adviceDialog/AddGroupAdvice'
   import EditGroupAdvice from './adviceDialog/EditGroupAdvice'
   import { uParseTime } from '@/utils/tools'
-  import { parseTime } from '@/utils'
   import {
     CheckDoctorAdvice,
     CreateDoctorAdvice,
@@ -918,7 +892,7 @@
           this.$message.error('没有选择患者')
           return false
         }
-        console.log(this.form)
+        // console.log(this.form)
         let mode = '2'
         if (this.form.advice_doctor != this.$store.getters.xt_user.user.id) {
           mode = '3'
@@ -2260,13 +2234,7 @@
           this.GetLastOrNextDoctorAdvice(params)
 
         }
-      },
-      getTime(value, temp) {
-        if (value != undefined) {
-          return parseTime(value, temp)
-        }
-        return ''
-      },
+      }
     },
     created() {
       var date = this.$route.query && this.$route.query.date