Преглед на файлове

Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

28169 преди 7 месеца
родител
ревизия
e69467dfaf

+ 1 - 0
src/lang/en.js Целия файл

@@ -130,6 +130,7 @@ export default {
130 130
     objectRegistration:'objectRegistration',
131 131
     Dialysisanalysis:'Dialysisanalysis',
132 132
     eleFaPiao:'eleFaPiao',
133
+
133 134
   },
134 135
   navbar: {
135 136
     logOut: 'Log Out',

+ 5 - 0
src/lang/zh.js Целия файл

@@ -313,6 +313,11 @@ export default {
313 313
     patientSettleDetail:"患者结算列表",
314 314
     fapiao:"电子发票列表",
315 315
 
316
+    drugStock:"药品盘存",
317
+    drugChange:"药品变更",
318
+    drugQuery:"药品查询",
319
+    drugCodeQuery:"药品追溯",
320
+    drugSourceCode:"药品追溯"
316 321
   },
317 322
   navbar: {
318 323
     logOut: '退出登录',

+ 3 - 0
src/router/index.js Целия файл

@@ -38,6 +38,8 @@ import hospitalCharges from './modules/hospitalCharges'
38 38
 import DepositManagement from './modules/DepositManagement'
39 39
 import hisTool from './modules/hisTool'
40 40
 import eleFaPiao from './modules/eleFaPiao'
41
+import drugSourceCode from './modules/drugSourceCode'
42
+
41 43
 
42 44
 import supply from './modules/supply'
43 45
 
@@ -210,6 +212,7 @@ var _asy_router_map = [
210 212
   Dialysisanalysis,// 新菜单6.1
211 213
   DialysisIndex,
212 214
   DialysisLogIndex,
215
+  drugSourceCode
213 216
 ]
214 217
 
215 218
 var is_asy_router = process.env.NODE_ENV === 'production' // true; 设置为 true 强制进行路由验证

+ 43 - 0
src/router/modules/drugSourceCode.js Целия файл

@@ -0,0 +1,43 @@
1
+import Layout from '@/views/layout/Layout'
2
+
3
+
4
+export default {
5
+  path: '/drugSourceCode',
6
+  component: Layout,
7
+  redirect: 'noredirect',
8
+  name: 'drugSourceCode',
9
+  alwaysShow: true,
10
+  meta: {
11
+    title: 'drugSourceCode',
12
+    icon: 'drugSourceCode',
13
+    isChild: true
14
+  },
15
+  children: [
16
+    {
17
+      path: '/drugSourceCode/drugStock',
18
+      component: () => import('@/xt_pages/drugSourceCode/drugStock'),
19
+      name: 'drugStock',
20
+      meta: { title: 'drugStock', noCache: true }
21
+    },
22
+    {
23
+      path: '/drugSourceCode/drugChange',
24
+      component: () => import('@/xt_pages/drugSourceCode/drugStock'),
25
+      name: 'drugChange',
26
+      meta: { title: 'drugChange', noCache: true },
27
+    },
28
+    {
29
+      path: '/drugSourceCode/drugQuery',
30
+      component: () => import('@/xt_pages/drugSourceCode/drugQuery'),
31
+      name: 'drugQuery',
32
+      meta: { title: 'drugQuery', noCache: true },
33
+    },
34
+    {
35
+      path: '/drugSourceCode/drugCodeQuery',
36
+      component: () => import('@/xt_pages/drugSourceCode/drugCodeQuery'),
37
+      name: 'drugCodeQuery',
38
+      meta: { title: 'drugCodeQuery', noCache: true },
39
+    },
40
+
41
+
42
+  ]
43
+}

+ 0 - 37
src/router/modules/hisTool.js Целия файл

@@ -176,43 +176,6 @@ export default {
176 176
       meta: { title: 'orgExportData', noCache: true }
177 177
     },
178 178
 
179
-        { //药品盘存
180
-          path: '/outpatientTool/drugStock',
181
-          component: () => import('@/xt_pages/outpatientTool/drugStock'),
182
-          name: 'drugStock',
183
-          meta: {
184
-            title: '药品盘存',
185
-            noCache: true
186
-          }
187
-        },
188
-        {//药品变更
189
-          path: '/outpatientTool/drugChange',
190
-          component: () => import('@/xt_pages/outpatientTool/drugChange'),
191
-          name: 'drugChange',
192
-          meta: {
193
-            title: '药品变更',
194
-            noCache: true
195
-          }
196
-        },
197
-        {//药品查询
198
-          path: '/outpatientTool/drugQuery',
199
-          component: () => import('@/xt_pages/outpatientTool/drugQuery'),
200
-          name: 'drugQuery',
201
-          meta: {
202
-            title: '药品查询',
203
-            noCache: true
204
-          },
205
-        },
206
-        //药品查询
207
-        {
208
-          path: '/outpatientTool/drugCodeQuery',
209
-          component: () => import('@/xt_pages/outpatientTool/drugCodeQuery'),
210
-          name: 'drugCodeQuery',
211
-          meta: {
212
-            title: '药品追溯',
213
-            noCache: true
214
-          },
215
-        },
216 179
     // {
217 180
     //   path: '/fapiao/settle',
218 181
     //   component: () => import('@/xt_pages/fapiao/settleDetail'),

+ 1 - 1
src/views/layout/components/Sidebar/index.vue Целия файл

@@ -69,7 +69,7 @@ export default {
69 69
     navTitle:{
70 70
       handler(newVal,oldVal){
71 71
         if(newVal == 'HIS管理'){
72
-          let nameArr = ['hospitalStation','hospitalRecord','hospitalCharges','DepositManagement','hisTool','outpatientRegistration','outpatientDoctorStation','outpatientCharges','outpatientPharmacy','outpatientRecord','eleFaPiao'];
72
+          let nameArr = ['hospitalStation','hospitalRecord','hospitalCharges','DepositManagement','hisTool','outpatientRegistration','outpatientDoctorStation','outpatientCharges','outpatientPharmacy','outpatientRecord','eleFaPiao','drugSourceCode'];
73 73
           // console.log('permission_routers',this.permission_routers)
74 74
           let routerArr = [];
75 75
           this.permission_routers.map(item => {

src/xt_pages/outpatientTool/drugChange.vue → src/xt_pages/drugSourceCode/drugChange.vue Целия файл

@@ -86,15 +86,19 @@
86 86
       <el-table-column align="center" prop="name" label="药品名称">
87 87
         <template slot-scope="scope">{{scope.row.drug_name}}</template>
88 88
       </el-table-column>
89
-      <el-table-column align="center" prop="name" label="药品类型">
90
-        <template slot-scope="scope">{{scope.row.drug_type}}</template>
91
-      </el-table-column>
89
+
92 90
       <el-table-column align="center" prop="name" label="规格单位">
93 91
         <template slot-scope="scope">{{scope.row.spec}}</template>
94 92
       </el-table-column>
95
-      <el-table-column align="center" prop="name" label="国家编码">
96
-        <template slot-scope="scope">{{scope.row.code}}</template>
93
+
94
+      <el-table-column  align="center" prop="name" label="追溯码">
95
+        <template slot-scope="scope">{{scope.row.drug_code}}</template>
96
+      </el-table-column>
97
+
98
+      <el-table-column align="center" prop="name" label="患者姓名">
99
+        <template slot-scope="scope">{{scope.row.p.name}}</template>
97 100
       </el-table-column>
101
+
98 102
       <el-table-column align="center" prop="name" label="批号">
99 103
         <template slot-scope="scope">{{scope.row.batch_number}}</template>
100 104
       </el-table-column>
@@ -111,13 +115,6 @@
111 115
       </el-table-column>
112 116
 
113 117
 
114
-      <el-table-column align="center" prop="total" label="结算日期">
115
-        <template slot-scope="scope">
116
-          <div>{{scope.row.e_date}}</div>
117
-        </template>
118
-      </el-table-column>
119
-
120
-
121 118
       <el-table-column align="center" prop="total" label="销售状态">
122 119
         <template slot-scope="scope">
123 120
           <div>{{scope.row.is_sale?'已销售':'未销售'}}</div>
@@ -139,7 +136,7 @@
139 136
       <el-table-column label="操作" width="200">
140 137
         <template slot-scope="scope">
141 138
           <el-button v-if="!scope.row.is_sale || scope.row.is_sale == 0 || scope.row.is_bg == 0" type="primary" @click="sigle_stock(scope.row)">销售变更</el-button>
142
-          <el-button type="primary" @click="deleteStock(scope.row)">删除</el-button>
139
+          <el-button v-if="scope.row.is_sale == 1 || scope.row.is_bg == 1" type="warning" @click="deleteStock(scope.row)">撤销</el-button>
143 140
         </template>
144 141
       </el-table-column>
145 142
     </el-table>

src/xt_pages/outpatientTool/drugCodeQuery.vue → src/xt_pages/drugSourceCode/drugCodeQuery.vue Целия файл


src/xt_pages/outpatientTool/drugQuery.vue → src/xt_pages/drugSourceCode/drugQuery.vue Целия файл

@@ -49,6 +49,10 @@
49 49
         <div>药品:</div>
50 50
         <el-select size="small" v-model="drug_id" placeholder="请选择"
51 51
                    style="width:100px;margin-left:10px;" @change="change">
52
+          <el-option
53
+            label="全部"
54
+            value="0">
55
+          </el-option>
52 56
           <el-option
53 57
             v-for="item,index in drugs"
54 58
             :key="index"

src/xt_pages/outpatientTool/drugStock.vue → src/xt_pages/drugSourceCode/drugStock.vue Целия файл

@@ -88,15 +88,19 @@
88 88
       <el-table-column align="center" prop="name" label="药品名称">
89 89
         <template slot-scope="scope">{{scope.row.drug_name}}</template>
90 90
       </el-table-column>
91
-      <el-table-column align="center" prop="name" label="药品类型">
92
-        <template slot-scope="scope">{{scope.row.drug_type}}</template>
93
-      </el-table-column>
91
+
94 92
       <el-table-column align="center" prop="name" label="规格单位">
95 93
         <template slot-scope="scope">{{scope.row.spec}}</template>
96 94
       </el-table-column>
97
-      <el-table-column align="center" prop="name" label="国家编码">
98
-        <template slot-scope="scope">{{scope.row.code}}</template>
95
+
96
+      <el-table-column align="center" prop="name" label="追溯码">
97
+        <template slot-scope="scope">{{scope.row.drug_code}}</template>
99 98
       </el-table-column>
99
+
100
+      <el-table-column align="center" prop="name" label="批号">
101
+        <template slot-scope="scope">{{scope.row.drug_code}}</template>
102
+      </el-table-column>
103
+
100 104
       <el-table-column align="center" prop="name" label="批号">
101 105
         <template slot-scope="scope">{{scope.row.batch_number}}</template>
102 106
       </el-table-column>
@@ -113,11 +117,7 @@
113 117
       </el-table-column>
114 118
 
115 119
 
116
-      <el-table-column align="center" prop="total" label="有效日期">
117
-        <template slot-scope="scope">
118
-          <div>{{scope.row.e_date}}</div>
119
-        </template>
120
-      </el-table-column>
120
+
121 121
 
122 122
 
123 123
       <el-table-column align="center" prop="total" label="盘存状态">
@@ -141,7 +141,7 @@
141 141
       <el-table-column label="操作" width="200">
142 142
         <template slot-scope="scope">
143 143
           <el-button v-if="!scope.row.is_pc || scope.row.is_pc == 0" type="primary" @click="sigle_stock(scope.row)">盘存</el-button>
144
-          <el-button  type="primary" @click="deleteStock(scope.row)">删除</el-button>
144
+          <el-button v-if="scope.row.is_pc == 1 || scope.row.is_pc == 1"  type="primary" @click="deleteStock(scope.row)">撤销</el-button>
145 145
         </template>
146 146
       </el-table-column>
147 147
     </el-table>