See999 4 years ago
parent
commit
3ade717093

+ 4 - 1
src/App.vue View File

59
             if (navigator.onLine == false) {
59
             if (navigator.onLine == false) {
60
               this.showWsErr = true;
60
               this.showWsErr = true;
61
               this.wsErrMsg = "网络已断开,请检查网络后重新打开页面";
61
               this.wsErrMsg = "网络已断开,请检查网络后重新打开页面";
62
+              alert(this.wsErrMsg)
62
               console.log('navigator',navigator)
63
               console.log('navigator',navigator)
63
             } else if (
64
             } else if (
64
               navigator.onLine == true &&
65
               navigator.onLine == true &&
70
           }, 3000);
71
           }, 3000);
71
         }
72
         }
72
         
73
         
73
-      })
74
+      }).catch(error => {
75
+          window.location.href = error.response.data.redirect;
76
+        });
74
     }
77
     }
75
   },
78
   },
76
   
79
   

+ 17 - 1
src/router/index.js View File

100
     }
100
     }
101
   }]
101
   }]
102
 },
102
 },
103
+{
104
+  path: '/kuyiShopping',
105
+  component: Layout,
106
+  name:'kuyiShopping',
107
+  redirct: '/kuyiShopping/index',
108
+  children: [{
109
+    path: '/kuyiShopping/index',
110
+    component: () => import('@/xt_pages/kuyiShopping/index'),
111
+    name: 'kuyiShopping',
112
+    meta: {
113
+      title: 'kuyiShopping',
114
+      icon: 'kuyiShopping',
115
+      noCache: true
116
+    }
117
+  }]
118
+},
103
 service
119
 service
104
   // patient,
120
   // patient,
105
   // workforce,
121
   // workforce,
149
   outpatientDoctorStation,
165
   outpatientDoctorStation,
150
   outpatientCharges,
166
   outpatientCharges,
151
   outpatientPharmacy,
167
   outpatientPharmacy,
152
-  kuyiShopping,
168
+  // kuyiShopping,
153
   integration,
169
   integration,
154
 ]
170
 ]
155
 
171
 

+ 1 - 1
src/router/modules/kuyiShopping.js View File

6
     name:'kuyiShopping',
6
     name:'kuyiShopping',
7
     redirct: '/kuyiShopping/index',
7
     redirct: '/kuyiShopping/index',
