修改了登录页面和首页

api/index.js

@@ -67,6 +67,7 @@ export { default as staffTask } from './staff/staffTask'
 export { default as car } from './res/car'
 export { default as onlFormHead } from './online/onlFormHead'
 export { default as testValueExtend } from './drug/testValueExtend'
+export { default as drugStatistics } from './drug/drugStatistics'
 /**
  * 字典
  */

package.json

@@ -23,6 +23,7 @@
     "cross-env": "^5.2.0",
     "dateformat": "^3.0.3",
     "dhtmlx-gantt": "^7.0.0",
+    "echarts": "^4.8.0",
     "element-ui": "2.13.0",
     "extend": "^3.0.2",
     "extract-text-webpack-plugin": "^4.0.0-beta.0",

pages/drug-register/product/sample-manage/SampleItemList.vue

@@ -265,11 +265,18 @@ export default {
       }
     },
     _init() {
+      this.getPage = {
+        total: 0,
+        size: 50,
+        records: []
+      }
       this.getPage.records = []
       this.getPage.total = 0
       this.$refs.pageTable._initTable()
+      // this.getPage.records = []
+      // this.getPage.total = 0
+      // this.$refs.pageTable._initTable()
     },
-
     _importItem() {
       this.$refs.relItemModal._open(this.catalogueId)
     },

pages/drug-sample-keep/tabs/preparationManageHistory.vue

@@ -46,7 +46,10 @@
           :fixed="item.fixed?item.fixed:undefined"
         >
           <template slot-scope="scope" @click.stop="_handleIndex(scope)">
-            <span v-if="item.datetime">
+            <span v-if="item.datetime" @click="_handleIndex(scope)">
+              {{ scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd HH:MM:ss'):'' }}
+            </span>
+            <span v-else-if="item.data">
               {{ scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd HH:MM:ss'):'' }}
             </span>
             <span v-else-if="item.key === 'status'">
@@ -101,7 +104,7 @@ export default {
         {
           title: '开始留样时间',
           key: 'ctime',
-          width: 120,
+          width: 160,
           data: true,
           align: 'center'
         },
@@ -166,6 +169,7 @@ export default {
       }
     },
     _handleIndex(data) {
+      console.log(data)
       this.currentIndex = data.$index
     },
     _tableResultChange(msg, data) {

pages/oos/oos-check/tabs/OosPlanCheckHis.vue

@@ -41,11 +41,14 @@
       </Form>
       </Col>
       <!--按钮-->
-      <Col span="24" />
+<!--      <Col span="24" />-->
+<!--      <btn-list :msg="btn" :open="searchOpen" show-search-btn="true" @on-result-change="_btnClick" />-->
+<!--      </Col>-->
+      <Col span="24">
         <btn-list :msg="btn" :open="searchOpen" show-search-btn="true" @on-result-change="_btnClick" />
       </Col>
       <!--table-->
-      <Col span="24" />
+      <Col span="24">
       <element-table
         ref="pageTable"
         :page-columns="pageColumns"
@@ -181,6 +184,7 @@ export default {
           this._endByIds()
           break
         case 'search':
+          console.log('点击了收起搜索')
           this.searchOpen = !this.searchOpen
           break
       }

router/drug-routes.js

@@ -11,6 +11,7 @@ import drugConsumeRouters from '../router/drug-consume-routes'
 import drugOosRouters from '../router/drug-oos-routes'
 import staffRouters from '../router/staff-routes'
 import frameRouters from '../router/frame-routes'
+import statisticRouters from '../router/drug-statistic-routes'
 
 export default [
   {
@@ -66,5 +67,11 @@ export default [
     path: 'frame',
     component: blank,
     children: frameRouters
+  },
+  {
+    meta: { title: '统计查询' },
+    path: 'statistics',
+    component: blank,
+    children: statisticRouters
   }
 ]

router/routes.js

@@ -15,16 +15,16 @@ import flowFormRoutes from './flowform-routes'
 export default [
   { path: '/lock', name: 'Lock', component: lock, meta: { allowBack: false } },
   {
-    path: '/',
-    component: index,
-    children: [{ path: '/', meta: { title: '首页' } }]
-  },
-  {
     path: '/login',
     component: login,
     meta: { allowBack: false }
   },
   {
+    path: '/',
+    component: index,
+    children: [{ path: '/', meta: { title: '首页' } }]
+  },
+  {
     path: '/sys',
     component: blank,
     children: sysRouters,