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

config/dev.env.js

@@ -1,14 +1,13 @@
-'use strict'
-const merge = require('webpack-merge')
-const prodEnv = require('./prod.env')
+"use strict";
+const merge = require("webpack-merge");
+const prodEnv = require("./prod.env");
 
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   //BASE_API: '"https://api.xt.kuyicloud.com"'
   BASE_API: '"http://localhost:9531"'
-  //BASE_API: '"http://localhost:9529"'
+  // BASE_API: '"http://localhost:9529"'
   //http://api.xt.test.sgjyun.com http://localhost:9529
   // BASE_API: '"http://api.xt.test.sgjyun.com"'
   // BASE_API: '"https://api.xt.kuyicloud.com"'
-
-})
+});

src/pages/advice/DialysisAdviceTable.vue

@@ -80,17 +80,17 @@
 
       <table class="table dialysisTable">
         <tr>
-          <th width="60px">姓名</th>
+          <th width="40px">姓名</th>
           <th width="40px">透析号</th>
           <!-- <th width="50px">类型</th> -->
-          <th width="110px">开始时间</th>
-          <th width="140px">医嘱内容</th>
-          <th width="100px">执行时间</th>
+          <th width="50px">开始时间</th>
+          <th width="60px">医嘱内容</th>
+          <th width="50px">执行时间</th>
           <th width="80px">执行护士</th>
           <th width="80px">校对护士</th>
-          <th width="110px">校对时间</th>
+          <th width="50px">校对时间</th>
           <th width="60px">开嘱医生</th>
-          <th width="110px">开嘱时间</th>
+          <th width="50px">开嘱时间</th>
         </tr>
         <template v-for="(schedules, zone_name, index) in filtedScheduals">
           <tr :key="index">
@@ -126,7 +126,7 @@
                 <td v-if="advice_index == 0" :rowspan="group.advices.length">
                   {{
                   advice.parent_id == 0
-                  ? parseTime(advice.start_time, "{m}-{d} {h}:{i}")
+                  ? parseTime(advice.start_time, "{h}:{i}")
                   : ""
                   }}
                 </td>
@@ -153,12 +153,12 @@
                     v-if="advice.parent_id == 0 && advice.remark.length > 0"
                   >({{ advice.remark }})</span>
                 </td>
-                <td>{{ parseTime(advice.execution_time, "{m}-{d} {h}:{i}") }}</td>
+                <td>{{ parseTime(advice.execution_time, "{h}:{i}") }}</td>
                 <td>{{ getName(advice.execution_staff) }}</td>
                 <td>{{ getName(advice.checker) }}</td>
-                <td>{{ parseTime(advice.check_time, "{m}-{d} {h}:{i}") }}</td>
+                <td>{{ parseTime(advice.check_time, "{h}:{i}") }}</td>
                 <td>{{ getName(advice.advice_doctor) }}</td>
-                <td>{{ parseTime(advice.created_time, "{m}-{d} {h}:{i}") }}</td>
+                <td>{{ parseTime(advice.created_time, "{h}:{i}") }}</td>
               </tr>
             </template>
           </template>
@@ -626,7 +626,8 @@ export default {
 }
 .dialysisTable {
   @media only screen and (max-width: 450px) {
-    width: 1070px;
+    width: 800px;
+    //
   }
 }
 </style>