8
     children: [{
8
     children: [{
9
-      path: '/kuyiShopping',
9
+      path: '/kuyiShopping/index',
10
       component: () => import('@/xt_pages/kuyiShopping/index'),
10
       component: () => import('@/xt_pages/kuyiShopping/index'),
11
       name: 'kuyiShopping',
11
       name: 'kuyiShopping',
12
       meta: {
12
       meta: {

+ 2 - 1
src/views/layout/Layout.vue View File

193
     },
193
     },
194
     clickActive(index,title){
194
     clickActive(index,title){
195
       if(index == 4){
195
       if(index == 4){
196
-        this.$router.push('/kuyiShopping')
196
+        // this.$router.push({ path: "/kuyiShopping",name:"kuyiShopping" })
197
+        this.$router.push('/kuyiShopping/index')
197
       }else if(index == 6){
198
       }else if(index == 6){
198
         this.CDMWebsit()
199
         this.CDMWebsit()
199
       }
200
       }

+ 1 - 1
src/xt_pages/kuyiShopping/index.vue View File

1
 <template>
1
 <template>
2
-    <div style="width:100%;height:100%;">
2
+    <div class="page-kuyiShopping" style="width:100%;height:100%;">
3
         <iframe style="width:100%;height:100%;" src="http://market.kuyicloud.com/app/index.php?i=2&c=entry&m=ewei_shopv2&do=mobile&r=pc" frameborder="0"></iframe>
3
         <iframe style="width:100%;height:100%;" src="http://market.kuyicloud.com/app/index.php?i=2&c=entry&m=ewei_shopv2&do=mobile&r=pc" frameborder="0"></iframe>
4
     </div>
4
     </div>
5
 </template>
5
 </template>

+ 3 - 1
src/xt_pages/outpatientRegistration/index.vue View File

286
         },
286
         },
287
         getForm(){
287
         getForm(){
288
             this.form.total = this.total
288
             this.form.total = this.total
289
-            // console.log(this.form)
289
+            // console.log(new Date(new Date().toLocaleDateString()).getTime() / 1000)
290
             // console.log(JSON.parse(localStorage.getItem("temp")))
290
             // console.log(JSON.parse(localStorage.getItem("temp")))
291
             if(localStorage.getItem("temp")){
291
             if(localStorage.getItem("temp")){
292
                 let a = JSON.parse(localStorage.getItem("temp"))
292
                 let a = JSON.parse(localStorage.getItem("temp"))
293
                 // let arr = []
293
                 // let arr = []
294
+                this.form.create_time = new Date(new Date().toLocaleDateString()).getTime() / 1000
294
                 a.push(this.form)
295
                 a.push(this.form)
295
                 console.log(111,a)
296
                 console.log(111,a)
296
                 localStorage.setItem("temp",JSON.stringify(a));
297
                 localStorage.setItem("temp",JSON.stringify(a));
300
                 this.$message({message: '添加成功',type: 'success'});
301
                 this.$message({message: '添加成功',type: 'success'});
301
             }else {
302
             }else {
302
                 let arr = []
303
                 let arr = []
304
+                this.form.create_time = new Date(new Date().toLocaleDateString()).getTime() / 1000
303
                 arr.push(this.form)
305
                 arr.push(this.form)
304
                 localStorage.setItem("temp",JSON.stringify(arr));
306
                 localStorage.setItem("temp",JSON.stringify(arr));
305
                 Object.keys(this.form).forEach((key)=>{
307
                 Object.keys(this.form).forEach((key)=>{

+ 70 - 18
src/xt_pages/outpatientRegistration/registrationHistory.vue View File

9
                 <el-button style="margin-right:10px;" class="filter-item" type="primary" icon="el-icon-search" @click="searchAction">搜索</el-button>
9
                 <el-button style="margin-right:10px;" class="filter-item" type="primary" icon="el-icon-search" @click="searchAction">搜索</el-button>
10
                 <el-date-picker
10
                 <el-date-picker
11
                 v-model="value1"
11
                 v-model="value1"
12
+                @change="changeTime"
12
                 style="margin-right:10px;"
13
                 style="margin-right:10px;"
13
                 type="daterange"
14
                 type="daterange"
14
                 range-separator="-"
15
                 range-separator="-"
15
                 start-placeholder="开始日期"
16
                 start-placeholder="开始日期"
16
                 end-placeholder="结束日期">
17
                 end-placeholder="结束日期">
17
                 </el-date-picker>
18
                 </el-date-picker>
18
-                <label class="title"><span class="name">挂号类型</span> : </label>
19
+                <!-- <label class="title"><span class="name">挂号类型</span> : </label>
19
                 <el-select v-model="value" placeholder="请选择" style="width:150px;">
20
                 <el-select v-model="value" placeholder="请选择" style="width:150px;">
20
                     <el-option
21
                     <el-option
21
                     v-for="item in options"
22
                     v-for="item in options"
23
                     :label="item.label"
24
                     :label="item.label"
24
                     :value="item.value">
25
                     :value="item.value">
25
                     </el-option>
26
                     </el-option>
26
-                </el-select>
27
+                </el-select> -->
27
             </div>
28
             </div>
28
             <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
29
             <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
29
                 <el-table-column align="center" type="index" label="序号" width="60">
30
                 <el-table-column align="center" type="index" label="序号" width="60">
30
                 </el-table-column>
31
                 </el-table-column>
31
                 <el-table-column align="center" prop="name" label="时间" width="100">
32
                 <el-table-column align="center" prop="name" label="时间" width="100">
32
-                    <template slot-scope="scope">{{ scope.row.date }}</template>
33
+                    <template slot-scope="scope">{{ scope.row.create_time }}</template>
33
                 </el-table-column>
34
                 </el-table-column>
34
                 <el-table-column align="center" prop="dialysis_no" label="姓名" width="80">
35
                 <el-table-column align="center" prop="dialysis_no" label="姓名" width="80">
35
-                    <template slot-scope="scope">{{scope.row.name}}</template>
36
+                    <template slot-scope="scope">{{scope.row.name }}</template>
36
                 </el-table-column>
37
                 </el-table-column>
37
                 <el-table-column align="center" prop="name" label="科室" width="80">
38
                 <el-table-column align="center" prop="name" label="科室" width="80">
38
-                    <template slot-scope="scope">{{ scope.row.name }}</template>
39
+                    <template slot-scope="scope">{{ scope.row.department }}</template>
39
                 </el-table-column>
40
                 </el-table-column>
40
                 <el-table-column align="center" prop="name" label="挂号类型" width="90">
41
                 <el-table-column align="center" prop="name" label="挂号类型" width="90">
41
-                    <template slot-scope="scope">{{ scope.row.name }}</template>
42
+                    <template slot-scope="scope">
43
+                        <span v-if="scope.row.register == 1">普通</span>
44
+                        <span v-if="scope.row.register == 2">主治</span>
45
+                        <span v-if="scope.row.register == 3">主任</span>
46
+                        <span v-if="scope.row.register == 4">免收诊金</span>
47
+                        <span v-if="scope.row.register == 5">专家</span>
48
+                    </template>
42
                 </el-table-column>
49
                 </el-table-column>
43
                 <el-table-column align="center" prop="name" label="就诊号" width="80">
50
                 <el-table-column align="center" prop="name" label="就诊号" width="80">
44
-                    <template slot-scope="scope">{{ scope.row.name }}</template>
51
+                    <template slot-scope="scope"></template>
45
                 </el-table-column>
52
                 </el-table-column>
46
                 <el-table-column align="center" prop="name" label="证件号">
53
                 <el-table-column align="center" prop="name" label="证件号">
47
-                    <template slot-scope="scope">782319204827282917</template>
54
+                    <template slot-scope="scope">{{ scope.row.idCard }}</template>
48
                 </el-table-column>
55
                 </el-table-column>
49
-                <el-table-column align="center" prop="name" label="患者保险类型" width="80">
50
-                    <template slot-scope="scope">{{ scope.row.name }}</template>
56
+                <el-table-column align="center" label="患者保险类型" width="80">
57
+                    <!-- <template slot-scope="scope">{{ scope.row.name }}</template> -->
51
                 </el-table-column>
58
                 </el-table-column>
52
                 <el-table-column align="center" prop="name" label="医生" width="80">
59
                 <el-table-column align="center" prop="name" label="医生" width="80">
53
-                    <template slot-scope="scope">{{ scope.row.name }}</template>
60
+                    <template slot-scope="scope">{{ scope.row.doctor }}</template>
54
                 </el-table-column>
61
                 </el-table-column>
55
                 <el-table-column align="center" prop="name" label="挂号费" width="70">
62
                 <el-table-column align="center" prop="name" label="挂号费" width="70">
56
-                    <template slot-scope="scope">{{ scope.row.name }}</template>
63
+                    <template slot-scope="scope">{{ scope.row.registrationFee }}</template>
57
                 </el-table-column>
64
                 </el-table-column>
58
                 <el-table-column align="center" prop="name" label="诊疗费" width="70">
65
                 <el-table-column align="center" prop="name" label="诊疗费" width="70">
59
-                    <template slot-scope="scope">{{ scope.row.name }}</template>
66
+                    <template slot-scope="scope">{{ scope.row.medicalExpenses }}</template>
60
                 </el-table-column>
67
                 </el-table-column>
61
                 <el-table-column align="center" prop="name" label="工本费" width="70">
68
                 <el-table-column align="center" prop="name" label="工本费" width="70">
62
-                    <template slot-scope="scope">{{ scope.row.name }}</template>
69
+                    <template slot-scope="scope">{{ scope.row.cost }}</template>
63
                 </el-table-column>
70
                 </el-table-column>
64
                 <el-table-column align="center" prop="name" label="操作人" width="70">
71
                 <el-table-column align="center" prop="name" label="操作人" width="70">
65
-                    <template slot-scope="scope">{{ scope.row.name }}</template>
72
+                    <template slot-scope="scope">{{ $store.getters.xt_user.org.org_name }}</template>
66
                 </el-table-column>
73
                 </el-table-column>
67
                 <el-table-column align="center" prop="name" label="操作" width="80">
74
                 <el-table-column align="center" prop="name" label="操作" width="80">
68
                     <template slot-scope="scope">
75
                     <template slot-scope="scope">
69
-                        <el-button size="mini" type="primary">编辑</el-button>
76
+                        <!-- <el-button size="mini" type="primary">编辑</el-button> -->
77
+                        <span>已就诊</span>
70
                     </template>
78
                     </template>
71
                 </el-table-column>
79
                 </el-table-column>
72
             </el-table>
80
             </el-table>
73
 
81
 
74
-            <el-pagination
82
+            <!-- <el-pagination
75
                 @size-change="handleSizeChange"
83
                 @size-change="handleSizeChange"
76
                 @current-change="handleCurrentChange"
84
                 @current-change="handleCurrentChange"
77
                 :page-sizes="[10, 50, 100]"
85
                 :page-sizes="[10, 50, 100]"
81
                 layout="total, sizes, prev, pager, next, jumper"
89
                 layout="total, sizes, prev, pager, next, jumper"
82
                 :total="total"
90
                 :total="total"
83
             >
91
             >
84
-            </el-pagination>
92
+            </el-pagination> -->
85
         </div>
93
         </div>
86
     </div>
94
     </div>
87
 </template>
95
 </template>
88
 
96
 
89
 <script>
97
 <script>
98
+const moment = require('moment')
90
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
99
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
91
 export default {
100
 export default {
92
     components:{
101
     components:{
98
                 { path: false, name: '门诊挂号' },
107
                 { path: false, name: '门诊挂号' },
99
                 { path: false, name: '挂号历史' }
108
                 { path: false, name: '挂号历史' }
100
             ],
109
             ],
110
+            search_input:'',
101
             value1:'',
111
             value1:'',
102
             tableData: [{
112
             tableData: [{
103
             date: '2016-05-02',
113
             date: '2016-05-02',
117
             address: '上海市普陀区金沙江路 1516 弄'
127
             address: '上海市普陀区金沙江路 1516 弄'
118
             }]
128
             }]
119
         }
129
         }
130
+    },
131
+    created(){
132
+        let a = JSON.parse(localStorage.getItem("temp"))
133
+        a.map(item => {
134
+            item.create_time = moment(item.create_time * 1000).format('YYYY-MM-DD')
135
+        })
136
+        console.log('aaaaaaaaaaaaaa',a)
137
+        this.tableData = a
138
+    },
139
+    methods:{
140
+        searchAction(){
141
+            let arr = this.tableData
142
+            let a = []
143
+            arr.map(item => {
144
+                if(item.name.indexOf(this.search_input) > -1){
145
+                    a.push(item)
146
+                }
147
+            })
148
+            this.tableData = a
149
+        },
150
+        changeTime(val){
151
+            let arr = JSON.parse(localStorage.getItem("temp"))
152
+            arr.map(item => {
153
+                item.create_time = moment(item.create_time * 1000).format('YYYY-MM-DD')
154
+            })
155
+            this.tableData = arr
156
+            console.log(new Date(val[0]).getTime() / 1000)
157
+            console.log(new Date(val[1]).getTime() / 1000)
158
+            let arr1 = this.tableData
159
+            let a = []
160
+            arr1.map(item => {
161
+                // if(new Date(val[0]).getTime() / 1000){
162
+                //     a.push(item)
163
+                // }
164
+                if(new Date(item.create_time).getTime() / 1000 > new Date(val[0]).getTime() / 1000 && new Date(item.create_time).getTime() / 1000 < new Date(val[1]).getTime() / 1000){
165
+                    a.push(item)
166
+                }
167
+                console.log()
168
+            })
169
+            this.tableData = a
170
+        }
171
+
120
     }
172
     }
121
 }
173
 }
122
 </script>
174
 </script>