1

src/App.vue

@@ -59,6 +59,7 @@ export default {
             if (navigator.onLine == false) {
               this.showWsErr = true;
               this.wsErrMsg = "网络已断开，请检查网络后重新打开页面";
+              alert(this.wsErrMsg)
               console.log('navigator',navigator)
             } else if (
               navigator.onLine == true &&
@@ -70,7 +71,9 @@ export default {
           }, 3000);
         }
         
-      })
+      }).catch(error => {
+          window.location.href = error.response.data.redirect;
+        });
     }
   },
   

src/router/index.js

@@ -100,6 +100,22 @@ var _constant_router_map = [{
     }
   }]
 },
+{
+  path: '/kuyiShopping',
+  component: Layout,
+  name:'kuyiShopping',
+  redirct: '/kuyiShopping/index',
+  children: [{
+    path: '/kuyiShopping/index',
+    component: () => import('@/xt_pages/kuyiShopping/index'),
+    name: 'kuyiShopping',
+    meta: {
+      title: 'kuyiShopping',
+      icon: 'kuyiShopping',
+      noCache: true
+    }
+  }]
+},
 service
   // patient,
   // workforce,
@@ -149,7 +165,7 @@ var _asy_router_map = [
   outpatientDoctorStation,
   outpatientCharges,
   outpatientPharmacy,
-  kuyiShopping,
+  // kuyiShopping,
   integration,
 ]
 

src/router/modules/kuyiShopping.js

