Ver código fonte

修改问题

张保健 5 anos atrás
pai
commit
281bc431e6

+ 1 - 1
src/lang/zh.js Ver arquivo

@@ -138,7 +138,7 @@ export default {
138 138
     special_permission_manage: '特殊权限管理',
139 139
     schedule_print: '排班打印',
140 140
 
141
-    warehouseReceipt: '出入库',
141
+    warehouseReceipt: '耗材出入库',
142 142
     warehouseReceiptOther: '其他出入库',
143 143
     stockInOrder: '耗材入库单',
144 144
     salesReturnOrder: '耗材退货单',

+ 22 - 11
src/router/modules/integration.js Ver arquivo

@@ -10,17 +10,28 @@ export default {
10 10
     title: 'integration_config',
11 11
     icon: 'excel'
12 12
   },
13
-  children: [
14
-    {
15
-      path: '/integration/his',
16
-      component: () => import('@/xt_pages/integration/his_config'),
17
-      name: 'his_config',
18
-      meta: {
19
-        title: 'his_config',
20
-        noCache: true,
21
-
22
-      }
23
-    },
13
+  children: [{
14
+    path: '/data/hisconfig',
15
+    component: () => import('@/xt_pages/integration/his_config'),
16
+    name: 'HIS集成',
17
+    meta: {
18
+      title: 'HIS集成'
19
+    }
20
+  }, {
21
+    path: '/data/lisconfig',
22
+    component: () => import('@/xt_pages/integration/lis_config'),
23
+    name: 'LIS集成',
24
+    meta: {
25
+      title: 'LIS集成'
26
+    }
27
+  }, {
28
+    path: '/data/sisconfig',
29
+    component: () => import('@/xt_pages/integration/sis_config'),
30
+    name: '质控集成',
31
+    meta: {
32
+      title: '质控集成'
33
+    }
34
+  }
24 35
 
25 36
   ]
26 37
 }

+ 101 - 101
src/router/modules/stock.js Ver arquivo

@@ -1,114 +1,114 @@
1
-import Layout from "@/views/layout/Layout";
1
+import Layout from '@/views/layout/Layout'
2 2
 
3 3
 export default {
4
-  path: "/stock",
4
+  path: '/stock',
5 5
   component: Layout,
6
-  redirect: "noredirect",
7
-  name: "stockManage",
6
+  redirect: 'noredirect',
7
+  name: 'stockManage',
8 8
   alwaysShow: true,
9 9
   meta: {
10
-    title: "stockManage",
11
-    icon: "stock",
10
+    title: 'stockManage',
11
+    icon: 'stock',
12 12
     isChild: true
13 13
   },
14 14
   children: [
15 15
     {
16
-      path: "/stock/warehouseReceipt/",
16
+      path: '/stock/warehouseReceipt/',
17 17
       component: Layout,
18
-      redirect: "/stock/in",
19
-      name: "warehouseReceipt",
18
+      redirect: '/stock/in',
19
+      name: 'warehouseReceipt',
20 20
       parentNum: 1,
21 21
       meta: {
22 22
         isChild: true,
23
-        title: "warehouseReceipt",
24
-        noCache: true,
23
+        title: 'warehouseReceipt',
24
+        noCache: true
25 25
 
26 26
       }
27 27
     },
28 28
     {
29
-      path: "/stock/warehouseReceiptOther/",
29
+      path: '/stock/warehouseReceiptOther/',
30 30
       component: Layout,
31
-      redirect: "/stock/in/other",
32
-      name: "warehouseReceiptOther",
31
+      redirect: '/stock/in/other',
32
+      name: 'warehouseReceiptOther',
33 33
       parentNum: 2,
34 34
       meta: {
35 35
         isChild: true,
36
-        title: "warehouseReceiptOther",
37
-        noCache: true,
36
+        title: 'warehouseReceiptOther',
37
+        noCache: true
38 38
 
39 39
       }
40 40
     },
41 41
     {
42
-      path: "/stock/in",
43
-      component: () => import("@/xt_pages/stock/stockInOrder"),
44
-      name: "stockInOrder",
42
+      path: '/stock/in',
43
+      component: () => import('@/xt_pages/stock/stockInOrder'),
44
+      name: 'stockInOrder',
45 45
       hidden: true,
46 46
       is_menu: false,
47 47
       num: 1,
48
-      meta: { title: "stockInOrder", noCache: true }
48
+      meta: { title: 'stockInOrder', noCache: true }
49 49
     },
50 50
     {
51
-      path: "/stock/return",
52
-      component: () => import("@/xt_pages/stock/salesReturnOrder"),
53
-      name: "salesReturnOrder",
51
+      path: '/stock/return',
52
+      component: () => import('@/xt_pages/stock/salesReturnOrder'),
53
+      name: 'salesReturnOrder',
54 54
       hidden: true,
55 55
       is_menu: false,
56 56
       num: 1,
57
-      meta: { title: "salesReturnOrder", noCache: true }
57
+      meta: { title: 'salesReturnOrder', noCache: true }
58 58
     },
59 59
     {
60
-      path: "/stock/out",
61
-      component: () => import("@/xt_pages/stock/stockOutOrder"),
62
-      name: "stockOutOrder",
60
+      path: '/stock/out',
61
+      component: () => import('@/xt_pages/stock/stockOutOrder'),
62
+      name: 'stockOutOrder',
63 63
       hidden: true,
64 64
       is_menu: false,
65 65
       num: 1,
66
-      meta: { title: "stockOutOrder", noCache: true }
66
+      meta: { title: 'stockOutOrder', noCache: true }
67 67
     },
68 68
     {
69
-      path: "/stock/cancel",
70
-      component: () => import("@/xt_pages/stock/cancelStockOrder"),
71
-      name: "cancelStockOrder",
69
+      path: '/stock/cancel',
70
+      component: () => import('@/xt_pages/stock/cancelStockOrder'),
71
+      name: 'cancelStockOrder',
72 72
       hidden: true,
73 73
       is_menu: false,
74 74
       num: 1,
75
-      meta: { title: "cancelStockOrder", noCache: true }
75
+      meta: { title: 'cancelStockOrder', noCache: true }
76 76
     },
77 77
     {
78
-      path: "/stock/in/other",
79
-      component: () => import("@/xt_pages/stock/otherStockInOrder"),
80
-      name: "otherStockInOrder",
78
+      path: '/stock/in/other',
79
+      component: () => import('@/xt_pages/stock/otherStockInOrder'),
80
+      name: 'otherStockInOrder',
81 81
       hidden: true,
82 82
       is_menu: false,
83 83
       num: 2,
84
-      meta: { title: "otherStockInOrder", noCache: true }
84
+      meta: { title: 'otherStockInOrder', noCache: true }
85 85
     },
86 86
     {
87
-      path: "/stock/return/other",
88
-      component: () => import("@/xt_pages/stock/otherSalesReturnOrder"),
89
-      name: "otherSalesReturnOrder",
87
+      path: '/stock/return/other',
88
+      component: () => import('@/xt_pages/stock/otherSalesReturnOrder'),
89
+      name: 'otherSalesReturnOrder',
90 90
       hidden: true,
91 91
       is_menu: false,
92 92
       num: 2,
93
-      meta: { title: "otherSalesReturnOrder", noCache: true }
93
+      meta: { title: 'otherSalesReturnOrder', noCache: true }
94 94
     },
95 95
     {
96
-      path: "/stock/out/other",
97
-      component: () => import("@/xt_pages/stock/otherStockOutOrder"),
98
-      name: "otherStockOutOrder",
96
+      path: '/stock/out/other',
97
+      component: () => import('@/xt_pages/stock/otherStockOutOrder'),
98
+      name: 'otherStockOutOrder',
99 99
       hidden: true,
100 100
       is_menu: false,
101 101
       num: 2,
102
-      meta: { title: "otherStockOutOrder", noCache: true }
102
+      meta: { title: 'otherStockOutOrder', noCache: true }
103 103
     },
104 104
     {
105
-      path: "/stock/cancel/other",
106
-      component: () => import("@/xt_pages/stock/otherCancelStockOrder"),
107
-      name: "otherCancelStockOrder",
105
+      path: '/stock/cancel/other',
106
+      component: () => import('@/xt_pages/stock/otherCancelStockOrder'),
107
+      name: 'otherCancelStockOrder',
108 108
       hidden: true,
109 109
       is_menu: false,
110 110
       num: 2,
111
-      meta: { title: "otherCancelStockOrder", noCache: true }
111
+      meta: { title: 'otherCancelStockOrder', noCache: true }
112 112
     },
113 113
     // {
114 114
     //   path: "/stock/",
@@ -161,105 +161,105 @@ export default {
161 161
     //   ]
162 162
     // },
163 163
     {
164
-      path: "/stock/query",
165
-      component: () => import("@/xt_pages/stock/stockQuery"),
166
-      name: "stockQuery",
167
-      meta: { title: "stockQuery", noCache: true }
164
+      path: '/stock/query',
165
+      component: () => import('@/xt_pages/stock/stockQuery'),
166
+      name: 'stockQuery',
167
+      meta: { title: 'stockQuery', noCache: true }
168 168
     },
169 169
     {
170
-      path: "/stock/detail",
171
-      component: () => import("@/xt_pages/stock/stockDetailIndex"),
172
-      name: "stockDetail",
173
-      meta: { title: "stockDetail", noCache: true }
170
+      path: '/stock/detail',
171
+      component: () => import('@/xt_pages/stock/stockDetailIndex'),
172
+      name: 'stockDetail',
173
+      meta: { title: 'stockDetail', noCache: true }
174 174
     },
175 175
     {
176
-      path: "/stock/in/add",
177
-      component: () => import("@/xt_pages/stock/stockInOrderAdd"),
178
-      name: "stockInOrderAdd",
176
+      path: '/stock/in/add',
177
+      component: () => import('@/xt_pages/stock/stockInOrderAdd'),
178
+      name: 'stockInOrderAdd',
179 179
       hidden: true,
180 180
       is_menu: false,
181
-      meta: { title: "stockInOrderAdd", noCache: true }
181
+      meta: { title: 'stockInOrderAdd', noCache: true }
182 182
     },
183 183
     {
184
-      path: "/stock/in/detail",
185
-      component: () => import("@/xt_pages/stock/stockInDetail"),
186
-      name: "stockInDetail",
184
+      path: '/stock/in/detail',
185
+      component: () => import('@/xt_pages/stock/stockInDetail'),
186
+      name: 'stockInDetail',
187 187
       hidden: true,
188 188
       is_menu: false,
189
-      meta: { title: "stockInDetail", noCache: true }
189
+      meta: { title: 'stockInDetail', noCache: true }
190 190
     },
191 191
     {
192
-      path: "/stock/return/detail",
193
-      component: () => import("@/xt_pages/stock/salesReturnDetail"),
194
-      name: "salesReturnDetail",
192
+      path: '/stock/return/detail',
193
+      component: () => import('@/xt_pages/stock/salesReturnDetail'),
194
+      name: 'salesReturnDetail',
195 195
       hidden: true,
196 196
       is_menu: false,
197
-      meta: { title: "salesReturnDetail", noCache: true }
197
+      meta: { title: 'salesReturnDetail', noCache: true }
198 198
     },
199 199
     {
200
-      path: "/stock/return/add",
201
-      component: () => import("@/xt_pages/stock/salesReturnOrderAdd"),
202
-      name: "salesReturnOrderAdd",
200
+      path: '/stock/return/add',
201
+      component: () => import('@/xt_pages/stock/salesReturnOrderAdd'),
202
+      name: 'salesReturnOrderAdd',
203 203
       hidden: true,
204 204
       is_menu: false,
205
-      meta: { title: "salesReturnOrderAdd", noCache: true }
205
+      meta: { title: 'salesReturnOrderAdd', noCache: true }
206 206
     },
207 207
     {
208
-      path: "/stock/out/add",
209
-      component: () => import("@/xt_pages/stock/stockOutOrderAdd"),
210
-      name: "stockOutOrderAdd",
208
+      path: '/stock/out/add',
209
+      component: () => import('@/xt_pages/stock/stockOutOrderAdd'),
210
+      name: 'stockOutOrderAdd',
211 211
       hidden: true,
212 212
       is_menu: false,
213
-      meta: { title: "stockOutOrderAdd", noCache: true }
213
+      meta: { title: 'stockOutOrderAdd', noCache: true }
214 214
     },
215 215
     {
216
-      path: "/stock/out/detail",
217
-      component: () => import("@/xt_pages/stock/stockOutDetail"),
218
-      name: "stockOutDetail",
216
+      path: '/stock/out/detail',
217
+      component: () => import('@/xt_pages/stock/stockOutDetail'),
218
+      name: 'stockOutDetail',
219 219
       hidden: true,
220 220
       is_menu: false,
221
-      meta: { title: "stockOutDetail", noCache: true }
221
+      meta: { title: 'stockOutDetail', noCache: true }
222 222
     },
223 223
     {
224
-      path: "/stock/cancel/add",
225
-      component: () => import("@/xt_pages/stock/cancelStockOrderAdd"),
226
-      name: "cancelStockOrderAdd",
224
+      path: '/stock/cancel/add',
225
+      component: () => import('@/xt_pages/stock/cancelStockOrderAdd'),
226
+      name: 'cancelStockOrderAdd',
227 227
       hidden: true,
228 228
       is_menu: false,
229
-      meta: { title: "cancelStockOrderAdd", noCache: true }
229
+      meta: { title: 'cancelStockOrderAdd', noCache: true }
230 230
     },
231 231
     {
232
-      path: "/stock/cancel/detail",
233
-      component: () => import("@/xt_pages/stock/cancelStockDetail"),
234
-      name: "cancelStockDetail",
232
+      path: '/stock/cancel/detail',
233
+      component: () => import('@/xt_pages/stock/cancelStockDetail'),
234
+      name: 'cancelStockDetail',
235 235
       hidden: true,
236 236
       is_menu: false,
237
-      meta: { title: "cancelStockDetail", noCache: true }
237
+      meta: { title: 'cancelStockDetail', noCache: true }
238 238
     },
239 239
     {
240
-      path: "/stock/config",
241
-      component: () => import("@/xt_pages/stock/index"),
242
-      name: "config",
243
-      meta: { title: "config", noCache: true }
240
+      path: '/stock/config',
241
+      component: () => import('@/xt_pages/stock/index'),
242
+      name: 'config',
243
+      meta: { title: 'config', noCache: true }
244 244
     },
245 245
     {
246
-      path: "/stock/print",
247
-      component: () => import("@/xt_pages/stock/detail/print"),
246
+      path: '/stock/print',
247
+      component: () => import('@/xt_pages/stock/detail/print'),
248 248
       hidden: true,
249 249
       is_menu: false,
250
-      name: "stock_print",
250
+      name: 'stock_print',
251 251
       meta: {
252
-        title: "库存打印",
252
+        title: '库存打印',
253 253
         noCache: true
254 254
       }
255 255
     },
256 256
     {
257
-      path: "/stock/user/detail",
258
-      component: () => import("@/xt_pages/stock/stockUserDetail"),
259
-      name: "user_detail",
257
+      path: '/stock/user/detail',
258
+      component: () => import('@/xt_pages/stock/stockUserDetail'),
259
+      name: 'user_detail',
260 260
       hidden: true,
261 261
       is_menu: false,
262
-      meta: { title: "user_detail", noCache: true }
262
+      meta: { title: 'user_detail', noCache: true }
263 263
     }
264 264
   ]
265
-};
265
+}

+ 0 - 14
src/router/modules/systems.js Ver arquivo

@@ -118,20 +118,6 @@ export default {
118 118
     meta: {
119 119
       title: 'printTemplate'
120 120
     }
121
-  }, {
122
-    path: '/data/hisconfig',
123
-    component: () => import('@/xt_pages/integration/his_config'),
124
-    name: 'hisconfig',
125
-    meta: {
126
-      title: 'HIS集成'
127
-    }
128
-  }, {
129
-    path: '/data/hisconfig',
130
-    component: () => import('@/xt_pages/integration/his_config'),
131
-    name: 'hisconfig',
132
-    meta: {
133
-      title: 'LIS集成'
134
-    }
135 121
   }
136 122
   ]
