柳香萍 6 lat temu
rodzic
commit
baa70a953c

+ 1 - 1
src/views/layout/components/Navbar.vue Wyświetl plik

@@ -127,7 +127,7 @@ export default {
127 127
   top: 0;
128 128
   left: 0;
129 129
   right: 0;
130
-  z-index: 999;
130
+  z-index: 2052;
131 131
   .nav-logo {
132 132
     width: 162px;
133 133
     display: flex;

+ 1 - 1
src/views/layout/components/TagsView.vue Wyświetl plik

@@ -124,7 +124,7 @@ export default {
124 124
     border-bottom: 1px solid #d8dce5;
125 125
     box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
126 126
     position: fixed;
127
-    z-index: 999;
127
+    z-index: 2052;
128 128
     top: 60px;
129 129
     .tags-view-item {
130 130
       display: inline-block;

+ 2 - 2
src/xt_pages/stock/addStockIn.vue Wyświetl plik

@@ -72,10 +72,10 @@
72 72
           </el-table-column>
73 73
           <el-table-column label="操作" align="center" min-width="70">
74 74
             <template slot-scope="scope">
75
-              <el-tooltip class="item" effect="dark" content="编辑" placement="top">
75
+              <el-tooltip class="item" effect="dark" content="添加" placement="top">
76 76
                 <el-button
77 77
                   size="small"
78
-                  icon="el-icon-edit-outline"
78
+                  icon="el-icon-circle-plus-outline"
79 79
                   @click="handleEdit(scope.$index, scope.row)">
80 80
                 </el-button>
81 81
               </el-tooltip>

+ 2 - 2
src/xt_pages/stock/addStockOut.vue Wyświetl plik

@@ -61,10 +61,10 @@
61 61
           </el-table-column>
62 62
           <el-table-column label="操作" align="center" min-width="70">
63 63
             <template slot-scope="scope">
64
-              <el-tooltip class="item" effect="dark" content="编辑" placement="top">
64
+              <el-tooltip class="item" effect="dark" content="添加" placement="top">
65 65
                 <el-button
66 66
                   size="small"
67
-                  icon="el-icon-edit-outline"
67
+                  icon="el-icon-circle-plus-outline"
68 68
                   @click="handleEdit(scope.$index, scope.row)">
69 69
                 </el-button>
70 70
               </el-tooltip>

+ 2 - 2
src/xt_pages/stock/cancelStockOrder.vue Wyświetl plik

@@ -81,11 +81,11 @@
81 81
 
82 82
         <el-table-column label="操作" align="center">
83 83
           <template slot-scope="scope">
84
-            <el-tooltip class="item" effect="dark" content="编辑" placement="top">
84
+            <el-tooltip class="item" effect="dark" content="添加" placement="top">
85 85
               <el-button
86 86
                 size="small"
87 87
                 type="primary"
88
-                icon="el-icon-edit-outline"
88
+                icon="el-icon-circle-plus-outline"
89 89
                 @click="handleEdit(scope.$index, scope.row)">
90 90
               </el-button>
91 91
             </el-tooltip>  

+ 21 - 34
src/xt_pages/user/patients.vue Wyświetl plik

@@ -1,17 +1,16 @@
1 1
 <template>
2 2
 <div class="main-contain">
3
+  <div class="position">
4
+    <bread-crumb></bread-crumb>
5
+    <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" @click="$router.push({path:'/patients/create'})" class="filter-item" style="float:right;" type="primary" icon="el-icon-circle-plus-outline" size="small">新增</el-button>
6
+  </div>
3 7
   <div class="app-container">
4
-    <div class="filter-container">
8
+    <div class="cell">
9
+      <label class="title"><span class="name">病人搜索</span> : </label>
5 10
       <el-input   style="width: 400px;" v-model="searchKey" class="filter-item" placeholder="病人姓名/透析号" size="small"/>
6 11
       <el-button  class="filter-item" type="primary" icon="el-icon-search" @click="search" size="small" >搜索</el-button>
7
-      <!-- <el-button  class="filter-item" type="primary" style="float:right;" icon="el-icon-download" >批量导入</el-button> -->
8
-      <!-- <el-button  type="primary" plain style="float:right;" icon="el-icon-download" >批量导入</el-button>       -->
9
-      <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" @click="$router.push({path:'/patients/create'})" class="filter-item" style="float:right;" type="primary" icon="el-icon-zoom-in" size="small">新增病人</el-button>
10 12
     </div>
11
-    <!-- <div class="search-component clearfix">
12
-      <input type="text" class="searchBox" placeholder="姓名/首拼/透析号" v-model="searchVal">
13
-      <button class="searchBtn">搜 索</button>
14
-    </div> -->
13
+   
15 14
     <div class="cell">
16 15
       <label class="title"><span class="name">日期查询</span> : </label>
17 16
       <el-date-picker v-model="listQuery.start_time" size="small"  prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right" :picker-options="pickerOptions1"  format="yyyy-MM-dd" value-format="yyyy-MM-dd" > </el-date-picker>
@@ -34,14 +33,6 @@
34 33
         </ul>
35 34
       </div>
36 35
     </div>
37
-    <!-- <div class="cell clearfix">
38
-	    <label class="title"><span class="name">病人来源</span> : </label>
39
-	    <div class="time ">
40
-        <ul class="">
41
-          <li :class="item.value==sourceType?'active':''" :style="item.source>0&&lapsetoType!=1?'display:none;':''" @click="selectLapseTo(item.value, item.source, item.lapseto)" v-for="item in sourceArr" :key="item.value" >{{item.label}}</li>
42
-        </ul>
43
-      </div>
44
-    </div> -->
45 36
     <div class="cell clearfix">
46 37
       <label class="title"><span class="name">转归情况</span> : </label>
47 38
       <div class="time ">
@@ -68,7 +59,7 @@
68 59
           :value="item.id">
69 60
         </el-option>
70 61
       </el-select>
71
-      <el-select v-model="listQuery.reimbursement_way"  size="small" clearable  placeholder="付费方式"  @change="changeOtherSearch">
62
+      <el-select style="margin-left: 10px;" v-model="listQuery.reimbursement_way"  size="small" clearable  placeholder="付费方式"  @change="changeOtherSearch">
72 63
         <el-option
73 64
           v-for="item in reimbursement_ways"
74 65
           :key="item.id"
@@ -104,12 +95,8 @@
104 95
       </el-select>
105 96
     </div>
106 97
 
107
-    <!-- <div class="amount" >总<span>{{pageTotal}}</span>条 已选择{{pageSelect}}位患者</div> -->
108 98
     <el-table
109
-      ref="multipleTable" :data="tableData" border fit highlight-current-row  style="width: 100%;margin-top: 10px;" @selection-change="handleSelectionChange">
110
-      <!-- <el-table-column type="selection" label="全选" width="60px" align="center">
111
-        <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
112
-      </el-table-column> -->
99
+      ref="multipleTable" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :data="tableData" border fit highlight-current-row  style="width: 100%;margin-top: 10px;" @selection-change="handleSelectionChange">
113 100
       <el-table-column align="center" label="全选" width="60px" type="selection" ></el-table-column>
114 101
       <el-table-column type="index" label="序号" width="60px" align="center"></el-table-column>
115 102
       <el-table-column  label="透析号" min-width="80" property="dialysis_no" align="center"></el-table-column>
@@ -152,8 +139,13 @@
152 139
       </el-table-column>
153 140
       <el-table-column  label="操作" align="center" min-width="140">
154 141
         <template slot-scope="scope">
155
-          <el-button type="primary" icon="el-icon-edit" size="mini" @click="OpenSetLapseto(scope.row, scope.$index)">转归</el-button>
156
-          <el-button type="primary" size="mini" @click="OpenView(scope.row.name,scope.row.dialysis_no,scope.row.id)">预览</el-button>
142
+          <el-tooltip class="item" effect="dark" content="转归" placement="top">
143
+            <el-button type="primary" icon="el-icon-edit" size="small" @click="OpenSetLapseto(scope.row, scope.$index)"></el-button>
144
+          </el-tooltip>
145
+          <el-tooltip class="item" effect="dark" content="预览" placement="top">          
146
+            <el-button type="danger" icon="el-icon-tickets" size="small" @click="OpenView(scope.row.name,scope.row.dialysis_no,scope.row.id)"></el-button>
147
+          </el-tooltip>
148
+          
157 149
         </template>
158 150
       </el-table-column>
159 151
     </el-table>
@@ -257,19 +249,14 @@
257 249
   import Vue from 'vue'
258 250
   import  print from 'print-js'
259 251
   import { Base64 } from 'js-base64'
260
-  import {
261
-    uParseTime
262
-  } from '@/utils/tools'
252
+  import { uParseTime} from '@/utils/tools'
263 253
   import { log } from 'util'
254
+  import BreadCrumb from "@/xt_pages/components/bread-crumb";
264 255
   export default {
265 256
     name: 'Patient',
266
-
267
-
268
-
269
-
270
-
271
-
272
-
257
+    components:{
258
+      BreadCrumb
259
+    },
273 260
     data() {
274 261
       return {
275 262
         lapsetoRules: {