@@ -6,7 +6,7 @@ export default {
     name:'kuyiShopping',
     redirct: '/kuyiShopping/index',
     children: [{
-      path: '/kuyiShopping',
+      path: '/kuyiShopping/index',
       component: () => import('@/xt_pages/kuyiShopping/index'),
       name: 'kuyiShopping',
       meta: {

src/views/layout/Layout.vue

@@ -193,7 +193,8 @@ export default {
     },
     clickActive(index,title){
       if(index == 4){
-        this.$router.push('/kuyiShopping')
+        // this.$router.push({ path: "/kuyiShopping",name:"kuyiShopping" })
+        this.$router.push('/kuyiShopping/index')
       }else if(index == 6){
         this.CDMWebsit()
       }

src/xt_pages/kuyiShopping/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <div style="width:100%;height:100%;">
+    <div class="page-kuyiShopping" style="width:100%;height:100%;">
         <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>
     </div>
 </template>

src/xt_pages/outpatientRegistration/index.vue

@@ -286,11 +286,12 @@ export default {
         },
         getForm(){
             this.form.total = this.total
-            // console.log(this.form)
+            // console.log(new Date(new Date().toLocaleDateString()).getTime() / 1000)
             // console.log(JSON.parse(localStorage.getItem("temp")))
             if(localStorage.getItem("temp")){
                 let a = JSON.parse(localStorage.getItem("temp"))
                 // let arr = []
+                this.form.create_time = new Date(new Date().toLocaleDateString()).getTime() / 1000
                 a.push(this.form)
                 console.log(111,a)
                 localStorage.setItem("temp",JSON.stringify(a));
@@ -300,6 +301,7 @@ export default {
                 this.$message({message: '添加成功',type: 'success'});
             }else {
                 let arr = []
+                this.form.create_time = new Date(new Date().toLocaleDateString()).getTime() / 1000
                 arr.push(this.form)
                 localStorage.setItem("temp",JSON.stringify(arr));
                 Object.keys(this.form).forEach((key)=>{

src/xt_pages/outpatientRegistration/registrationHistory.vue

@@ -9,13 +9,14 @@
                 <el-button style="margin-right:10px;" class="filter-item" type="primary" icon="el-icon-search" @click="searchAction">搜索</el-button>
                 <el-date-picker
                 v-model="value1"
+                @change="changeTime"
                 style="margin-right:10px;"
                 type="daterange"
                 range-separator="-"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期">
                 </el-date-picker>
-                <label class="title"><span class="name">挂号类型</span> : </label>
+                <!-- <label class="title"><span class="name">挂号类型</span> : </label>
                 <el-select v-model="value" placeholder="请选择" style="width:150px;">
                     <el-option
                     v-for="item in options"
@@ -23,55 +24,62 @@
                     :label="item.label"
                     :value="item.value">
                     </el-option>
-                </el-select>
+                </el-select> -->
             </div>
             <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>
                 <el-table-column align="center" type="index" label="序号" width="60">
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="时间" width="100">
-                    <template slot-scope="scope">{{ scope.row.date }}</template>
+                    <template slot-scope="scope">{{ scope.row.create_time }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="dialysis_no" label="姓名" width="80">
-                    <template slot-scope="scope">{{scope.row.name}}</template>
+                    <template slot-scope="scope">{{scope.row.name }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="科室" width="80">
-                    <template slot-scope="scope">{{ scope.row.name }}</template>
+                    <template slot-scope="scope">{{ scope.row.department }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="挂号类型" width="90">
-                    <template slot-scope="scope">{{ scope.row.name }}</template>
+                    <template slot-scope="scope">
+                        <span v-if="scope.row.register == 1">普通</span>
+                        <span v-if="scope.row.register == 2">主治</span>
+                        <span v-if="scope.row.register == 3">主任</span>
+                        <span v-if="scope.row.register == 4">免收诊金</span>
+                        <span v-if="scope.row.register == 5">专家</span>
+                    </template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="就诊号" width="80">
-                    <template slot-scope="scope">{{ scope.row.name }}</template>
+                    <template slot-scope="scope"></template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="证件号">
-                    <template slot-scope="scope">782319204827282917</template>
+                    <template slot-scope="scope">{{ scope.row.idCard }}</template>
                 </el-table-column>
-                <el-table-column align="center" prop="name" label="患者保险类型" width="80">
-                    <template slot-scope="scope">{{ scope.row.name }}</template>
+                <el-table-column align="center" label="患者保险类型" width="80">
+                    <!-- <template slot-scope="scope">{{ scope.row.name }}</template> -->
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="医生" width="80">
-                    <template slot-scope="scope">{{ scope.row.name }}</template>
+                    <template slot-scope="scope">{{ scope.row.doctor }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="挂号费" width="70">
-                    <template slot-scope="scope">{{ scope.row.name }}</template>
+                    <template slot-scope="scope">{{ scope.row.registrationFee }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="诊疗费" width="70">
-                    <template slot-scope="scope">{{ scope.row.name }}</template>
+                    <template slot-scope="scope">{{ scope.row.medicalExpenses }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="工本费" width="70">
-                    <template slot-scope="scope">{{ scope.row.name }}</template>
+                    <template slot-scope="scope">{{ scope.row.cost }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="操作人" width="70">
-                    <template slot-scope="scope">{{ scope.row.name }}</template>
+                    <template slot-scope="scope">{{ $store.getters.xt_user.org.org_name }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="操作" width="80">
                     <template slot-scope="scope">
-                        <el-button size="mini" type="primary">编辑</el-button>
+                        <!-- <el-button size="mini" type="primary">编辑</el-button> -->
+                        <span>已就诊</span>
                     </template>
                 </el-table-column>
             </el-table>
 
-            <el-pagination
+            <!-- <el-pagination
                 @size-change="handleSizeChange"
                 @current-change="handleCurrentChange"
                 :page-sizes="[10, 50, 100]"
@@ -81,12 +89,13 @@
                 layout="total, sizes, prev, pager, next, jumper"
                 :total="total"
             >
-            </el-pagination>
+            </el-pagination> -->
         </div>
     </div>
 </template>
 
 <script>
+const moment = require('moment')
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 export default {
     components:{
@@ -98,6 +107,7 @@ export default {
                 { path: false, name: '门诊挂号' },
                 { path: false, name: '挂号历史' }
             ],
+            search_input:'',
             value1:'',
             tableData: [{
             date: '2016-05-02',
@@ -117,6 +127,48 @@ export default {
             address: '上海市普陀区金沙江路 1516 弄'
             }]
         }
+    },
+    created(){
+        let a = JSON.parse(localStorage.getItem("temp"))
+        a.map(item => {
+            item.create_time = moment(item.create_time * 1000).format('YYYY-MM-DD')
+        })
+        console.log('aaaaaaaaaaaaaa',a)
+        this.tableData = a
+    },
+    methods:{
+        searchAction(){
+            let arr = this.tableData
+            let a = []
+            arr.map(item => {
+                if(item.name.indexOf(this.search_input) > -1){
+                    a.push(item)
+                }
+            })
+            this.tableData = a
+        },
+        changeTime(val){
+            let arr = JSON.parse(localStorage.getItem("temp"))
+            arr.map(item => {
+                item.create_time = moment(item.create_time * 1000).format('YYYY-MM-DD')
+            })
+            this.tableData = arr
+            console.log(new Date(val[0]).getTime() / 1000)
+            console.log(new Date(val[1]).getTime() / 1000)
+            let arr1 = this.tableData
+            let a = []
+            arr1.map(item => {
+                // if(new Date(val[0]).getTime() / 1000){
+                //     a.push(item)
+                // }
+                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){
+                    a.push(item)
+                }
+                console.log()
+            })
+            this.tableData = a
+        }
+
     }
 }
 </script>