新分支

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/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/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))