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

src/lang/en.js

@@ -130,6 +130,7 @@ export default {
     objectRegistration:'objectRegistration',
     Dialysisanalysis:'Dialysisanalysis',
     eleFaPiao:'eleFaPiao',
+
   },
   navbar: {
     logOut: 'Log Out',

src/lang/zh.js

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

src/router/index.js

@@ -38,6 +38,8 @@ import hospitalCharges from './modules/hospitalCharges'
 import DepositManagement from './modules/DepositManagement'
 import hisTool from './modules/hisTool'
 import eleFaPiao from './modules/eleFaPiao'
+import drugSourceCode from './modules/drugSourceCode'
+
 
 import supply from './modules/supply'
 
@@ -210,6 +212,7 @@ var _asy_router_map = [
   Dialysisanalysis,// 新菜单6.1
   DialysisIndex,
   DialysisLogIndex,
+  drugSourceCode
 ]
 
 var is_asy_router = process.env.NODE_ENV === 'production' // true; 设置为 true 强制进行路由验证

src/router/modules/drugSourceCode.js

@@ -0,0 +1,43 @@
+import Layout from '@/views/layout/Layout'
+
+
+export default {
+  path: '/drugSourceCode',
+  component: Layout,
+  redirect: 'noredirect',
+  name: 'drugSourceCode',
+  alwaysShow: true,
+  meta: {
+    title: 'drugSourceCode',
+    icon: 'drugSourceCode',
+    isChild: true
+  },
+  children: [
+    {
+      path: '/drugSourceCode/drugStock',
+      component: () => import('@/xt_pages/drugSourceCode/drugStock'),
+      name: 'drugStock',
+      meta: { title: 'drugStock', noCache: true }
+    },
+    {
+      path: '/drugSourceCode/drugChange',
+      component: () => import('@/xt_pages/drugSourceCode/drugStock'),
+      name: 'drugChange',
+      meta: { title: 'drugChange', noCache: true },
+    },
+    {
+      path: '/drugSourceCode/drugQuery',
+      component: () => import('@/xt_pages/drugSourceCode/drugQuery'),
+      name: 'drugQuery',
+      meta: { title: 'drugQuery', noCache: true },
+    },
+    {
+      path: '/drugSourceCode/drugCodeQuery',
+      component: () => import('@/xt_pages/drugSourceCode/drugCodeQuery'),
+      name: 'drugCodeQuery',
+      meta: { title: 'drugCodeQuery', noCache: true },
+    },
+
+
+  ]
+}

src/router/modules/hisTool.js

@@ -176,43 +176,6 @@ export default {
       meta: { title: 'orgExportData', noCache: true }
     },
 
-        { //药品盘存
-          path: '/outpatientTool/drugStock',
-          component: () => import('@/xt_pages/outpatientTool/drugStock'),
-          name: 'drugStock',
-          meta: {
-            title: '药品盘存',
-            noCache: true
-          }
-        },
-        {//药品变更
-          path: '/outpatientTool/drugChange',
-          component: () => import('@/xt_pages/outpatientTool/drugChange'),
-          name: 'drugChange',
-          meta: {
-            title: '药品变更',
-            noCache: true
-          }
-        },
-        {//药品查询
-          path: '/outpatientTool/drugQuery',
-          component: () => import('@/xt_pages/outpatientTool/drugQuery'),
-          name: 'drugQuery',
-          meta: {
-            title: '药品查询',
-            noCache: true
-          },
-        },
-        //药品查询
-        {
-          path: '/outpatientTool/drugCodeQuery',
-          component: () => import('@/xt_pages/outpatientTool/drugCodeQuery'),
-          name: 'drugCodeQuery',
-          meta: {
-            title: '药品追溯',
-            noCache: true
-          },
-        },
     // {
     //   path: '/fapiao/settle',
     //   component: () => import('@/xt_pages/fapiao/settleDetail'),

src/views/layout/components/Sidebar/index.vue

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

src/xt_pages/outpatientTool/drugChange.vue → src/xt_pages/drugSourceCode/drugChange.vue

@@ -86,15 +86,19 @@
       <el-table-column align="center" prop="name" label="药品名称">
         <template slot-scope="scope">{{scope.row.drug_name}}</template>
       </el-table-column>
-      <el-table-column align="center" prop="name" label="药品类型">
-        <template slot-scope="scope">{{scope.row.drug_type}}</template>
-      </el-table-column>
+
       <el-table-column align="center" prop="name" label="规格单位">
         <template slot-scope="scope">{{scope.row.spec}}</template>
       </el-table-column>
-      <el-table-column align="center" prop="name" label="国家编码">
-        <template slot-scope="scope">{{scope.row.code}}</template>
+
+      <el-table-column  align="center" prop="name" label="追溯码">
+        <template slot-scope="scope">{{scope.row.drug_code}}</template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" label="患者姓名">
+        <template slot-scope="scope">{{scope.row.p.name}}</template>
       </el-table-column>
+
       <el-table-column align="center" prop="name" label="批号">
         <template slot-scope="scope">{{scope.row.batch_number}}</template>
       </el-table-column>
@@ -111,13 +115,6 @@
       </el-table-column>
 
 
-      <el-table-column align="center" prop="total" label="结算日期">
-        <template slot-scope="scope">
-          <div>{{scope.row.e_date}}</div>
-        </template>
-      </el-table-column>
-
-
       <el-table-column align="center" prop="total" label="销售状态">
         <template slot-scope="scope">
           <div>{{scope.row.is_sale?'已销售':'未销售'}}</div>
@@ -139,7 +136,7 @@
       <el-table-column label="操作" width="200">
         <template slot-scope="scope">
           <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>
-          <el-button type="primary" @click="deleteStock(scope.row)">删除</el-button>
+          <el-button v-if="scope.row.is_sale == 1 || scope.row.is_bg == 1" type="warning" @click="deleteStock(scope.row)">撤销</el-button>
         </template>
       </el-table-column>
     </el-table>

src/xt_pages/outpatientTool/drugQuery.vue → src/xt_pages/drugSourceCode/drugQuery.vue

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

src/xt_pages/outpatientTool/drugStock.vue → src/xt_pages/drugSourceCode/drugStock.vue

@@ -88,15 +88,19 @@
       <el-table-column align="center" prop="name" label="药品名称">
         <template slot-scope="scope">{{scope.row.drug_name}}</template>
       </el-table-column>
-      <el-table-column align="center" prop="name" label="药品类型">
-        <template slot-scope="scope">{{scope.row.drug_type}}</template>
-      </el-table-column>
+
       <el-table-column align="center" prop="name" label="规格单位">
         <template slot-scope="scope">{{scope.row.spec}}</template>
       </el-table-column>
-      <el-table-column align="center" prop="name" label="国家编码">
-        <template slot-scope="scope">{{scope.row.code}}</template>
+
+      <el-table-column align="center" prop="name" label="追溯码">
+        <template slot-scope="scope">{{scope.row.drug_code}}</template>
       </el-table-column>
+
+      <el-table-column align="center" prop="name" label="批号">
+        <template slot-scope="scope">{{scope.row.drug_code}}</template>
+      </el-table-column>
+
       <el-table-column align="center" prop="name" label="批号">
         <template slot-scope="scope">{{scope.row.batch_number}}</template>
       </el-table-column>
@@ -113,11 +117,7 @@
       </el-table-column>
 
 
-      <el-table-column align="center" prop="total" label="有效日期">
-        <template slot-scope="scope">
-          <div>{{scope.row.e_date}}</div>
-        </template>
-      </el-table-column>
+
 
 
       <el-table-column align="center" prop="total" label="盘存状态">
@@ -141,7 +141,7 @@
       <el-table-column label="操作" width="200">
         <template slot-scope="scope">
           <el-button v-if="!scope.row.is_pc || scope.row.is_pc == 0" type="primary" @click="sigle_stock(scope.row)">盘存</el-button>
-          <el-button  type="primary" @click="deleteStock(scope.row)">删除</el-button>
+          <el-button v-if="scope.row.is_pc == 1 || scope.row.is_pc == 1"  type="primary" @click="deleteStock(scope.row)">撤销</el-button>
         </template>
       </el-table-column>
     </el-table>