XMLWAN 4 jaren geleden
bovenliggende
commit
7d78c5081c

+ 3 - 1
src/lang/zh.js Bestand weergeven

355
     rescue_record: '抢救记录',
355
     rescue_record: '抢救记录',
356
     manage_ment: '设备管理',
356
     manage_ment: '设备管理',
357
     nursing_record: '透析护理记录',
357
     nursing_record: '透析护理记录',
358
-    special_record: '特殊记录'
358
+    special_record: '特殊记录',
359
+    template_summary: '治疗小结',
360
+    template_plan: '个性化方案'
359
   }
361
   }
360
 }
362
 }

+ 1 - 0
src/xt_pages/data/components/templateTable.vue Bestand weergeven

354
         }
354
         }
355
 
355
 
356
         if (valid) {
356
         if (valid) {
357
+           
357
           createConfig(this.temp).then(response => {
358
           createConfig(this.temp).then(response => {
358
             if (!response.data) {
359
             if (!response.data) {
359
               // 由于mockjs 不支持自定义状态码只能这样hack
360
               // 由于mockjs 不支持自定义状态码只能这样hack

+ 3 - 1
src/xt_pages/data/template.vue Bestand weergeven

45
         { label: this.$t("data_config.nursing_record"), key: "nursing_record" },
45
         { label: this.$t("data_config.nursing_record"), key: "nursing_record" },
46
         { label: this.$t("data_config.special_record"), key: "special_record" },
46
         { label: this.$t("data_config.special_record"), key: "special_record" },
47
         { label: this.$t("data_config.course_disease"), key: "course_disease" },
47
         { label: this.$t("data_config.course_disease"), key: "course_disease" },
48
-        { label: this.$t("data_config.rescue_record"), key: "rescue_record" }
48
+        { label: this.$t("data_config.rescue_record"), key: "rescue_record" },
49
+        // { label: this.$t("data_config.template_summary"), key: "template_summary" },
50
+        // { label: this.$t("data_config.template_plan"), key: "template_plan" }
49
       ],
51
       ],
50
       activeName: "education",
52
       activeName: "education",
51
       createdTimes: 0
53
       createdTimes: 0

+ 4 - 5
src/xt_pages/stock/drugs/drugStockInOrder.vue Bestand weergeven

847
         console.log("hhh23",this.exportList)
847
         console.log("hhh23",this.exportList)
848
          for(let i=0;i<this.exportList.length;i++){
848
          for(let i=0;i<this.exportList.length;i++){
849
            for(let j=0;j<this.drugTypeList.length;j++){
849
            for(let j=0;j<this.drugTypeList.length;j++){
850
-             if(this.exportList[i].drug_type == this.drugTypeList[j].value){
850
+             if(this.exportList[i].drug_type == this.drugTypeList[j].id){
851
                this.exportList[i].drug_type = this.drugTypeList[j].name
851
                this.exportList[i].drug_type = this.drugTypeList[j].name
852
              }
852
              }
853
            }
853
            }
854
          }
854
          }
855
-       
856
-       
855
+              
857
         const tHeader = ['药品名称','药品类型','规格&单位', '批号','入库数量','进货价','总价','生产厂家','生产日期','有效日期','经销商','批注文号','备注']
856
         const tHeader = ['药品名称','药品类型','规格&单位', '批号','入库数量','进货价','总价','生产厂家','生产日期','有效日期','经销商','批注文号','备注']
858
-        const filterVal = ['drug_name', 'drug_type','unit','number','warehousing_count','price','total_price','manufacturer','product_date','expiry_date','dealer','batch_number','remark']
857
+        const filterVal = ['drug_name', 'drug_type','unit','batch_number','warehousing_count','price','total_price','manufacturer','product_date','expiry_date','dealer','number','remark']
859
          
858
          
860
      
859
      
861
         console.log("table",this.exportList)
860
         console.log("table",this.exportList)
862
-      
861
+        return
863
         const data = this.formatJson(filterVal, this.exportList)
862
         const data = this.formatJson(filterVal, this.exportList)
864
         excel.export_json_to_excel({
863
         excel.export_json_to_excel({
865
           header: tHeader,
864
           header: tHeader,

+ 23 - 19
src/xt_pages/stock/drugs/drugStockOutOrder.vue Bestand weergeven

349
               <span>批次号</span>
349
               <span>批次号</span>
350
             </template>
350
             </template>
351
             <template slot-scope="scope">
351
             <template slot-scope="scope">
352
-              <span>{{getDrugBatchNumber(scope.row.id)}}</span>
352
+              <span>{{getDrugBatchNumber(scope.row.drug_id)}}</span>
353
             </template>
353
             </template>
354
           </el-table-column>
354
           </el-table-column>
355
           
355
           
524
       drugOutList:[],
524
       drugOutList:[],
525
       outList:[],
525
       outList:[],
526
       userListOne:[],
526
       userListOne:[],
527
-      exportList:[]
527
+      exportList:[],
528
+      batchNumberList:[]
528
     };
529
     };
529
   },
530
   },
530
   methods: {
531
   methods: {
1002
          this.userListOne = userListOne
1003
          this.userListOne = userListOne
1003
          var  batchNumber = response.data.data.batchNumber
1004
          var  batchNumber = response.data.data.batchNumber
1004
          console.log("出库详情",batchNumber)
1005
          console.log("出库详情",batchNumber)
1006
+         this.batchNumberList = batchNumber
1005
        }
1007
        }
1006
      })
1008
      })
1007
    },
1009
    },