137 123
 }

+ 2 - 2
src/xt_pages/integration/his_config.vue Ver arquivo

@@ -18,9 +18,9 @@
18 18
           <el-tab-pane label="同步列表">
19 19
             <sync-list></sync-list>
20 20
           </el-tab-pane>
21
-          <el-tab-pane label="字段配置">
21
+          <!-- <el-tab-pane label="字段配置">
22 22
             <field-config></field-config>
23
-          </el-tab-pane>
23
+          </el-tab-pane> -->
24 24
         </el-tabs>
25 25
       </div>
26 26
     </div>

+ 60 - 0
src/xt_pages/integration/lis_config.vue Ver arquivo

@@ -0,0 +1,60 @@
1
+<template>
2
+  <div class="main-contain">
3
+    <div class="position">
4
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
5
+    </div>
6
+    <div class="app-container">
7
+      <div class="service-box">
8
+        <el-tabs v-model="activeName">
9
+          <el-tab-pane label="接口配置" name="first">
10
+            <interface-config></interface-config>
11
+          </el-tab-pane>
12
+          <el-tab-pane label="同步列表">
13
+            <sync-list></sync-list>
14
+          </el-tab-pane>
15
+          <el-tab-pane label="字段配置">
16
+            <field-config></field-config>
17
+          </el-tab-pane>
18
+        </el-tabs>
19
+      </div>
20
+    </div>
21
+  </div>
22
+</template>
23
+
24
+<script>
25
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
26
+  import InterfaceConfig from './his/interfaceConfig'
27
+  import SyncList from './his/syncList'
28
+  import FieldConfig from './his/fieldConfig'
29
+
30
+  export default {
31
+    name: 'his_config',
32
+    components: {
33
+      InterfaceConfig,
34
+      SyncList,
35
+      FieldConfig,
36
+      BreadCrumb
37
+    },
38
+    data() {
39
+      return {
40
+        crumbs: [
41
+          { path: false, name: '集成配置' },
42
+          { path: '/integration/his', name: 'HIS集成配置' }
43
+        ],
44
+        activeName: 'first'
45
+
46
+      }
47
+    },
48
+    methods: {
49
+      handleClick(tab, event) {
50
+        console.log(tab, event, this.activeName)
51
+      }
52
+    }
53
+  }
54
+</script>
55
+
56
+
57
+
58
+
59
+
60
+

