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

src/api/project/project.js

     params:params,
   })
 }
+
+
+export function postProjectInformation(params){
+  
+  return request({
+    url:"/api/postprojectinformation",
+    method:"post",
+    data:params
+  })
+}

src/api/stock.js

     method:"Post",
     data:params,
   })
+}
+
+export function postDrugInformation(params){
+  
+  return request({
+    url:"/api/good/postdruginformation",
+    method:"post",
+    data:params
+  })
 }

src/xt_pages/components/DrugExcel/index.vue

+<template>
+  <div>
+    <input id="excel-drug-input" ref="excel-drug-input" type="file" accept=".xlsx, .xls, .xltx" @change="handleClick">
+    <el-button :loading="loading" style="margin-left:16px;" size="mini" type="primary" @click="handleUpload">导入模板
+    </el-button>
+  </div>
+</template>
+
+<script>
+  import XLSX from 'xlsx'
+
+  export default {
+    props: {
+      beforeUpload: Function,
+      onSuccess: Function
+    },
+    data() {
+      return {
+        loading: false,
+        excelData: {
+          header: null,
+          results: null
+        }
+      }
+    },
+    methods: {
+      generateDate({ header, results }) {
+        this.excelData.header = header
+        this.excelData.results = results
+        this.onSuccess && this.onSuccess(this.excelData)
+      },
+      handleDrop(e) {
+        e.stopPropagation()
+        e.preventDefault()
+        if (this.loading) return
+        const files = e.dataTransfer.files
+        if (files.length !== 1) {
+          this.$message.error('Only support uploading one file!')
+          return
+        }
+        const rawFile = files[0] // only use files[0]
+
+        if (!this.isExcel(rawFile)) {
+          this.$message.error('Only supports upload .xlsx, .xls, .csv suffix files')
+          return false
+        }
+        this.upload(rawFile)
+        e.stopPropagation()
+        e.preventDefault()
+      },
+      handleDragover(e) {
+        e.stopPropagation()
+        e.preventDefault()
+        e.dataTransfer.dropEffect = 'copy'
+      },
+      handleUpload() {
+        document.getElementById('excel-drug-input').click()
+      },
+      handleClick(e) {
+        const files = e.target.files
+        const rawFile = files[0] // only use files[0]
+        if (!rawFile) return
+        this.upload(rawFile)
+      },
+      upload(rawFile) {
+        this.$refs['excel-drug-input'].value = null // fix can't select the same excel
+
+        if (!this.beforeUpload) {
+          this.readerData(rawFile)
+          return
+        }
+        const before = this.beforeUpload(rawFile)
+        if (before) {
+          this.readerData(rawFile)
+        }
+      },
+      readerData(rawFile) {
+        this.loading = true
+        return new Promise((resolve, reject) => {
+          const reader = new FileReader()
+          reader.onload = e => {
+            const data = e.target.result
+            const fixedData = this.fixdata(data)
+            const workbook = XLSX.read(btoa(fixedData), { type: 'base64' })
+            const firstSheetName = workbook.SheetNames[0]
+            const worksheet = workbook.Sheets[firstSheetName]
+            const header = this.get_header_row(worksheet)
+            const results = XLSX.utils.sheet_to_json(worksheet)
+            this.generateDate({ header, results })
+            this.loading = false
+            resolve()
+          }
+          reader.readAsArrayBuffer(rawFile)
+        })
+      },
+      fixdata(data) {
+        let o = ''
+        let l = 0
+        const w = 10240
+        for (; l < data.byteLength / w; ++l) o += String.fromCharCode.apply(null, new Uint8Array(data.slice(l * w, l * w + w)))
+        o += String.fromCharCode.apply(null, new Uint8Array(data.slice(l * w)))
+        return o
+      },
+      get_header_row(sheet) {
+        if(sheet['!ref'] == undefined){
+          this.loading = false
+          return
+        }
+
+        const headers = []
+        const range = XLSX.utils.decode_range(sheet['!ref'])
+        let C
+        const R = range.s.r /* start in the first row */
+        for (C = range.s.c; C <= range.e.c; ++C) { /* walk every column in the range */
+          var cell = sheet[XLSX.utils.encode_cell({ c: C, r: R })] /* find the cell in the first row */
+          var hdr = 'UNKNOWN ' + C // <-- replace with your desired default
+          if (cell && cell.t) hdr = XLSX.utils.format_cell(cell)
+          headers.push(hdr)
+        }
+        return headers
+      },
+      isExcel(file) {
+        return /\.(xlsx|xls|csv)$/.test(file.name)
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  #excel-project-input {
+    display: none;
+    z-index: -9999;
+  }
+
+  #drop {
+    border: 2px dashed #bbb;
+    width: 600px;
+    height: 160px;
+    line-height: 160px;
+    margin: 0 auto;
+    font-size: 24px;
+    border-radius: 5px;
+    text-align: center;
+    color: #bbb;
+    position: relative;
+  }
+</style>

src/xt_pages/components/ProjectExcel/index.vue

+<template>
+  <div>
+    <input id="excel-project-input" ref="excel-project-input" type="file" accept=".xlsx, .xls, .xltx" @change="handleClick">
+    <el-button :loading="loading" style="margin-left:16px;" size="mini" type="primary" @click="handleUpload">导入模板
+    </el-button>
+  </div>
+</template>
+
+<script>
+  import XLSX from 'xlsx'
+
+  export default {
+    props: {
+      beforeUpload: Function,
+      onSuccess: Function
+    },
+    data() {
+      return {
+        loading: false,
+        excelData: {
+          header: null,
+          results: null
+        }
+      }
+    },
+    methods: {
+      generateDate({ header, results }) {
+        this.excelData.header = header
+        this.excelData.results = results
+        this.onSuccess && this.onSuccess(this.excelData)
+      },
+      handleDrop(e) {
+        e.stopPropagation()
+        e.preventDefault()
+        if (this.loading) return
+        const files = e.dataTransfer.files
+        if (files.length !== 1) {
+          this.$message.error('Only support uploading one file!')
+          return
+        }
+        const rawFile = files[0] // only use files[0]
+
+        if (!this.isExcel(rawFile)) {
+          this.$message.error('Only supports upload .xlsx, .xls, .csv suffix files')
+          return false
+        }
+        this.upload(rawFile)
+        e.stopPropagation()
+        e.preventDefault()
+      },
+      handleDragover(e) {
+        e.stopPropagation()
+        e.preventDefault()
+        e.dataTransfer.dropEffect = 'copy'
+      },
+      handleUpload() {
+        document.getElementById('excel-project-input').click()
+      },
+      handleClick(e) {
+        const files = e.target.files
+        const rawFile = files[0] // only use files[0]
+        if (!rawFile) return
+        this.upload(rawFile)
+      },
+      upload(rawFile) {
+        this.$refs['excel-project-input'].value = null // fix can't select the same excel
+
+        if (!this.beforeUpload) {
+          this.readerData(rawFile)
+          return
+        }
+        const before = this.beforeUpload(rawFile)
+        if (before) {
+          this.readerData(rawFile)
+        }
+      },
+      readerData(rawFile) {
+        this.loading = true
+        return new Promise((resolve, reject) => {
+          const reader = new FileReader()
+          reader.onload = e => {
+            const data = e.target.result
+            const fixedData = this.fixdata(data)
+            const workbook = XLSX.read(btoa(fixedData), { type: 'base64' })
+            const firstSheetName = workbook.SheetNames[0]
+            const worksheet = workbook.Sheets[firstSheetName]
+            const header = this.get_header_row(worksheet)
+            const results = XLSX.utils.sheet_to_json(worksheet)
+            this.generateDate({ header, results })
+            this.loading = false
+            resolve()
+          }
+          reader.readAsArrayBuffer(rawFile)
+        })
+      },
+      fixdata(data) {
+        let o = ''
+        let l = 0
+        const w = 10240
+        for (; l < data.byteLength / w; ++l) o += String.fromCharCode.apply(null, new Uint8Array(data.slice(l * w, l * w + w)))
+        o += String.fromCharCode.apply(null, new Uint8Array(data.slice(l * w)))
+        return o
+      },
+      get_header_row(sheet) {
+        if(sheet['!ref'] == undefined){
+          this.loading = false
+          return
+        }
+
+        const headers = []
+        const range = XLSX.utils.decode_range(sheet['!ref'])
+        let C
+        const R = range.s.r /* start in the first row */
+        for (C = range.s.c; C <= range.e.c; ++C) { /* walk every column in the range */
+          var cell = sheet[XLSX.utils.encode_cell({ c: C, r: R })] /* find the cell in the first row */
+          var hdr = 'UNKNOWN ' + C // <-- replace with your desired default
+          if (cell && cell.t) hdr = XLSX.utils.format_cell(cell)
+          headers.push(hdr)
+        }
+        return headers
+      },
+      isExcel(file) {
+        return /\.(xlsx|xls|csv)$/.test(file.name)
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  #excel-project-input {
+    display: none;
+    z-index: -9999;
+  }
+
+  #drop {
+    border: 2px dashed #bbb;
+    width: 600px;
+    height: 160px;
+    line-height: 160px;
+    margin: 0 auto;
+    font-size: 24px;
+    border-radius: 5px;
+    text-align: center;
+    color: #bbb;
+    position: relative;
+  }
+</style>

src/xt_pages/data/basicConfig.vue

           </p>
         </div>
 
-        <div class="configBox">
+        <!-- <div class="configBox">
           <p style="font-size:18px;font-weight:bold">血压数据自动获取</p>
           <p style="font-size:14px;margin-top:5px;color:#333;">在联机的状态下,开启透析监测-血压数据自动获取功能后,则不需要手动输入,数据会自动上传到监测中</p>
           <p style="margin-top:20px;">透析监测-血压数据自动获取：
           <p style="margin-top:20px;">透析监测-血压数据自动获取：
           <el-switch v-model="is_open_order" @change="changeFuncThree"></el-switch>
           </p>
-        </div>
+        </div> -->
         <!--<div class="configBox">-->
             <!--<p>药品，耗材出库</p>-->
             <!--<p style="font-size:14px;margin-top:5px;">开启药品，耗材出库自动扣减则医生开完医嘱或处方可直接出库，不开启则由发药动作或出库按钮手动出库</p>-->
 
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import { getAllIsOpenInit,postXtHisIsOpen,postMonitorIsOpen,getMonitorConfig,addOrderConfig,getOrderConfig } from '@/api/config'
+import { getAllIsOpenInit,postXtHisIsOpen,postMonitorIsOpen} from '@/api/config'
 
 export default {
   name: "printTemplate",

src/xt_pages/data/components/consumables.vue

      <div style="display:flex; align-items:center;margin-bottom:10px;">
         <el-button type="primary" size="mini" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028">批量备案</el-button>
         <el-button type="primary" size="mini" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028" @click="GDYBBatchPutOnRecord">批量备案</el-button>
-        <!-- <el-button size="mini" type="primary">下载模版</el-button>
-        <upload-excel :on-success='handleSuccess' :before-upload="beforeUpload"></upload-excel> -->
+        <!-- <el-link target="_blank" href="https://kuyi.shengws.com/stock_template.xlsx" :underline="false"
+                 style="margin-left:15px">
+          <el-button
+            class="filter-item"
+            type="primary"
+            size="small"
+          >下载模版
+          </el-button>
+        </el-link>
+        <upload-excel :on-success='handleSuccess'></upload-excel>
+        <el-button
+          style="margin-left:10px;"
+          @click="generateLog()"
+          class="filter-item"
+          type="primary"
+          size="small"
+        >下载日志
+        </el-button> -->
       </div>
 
     <el-table
       </span>
     </el-dialog>
 
+
+     <el-dialog
+      title="提示"
+      :visible.sync="exportLogVisible"
+      width="40%"
+    >
+
+      <div v-for="(item,index) in logs" :key="index">
+        <span> {{ item.export_time | parseTime('{y}-{m}-{d} {h}:{i}:{s}')}}</span>
+        <br/>
+        <br/>
+        <span>{{getContent(item)}}</span>
+        <span >点击</span>
+        <span style="color:blue" @click="generateTxt(item)">查看详情</span>
+        <br/>
+        <br/>
+      </div>
+
+      <span slot="footer" class="dialog-footer">
+    <el-button @click="exportLogVisible = false">取 消</el-button>
+    <el-button type="primary" @click="exportLogVisible = false">确 定</el-button>
+    </span>
+    </el-dialog>
+
   </div>
 </template>
 
     postGoodInformation
   } from '@/api/stock'
   import UploadExcel from '@/xt_pages/components/UploadExcel'
+  import { generateLog } from '@/api/config'
   export default {
     components: {
       GoodInfoDailog,
               special_medical:"",
               production_type:""
             },
-
-            isVisibility: false
+            isVisibility: false,
+       
           }
         },
         selectDrug:[],
         manufacturer:"",
         dialogVisible:false,
         goodType:[],
-        dealers:[]
+        dealers:[],
+        exportLogVisible:false,
+        logs: [],
       }
     },
     methods: {
        
        var tableData = []
        for(let i=0;i<results.length;i++){
-         let obj = {}
+         let obj = {"good_kind_id":0,"good_type_id":0,"medical_insurance_id":0,"dealer_id":0,"statistic_id":0,"manufacturer_id":0,"unit_id":0}
          for (var key in results[i]) {
 
            if (results[i]['*耗材名称'] === undefined) {
                obj['is_mark'] = results[i][key].replace(/\s/g,"")
               }
            }
+
+
          }
          tableData.push(obj)
          console.log("表哥2222",tableData)
          var goodKind  =  this.getDictionaryDataConfig('system','good_kind')
-         console.log("耗材种类",goodKind)
-         console.log("耗材类型",this.goodType)
+         
+        //  console.log("耗材种类",goodKind)
+        //  console.log("耗材类型",this.goodType)
         var medicalInsuranceLevel = this.getDictionaryDataConfig('system','medical_insurance_level')
-        console.log("医保等级",medicalInsuranceLevel)
-        console.log("生产厂商",this.manufacturers)
-        console.log("经销商",this.dealers)
+        // console.log("医保等级",medicalInsuranceLevel)
+        // console.log("生产厂商",this.manufacturers)
+        // console.log("经销商",this.dealers)
         var statisticsCategory = getDictionaryDataConfig('system','statistics_category')
-        console.log("统计分类",statisticsCategory)
+        // console.log("统计分类",statisticsCategory)
+       
+        var goodUnit =  this.$store.getters.good_unit
+       
+
         for(let i=0;i<tableData.length;i++){ 
           for(let j=0;j<goodKind.length;j++){
+             
              if(tableData[i].good_kind == goodKind[j].name){
                 tableData[i].good_kind_id = goodKind[j].id
              }    
         }
 
         
-        // for(let a=0;a<this.manufacturers.length;a++){
+        for(let a=0;a<this.manufacturers.length;a++){
+           if(tableData[i].manufacturer == this.manufacturers[a].manufacturer_name){
+               tableData[i].manufacturer_id = this.manufacturers[a].id
+           }
+        }
+       
+        for(let s=0;s<this.dealers.length;s++){
+           if(tableData[i].dealer == this.dealers[s].dealer_name){
+               tableData[i].dealer_id = this.dealers[s].id
+           }
+        }
+        
+        for(let h=0;h<statisticsCategory.length;h++){
+           if(tableData[i].statistics_category == statisticsCategory[h].name){
+               tableData[i].statistic_id = statisticsCategory[h].id
+           }
+         }
+
+         for(let c=0;c<goodUnit.length;c++){
+            if(tableData[i].good_unit == goodUnit[c].name){
+               tableData[i].unit_id = goodUnit[c].id
+            }
+         }
+
+        }
+       }
+       
+       for(let i=0;i<tableData.length;i++){
+          tableData[i].stock_warn_count = parseInt(tableData[i].stock_warn_count)
 
-        // }
+          if(tableData[i].is_special_diseases == "是"){
+              tableData[i].is_special_diseases = 1
+          }
+          if(tableData[i].is_special_diseases == "否"){
+              tableData[i].is_special_diseases = 2
+          }
 
+          if(tableData[i].is_record == "是"){
+             tableData[i].is_record = 1
+          }
+          if(tableData[i].is_record == "否"){
+             tableData[i].is_record = 2
+          }
 
+         
 
-        }
+          if(tableData[i].special_medical == "是"){
+             tableData[i].special_medical = 1
+          }
+          if(tableData[i].special_medical == "否"){
+             tableData[i].special_medical = 2
+          }
        }