1153
          return  total_price
1155
          return  total_price
1154
       },
1156
       },
1155
 
1157
 
1156
-      getDrugBatchNumber(id){
1158
+      // getDrugBatchNumber(id){
1157
         
1159
         
1158
-        var arr= []
1159
-        var batchNumber =[]
1160
+      //   var arr= []
1161
+      //   var batchNumber =[]
1160
         
1162
         
1161
-        for(let i=0;i<this.userList.length;i++){
1162
-           if(id == this.userList[i].id){
1163
-             for(let j=0;j<this.userList[i].drugwarehouseoutinfo.length;j++){
1164
-                batchNumber.push(this.userList[i].drugwarehouseoutinfo[j].batch_number)
1165
-             }
1166
-           }
1163
+      //   for(let i=0;i<this.userList.length;i++){
1164
+      //      if(id == this.userList[i].id){
1165
+      //        for(let j=0;j<this.userList[i].drugwarehouseoutinfo.length;j++){
1166
+      //           batchNumber.push(this.userList[i].drugwarehouseoutinfo[j].batch_number)
1167
+      //        }
1168
+      //      }
1169
+      //   }
1170
+      //   return batchNumber.join(",")
1171
+      // },
1172
+      getDrugBatchNumber(drugid){
1173
+        var arr = []
1174
+        for(let i=0;i<this.batchNumberList.length;i++){
1175
+          if(drugid == this.batchNumberList[i].drug_id){
1176
+            arr.push(this.batchNumberList[i].batch_number)
1177
+          }
1167
         }
1178
         }
1168
-        // console.log("arr",arr)
1169
-        // if(arr.length > 0 ){
1170
-        //  for(let j=0;j<arr.length;j++){
1171
-        //    batchNumber.push(arr[j].batch_number)
1172
-        //   }
1173
-        // }
1174
-        // console.log("hhhhhh",batchNumber)
1175
-        return batchNumber.join(",")
1179
+        return arr.join(",")
1176
       },
1180
       },
1177
     
1181
     
1178
       getExportOutOrderDrugList(){
1182
       getExportOutOrderDrugList(){

+ 4 - 2
src/xt_pages/upload/fast/FastProvince.vue Bestand weergeven

143
             <el-tab-pane label="抢救记录">
143
             <el-tab-pane label="抢救记录">
144
               <rescue-record :doctor_advices='doctor_advices' :patient='patient' :prescription='prescription'></rescue-record>
144
               <rescue-record :doctor_advices='doctor_advices' :patient='patient' :prescription='prescription'></rescue-record>
145
             </el-tab-pane>
145
             </el-tab-pane>
146
+             
146
           </el-tabs>
147
           </el-tabs>
147
         </div>
148
         </div>
148
       </div>
149
       </div>
160
   import dialysisParams from "../fast/dialysisParams"
161
   import dialysisParams from "../fast/dialysisParams"
161
   import dialysisSummary from "../fast/dialysisSummary"
162
   import dialysisSummary from "../fast/dialysisSummary"
162
   import rescueRecord from "../fast/rescueRecord"
163
   import rescueRecord from "../fast/rescueRecord"
163
-
164
+  
164
   import {
165
   import {
165
   getDialysisRecordInitData,
166
   getDialysisRecordInitData,
166
   getDialysisSchedules,
167
   getDialysisSchedules,
175
       treatInfo,
176
       treatInfo,
176
       dialysisParams,
177
       dialysisParams,
177
       dialysisSummary,
178
       dialysisSummary,
178
-      rescueRecord
179
+      rescueRecord,
180
+     
179
     },
181
     },
180
     data() {
182
     data() {
181
       return {
183
       return {