+ 60 - 0
src/xt_pages/integration/sis_config.vue Ver arquivo

@@ -0,0 +1,60 @@
1
+<template>
2
+  <div class="main-contain">
3
+    <div class="position">
4
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
5
+    </div>
6
+    <div class="app-container">
7
+      <div class="service-box">
8
+        <el-tabs v-model="activeName">
9
+          <el-tab-pane label="接口配置" name="first">
10
+            <interface-config></interface-config>
11
+          </el-tab-pane>
12
+          <el-tab-pane label="同步列表">
13
+            <sync-list></sync-list>
14
+          </el-tab-pane>
15
+          <!-- <el-tab-pane label="字段配置">
16
+            <field-config></field-config>
17
+          </el-tab-pane> -->
18
+        </el-tabs>
19
+      </div>
20
+    </div>
21
+  </div>
22
+</template>
23
+
24
+<script>
25
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
26
+  import InterfaceConfig from './his/interfaceConfig'
27
+  import SyncList from './his/syncList'
28
+  import FieldConfig from './his/fieldConfig'
29
+
30
+  export default {
31
+    name: 'his_config',
32
+    components: {
33
+      InterfaceConfig,
34
+      SyncList,
35
+      FieldConfig,
36
+      BreadCrumb
37
+    },
38
+    data() {
39
+      return {
40
+        crumbs: [
41
+          { path: false, name: '集成配置' },
42
+          { path: '/integration/his', name: 'HIS集成配置' }
43
+        ],
44
+        activeName: 'first'
45
+
46
+      }
47
+    },
48
+    methods: {
49
+      handleClick(tab, event) {
50
+        console.log(tab, event, this.activeName)
51
+      }
52
+    }
53
+  }
54
+</script>
55
+
56
+
57
+
58
+
59
+
60
+