+     
+       
        let params = {
           'goods':tableData 
         }
        console.log("params2222",params)
-        return
+       
        
         postGoodInformation(params).then(response=>{
            if(response.data.state == 1){
              var msg =  response.data.data.msg
              this.$message.success("导入成功!")
+           }else{
+             this.$message.error("导入失败")
            }
         })
+      },
+      generateTxt: function(log) {
+        var content = ''
+        var errlog = log.err_logs
+        content = this.getContent(log)
+        for (let i = 0; i < errlog.length; i++) {
+          if (content.length == 0) {
+            content = errlog[i].err_msg
+          } else {
+            content = content + '\n' + errlog[i].err_msg
+          }
+        }
 
-      }
+        var url = new Blob(['\ufeff' + content], { type: 'text/txt,charset=UTF-8' })
+        if (typeof url === 'object' && url instanceof Blob) {
+          url = URL.createObjectURL(url) // 创建blob地址
+        }
+        const aLink = document.createElement('a')
+        aLink.href = url
+        aLink.download = this.timestampToTime(log.export_time) + '患者导入日志' + '.txt'
+        aLink.click()
+
+      },
+      getContent(log) {
+        return '您导入的文档共' + log.total_num + '条患者数据' + '，' + '已成功导入' + log.success_num + '条，导入失败' + log.fail_num + '条,'
+      },
+      timestampToTime(timestamp) {
+        var date = new Date(timestamp * 1000)//时间戳为10位需*1000，时间戳为13位的话不需乘1000
+        var Y = date.getFullYear() + '年'
+        var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '月'
+        var D = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate()) + '日 '
+        var h = (date.getHours() < 10 ? '0' + (date.getHours()) : date.getHours()) + '时'
+        var m = (date.getMinutes() < 10 ? '0' + (date.getMinutes()) : date.getMinutes()) + '分'
+        var s = (date.getSeconds() < 10 ? '0' + (date.getSeconds()) : date.getSeconds()) + '秒'
+        return Y + M + D + h + m + s
+      },
+       generateLog() {
+        let params = {
+          'log_type': 5
+        }
+        generateLog(params).then(
+          response => {
+            if (response.data.state === 1) {
+              this.logs = response.data.data.logs
+              this.exportLogVisible = true
+            } else {
+              this.$message.error(response.data.msg)
+            }
+          }
+        )
+
+      },
     }, 
     created() {
       this.getList()

src/xt_pages/data/components/drugs.vue

       </div>
       <div>
         <el-button type="primary" @click="openForm(0)">新增</el-button>
+        <!-- <el-button type="primary" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028" >批量备案</el-button>
+        <el-button type="primary" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028" @click="GDYBBatchPutOnRecord()">批量备案</el-button> -->
+      </div>
+      
+    </div>
+    <div style="display:flex; align-items:center;margin-bottom:10px;">
         <el-button type="primary" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028" >批量备案</el-button>
         <el-button type="primary" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028" @click="GDYBBatchPutOnRecord()">批量备案</el-button>
+        <!-- <el-link target="_blank" href="https://kuyi.shengws.com/drug_template.xlsx" :underline="false"
+                 style="margin-left:15px">
+          <el-button
+            class="filter-item"
+            type="primary"
+            size="small"
+          >下载模版
+          </el-button>
+        </el-link>
+        <upload-excel :on-success='handleSuccessTwo'></upload-excel>
+        <el-button
+          style="margin-left:10px;"
+          @click="generateLog()"
+          class="filter-item"
+          type="primary"
+          size="small"
+        >下载日志
+        </el-button> -->
       </div>
-    </div>
     <el-table :data="list" border style="width: 100%" :row-style="{ color: '#303133' }"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}"
              @selection-change="handleSelectionChange">
       :total="total"
     >
     </el-pagination>
