See999 пре 4 година
родитељ
комит
41a307e05c

+ 11 - 10
src/xt_pages/stock/stockInOrderDetail.vue Прегледај датотеку

@@ -14,8 +14,7 @@
14 14
       <div class="filter-container">
15 15
         <span style="font-size: 18px;color: #606266">入库单详情</span>
16 16
         <el-row style="float:right;">
17
-          <span style="color: #606266">入库单号: {{ WarehouseInfo.warehouse.warehousing_order }}</span>&nbsp;&nbsp;
18
-          <span><el-button size="small" type="primary" @click="printOrder">打印</el-button></span>
17
+          <span style="color: #606266">入库单号: {{ WarehouseInfo.warehouse.warehousing_order }}</span>
19 18
         </el-row>
20 19
       </div>
21 20
 
@@ -35,14 +34,16 @@
35 34
         >
36 35
       </div>
37 36
 
38
-      <div class="cell clearfix" style="margin-top: 10px">
39
-     
40
-        <el-button size="small" icon="el-icon-edit" @click="editRecord"
41
-          >编辑</el-button
42
-        >
43
-        <el-button size="small" icon="el-icon-delete" @click="deleteRecord"
44
-          >删除</el-button
45
-        >
37
+      <div style="display:flex;justify-content: space-between;align-items: center;margin: 12px 0;">
38
+        <div>
39
+          <el-button size="small" icon="el-icon-edit" @click="editRecord"
40
+            >编辑</el-button
41
+          >
42
+          <el-button size="small" icon="el-icon-delete" @click="deleteRecord"
43
+            >删除</el-button
44
+          >
45
+        </div>
46
+        <el-button size="small" type="primary" @click="printOrder">打印</el-button>
46 47
       </div>
47 48
 
48 49
       <el-row :gutter="12" style="margin-top: 10px">

+ 7 - 5
src/xt_pages/stock/stockOutOrderDetail.vue Прегледај датотеку

@@ -11,8 +11,7 @@
11 11
       <div class="filter-container">
12 12
         <span style="font-size: 18px;color: #606266">出库单详情</span>
13 13
         <el-row style="float:right;">
14
-          <span style="color: #606266">{{warehousingOutInfo.info.warehouse_out_order_number}}</span>&nbsp;&nbsp;
15
-          <span><el-button size="small" type="primary" @click="printOrder">打印</el-button></span>
14
+          <span style="color: #606266">出库单号:{{warehousingOutInfo.info.warehouse_out_order_number}}</span>
16 15
         </el-row>
17 16
       </div>
18 17
 
@@ -23,9 +22,12 @@
23 22
         <span style="width: 300px;color: #606266">经销商 {{getDealerName(warehousingOutInfo.info.dealer)}}</span>
24 23
       </div>
25 24
 
26
-      <div class="filter-container" style="margin-top: 10px">
27
-        <el-button size="small" icon="el-icon-edit" @click="editRecord" v-if="warehousingOutInfo.info.is_sys != 1">编辑</el-button>
28
-        <el-button size="small" icon="el-icon-delete" @click="deleteRecord" v-if="warehousingOutInfo.info.is_sys != 1">删除</el-button>
25
+      <div style="display:flex;justify-content: space-between;align-items: center;margin: 12px 0;">
26
+        <div>
27
+          <el-button size="small" icon="el-icon-edit" @click="editRecord" v-if="warehousingOutInfo.info.is_sys != 1">编辑</el-button>
28
+          <el-button size="small" icon="el-icon-delete" @click="deleteRecord" v-if="warehousingOutInfo.info.is_sys != 1">删除</el-button>
29
+        </div>
30
+        <el-button size="small" type="primary" @click="printOrder">打印</el-button>
29 31
       </div>
30 32
 
31 33
       <el-row :gutter="12" style="margin-top: 10px">

+ 22 - 21
src/xt_pages/user/vascularAccess.vue Прегледај датотеку

@@ -2,19 +2,18 @@
2 2
   <div class="patient-container">
3 3
     <patient-sidebar :id="patientID" defaultActive="1-6" v-on:tran-patient="onTranPatient"></patient-sidebar>
4 4
     <div class="patient-app-container advice-container app-container">
5
-      <div class="cell clearfix">
6
-         <span>血管通路列表</span>
7
-         <el-button size="medium" type="primary" @click="dialogVisible =true" style="margin-left:850px" >新增</el-button>
5
+      <div style="display:flex;justify-content: space-between;align-items: center;margin-bottom: 12px;">
6
+         <span style="font-weight:bold;">血管通路列表</span>
7
+         <el-button size="medium" type="primary" @click="dialogVisible =true">新增</el-button>
8 8
       </div>
9
-      <el-table  :data="tableData" border style="width:100%">
10
-      <el-table-column  prop="start_time"   label="建立日期"  width="150"    align="center">
11
-          <template  slot-scope="scope">
9
+      <el-table class="oictable" :data="tableData" border style="width:100%">
10
+      <el-table-column prop="start_time" label="建立日期" width="100" align="center">
11
+          <template slot-scope="scope">
12 12
             <span>{{ getTime(scope.row.start_time, "{y}-{m}-{d}")}}</span>
13 13
           </template>
14 14
      </el-table-column>
15
-      <el-table-column   prop="blood_access_part_opera_id" label="血管通路"   align="center" width="200">
15
+      <el-table-column prop="blood_access_part_opera_id" label="血管通路" align="center" width="120">
16 16
         <template slot-scope="scope">
17
-         
18 17
            <router-link
