数据

src/lang/zh.js

@@ -355,6 +355,8 @@ export default {
     rescue_record: '抢救记录',
     manage_ment: '设备管理',
     nursing_record: '透析护理记录',
-    special_record: '特殊记录'
+    special_record: '特殊记录',
+    template_summary: '治疗小结',
+    template_plan: '个性化方案'
   }
 }

src/xt_pages/data/components/templateTable.vue

@@ -354,6 +354,7 @@ export default {
         }
 
         if (valid) {
+           
           createConfig(this.temp).then(response => {
             if (!response.data) {
               // 由于mockjs 不支持自定义状态码只能这样hack

src/xt_pages/data/template.vue

@@ -45,7 +45,9 @@ export default {
         { label: this.$t("data_config.nursing_record"), key: "nursing_record" },
         { label: this.$t("data_config.special_record"), key: "special_record" },
         { label: this.$t("data_config.course_disease"), key: "course_disease" },
-        { label: this.$t("data_config.rescue_record"), key: "rescue_record" }
+        { label: this.$t("data_config.rescue_record"), key: "rescue_record" },
+        // { label: this.$t("data_config.template_summary"), key: "template_summary" },
+        // { label: this.$t("data_config.template_plan"), key: "template_plan" }
       ],
       activeName: "education",
       createdTimes: 0

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -847,19 +847,18 @@ export default {
         console.log("hhh23",this.exportList)
          for(let i=0;i<this.exportList.length;i++){
            for(let j=0;j<this.drugTypeList.length;j++){
-             if(this.exportList[i].drug_type == this.drugTypeList[j].value){
+             if(this.exportList[i].drug_type == this.drugTypeList[j].id){
                this.exportList[i].drug_type = this.drugTypeList[j].name
              }
            }
          }
-       
-       
+              
         const tHeader = ['药品名称','药品类型','规格&单位', '批号','入库数量','进货价','总价','生产厂家','生产日期','有效日期','经销商','批注文号','备注']
-        const filterVal = ['drug_name', 'drug_type','unit','number','warehousing_count','price','total_price','manufacturer','product_date','expiry_date','dealer','batch_number','remark']
+        const filterVal = ['drug_name', 'drug_type','unit','batch_number','warehousing_count','price','total_price','manufacturer','product_date','expiry_date','dealer','number','remark']
          
      
         console.log("table",this.exportList)
-      
+        return
         const data = this.formatJson(filterVal, this.exportList)
         excel.export_json_to_excel({
           header: tHeader,

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -349,7 +349,7 @@
               <span>批次号</span>
             </template>
             <template slot-scope="scope">
-              <span>{{getDrugBatchNumber(scope.row.id)}}</span>
+              <span>{{getDrugBatchNumber(scope.row.drug_id)}}</span>
             </template>
           </el-table-column>
           
@@ -524,7 +524,8 @@ export default {
       drugOutList:[],
       outList:[],
       userListOne:[],
-      exportList:[]
+      exportList:[],
+      batchNumberList:[]
     };
   },
   methods: {
@@ -1002,6 +1003,7 @@ export default {
          this.userListOne = userListOne
          var  batchNumber = response.data.data.batchNumber
          console.log("出库详情",batchNumber)
+         this.batchNumberList = batchNumber
        }
      })
    },
@@ -1153,26 +1155,28 @@ export default {
          return  total_price
       },
 
-      getDrugBatchNumber(id){
+      // getDrugBatchNumber(id){
         
-        var arr= []
-        var batchNumber =[]
+      //   var arr= []
+      //   var batchNumber =[]
         
-        for(let i=0;i<this.userList.length;i++){
-           if(id == this.userList[i].id){
-             for(let j=0;j<this.userList[i].drugwarehouseoutinfo.length;j++){
-                batchNumber.push(this.userList[i].drugwarehouseoutinfo[j].batch_number)
-             }
-           }
+      //   for(let i=0;i<this.userList.length;i++){
+      //      if(id == this.userList[i].id){
+      //        for(let j=0;j<this.userList[i].drugwarehouseoutinfo.length;j++){
+      //           batchNumber.push(this.userList[i].drugwarehouseoutinfo[j].batch_number)
+      //        }
+      //      }
+      //   }
+      //   return batchNumber.join(",")
+      // },
+      getDrugBatchNumber(drugid){
+        var arr = []
+        for(let i=0;i<this.batchNumberList.length;i++){
+          if(drugid == this.batchNumberList[i].drug_id){
+            arr.push(this.batchNumberList[i].batch_number)
+          }
         }
-        // console.log("arr",arr)
-        // if(arr.length > 0 ){
-        //  for(let j=0;j<arr.length;j++){
-        //    batchNumber.push(arr[j].batch_number)
-        //   }
-        // }
-        // console.log("hhhhhh",batchNumber)
-        return batchNumber.join(",")
+        return arr.join(",")
       },
     
       getExportOutOrderDrugList(){

src/xt_pages/upload/fast/FastProvince.vue

@@ -143,6 +143,7 @@
             <el-tab-pane label="抢救记录">
               <rescue-record :doctor_advices='doctor_advices' :patient='patient' :prescription='prescription'></rescue-record>
             </el-tab-pane>
+             
           </el-tabs>
         </div>
       </div>
@@ -160,7 +161,7 @@
   import dialysisParams from "../fast/dialysisParams"
   import dialysisSummary from "../fast/dialysisSummary"
   import rescueRecord from "../fast/rescueRecord"
-
+  
   import {
   getDialysisRecordInitData,
   getDialysisSchedules,
@@ -175,7 +176,8 @@ import { parseTime } from "@/utils";
       treatInfo,
       dialysisParams,
       dialysisSummary,
-      rescueRecord
+      rescueRecord,
+     
     },
     data() {
       return {