+   
 
+    <el-dialog
+      title="提示"
+      :visible.sync="dialogVisible"
+      width="40%"
+    >
+      <span>您提交的文档不是系统标准导入模板，请检查您的文档或重新 </span>
+      <span slot="footer" class="dialog-footer">
+    <el-button @click="dialogVisible = false">取 消</el-button>
+    <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+      </span>
+    </el-dialog>
+
+
+     <el-dialog
+      title="提示"
+      :visible.sync="exportLogVisible"
+      width="40%"
+    >
+
+      <div v-for="(item,index) in logs" :key="index">
+        <span> {{ item.export_time | parseTime('{y}-{m}-{d} {h}:{i}:{s}')}}</span>
+        <br/>
+        <br/>
+        <span>{{getContent(item)}}</span>
+        <span >点击</span>
+        <span style="color:blue" @click="generateTxt(item)">查看详情</span>
+        <br/>
+        <br/>
+      </div>
+
+      <span slot="footer" class="dialog-footer">
+    <el-button @click="exportLogVisible = false">取 消</el-button>
+    <el-button type="primary" @click="exportLogVisible = false">确 定</el-button>
+    </span>
+    </el-dialog>
   </div>
 </template>
 
   import selfPayment from './selfPayment'
   import maintain from './maintain'
   import addDrugs from './addDrugs'