19 18
               :to="'/patients/patient/' + scope.row.patient_id+'/vascularAccessDetail/'+scope.row.id"
20 19
               style="color:#409eff;width:100%;display:block;"
@@ -23,55 +22,55 @@
23 22
             >
24 23
         </template>
25 24
      </el-table-column>
26
-     <el-table-column   prop="blood_access_part_id" label="血管通路部位"   align="center" width="200">
25
+     <el-table-column prop="blood_access_part_id" label="血管通路部位" width="200" align="center">
27 26
         <template slot-scope="scope">
28 27
            <span>{{scope.row.blood_access_part_id}}</span>  
29 28
         </template>
30 29
      </el-table-column>
31
-      <el-table-column     prop="inflow_pass"    label="流入-流出道"    align="center">
30
+      <el-table-column prop="inflow_pass" label="流入-流出道" width="100" align="center">
32 31
          <template slot-scope="scope">
33 32
             <span>{{scope.row.inflow_pass}}</span>
34 33
          </template>
35 34
       </el-table-column>
36
-      <el-table-column     prop="date"    label="首次启用日期" width="120"     align="center">
35
+      <el-table-column prop="date" label="首次启用日期" width="120" align="center">
37 36
           <template slot-scope="scope">
38 37
             <span>{{ getTime(scope.row.first_start_time, "{y}-{m}-{d}")}}</span>
39 38
           </template>
40 39
       </el-table-column>
41
-      <el-table-column     prop="date"    label="默认到处方"      align="center">
40
+      <el-table-column prop="date" label="默认到处方" align="center" width="100">
42 41
           <template slot-scope="scope">
43 42
              <span v-if="scope.row.user_status == 1">启用</span>
44 43
              <span v-if="scope.row.user_status == 2">停用</span>
45 44
           </template>
46 45
       </el-table-column>
47
-       <el-table-column     prop="date"    label="停用日期"      align="center">
46
+       <el-table-column prop="date" label="停用日期" align="center" width="100">
48 47
           <template slot-scope="scope">
49 48
             <span v-if="scope.row.stop_time>0">{{ getTime(scope.row.stop_time, "{y}-{m}-{d}")}}</span>
50 49
              <span v-if="scope.row.stop_time<0"></span>
51 50
           </template>
52 51
       </el-table-column>
53
-       <el-table-column     prop="date"    label="停用原因"      align="center">
52
+       <el-table-column prop="date" label="停用原因" align="center" width="120">
54 53
           <template slot-scope="scope">
55 54
              <span>{{scope.row.stop_reason}}</span>
56 55
           </template>
57 56
       </el-table-column>
58
-       <el-table-column     prop="date"    label="使用寿命(天)"      align="center">
57
+       <el-table-column prop="date" label="使用寿命(天)" align="center" width="120">
59 58
           <template slot-scope="scope">
60 59
            <span v-if="scope.row.stop_time>0&&(scope.row.stop_time - scope.row.start_time)/86400 == 0"></span> 
61 60
            <span v-if="scope.row.stop_time>0&&(scope.row.stop_time - scope.row.start_time)/86400 != 0">{{(scope.row.stop_time - scope.row.start_time)/86400}}</span>
62 61
           </template>
63 62
       </el-table-column>
64
-       <el-table-column   prop="date"    label="备注"      align="center">
63
+       <el-table-column prop="date" label="备注" align="center" width="180">
65 64
           <template slot-scope="scope">
66 65
              <span>{{scope.row.remark}}</span>
67 66
           </template>
68 67
       </el-table-column>
69
-      <el-table-column     prop="date"    label="创始人"      align="center">
68
+      <el-table-column prop="date" label="创始人" align="center" width="100">
70 69
           <template slot-scope="scope">
71 70
             <span>{{getDoctor(scope.row.creator)}}</span>
72 71
           </template>
73 72
       </el-table-column>
74
-       <el-table-column   prop="date"  label="操作" width="140" align="center">
73
+       <el-table-column prop="date" fixed="right" label="操作" width="140" align="center">
75 74
           <template slot-scope="scope">
76 75
              <el-tooltip class="item" effect="dark" content="编辑" placement="top">
77 76
                <el-button
@@ -708,13 +707,15 @@
708 707
 </script>
709 708
 
710 709
 <style>
711
-  #oictable ::-webkit-scrollbar {
710
+  .oictable ::-webkit-scrollbar {
712 711
     height: 15px;
713 712
   }
714 713
 </style>
715 714
 
716
-<style rel="stylesheet/scss" lang="scss" scoped>
717
-   
715
+<style rel="stylesheet/scss" lang="scss">
716
+   ::-webkit-scrollbar{
717
+      height:15px;
718
+   }
718 719
 
719 720
 </style>
720 721
 

+ 2 - 2
src/xt_pages/user/vascularAccessDetail.vue Прегледај датотеку

@@ -2,8 +2,8 @@
2 2
   <div class="patient-container">
3 3
     <patient-sidebar :id="patientID" defaultActive="1-6" v-on:tran-patient="onTranPatient"></patient-sidebar>
4 4
     <div class="patient-app-container advice-container app-container">
5
-      <div class="cell clearfix">
6
-         <span>通路详情 &nbsp; </span>
5
+      <div style="display:flex;justify-content: space-between;align-items: center;margin-bottom: 12px;">
6
+         <span style="font-weight:bold;">通路详情</span>
7 7
          <el-button size="medium" type="primary" @click="dialogVisible =true" style="margin-left:800px" >新增</el-button>
8 8
       </div>
9 9
       <div class="cell clearfix">