Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/api/config.js

@@ -251,4 +251,13 @@ export function getSelfPrintList(params){
     method:"get",
     params:params,
   })
+}
+
+export function changeDrugCodeOpen(params){
+ 
+  return request({
+    url:"/api/changedrugcodeopen",
+    method:"get",
+    params:params
+  })
 }

src/api/pharmacy.js

@@ -173,4 +173,13 @@ export function updateDrugInventoryWarehouseInfo(params){
     method:"get",
     params:params
   })
+}
+
+export function changeDrugCode(params){
+
+  return request({
+    url:"/api/pharmacy/changedrugcode",
+    method:"get",
+    params:params,
+  })
 }

src/lang/zh.js

@@ -306,7 +306,7 @@ export default {
     queryData:"结算数据查询",
     chargeDetailManagementTwo:"门诊明细上传",
     orgExportData:"数据导出",
-
+    eleFaPiao:"电子发票",
 
 
     settleDetail:"结算明细列表",

src/router/index.js

@@ -37,7 +37,7 @@ import hospitalStation from './modules/hospitalStation'
 import hospitalCharges from './modules/hospitalCharges'
 import DepositManagement from './modules/DepositManagement'
 import hisTool from './modules/hisTool'
-import faPiao from './modules/faPiao'
+import eleFaPiao from './modules/eleFaPiao'
 
 import supply from './modules/supply'
 
@@ -203,7 +203,7 @@ var _asy_router_map = [
   hospitalStation,
   hospitalCharges,
   hisTool,
-  faPiao,
+  eleFaPiao,
   integration,
   basicConfig,
   supply,

src/router/modules/faPiao.js → src/router/modules/eleFaPiao.js

@@ -1,31 +1,31 @@
 import Layout from '@/views/layout/Layout'
 
 export default {
-  path: '/fapiao',
+  path: '/eleFaPiao',
   component: Layout,
   redirect: 'noredirect',
-  name: 'fapiao',
+  name: 'eleFaPiao',
   alwaysShow: true,
   meta: {
-    title: 'fapiao',
+    title: 'eleFaPiao',
     isChild: true
   },
   children: [
     {
-      path: '/fapiao/settle',
-      component: () => import('@/xt_pages/fapiao/settleDetail'),
+      path: '/eleFaPiao/settle',
+      component: () => import('@/xt_pages/eleFaPiao/settleDetail'),
       name: 'settleDetail',
       meta: { title: 'settleDetail', noCache: true }
     },
     {
-      path: '/fapiao/patientsettle',
-      component: () => import('@/xt_pages/fapiao/patientSettleDetail'),
+      path: '/eleFaPiao/patientsettle',
+      component: () => import('@/xt_pages/eleFaPiao/patientSettleDetail'),
       name: 'patientSettleDetail',
       meta: { title: 'patientSettleDetail', noCache: true },
     },
     {
-      path: '/fapiao/elefapiao',
-      component: () => import('@/xt_pages/fapiao/fapiao'),
+      path: '/eleFaPiao/elefapiao',
+      component: () => import('@/xt_pages/eleFaPiao/fapiao'),
       name: 'elefapiao',
       meta: { title: 'elefapiao', noCache: true },
     },

src/router/modules/hisTool.js

@@ -95,8 +95,13 @@ export default {
     //   component: () => import('@/xt_pages/outpatientTool/fapiao'),
     //   name: 'faPiao',
     //   meta: { title: 'faPiao', noCache: true }
-    // }, 
+    // },
     {
+      path: '/hisTool/faPiao',
+      component: () => import('@/xt_pages/outpatientTool/fapiao'),
+      name: 'faPiao',
+      meta: { title: 'faPiao', noCache: true }
+    }, {
       path: '/hisTool/yidiClear',
       component: () => import('@/xt_pages/outpatientTool/yidiClear'),
       name: 'yidiClear',

src/views/layout/Layout.vue

@@ -132,7 +132,7 @@ export default {
     }
   },
   created(){
-    let menzhen = ['hospitalStation',"hospitalRecord","hospitalCharges","DepositManagement","hisTool","faPiao",'outpatientRegistration','outpatientDoctorStation','outpatientCharges','outpatientPharmacy','outpatientRecord'];
+    let menzhen = ['hospitalStation',"hospitalRecord","hospitalCharges","DepositManagement","hisTool","eleFaPiao",'outpatientRegistration','outpatientDoctorStation','outpatientCharges','outpatientPharmacy','outpatientRecord'];
     let bingli = ['User','createPatient'];
     let touxi = ['home','workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control','dialysis_index','log_index'];
     let kucun = ['stockManage','stockDrugs','selfPreparedMedicine','inventoryTransfer','wareHouseManage','otherManagement'];

src/xt_pages/Pharmacy/DrugDispensing.vue

@@ -195,14 +195,14 @@
             <el-table-column
               type="index"
               label="序号"
-              width="120"
+              width="50"
               align="center"
             >
             </el-table-column>
             <el-table-column
               prop="name"
               label="患者名称"
-              width="180"
+              width="100"
               align="center"
             >
               <template slot-scope="scope">
@@ -212,7 +212,7 @@
             <el-table-column
               prop="name"
               label="单次用量"
-              width="170"
+              width="100"
               align="center"
             >
               <template slot-scope="scope">
@@ -222,7 +222,7 @@
             <el-table-column
               prop="name"
               label="用法"
-              width="160"
+              width="100"
               align="center"
             >
               <template slot-scope="scope">
@@ -232,7 +232,7 @@
             <el-table-column
               prop="name"
               label="频率"
-              width="160"
+              width="100"
               align="center"
             >
               <template slot-scope="scope">
@@ -242,7 +242,7 @@
             <el-table-column
               prop="name"
               label="天数"
-              width="160"
+              width="100"
               align="center"
             >
               <template slot-scope="scope">
@@ -252,17 +252,22 @@
             <el-table-column
               prop="name"
               label="总量"
-              width="160"
+              width="100"
               align="center"
             >
               <template slot-scope="scope">
                 {{ scope.row.total }}
               </template>
             </el-table-column>
+            <el-table-column label="药品追溯码" width="162" align="center">
+              <template slot-scope="scope">
+                 <el-input style="width: 100;" v-model="scope.row.DrugCode" @input="changeDrugCode(scope.row.ID,scope.row.DataSources,scope.row.DrugCode)"></el-input>
+              </template>
+            </el-table-column>
             <el-table-column
               prop="name"
               label="数据来源"
-              width="162"
+              width="102"
               align="center"
             >
               <template slot-scope="scope">
@@ -454,6 +459,7 @@ import {
   getcurrentname,
   getpartitionlist,
   routeofadministration,
+  changeDrugCode
 } from "@/api/pharmacy";
 const moment = require("moment");
 export default {
@@ -506,6 +512,29 @@ export default {
   },
 
   methods: {
+    changeDrugCode(id,DataSources,drug_code){
+       var is_source =0
+       if (DataSources == "his处方"){
+        is_source = 1
+       }
+       if (DataSources == "临时医嘱"){
+         is_source = 2
+       }
+       var params = {
+        id:id,
+        data_source:is_source,
+        drug_code:drug_code,
+       }
+       console.log("paramss",params)
+      
+      changeDrugCode(params).then(response=>{
+         if(response.data.state == 1){
+            this.$message.success("保存成功!")
+         }
+      })
+    
+
+    },
     tt() {},
     async fun3() {
       this.fun1().then((val) => {

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -178,11 +178,11 @@
             <el-table-column
               type="index"
               label="序号"
-              width="120"
+              width="50"
               align="center"
             >
             </el-table-column>
-            <el-table-column label="名称" width="200" align="center">
+            <el-table-column label="名称" width="100" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.Name ? scope.row.Name : "" }}</span>
               </template>
@@ -226,6 +226,11 @@
                 <span>{{ getManutuer(scope.row.DrugId) }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="药品追溯码" width="162" align="center">
+              <template slot-scope="scope">
+                 <el-input style="width: 100;" v-model="scope.row.DrugCode" @input="changeDrugCode(scope.row.ID,scope.row.DataSources,scope.row.DrugCode)"></el-input>
+              </template>
+            </el-table-column>
             <el-table-column label="开立医生" width="150" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.Doctor ? scope.row.Doctor : "" }}</span>
@@ -243,6 +248,8 @@
                 <span>{{getDrugName(scope.row.DrugId)}}</span>
               </template>
             </el-table-column>
+
+        
             <el-table-column label="备注" width="170" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.Remarks ? scope.row.Remarks : "" }}</span>
@@ -304,7 +311,9 @@ import {
   dispensingmedicine,
   drugwithdrawal,
   getpartitionlist,
+  changeDrugCode
 } from "@/api/pharmacy";
+import dataDruguse from "../../router/modules/dataDruguse";
 const moment = require("moment");
 export default {
   components: {
@@ -792,6 +801,28 @@ export default {
          }
        }
        return spc
+    },
+    changeDrugCode(id,DataSources,drug_code){
+       var is_source =0
+       if (DataSources == "his处方"){
+        is_source = 1
+       }
+       if (DataSources == "临时医嘱"){
+         is_source = 2
+       }
+       var params = {
+        id:id,
+        data_source:is_source,
+        drug_code:drug_code,
+       }
+       console.log("paramss",params)
+      changeDrugCode(params).then(response=>{
+         if(response.data.state == 1){
+            this.$message.success("保存成功!")
+         }
+      })
+    
+
     }
   },
 };

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -517,7 +517,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                         
                         "
                         v-if="prescription.mode_id == 1"
                       >
@@ -528,7 +528,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                        
                         "
                         v-if="prescription.mode_id == 2"
                       >
@@ -539,7 +539,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                         
                         "
                         v-if="prescription.mode_id == 3"
                       >
@@ -550,7 +550,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                          
                         "
                         v-if="prescription.mode_id == 4"
                       >
@@ -561,7 +561,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                         
                         "
                         v-if="prescription.mode_id == 5"
                       >
@@ -572,7 +572,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                         
                         "
                         v-if="prescription.mode_id == 6"
                       >
@@ -583,7 +583,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                          
                         "
                         v-if="prescription.mode_id == 7"
                       >
@@ -594,7 +594,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                         
                         "
                         v-if="prescription.mode_id == 8"
                       >
@@ -605,7 +605,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                          
                         "
                         v-if="prescription.mode_id == 9"
                       >
@@ -616,7 +616,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                          
                         "
                         v-if="prescription.mode_id == 10"
                       >
@@ -627,7 +627,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                         
                         "
                         v-if="prescription.mode_id == 11"
                       >
@@ -638,7 +638,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                          
                         "
                         v-if="prescription.mode_id == 12"
                       >
@@ -649,7 +649,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                         
                         "
                         v-if="prescription.mode_id == 13"
                       >
@@ -660,7 +660,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                         
                         "
                         v-if="prescription.mode_id == 14"
                       >
@@ -671,7 +671,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                         
                         "
                         v-if="prescription.mode_id == 15"
                       >
@@ -682,7 +682,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                          
                         "
                         v-if="prescription.mode_id == 16"
                       >
@@ -693,7 +693,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                          
                         "
                         v-if="prescription.mode_id == 17"
                       >
@@ -704,7 +704,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                          
                         "
                         v-if="prescription.mode_id == 18"
                       >
@@ -715,7 +715,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                          
                         "
                         v-if="prescription.mode_id == 19"
                       >
@@ -726,7 +726,7 @@
                         style="
                           width: 150px;
                           text-align: center;
-                          font-weight: 600;
+                         
                         "
                         v-if="prescription.mode_id == 22"
                       >
@@ -737,7 +737,7 @@
                         style="
                           width: 150px;
                           text-align: center;
-                          font-weight: 600;
+                          
                         "
                         v-if="prescription.mode_id == 23"
                       >
@@ -748,7 +748,7 @@
                         style="
                           width: 150px;
                           text-align: center;
-                          font-weight: 600;
+                         
                         "
                         v-if="prescription.mode_id == 24"
                       >
@@ -758,7 +758,7 @@
                         class="under_line"
                         style="width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                         
                         "
                         v-if="prescription.mode_id == 25"
                       >
@@ -769,7 +769,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                         
                         "
                         v-if="prescription.mode_id == 29"
                       >
@@ -780,7 +780,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                          
                         "
                         v-if="prescription.mode_id == 30"
                       >
@@ -791,7 +791,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                          
                         "
                         v-if="prescription.mode_id == 31"
                       >
@@ -802,7 +802,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                          
                         "
                         v-if="prescription.mode_id == 32"
                       >
@@ -813,7 +813,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                          
                         "
                         v-if="prescription.mode_id == 33"
                       >
@@ -824,7 +824,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                          
                         "
                         v-if="prescription.mode_id == 34"
                       >
@@ -835,7 +835,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                         
                         "
                         v-if="prescription.mode_id == 35"
                       >
@@ -846,7 +846,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                          
                         "
                         v-if="prescription.mode_id == 36"
                       >
@@ -857,7 +857,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                         
                         "
                         v-if="prescription.mode_id == 37"
                       >
@@ -868,7 +868,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                         
                         "
                         v-if="prescription.mode_id == 38"
                       >
@@ -879,7 +879,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                          
                         "
                         v-if="prescription.mode_id == 39"
                       >
@@ -891,7 +891,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                          
                         "
                         v-if="prescription.mode_id == 40"
                       >
@@ -903,7 +903,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                         
                         "
                         v-if="prescription.mode_id == 41"
                       >
@@ -915,7 +915,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                         
                         "
                         v-if="prescription.mode_id == 42"
                       >
@@ -927,7 +927,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                          
                         "
                         v-if="prescription.mode_id == 43"
                       >
@@ -5435,7 +5435,7 @@ export default {
 
         console.log("haaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",this.doctor_advices)
 
-        if(this.org_id ==10206 || this.org_id ==10644 || this.org_id ==10633 || this.org_id == 10489){
+        if(this.org_id ==10206 || this.org_id ==10644 || this.org_id ==10633 || this.org_id == 10489 || this.org_id == 0){
           let projectsOne = [];
           response.data.data.projects.map((item) => {
               projectsOne.push(item);
@@ -5545,6 +5545,14 @@ export default {
             }
             }
 
+          
+
+            for(let i=0;i<newHisArr.length;i++){
+              newHisArr[i].advice_name_str = ""
+              newHisArr[i].advice_name_str = newHisArr[i].project_team + (newHisArr[i].prescription_id).toString()
+            }
+            console.log("newHisArr===================================",newHisArr)
+
             var ordHisArr = this.getQuChong(newHisArr)
 
            this.doctor_advices.push(...ordHisArr)
@@ -5686,9 +5694,9 @@ export default {
       let result = [];
         let obj = {};
         for (let i = 0; i < tempArr.length; i++) {
-            if (!obj[tempArr[i].project_team]) {
+            if (!obj[tempArr[i].advice_name_str]) {
                 result.push(tempArr[i]);
-                obj[tempArr[i].project_team] = true;
+                obj[tempArr[i].advice_name_str] = true;
             };
         };
         return result;

src/xt_pages/fapiao/newSettleDetail.vue → src/xt_pages/eleFaPiao/newSettleDetail.vue

@@ -428,13 +428,10 @@ export default {
                 .catch(() => {
                 })
             }
-
           }
-
         }
       }).catch(function(error) {
       })
-
     },
     query(){
 

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -161,11 +161,6 @@
           >
             </el-pagination>
      </div>
-
-
-
-  
-
   </div>
 </template>
 <script>

src/xt_pages/user/components/PatientDetail.vue

@@ -120,7 +120,6 @@
               <el-form-item
                 label="身份证号 : "
                 class="is-required"
-                prop="idCardNo"
               >
                 <el-input v-model="form.idCardNo" disabled></el-input>
               </el-form-item>

src/xt_pages/user/components/PatientForm.vue

@@ -129,10 +129,8 @@
               <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item
                   label="身份证号 : "
-                  prop="idCardNo"
                 >
                   <el-input
-                    @input="checkIdCardNo"
                     v-model="form.idCardNo"
                   ></el-input><!---->
                 </el-form-item>

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-  //   store.dispatch('VerifyConfigList', []).then(() => {
-  //     next()
-  //   })
-  // }
-  // if (store.getters.permission_routers === undefined) {
-  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //     next()
-  //   })
-  // } else {
-  //   next()
-  // }
-  // return
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+    store.dispatch('VerifyConfigList', []).then(() => {
+      next()
+    })
+  }
+  if (store.getters.permission_routers === undefined) {
+    store.dispatch('xt_GenerateRoutes', []).then(() => {
+      next()
+    })
+  } else {
+    next()
+  }
+  return
   // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))