-  import { GetAllManufacturer } from '@/api/stock'
-  import { getDataConfig } from "@/utils/data";
+  import { GetAllManufacturer,postDrugInformation } from '@/api/stock'
+  import { getDataConfig,getDictionaryDataConfig } from "@/utils/data";
   import { uParseTime } from '@/utils/tools'
   import {
     createBaseDrugLib,
     deleteDurg
   } from '@/api/data'
  import {GetAllConfig } from "@/api/stock";
+ import { generateLog } from '@/api/config'
+ import UploadExcel from '@/xt_pages/components/UploadExcel'
   export default {
     components: {
       selfPayment,
       maintain,
-      addDrugs
+      addDrugs,
+      UploadExcel
     },
     data() {
       return {
 
         dealer:[],
         selectDrug:[],
+        dialogVisible:false,
+        exportLogVisible:false,
+        logs:[]
       }
     },
     methods: {
           } else {
             this.total = response.data.data.total
             this.list = []
-            console.log("333333333",response.data.data.list)
+           
             for (let i = 0; i < response.data.data.list.length; i++) {
               this.list.push(response.data.data.list[i])
             }
         })
        });
      },
+
+      handleSuccessTwo({ results, header }) {
+       console.log("hhhhhhhh",results)
+        if (header != undefined && header.length > 0) {
+            
+          var isHasDrugName = header.includes('*药品名称')
+         
+          var isHasDrugAlias = header.includes('*药品别名')
+          
+          var isHasDrugSpec = header.includes('*药品规格')
+        
+          var isHasDrugType =  header.includes('*药品类型')
+        
+          var isHasDrugStockLimit =  header.includes('*库存警戒')
+         
+          var isHasDrugOriginPlace= header.includes('*产地')
+         
+          var isHasDrugDosageForm = header.includes('*药品剂型')
+        
+          var isHasMaxUnit= header.includes('*最大单位')
+
+          var isHasMinUnit= header.includes('*最小单位')
+
+          var isHasUnitMatrixing= header.includes("*单位换算")
+        
+          var isHasRetailPrice = header.includes('*单零售价')
+        
+          var isHasLastPrice = header.includes('*上次进价')
+
+          var isHasDrugClassifye = header.includes('*药物分类')
+
+         var isHasManufacturer = header.includes('*生产厂商')
+
+          var isHasDealer =  header.includes('*经销商')
+          if (!(isHasDrugName && isHasDrugAlias && isHasDrugSpec && isHasDrugType && isHasDrugStockLimit && isHasDrugOriginPlace && isHasDrugDosageForm && isHasMaxUnit &&  isHasMinUnit && isHasUnitMatrixing &&  isHasRetailPrice && isHasLastPrice && isHasDrugClassifye && isHasManufacturer && isHasDealer)) {
+            this.dialogVisible = true
+            return
+          }
+        }else {
+          this.dialogVisible = true
+          return
+        }
+       
+       var tableData = []
+       for(let i=0;i<results.length;i++){
+         let obj = {"drug_type_id":0,"drug_dosage_form_id":0,"medical_insurance_level_id":0,"drug_classify_id":0,"manufacturer_id":0,"dealer_id":0}
+         for (var key in results[i]) {
+
+           if (results[i]['*药品名称'] === undefined) {
+                obj['drug_name'] = ''
+              } else {
+           if (key == '*药品名称') {
+               obj['drug_name'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+
+           if (results[i]['*药品别名'] === undefined) {
+                obj['drug_alias'] = ''
+              } else {
+           if (key == '*药品别名') {
+               obj['drug_alias'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+            if (results[i]['*药品规格'] === undefined) {
+                obj['drug_spec'] = ''
+              } else {
+           if (key == '*药品规格') {
+               obj['drug_spec'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+            if (results[i]['*药品类型'] === undefined) {
+                obj['drug_type'] = ''
+              } else {
+           if (key == '*药品类型') {
+               obj['drug_type'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+           
+
+           if (results[i]['*库存警戒'] === undefined) {
+                obj['drug_stock_limit'] = ''
+              } else {
+           if (key == '*库存警戒') {
+               obj['drug_stock_limit'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+           if (results[i]['*产地'] === undefined) {
+                obj['drug_origin_place'] = ''
+              } else {
+           if (key == '*产地') {
+               obj['drug_origin_place'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+           if (results[i]['*药品剂型'] === undefined) {
+                obj['drug_dosage_form'] = ''
+              } else {
+           if (key == '*药品剂型') {
+               obj['drug_dosage_form'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+
+            if (results[i]['*医保等级'] === undefined) {
+                obj['medical_insurance_level'] = ''
+              } else {
+           if (key == '*医保等级') {
+               obj['medical_insurance_level'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+           if (results[i]['*最大单位'] === undefined) {
+                obj['max_unit'] = ''
+              } else {
+           if (key == '*最大单位') {
+               obj['max_unit'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+           if (results[i]['*最小单位'] === undefined) {
+                obj['min_unit'] = ''
+              } else {
+           if (key == '*最小单位') {
+               obj['min_unit'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+
+            if (results[i]['*单位换算'] === undefined) {
+                obj['unit_matrixing'] = ''
+              } else {
+           if (key == '*单位换算') {
+               obj['unit_matrixing'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+            if (results[i]['*单零售价'] === undefined) {
+                obj['retail_price'] = ''
+              } else {
+           if (key == '*单零售价') {
+               obj['retail_price'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+           
+
+         if (results[i]['*上次进价'] === undefined) {
+                obj['last_price'] = ''
+              } else {
+           if (key == '*上次进价') {
+               obj['last_price'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+            if (results[i]['*药物分类'] === undefined) {
+                obj['drug_classify'] = ''
+              } else {
+           if (key == '*药物分类') {
+               obj['drug_classify'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+
+            if (results[i]['*生产厂商'] === undefined) {
+                obj['manufacturer'] = ''
+              } else {
+           if (key == '*生产厂商') {
+               obj['manufacturer'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+            if (results[i]['*经销商'] === undefined) {
+                obj['dealer'] = ''
+              } else {
+           if (key == '*经销商') {
+               obj['dealer'] = results[i][key].replace(/\s/g,"")
+              }
+          
+           }
+         }
+         tableData.push(obj)
+         console.log("表哥2222",tableData)
+      
+        var drugType =  this.getDictionaryDataConfig('system','drug_type')
+       
+       
+        var drugDosageForm = this.getDictionaryDataConfig('system','drug_dosage_form')
+       
+        var medicalInsuranceLevel = this.getDictionaryDataConfig('system','medical_insurance_level')
+        
+
+        var drugClassify =  this.getDictionaryDataConfig('system','drug_classify')
+       
+
+        var goodUnit =  this.$store.getters.good_unit
+       
+
+        for(let i=0;i<tableData.length;i++){ 
+          for(let j=0;j<drugType.length;j++){
+            if(tableData[i].drug_type == drugType[j].name){
+                tableData[i].drug_type_id = drugType[j].id
+             }    
+          }
+
+          for(let j=0;j<drugDosageForm.length;j++){
+            if(tableData[i].drug_dosage_form == drugDosageForm[j].name){
+                tableData[i].drug_dosage_form_id = drugDosageForm[j].id
+            }
+          }
+
+          for(let j=0;j<medicalInsuranceLevel.length;j++){
+            if(tableData[i].medical_insurance_level == medicalInsuranceLevel[j].name){
+                tableData[i].medical_insurance_level_id = medicalInsuranceLevel[j].id
+            }
+          }
+
+          for(let j=0;j<drugClassify.length;j++){
+             if(tableData[i].drug_classify == drugClassify[j].name){
+                tableData[i].drug_classify_id = drugClassify[j].id
+             }
+          } 
+         
+          console.log("生产",this.manufacturers)
+          for(let j=0;j<this.manufacturers.length;j++){
+            if(tableData[i].manufacturer == this.manufacturers[j].manufacturer_name){
+               tableData[i].manufacturer_id = this.manufacturers[j].id
+            }
+          }
+          console.log("经销商",this.dealer)
+          for(let j=0;j<this.dealer.length;j++){
+            if(tableData[i].dealer == this.dealer[j].dealer_name){
+               tableData[i].dealer_id = this.dealer[j].id
+            }
+          }
+          
+        }
+       }
+       for(let i=0;i<tableData.length;i++){
+          tableData[i].retail_price = parseInt(tableData[i].retail_price)
+          tableData[i].last_price = parseInt(tableData[i].last_price)
+       }
+       
+       let params = {
+          'drugs':tableData 
+        }
+       console.log("params2222",params)
+        postDrugInformation(params).then(response=>{
+           if(response.data.state == 1){
+             var msg =  response.data.data.msg
+             this.$message.success("导入成功!")
+           }else{
+             this.$message.error("导入失败")
+           }
+        })
+      },
+      generateTxt: function(log) {
+        var content = ''
+        var errlog = log.err_logs
+        content = this.getContent(log)
+        for (let i = 0; i < errlog.length; i++) {
+          if (content.length == 0) {
+            content = errlog[i].err_msg
+          } else {
+            content = content + '\n' + errlog[i].err_msg
+          }
+        }
+
+        var url = new Blob(['\ufeff' + content], { type: 'text/txt,charset=UTF-8' })
+        if (typeof url === 'object' && url instanceof Blob) {
+          url = URL.createObjectURL(url) // 创建blob地址
+        }
+        const aLink = document.createElement('a')
+        aLink.href = url
+        aLink.download = this.timestampToTime(log.export_time) + '患者导入日志' + '.txt'
+        aLink.click()
+
+      },
+      getContent(log) {
+        return '您导入的文档共' + log.total_num + '条患者数据' + '，' + '已成功导入' + log.success_num + '条，导入失败' + log.fail_num + '条,'
+      },
+      timestampToTime(timestamp) {
+        var date = new Date(timestamp * 1000)//时间戳为10位需*1000，时间戳为13位的话不需乘1000
+        var Y = date.getFullYear() + '年'
+        var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '月'
+        var D = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate()) + '日 '
+        var h = (date.getHours() < 10 ? '0' + (date.getHours()) : date.getHours()) + '时'
+        var m = (date.getMinutes() < 10 ? '0' + (date.getMinutes()) : date.getMinutes()) + '分'
+        var s = (date.getSeconds() < 10 ? '0' + (date.getSeconds()) : date.getSeconds()) + '秒'
+        return Y + M + D + h + m + s
+      },
+       generateLog() {
+        let params = {
+          'log_type': 4
+        }
+        generateLog(params).then(
+          response => {
+            if (response.data.state === 1) {
+              this.logs = response.data.data.logs
+              this.exportLogVisible = true
+            } else {
+              this.$message.error(response.data.msg)
+            }
+          }
+        )
+      },
+      getDictionaryDataConfig(module,filed_name){
+        return getDictionaryDataConfig(module,filed_name)
+      },
     },
     created() {
       this.getList()

src/xt_pages/data/components/editInspection.vue

               team_type: [{ required:true,message:'请填写组套类型',trigger:'change' }]
            },
            tableData:[],
-           item_id:[]
+           item_id:[],
+           projectList:[]
         }
     },
     methods:{

src/xt_pages/data/components/project.vue

             </div>
             <div>
              <el-button type="primary" @click="openForm(0)">新增</el-button>
-             <el-button type="primary" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028">批量备案</el-button>
-                <el-button type="primary" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028" @click="GDYBBatchPutOnRecord">批量备案</el-button>
-
+             <!-- <el-button type="primary" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028">批量备案</el-button>
+             <el-button type="primary" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028" @click="GDYBBatchPutOnRecord">批量备案</el-button> -->
             </div>
         </div>
+        <div style="display:flex; align-items:center;margin-bottom:10px;">
+        <el-button type="primary" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028" >批量备案</el-button>
+        <el-button type="primary" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028" @click="GDYBBatchPutOnRecord()">批量备案</el-button>
+        <!-- <el-link target="_blank" href="https://kuyi.shengws.com/project_template.xlsx" :underline="false"
+                 style="margin-left:15px">
+          <el-button
+            class="filter-item"
+            type="primary"
+            size="small"
+          >下载模版
+          </el-button>
+        </el-link>
+
+        <project-excel :on-success='handleSuccessOne'></project-excel>
+     
+        <el-button
+          style="margin-left:10px;"
+          @click="generateLog()"
+          class="filter-item"
+          type="primary"
+          size="small"
+        >下载日志
+        </el-button> -->
+      </div>
         <el-table :data="tableData" border style="width: 100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}"  @selection-change="handleSelectionChange">
             <el-table-column
               align="center"
 
         <add-project ref="addProject"></add-project>
         <editProject ref="editProject"></editProject>
+
+
+    <el-dialog
+      title="提示"
+      :visible.sync="dialogVisible"
+      width="40%"
+    >
+      <span>您提交的文档不是系统标准导入模板，请检查您的文档或重新 </span>
+      <span slot="footer" class="dialog-footer">
+    <el-button @click="dialogVisible = false">取 消</el-button>
+    <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+      </span>
+    </el-dialog>
+
+
+     <el-dialog
+      title="提示"
+      :visible.sync="exportLogVisible"
+      width="40%"
+    >
+
+      <div v-for="(item,index) in logs" :key="index">
+        <span> {{ item.export_time | parseTime('{y}-{m}-{d} {h}:{i}:{s}')}}</span>
+        <br/>
+        <br/>
+        <span>{{getContent(item)}}</span>
+        <span >点击</span>
+        <span style="color:blue" @click="generateTxt(item)">查看详情</span>
+        <br/>
+        <br/>
+      </div>
+
+      <span slot="footer" class="dialog-footer">
+    <el-button @click="exportLogVisible = false">取 消</el-button>
+    <el-button type="primary" @click="exportLogVisible = false">确 定</el-button>
+    </span>
+    </el-dialog>
     </div>
 </template>
 
 <script>
 import addProject from './addProject'
 import editProject from './editProject'
-import { getProjectList,deleteHisProject,getDePartmentList } from "@/api/project/project"
+import { getProjectList,deleteHisProject,getDePartmentList,postProjectInformation } from "@/api/project/project"
 import { getDictionaryDataConfig } from "@/utils/data";
 import axios from 'axios'
+import ProjectExcel from '@/xt_pages/components/ProjectExcel'
+import { generateLog } from '@/api/config'
 export default {
     components:{
         addProject,
-        editProject
+        editProject,
+        ProjectExcel
     },
     data(){
         return{
               label: '未备案'
           }],
           is_mark:"",
-           limit:100,
-           page:1,
-           departMentList:[]
+          limit:100,
+          page:1,
+          departMentList:[],
+           dialogVisible:false,
+           exportLogVisible:false,
+           logs:[]
+          
         }
     },
     methods:{
             this.departMentList = department
             }
         })
-     }
+     },
+      handleSuccessOne({ results, header }) {
+       
+        if (header != undefined && header.length > 0) {
+            
+          var isHasProjectName = header.includes('*项目名称')
+        
+          var isHasProjectPrice = header.includes('*零价')
+
+          var isHasProjectUnit = header.includes('*单位')
+
+          var isHasProjectCostClassify = header.includes('*费用类别')
+
+          var isHasProjectExecutiveSection = header.includes('*执行科室')
+         
+          var isHasProjectMedicalCoverage = header.includes('*医保等级')
+         
+          if (!(isHasProjectName && isHasProjectPrice && isHasProjectUnit && isHasProjectCostClassify && isHasProjectExecutiveSection && isHasProjectMedicalCoverage )) {
+            this.dialogVisible = true
+            return
+          }
+        }else {
+          this.dialogVisible = true
+          return
+        }
+       
+       var tableData = []
+       for(let i=0;i<results.length;i++){
+         let obj = {"cost_classify_id":0,"medical_insurance_level_id":0,"executive_section_id":0}
+         for (var key in results[i]) {
+           if (results[i]['*项目名称'] === undefined) {
+                obj['project_name'] = ''
+              } else {
+           if (key == '*项目名称') {
+               obj['project_name'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+          if (results[i]['*零价'] === undefined) {
+                obj['price'] = ''
+              } else {
+           if (key == '*零价') {
+               obj['price'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+         if (results[i]['*单位'] === undefined) {
+                obj['unit'] = ''
+              } else {
+         if (key == '*单位') {
+               obj['unit'] = results[i][key].replace(/\s/g,"")
+              }
+          }
+
+         if (results[i]['*费用类别'] === undefined) {
+                obj['cost_classify'] = ''
+              } else {
+         if (key == '*费用类别') {
+               obj['cost_classify'] = results[i][key].replace(/\s/g,"")
+              }
+          }
+
+        if (results[i]['*执行科室'] === undefined) {
+                obj['executive_section'] = ''
+              } else {
+         if (key == '*执行科室') {
+               obj['executive_section'] = results[i][key].replace(/\s/g,"")
+              }
+          }
+
+         if (results[i]['*医保等级'] === undefined) {
+                obj['medical_coverage'] = ''
+              } else {
+         if (key == '*医保等级') {
+               obj['medical_coverage'] = results[i][key].replace(/\s/g,"")
+              }
+          }
+         }
+         tableData.push(obj)
+         console.log("项目列表",tableData)
+        
+        var costClassify =  this.getDictionaryDataConfig('system','cost_classify')
+        console.log("费用类别",costClassify)
+        var medicalInsuranceLevel = this.getDictionaryDataConfig('system','medical_insurance_level')
+        console.log("医保等级",medicalInsuranceLevel)
+      
+        for(let i=0;i<tableData.length;i++){ 
+          for(let j=0;j<costClassify.length;j++){
+            console.log("222222",costClassify[j].name)
+             if(tableData[i].cost_classify === costClassify[j].name){
+                 tableData[i].cost_classify_id = costClassify[j].id
+             }
+          }  
+
+          for(let j=0;j<medicalInsuranceLevel.length;j++){
+             if(tableData[i].medical_coverage == medicalInsuranceLevel[j].name ){
+                 tableData[i].medical_insurance_level_id = medicalInsuranceLevel[j].id
+             }
+          }
+
+         
+          
+          for(let j=0;j<this.departMentList.length;j++){
+             if(tableData[i].executive_section == this.departMentList[j].name){
+                tableData[i].executive_section_id = this.departMentList[j].id
+             }
+          }
+        }
+       }
+
+       for(let i=0;i<tableData.length;i++){
+          tableData[i].price = parseInt(tableData[i].price)
+       }
+       
+       let params = {
+          'projects':tableData 
+        }
+       console.log("params2222",params)
+        postProjectInformation(params).then(response=>{
+           if(response.data.state == 1){
+             var msg =  response.data.data.msg
+             this.$message.success("导入成功!")
+           }else{
+             this.$message.error("导入失败")
+           }
+        })
+      },
+      generateTxt: function(log) {
+        var content = ''
+        var errlog = log.err_logs
+        content = this.getContent(log)
+        for (let i = 0; i < errlog.length; i++) {
+          if (content.length == 0) {
+            content = errlog[i].err_msg
+          } else {
+            content = content + '\n' + errlog[i].err_msg
+          }
+        }
+
+        var url = new Blob(['\ufeff' + content], { type: 'text/txt,charset=UTF-8' })
+        if (typeof url === 'object' && url instanceof Blob) {
+          url = URL.createObjectURL(url) // 创建blob地址
+        }
+        const aLink = document.createElement('a')
+        aLink.href = url
+        aLink.download = this.timestampToTime(log.export_time) + '患者导入日志' + '.txt'
+        aLink.click()
+
+      },
+      getContent(log) {
+         console.log("日志",log)
+        return '您导入的文档共' + log.total_num + '条患者数据' + '，' + '已成功导入' + log.success_num + '条，导入失败' + log.fail_num + '条,'
+      },
+      timestampToTime(timestamp) {
+        var date = new Date(timestamp * 1000)//时间戳为10位需*1000，时间戳为13位的话不需乘1000
+        var Y = date.getFullYear() + '年'
+        var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '月'
+        var D = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate()) + '日 '
+        var h = (date.getHours() < 10 ? '0' + (date.getHours()) : date.getHours()) + '时'
+        var m = (date.getMinutes() < 10 ? '0' + (date.getMinutes()) : date.getMinutes()) + '分'
+        var s = (date.getSeconds() < 10 ? '0' + (date.getSeconds()) : date.getSeconds()) + '秒'
+        return Y + M + D + h + m + s
+      },
+       generateLog() {
+        let params = {
+          'log_type': 6
+        }
+        generateLog(params).then(
+          response => {
+            if (response.data.state === 1) {
+              this.logs = response.data.data.logs
+              this.exportLogVisible = true
+            } else {
+              this.$message.error(response.data.msg)
+            }
+          }
+        )
+      },
+      getDictionaryDataConfig(module, filed_name) {
+          return getDictionaryDataConfig(module, filed_name)
+      },
     },
     created(){
       this.getlist()

src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue

         >
           <template slot-scope="scope">
             <span v-if="scope.row.execution_time != 0">
-              {{scope.row.start_time | parseTime('{m}-{d} {h}:{i}')}}
+              {{scope.row.execution_time | parseTime('{m}-{d} {h}:{i}')}}
             </span>
             <span v-else></span>
           </template>
         >
           <template slot-scope="scope">
             <span v-if="scope.row.execution_time != 0">
-              {{scope.row.start_time | parseTime('{m}-{d} {h}:{i}')}}
+              {{scope.row.execution_time | parseTime('{m}-{d} {h}:{i}')}}
             </span>
             <span v-else></span>
           </template>

src/xt_pages/dialysis/dialysisDoctorAdvice.vue

         >
           <template slot-scope="scope">
             <span v-if="scope.row.execution_time != 0">
-              {{scope.row.start_time | parseTime('{m}-{d} {h}:{i}')}}
+              {{scope.row.execution_time | parseTime('{m}-{d} {h}:{i}')}}
             </span>
             <span v-else></span>
           </template>
             console.log("列表数据",schedules)
             var config = resp.data.config
             console.log("config222222",config.is_open)
-           if(config.is_open == 0){
+           if(config.is_open == 0 || config.is_open == 2){
             this.show = true
             this.showOne = false
             let arr = []
                 })
                 this.scheduleMap = a
             }
+            console.log("列表22222",this.scheduleMap)
             this.scheduleMap.map(ele => {
                 let firstIndex = this.scheduleMap.findIndex(item => {
                   return item.patient_id === ele.patient_id   // 当category相同的时候，返回第一个相同的Index 赋值给 firstIndex
             })
             this.indexInfoList = newArr
            }
-           if(config.is_open == 1 || config.is_open == 2){
+           if(config.is_open == 1){
              this.show = false
              this.showOne  = true
             var schedules =  resp.data.hisAdvices
                 })
                 this.scheduleMap = a
             }
+            console.log('333333344444',this.scheduleMap)
             this.scheduleMap.map(ele => {
                 let firstIndex = this.scheduleMap.findIndex(item => {
                   return item.patient_id === ele.patient_id   // 当category相同的时候，返回第一个相同的Index 赋值给 firstIndex
             this.indexInfoList = newArr
            }
          }
-         console.log("列表22222",this.scheduleMap)
+        //  console.log("列表22222",this.scheduleMap)
         })
     },
     getValue: function(val) {

src/xt_pages/stock/detail/print.vue

                 <span v-else>{{calCount(stock)}}</span> 
               </td>
               <td style="line-height:50px" v-if="type == 1 && stock.query_warehousing_info.length > 0">{{stock.query_warehousing_info[0].price}}</td>
-              <td style="line-height:50px" v-if="type == 3 && stock.query_warehouseout_info.length > 0">{{stock.query_warehouseout_info[0].price}}</td>
+              <td style="line-height:50px" v-if="type == 3 && stock.query_warehouseout_info.length > 0">
+                <!-- {{stock.query_warehouseout_info[0].price}} -->
+                {{getReailPrice(stock.id)}}
+              </td>
               <td style="line-height: 50px" v-if="type == 1">{{calTotal(stock)}}</td>
               <td style="line-height: 50px" v-if="type == 3">
                 
                   <span v-if="org_id == 10090">{{getPrice(stock.id)}}</span>
-                  <span v-else>{{(getStockCount(stock.id) * stock.query_warehouseout_info[0].price).toFixed(2)}}</span> 
+                  <span v-else>{{(getStockCount(stock.id) * getPrice(stock.id)).toFixed(2)}}</span> 
                
              </td>
               <td style="line-height: 50px"></td>
         end_time: this.$route.query.end_time,
         stockTotal:[],
         wareOutInfo:[],
-        org_id:0
+        org_id:0,
+        informationList:[]
       }
     },
     methods: {
             var org_id = response.data.data.orgid
             console.log("org_id",org_id)
             this.org_id = org_id
-           
+
+            var informationlist = response.data.data.infomationList
+            console.log('数据列表',informationlist)
+            this.informationList = informationlist
             for (let i = 0; i < response.data.data.list.length; i++) {
               if (this.type == 1) {
                 if (response.data.data.list[i].query_warehousing_info.length > 0) {
      },
      getPrice(id){
        var sum = ""
+       for(let i=0;i<this.informationList.length;i++){
+        for(let j=0;j<this.wareOutInfo.length;j++){
+           if(this.informationList[i].id == this.wareOutInfo[j].good_id){
+             this.wareOutInfo[j].retail_price =  this.informationList[i].retail_price 
+           }
+        }
+       }
+      
        for(let j=0;j<this.wareOutInfo.length;j++){
          if(id == this.wareOutInfo[j].good_id){
-            sum += this.wareOutInfo[j].price * this.wareOutInfo[j].count
+            sum += (this.wareOutInfo[j].retail_price * this.wareOutInfo[j].count).toFixed(2)
          }
        }
        
        return sum
        
+     },
+     getReailPrice(id){
+       var price = 0
+       for(let i=0;i<this.informationList.length;i++){
+          if(id == this.informationList[i].id){
+             price = this.informationList[i].retail_price
+          }
+       }
+       return price
      }
     },
     created() {

src/xt_pages/stock/drugs/drugStockInOrder.vue

           for (let i = 0; i < response.data.data.list.length; i++) {
             this.Warehouse.warehouseDate.push(response.data.data.list[i]);
           }
+          
         }
       });
     },
           for (let i = 0; i < response.data.data.list.length; i++) {
             this.Warehouse.warehouseDate.push(response.data.data.list[i]);
           }
+          console.log("列表",this.warehouse.warehouseDate)
         }
       });
     },

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

               return;
             }
           }
+          for(let i=0;i<this.recordInfo.recordData.length;i++){
+             if(this.recordInfo.recordData[i].dealer == ""){
+                this.recordInfo.recordData[i].dealer = 0
+             }
+             
+             if(this.recordInfo.recordData[i].manufacturer == ""){
+               this.recordInfo.recordData[i].manufacturer = 0
+             }
+            
+          }
           const params = {
             stockIn: this.recordInfo.recordData
           };
-
+          console.log("params",params)
+         
           EditDrugWarehouse(
             params,
             this.warehousing_time,

src/xt_pages/stock/stockOutOrderDetailPrint.vue

                                     <td><span v-if="item.good_id != 0">{{getSpecificationName(item.good_id)}}</span></td>
                                     <td><span v-if="item.good_id!=0">{{getUnit(item.good_id)}}</span></td>
                                     <td>{{item.price}}</td>
-                                    <td>{{getOutStockCount(item.good_id)}}</td> 
-                                    <td>{{(getOutStockCount(item.good_id)*item.price).toFixed(2)}}</td>
+                                    <td>{{getOutStockCount(item.good_id) + getWarehouseOutInfoCount(item.warehouse_out_id,item.good_id)}}</td> 
+                                    <td>{{((getOutStockCount(item.good_id) +getWarehouseOutInfoCount(item.warehouse_out_id,item.good_id))*item.price).toFixed(2)}}</td>
                                 </tr>
                                 <tr>
                                   <td>合计</td>
             is_use:"",
             good_kind:"",
             is_charge:"",
-            list:[]
+            list:[],
+            wareoutList:[],
         }
     },
     methods:{
               total_price += this.getOutStockCount(this.warehousingOutInfo.warehousingOutData[i].good_id)*this.warehousingOutInfo.warehousingOutData[i].price
             }
            this.allPrice = total_price
+
+           var wareoutList =  response.data.data.wareoutList
+           console.log("出库数据",wareoutList)
+           this.wareoutList = wareoutList
           }
         })
       },
         }
         return ""
       },
+
+      getWarehouseOutInfoCount(warehouse_out_id,good_id){
+        var count = 0 
+         for(let i=0;i<this.wareoutList.length;i++){
+            if(warehouse_out_id == this.wareoutList[i].warehouse_out_id && good_id == this.wareoutList[i].good_id){
+                count = this.wareoutList[i].count
+            }
+         }
+        return count
+      }
       
     },
     created(){

src/xt_pages/stock/stockQuery.vue

     },
 
     exportList(){
-         console.log("2222222",this.WarehouseInfo.warehouseInfoDate)
+      
          import('@/vendor/Export2Excel').then(excel => {
          const tHeader = ['商品编码', '耗材名称', '耗材类型','规格型号','入库数量','进货价','入库退货','实际入库','出库数量','出库退库','实际出库','剩余库存']
          const filterVal = ['good_code', 'good_name', 'type_name','specification_name','stockInCount','price','salesReturnCount','realCount','stockOutCount','cancelStockCount','realOutCount','overplus'] 

src/xt_pages/user/patients.vue

 
       },
       handleSuccess({ results, header }) {
-        console.log(results)
+        console.log("header22222",results)
         if (header != undefined && header.length > 0) {
           var isHasName = header.includes('*姓名')
           var isHasGender = header.includes('*性别')
                     }
                   }
 
-                  // console.log(obj)
+                  console.log("2222222",obj)
 
                   if (results[i]['家庭住址'] === undefined) {
                     obj['home_address'] = ''
                     }
                   }
                 }
-
+               
                 this.export_date.push(obj)
               }
 
               let index = 0
-
+             
               for (let i = 0; i < this.export_date.length; i++) {
                 if (this.export_date[i].dialysis_no == '') {
                   let new_dialysis_no = this.max_dialysis_no + index
               let params = {
                 'patients': this.export_date
               }
+              console.log("export2222",this.export_date)
+              
               postExportPatients(params).then(
                 response => {
                   if (response.data.state === 1) {