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

src/api/config.js

@@ -137,7 +137,42 @@ export function postXtHisIsOpen(params) {
 }
 
 
+export function postMonitorIsOpen(params){
+  console.log("params",params)
+  return request({
+    url:"/api/monitor/open",
+    method:"get",
+    params:params
+  })
+}
+
 
+export function getMonitorConfig(params){
+  
+  return request({
+    url:"/api/monitor/getmonitorconfig",
+    method:"Get",
+    params:params,
+  })
+}
 
 
+export function addOrderConfig(params){
+  
+  return request({
+    url:"/api/order/addorderconfig",
+    method:"Get",
+    params:params,
+
+  })
+}
+
+export function getOrderConfig(params){
+  
+  return request({
+    url:"/api/order/getorderconfig",
+    method:"get",
+    params:params,
+  })
+}
 

src/api/project/project.js

@@ -524,3 +524,13 @@ export function getUnRegisterHisPatientList (params) {
     params:params,
   })
 }
+
+
+export function postProjectInformation(params){
+  
+  return request({
+    url:"/api/postprojectinformation",
+    method:"post",
+    data:params
+  })
+}

src/api/stock.js

@@ -584,4 +584,22 @@ export function GetOutStockTotalCount(params){
     method:"get",
     params:params
   })
+}
+
+export function postGoodInformation(params){
+  console.log("PARMAS22",params)
+  return request({
+    url:"/api/good/postgoodinformation",
+    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

@@ -0,0 +1,147 @@
+<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

@@ -0,0 +1,147 @@
+<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

@@ -25,6 +25,22 @@
           <el-switch v-model="is_open_xt_his" @change="changeFuncOne"></el-switch>
           </p>
         </div>
+
+        <!-- <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;">透析监测-血压数据自动获取：
+          <el-switch v-model="is_open_monitor" @change="changeFuncTwo"></el-switch>
+          </p>
+        </div>
+
+        <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;">透析监测-血压数据自动获取：
+          <el-switch v-model="is_open_order" @change="changeFuncThree"></el-switch>
+          </p>
+        </div> -->
         <!--<div class="configBox">-->
             <!--<p>药品，耗材出库</p>-->
             <!--<p style="font-size:14px;margin-top:5px;">开启药品，耗材出库自动扣减则医生开完医嘱或处方可直接出库，不开启则由发药动作或出库按钮手动出库</p>-->
@@ -62,7 +78,7 @@
 
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import { getAllIsOpenInit,postXtHisIsOpen } from '@/api/config'
+import { getAllIsOpenInit,postXtHisIsOpen,postMonitorIsOpen} from '@/api/config'
 
 export default {
   name: "printTemplate",
@@ -76,6 +92,8 @@ export default {
       ],
       value:false,
       is_open_xt_his:false,
+      is_open_monitor:false,
+      is_open_order:false,
     };
   },
   methods: {
@@ -126,14 +144,82 @@ export default {
           }
         )
       }
+    },
 
+    changeFuncTwo(){
+      console.log("3333333",this.is_open_monitor)
+      var is_open = 0
+      if(this.is_open_monitor == true){
+          is_open = 1
+       }
+       if(this.is_open_monitor == false){
+         is_open = 2
+       }
+      let params = {
+         is_open:is_open,
+       }
+     console.log("params",params)
+      postMonitorIsOpen(params).then(response=>{
+         if(response.data.state == 1){
+            var config = response.data.data.config
+            this.$message.success("成功")
+            this.getMonitorConfig()
+         }
+      })
+    },
+    getMonitorConfig(){
+      getMonitorConfig().then(response=>{
+         if(response.data.state == 1){
+           var config =  response.data.data.config
+           console.log("config",config)
+           if (config.is_open == 1) {
+              this.is_open_monitor = true
+           }
+           if (config.is_open == 2) {
+              this.is_open_monitor = false
+           }
+         }
+      })
+    },
 
-
+    changeFuncThree(){
+      var is_open = 0
+      if(this.is_open_order == true){
+          is_open = 1
+       }
+       if(this.is_open_order == false){
+         is_open = 2
+       }
+      let params = {
+         is_open:is_open,
+       } 
+      addOrderConfig(params).then(response=>{
+         if(response.data.state == 1){
+           var config = response.data.data.config
+           this.$message.success("成功")
+           this.getOrderConfig()
+         }
+      })
+    },
+    getOrderConfig(){
+      getOrderConfig().then(response=>{
+        if(response.data.state == 1){
+           var config =  response.data.data.config
+          if (config.is_open == 1) {
+              this.is_open_order = true
+           }
+           if (config.is_open == 2) {
+              this.is_open_order = false
+           }
+        }
+      })
     }
 
   },
   created() {
     this.getInitIsOpenConfig()
+    this.getMonitorConfig()
+    this.getOrderConfig()
 
   }
 };

src/xt_pages/data/components/consumables.vue

@@ -4,7 +4,7 @@
       <div class="cell clearfix" style="margin-bottom:0;">
         <el-input style="width: 180px;margin-right:10px;" @keyup.enter.native='searchAction' v-model="keywords"
                   class="filter-item"/>
-        <el-button style="margin-right:10px;" class="filter-item" type="primary" icon="el-icon-search"
+        <el-button style="margin-right:10px;" class="filter-item" type="primary" icon="el-icon-search" 
                    @click="searchAction">搜索
         </el-button>
         <label class="title"><span class="name">是否启用</span> : </label>
@@ -59,14 +59,32 @@
       </div>
       <div>
         <el-button type="primary" @click="openForm()">新增</el-button>
-        <!--<el-button type="primary" @click="BatchDelete()">批量备案</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" 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-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
       border style="width: 100%" :row-style="{ color: '#303133' }"
@@ -168,6 +186,43 @@
     ></good-info-dailog>
     <self-payment ref='selfPayment'></self-payment>
 
+
+    <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>
 
@@ -185,12 +240,16 @@
     GetGoodInfo,
     GetGoodInfoByGoodId,
     getGoodInfoList,
-    modifyGoodInfo
+    modifyGoodInfo,
+    postGoodInformation
   } from '@/api/stock'
+  import UploadExcel from '@/xt_pages/components/UploadExcel'
+  import { generateLog } from '@/api/config'
   export default {
     components: {
       GoodInfoDailog,
-      selfPayment
+      selfPayment,
+      UploadExcel,
     },
     data() {
       return {
@@ -267,8 +326,8 @@
               special_medical:"",
               production_type:""
             },
-
-            isVisibility: false
+            isVisibility: false,
+       
           }
         },
         selectDrug:[],
@@ -285,7 +344,12 @@
             label: '未备案'
         }],
         is_record:"",
-        manufacturer:""
+        manufacturer:"",
+        dialogVisible:false,
+        goodType:[],
+        dealers:[],
+        exportLogVisible:false,
+        logs: [],
       }
     },
     methods: {
@@ -797,6 +861,7 @@
               this.goodInfo.goodInfoDialog.formValue.dealers.push(
                 response.data.data.dealer[i]
               )
+              this.dealers.push(response.data.data.dealer[i])
             }
           }
         })
@@ -831,9 +896,8 @@
               if (response.data.data.goodType[i].type == 1) {
                 response.data.data.goodType[i].type_name = response.data.data.goodType[i].type_name + '(系统设定)'
               }
-              this.goodInfo.goodInfoDialog.formValue.goodType.push(
-                response.data.data.goodType[i]
-              )
+              this.goodInfo.goodInfoDialog.formValue.goodType.push(response.data.data.goodType[i])
+              this.goodType.push(response.data.data.goodType[i]) 
             }
           }
         })
@@ -1012,7 +1076,383 @@
       changeRecord(){
          this.getList()
       },
-    }, created() {
+      handleSuccess({ results, header }) {
+        console.log("header",header)
+        var goods = []
+        if (header != undefined && header.length > 0) {
+            
+          var isHasMedicalInsuranceLevel = header.includes('*医保等级')
+          // console.log("医保等级",isHasMedicalInsuranceLevel)
+          var isHasGoodUnit = header.includes('*单位')
+          // console.log("单位",isHasGoodUnit)
+          var isHasStockWarnCount = header.includes('*库存警戒')
+          // console.log("库存警戒",isHasStockWarnCount)
+          var isHasManuFacturer =  header.includes('*生产厂商')
+          // console.log("生产厂商",isHasManuFacturer)
+          var isHasDealer =  header.includes('*经销商')
+          // console.log("经销商",isHasDealer)
+          var isHasGoodName = header.includes('*耗材名称')
+          // console.log("耗材名称",isHasGoodName)
+          var isHasGoodKand = header.includes('*耗材种类')
+          // console.log("耗材种类",isHasGoodKand)
+          var isHasSpecificationName = header.includes('*规格型号')
+          // console.log("规格型号",isHasSpecificationName)
+          var isHasBuyPrice = header.includes('*零价')
+          // console.log("零价",isHasBuyPrice)
+         
+          if (!(isHasMedicalInsuranceLevel && isHasGoodUnit && isHasStockWarnCount && isHasManuFacturer && isHasDealer && isHasGoodName && isHasGoodKand && isHasSpecificationName &&  isHasBuyPrice)) {
+            this.dialogVisible = true
+            return
+          }
+        }else {
+          this.dialogVisible = true
+          return
+        }
+       
+       var tableData = []
+       for(let i=0;i<results.length;i++){
+         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['good_name'] = ''
+              } else {
+           if (key == '*耗材名称') {
+               obj['good_name'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+           
+           if (results[i]['*耗材种类'] === undefined) {
+                obj['good_kind'] = ''
+              } else {
+           if (key == '*耗材种类') {
+               obj['good_kind'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+          if (results[i]['*耗材类型'] === undefined) {
+                obj['type_name'] = ''
+              } else {
+           if (key == '*耗材类型') {
+               obj['type_name'] = 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['specification_name'] = ''
+              } else {
+           if (key == '*规格型号') {
+               obj['specification_name'] = 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['good_unit'] = ''
+              } else {
+             if (key == '*单位') {
+               obj['good_unit'] = 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['stock_warn_count'] = ''
+              } else {
+             if (key == '*库存警戒') {
+               obj['stock_warn_count'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+           if (results[i]['*经销商'] === undefined) {
+                obj['dealer'] = ''
+              } else {
+             if (key == '*经销商') {
+               obj['dealer'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+           if (results[i]['拼音'] === undefined) {
+                obj['pinyin'] = ''
+              } else {
+             if (key == '拼音') {
+               obj['pinyin'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+           if (results[i]['五笔'] === undefined) {
+                obj['wubi'] = ''
+              } else {
+             if (key == '五笔') {
+               obj['wubi'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+           if (results[i]['最新进价'] === undefined) {
+                obj['buy_price'] = ''
+              } else {
+             if (key == '最新进价') {
+               obj['buy_price'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+           if (results[i]['医保编码'] === undefined) {
+                obj['medical_insurance_number'] = ''
+              } else {
+             if (key == '医保编码') {
+               obj['medical_insurance_number'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+          if (results[i]['是否特病目录'] === undefined) {
+                obj['is_special_diseases'] = ''
+              } else {
+             if (key == '是否特病目录') {
+               obj['is_special_diseases'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+          
+           if (results[i]['是否备案'] === undefined) {
+                obj['is_record'] = ''
+              } else {
+             if (key == '是否备案') {
+               obj['is_record'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+          if (results[i]['统计分类'] === undefined) {
+                obj['statistics_category'] = ''
+              } else {
+             if (key == '统计分类') {
+               obj['statistics_category'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+          
+          if (results[i]['状态'] === undefined) {
+                obj['good_status'] = ''
+              } else {
+             if (key == '状态') {
+               obj['good_status'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+           
+
+          if (results[i]['社保目录编码'] === undefined) {
+                obj['social_security_directory_code'] = ''
+              } else {
+             if (key == '社保目录编码') {
+               obj['social_security_directory_code'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+          if (results[i]['生产地类别'] === undefined) {
+                obj['production_type'] = ''
+              } else {
+             if (key == '生产地类别') {
+               obj['production_type'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+           if (results[i]['特殊医用材料标志'] === undefined) {
+                obj['special_medical'] = ''
+              } else {
+             if (key == '特殊医用材料标志') {
+               obj['special_medical'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+           if (results[i]['备注'] === undefined) {
+                obj['is_mark'] = ''
+              } else {
+             if (key == '备注') {
+               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)
+        var medicalInsuranceLevel = this.getDictionaryDataConfig('system','medical_insurance_level')
+        // console.log("医保等级",medicalInsuranceLevel)
+        // console.log("生产厂商",this.manufacturers)
+        // console.log("经销商",this.dealers)
+        var statisticsCategory = getDictionaryDataConfig('system','statistics_category')
+        // 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 z=0;z<this.goodType.length;z++){
+          if(tableData[i].type_name == this.goodType[z].type_name){
+             tableData[i].good_type_id = this.goodType[z].id
+           }
+        }
+        
+        for(let y=0;y<medicalInsuranceLevel.length;y++){
+           if(tableData[i].medical_insurance_level == medicalInsuranceLevel[y].name){
+               tableData[i].medical_insurance_id = medicalInsuranceLevel[y].id
+           }
+        }
+
+        
+        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)
+       
+       
+        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()
       this.getAllDealer()
       this.getAllManufacturer()

src/xt_pages/data/components/drugs.vue

@@ -56,10 +56,33 @@
       </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">
@@ -176,7 +199,43 @@
       :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>
 
@@ -185,8 +244,8 @@
   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,
@@ -198,11 +257,14 @@
     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 {
@@ -264,8 +326,9 @@
           is_charge_predict: '',//是否收费预估项
           is_statistics_work: '',//是否统计工作量
           is_charge_use: '',//是否收费常用项
-          drug_code: ''
-
+          drug_code: '',
+          hosp_appr_flag:'',
+          lmt_used_flag:'',
         },
         tempFormValue: {
           drug_name: '',//药品名称
@@ -316,6 +379,8 @@
           social_security_directory_code:'',
           is_mark:'',
           prescription_mark:'',
+          hosp_appr_flag:'',
+          lmt_used_flag:'',
 
         },
 
@@ -338,6 +403,9 @@
 
         dealer:[],
         selectDrug:[],
+        dialogVisible:false,
+        exportLogVisible:false,
+        logs:[]
       }
     },
     methods: {
@@ -602,6 +670,9 @@
               if(this.formValue.prescription_mark == 0){
                   this.formValue.prescription_mark = ""
               }
+              if(this.formValue.hosp_appr_flag == 0){
+                this.formValue.hosp_appr_flag = ""
+              }
               this.$refs.addDrugs.show(id, this.formValue)
 
             }
@@ -655,7 +726,7 @@
           } 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])
             }
@@ -832,6 +903,317 @@
         })
        });
      },
+
+      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

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

src/xt_pages/data/components/project.vue

@@ -34,11 +34,34 @@
             </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"
@@ -118,19 +141,59 @@
 
         <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{
@@ -165,9 +228,13 @@ export default {
               label: '未备案'
           }],
           is_mark:"",
-           limit:100,
-           page:1,
-           departMentList:[]
+          limit:100,
+          page:1,
+          departMentList:[],
+           dialogVisible:false,
+           exportLogVisible:false,
+           logs:[]
+          
         }
     },
     methods:{
@@ -449,7 +516,187 @@ export default {
             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/data/components/tableson.vue

@@ -405,6 +405,7 @@ export default {
       this.$refs["dataForm"].validate(valid => {
         if (valid) {
           this.temp.field_type = parseInt(this.temp.field_type)
+         
           console.log("2222",this.temp.field_name)
           createChildConfig(this.temp).then(response => {
             if (!response.data) {

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

@@ -295,7 +295,7 @@
         >
           <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>
@@ -385,7 +385,7 @@
         >
           <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

@@ -149,7 +149,7 @@
         >
           <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/outpatientCharges/components/registerDialog.vue

@@ -182,7 +182,7 @@
 </template>
 
 <script>
-  import {uParseTime} from "@/utils/tools";
+  import {uParseTime,jsGetAge} from "@/utils/tools";
   import axios from 'axios'
   import {PostSearch} from '@/api/patient'
 
@@ -394,10 +394,23 @@
         this.form.id = val.id
         this.form.name = val.name
         this.form.gender = val.gender
-        this.form.age = val.age
         this.form.birthday = uParseTime(val.birthday, '{y}-{m}-{d}')
         this.form.phone = val.phone
         this.form.id_card = val.id_card_no
+        var thisLen =  this.form.id_card.length;
+        var birth = "";
+        if (thisLen == 15) {
+          birth = "19" + this.form.id_card.substr(6, 6);
+        } else {
+          birth = this.form.id_card.substr(6, 8);
+        }
+        var births =
+                birth.substr(0, 4) +
+                "-" +
+                birth.substr(4, 2) +
+                "-" +
+                birth.substr(6, 2);
+        this.form.age = jsGetAge(births, "-");
       },
       querySearchAsync(keyword, cb) {
         let key = ''
@@ -468,6 +481,10 @@
       },
       show: function () {
         this.form = Object.assign({}, this.resetForm)
+        this.form.p_type = 14
+        this.form.sick_type = this.sick[0].id
+        this.form.diagnosis = this.diagnoses[0].id
+
         // this.form.name = patientInfo.name
         // this.form.gender = patientInfo.gender
         // this.form.age = patientInfo.age
@@ -479,7 +496,6 @@
         // this.form.id_card_type = 1
         // if( this.form.social_type == 0){
         //   this.form.social_type = ""
-        //
         // }
         this.visibility = true
 

src/xt_pages/outpatientCharges/costComparison.vue

@@ -213,7 +213,7 @@
 
           var that = this
 
-          if (this.$store.getters.xt_user.org_id == 9919) {
+          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106) {
             axios.get('http://127.0.0.1:9532/api/checkaccount/get', {
               params: params
             })

src/xt_pages/outpatientCharges/newStatementPrint.vue

@@ -152,7 +152,7 @@
 
       },
       getInfo(order_id) {
-        if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919) {
+        if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 10106) {
 
           var that = this
 

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -65,10 +65,10 @@
                         </el-button>
 
                         <el-button
-                                   v-if="(this.hisPatientInfo.id > 0 && this.order.id == 0) || this.order.order_status == 1"
-                                   size="small"
-                                   @click="sz_open(3)"
-                                   type="primary">收费
+                                v-if="(this.hisPatientInfo.id > 0 && this.order.id == 0) || this.order.order_status == 1"
+                                size="small"
+                                @click="sz_open(3)"
+                                type="primary">收费
                         </el-button>
 
                         <el-button size="small" @click="sz_open(11)" type="primary"
@@ -86,7 +86,7 @@
                         <el-button size="small" @click="sz_open(10)" type="primary">打印</el-button>
 
                         <!--<el-button-->
-                                <!--size="small" @click="sz_open(7)" type="primary"-->
+                        <!--size="small" @click="sz_open(7)" type="primary"-->
                         <!--&gt;撤销明细-->
                         <!--</el-button>-->
                     </div>
@@ -103,13 +103,10 @@
                     <!--</el-button>-->
 
 
-
-
                     <!-- <el-button size="small" @click="open(1)" type="primary" style="margin-left:10px;">打印处置单</el-button>
                     <el-button size="small" @click="open(2)" type="primary">打印治疗单</el-button> -->
 
 
-
                     <div v-if="this.$store.getters.xt_user.org_id != 9504 && this.$store.getters.xt_user.org_id != 10028">
                         <el-button size="small" @click="open(3)" type="primary">打印</el-button>
                         <el-button v-loading="loadingone" size="small"
@@ -136,16 +133,16 @@
                         </el-button>
 
                         <el-button
-                                v-if="this.$store.getters.xt_user.org_id == 9919 "
+                                v-if="this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 10106"
                                 size="small" @click="open(10)" type="primary"
                         >退号
                         </el-button>
 
-                        <el-button
-                                v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919"
-                                size="small" @click="open(11)" type="primary"
-                        >撤销明细
-                        </el-button>
+                        <!--<el-button-->
+                        <!--v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919  || this.$store.getters.xt_user.org_id == 9671  || this.$store.getters.xt_user.org_id == 10106"-->
+                        <!--size="small" @click="open(11)" type="primary"-->
+                        <!--&gt;撤销明细-->
+                        <!--</el-button>-->
 
                     </div>
                     <!--<el-button size="small" @click="query" type="primary"-->
@@ -340,7 +337,8 @@
         <register-dialog ref='register' :doctors="doctors" :department="department" :sick="sick" :diagnoses="diagnoses"
                          v-on:confirm="confirm" v-on:cancel="cancel"></register-dialog>
 
-        <register-dialog9504 ref='register9504' :doctors="doctors" :departments="department" :sick="sick" :diagnoses="diagnoses"
+        <register-dialog9504 ref='register9504' :doctors="doctors" :departments="department" :sick="sick"
+                             :diagnoses="diagnoses"
                              v-on:confirm="registerConfirm" v-on:cancel="registerCancel"></register-dialog9504>
 
         <charge-dialog ref='charge' v-on:confirm="chargeConfirm" v-on:cancel="chargeCancel"></charge-dialog>
@@ -496,7 +494,7 @@
         treatVisible: false,
         orderObj: {},
         paramsObj: {},
-        newOrderObj:{},
+        newOrderObj: {},
         statementVisible: false,
         newStatementVisible: false,
 
@@ -527,7 +525,7 @@
     },
     methods: {
       query() {
-        if (this.$store.getters.xt_user.org_id == 9919) {
+        if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 10106) {
           var that = this
           axios.get('http://127.0.0.1:9532/api/org/info', {
             params: {}
@@ -645,7 +643,7 @@
 
             })
 
-        } else if (this.$store.getters.xt_user.org_id == 9919) {
+        } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 10106) {
           var that = this
           axios.get('http://127.0.0.1:9532/api/upload/get', {
             params: form,
@@ -660,17 +658,23 @@
                 that.$refs.charge.hide()
                 return false
               } else {
-                that.changeRadio(2)
-                that.radio = 2
+                if (response.data.data.failed_code == -10) {
 
-                that.$refs.charge.hide()
-                that.loadingtwo = false
-                that.state = '已收费'
-                that.$message({ message: '收费成功', type: 'success' })
-                that.loadingtwo = false
-                that.cal_one = this.cal_one - 1
-                that.cal_two = this.cal_two + 1
-                that.patientTableData.splice(this.current_index, 1)
+                  that.$message.error(response.data.data.msg)
+
+                } else {
+                  that.changeRadio(2)
+                  that.radio = 2
+
+                  that.$refs.charge.hide()
+                  that.loadingtwo = false
+                  that.state = '已收费'
+                  that.$message({ message: '收费成功', type: 'success', duration: 5000 })
+                  that.loadingtwo = false
+                  that.cal_one = this.cal_one - 1
+                  that.cal_two = this.cal_two + 1
+                  that.patientTableData.splice(this.current_index, 1)
+                }
               }
             })
             .catch(function(error) {
@@ -698,11 +702,10 @@
         }
       }, chargeCancel() {
         this.$refs.charge.hide()
-      },registerCancel(){
+      }, registerCancel() {
         this.$refs.register9504.hide()
 
-
-      },registerConfirm(forms){
+      }, registerConfirm(forms) {
         forms['record_time'] = this.record_date
         forms['admin_user_id'] = this.$store.getters.xt_user.user.id
         forms['org_id'] = this.$store.getters.xt_user.org_id
@@ -710,7 +713,7 @@
         this.loadingone = true
 
         var that = this
-        if ( this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028) {
+        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028) {
           axios.get('http://127.0.0.1:9532/sz/api/register/get', {
             params: forms,
             headers: {
@@ -794,7 +797,7 @@
 
         var that = this
 
-        if ( this.$store.getters.xt_user.org_id == 10028 ||  this.$store.getters.xt_user.org_id == 9504) {
+        if (this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504) {
 
           axios.get('http://127.0.0.1:9532/sz/api/register/get', {
             params: forms,
@@ -867,7 +870,7 @@
 
             })
 
-        } else if (this.$store.getters.xt_user.org_id == 9919 ) {
+        } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 10106) {
 
           axios.get('http://127.0.0.1:9532/api/register/get', {
             params: forms,
@@ -882,53 +885,58 @@
                 that.$refs.register.hide()
                 return false
               } else {
-                that.$refs.register.hide()
-                let params = {
-                  'record_date': that.record_date
-                }
-                getChargeHisPatientList(params).then(response => {
-                  if (response.data.state == 0) {
-                    that.$message.error(response.data.msg)
-                    return false
-                  } else {
-                    that.loadingone = false
-
-                    that.patientTableData = []
-                    that.all_table_data = []
-                    that.hisPatientDatas = []
-
-                    let one_count = 0
-                    let two_count = 0
-                    let three_count = 0
-                    for (let i = 0; i < response.data.data.list.length; i++) {
-                      that.all_table_data.push(response.data.data.list[i])
-                      if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1 || response.data.data.list[i].order.order_status == 3) {
-                        one_count = one_count + 1
-                        that.patientTableData.push(response.data.data.list[i])
-                      }
-                      if (response.data.data.list[i].order.order_status == 2) {
-                        two_count = two_count + 1
-                        that.patientTableData.push(response.data.data.list[i])
+                if (response.data.data.failed_code == -10) {
+                  that.$message.error(response.data.data.msg)
+                  return
+                } else {
+                  that.$refs.register.hide()
+                  let params = {
+                    'record_date': that.record_date
+                  }
+                  getChargeHisPatientList(params).then(response => {
+                    if (response.data.state == 0) {
+                      that.$message.error(response.data.msg)
+                      return false
+                    } else {
+
+                      that.loadingone = false
+                      that.$message({ message: '挂号成功', type: 'success' })
+
+                      that.patientTableData = []
+                      that.all_table_data = []
+                      that.hisPatientDatas = []
+                      let one_count = 0
+                      let two_count = 0
+                      let three_count = 0
+                      for (let i = 0; i < response.data.data.list.length; i++) {
+                        that.all_table_data.push(response.data.data.list[i])
+                        if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1 || response.data.data.list[i].order.order_status == 3) {
+                          one_count = one_count + 1
+                          that.patientTableData.push(response.data.data.list[i])
+                        }
+                        if (response.data.data.list[i].order.order_status == 2) {
+                          two_count = two_count + 1
+                          that.patientTableData.push(response.data.data.list[i])
+                        }
                       }
-                    }
-                    that.hisPatientDatas = response.data.data.list_two
-                    that.cal_one = one_count
-                    that.cal_two = two_count
-                    that.cal_three = three_count
-                    that.current_index = 0
-
-                    for (let i = 0; i < that.patientTableData.length; i++) {
-                      if (this.patientTableData[i].id == this.patientInfo.id) {
-                        that.$refs.tab.setCurrentRow(that.patientTableData[i])
-                        that.getPatientInformation(that.patientTableData[i].id, that.patientTableData[i].order.number)
+                      that.hisPatientDatas = response.data.data.list_two
+                      that.cal_one = one_count
+                      that.cal_two = two_count
+                      that.cal_three = three_count
+                      that.current_index = 0
+                      for (let i = 0; i < that.patientTableData.length; i++) {
+                        if (this.patientTableData[i].id == this.patientInfo.id) {
+                          that.$refs.tab.setCurrentRow(that.patientTableData[i])
+                          that.getPatientInformation(that.patientTableData[i].id, that.patientTableData[i].order.number)
+                        }
                       }
+                      var his_info = response.data.data.his_info
+                      that.hisPatientInfo = his_info
+
                     }
-                    that.$message({ message: '挂号成功', type: 'success' })
-                    that.loadingone = false
-                    var his_info = response.data.data.his_info
-                    that.hisPatientInfo = his_info
-                  }
-                })
+
+                  })
+                }
               }
             })
             .catch(function(error) {
@@ -943,7 +951,7 @@
               return false
             } else {
               this.getPatientList()
-              this.$message({ message: '挂号成功', type: 'success' })
+              this.$message({ message: '挂号成功', type: 'success', duration: 5000 })
               this.$refs.register.hide()
               this.loadingone = false
               var his_info = response.data.data.his_info
@@ -1487,7 +1495,7 @@
           }
 
         } else if (index == 5) {
-          if (this.$store.getters.xt_user.org_id == 9919 ) {
+          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 10106) {
 
             var that = this
             this.$confirm('是否退费', '退费', {
@@ -1513,9 +1521,13 @@
                     that.loadingtwo = false
                     return false
                   } else {
-                    that.changeRadio(1)
-                    that.$message({ message: '退费成功', type: 'success' })
-                    that.loadingtwo = false
+                    if (response.data.data.failed_code == -10) {
+                      that.$message.error(response.data.data.msg)
+                    } else {
+                      that.changeRadio(1)
+                      that.$message({ message: '退费成功', type: 'success', duration: 5000 })
+                      that.loadingtwo = false
+                    }
 
                   }
                 })
@@ -1582,7 +1594,7 @@
 
           var that = this
 
-          if (this.$store.getters.xt_user.org_id == 9919) {
+          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106) {
             axios.get('http://127.0.0.1:9532/api/checkaccount/get', {
               params: params
             })
@@ -1632,27 +1644,40 @@
           // this.$refs.print.getInfo(this.order.id)
 
         } else if (index == 10) {
-          let params = {
+          var that = this
+          this.$confirm('是否退号', '退号', {
+            confirmButtonText: '确 定',
+            cancelButtonText: '取 消',
+            type: 'warning'
+          }).then(() => {
+            let params = {
+              'patient_id': this.patientInfo.id,
+              'record_time': this.record_date,
+              'org_id': this.$store.getters.xt_user.org_id,
+              'admin_user_id': this.$store.getters.xt_user.user.id
+            }
+            axios.get('http://127.0.0.1:9532/api/refundnumber/post', {
+              params: params
+            })
+              .then(function(response) {
+                if (response.data.state == 0) {
+                  that.$message.error(response.data.msg)
+                  return false
+                } else {
+                  if (response.data.data.failed_code == -10) {
+                    that.$message.error(response.data.data.msg)
+                  } else {
+                    that.radio = 1
+                    that.changeRadio(1)
+                    that.$message({ message: '退号成功', type: 'success', duration: 5000 })
+                  }
 
-            'patient_id': this.patientInfo.id,
-            'record_time': this.record_date,
-            'org_id': this.$store.getters.xt_user.org_id
-          }
-          axios.get('http://127.0.0.1:9532/api/refundnumber/post', {
-            params: params
+                }
+              })
+              .catch(function(error) {
+              })
+          }).catch(() => {
           })
-            .then(function(response) {
-              if (response.data.state == 0) {
-                that.$message.error(response.data.msg)
-                that.loadingtwo = false
-                return false
-              } else {
-                that.$message({ message: '退号成功', type: 'success' })
-                that.loadingtwo = false
-              }
-            })
-            .catch(function(error) {
-            })
         } else if (index == 11) {
           let params = {
             'order_id': this.order.id,
@@ -1670,7 +1695,8 @@
                 that.loadingtwo = false
                 return false
               } else {
-                that.$message({ message: '退号成功', type: 'success' })
+                // that.$message({ message: '退号成功', type: 'success' })
+                that.$message({ message: '退明细成功', type: 'success', duration: 5000 })
                 that.loadingtwo = false
               }
             })
@@ -1719,7 +1745,7 @@
             })
         } else if (index == 15) {
           var that = this
-          if (this.$store.getters.xt_user.org_id == 9919) {
+          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 10106) {
 
             if (this.diagnosis.length || this.diagnosis == 0) {
               that.$message.error('诊断不能为空,请选择诊断内容')
@@ -1828,7 +1854,7 @@
 
           }
           this.loadingtwo = true
-          if (this.$store.getters.xt_user.org_id == 9919 ) {
+          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106) {
             var that = this
             axios.get('http://127.0.0.1:9532/api/pre_upload/get', {
               params: form
@@ -2528,7 +2554,7 @@
             axios.get('http://127.0.0.1:9532/sz/api/upload/get', {
               params: params,
               headers: {
-                'Permission': 5,
+                'Permission': 5
               }
             })
               .then(function(response) {
@@ -2640,8 +2666,7 @@
 
                   } else {
 
-                      that.$message({ message: '明细撤销成功', type: 'success' })
-
+                    that.$message({ message: '明细撤销成功', type: 'success' })
 
                   }
                 }
@@ -2657,7 +2682,7 @@
               patient_id: this.patient_id,
               prescription_id: this.prescription_id,
               order_id: this.order.id,
-              admin_user_id: this.$store.getters.xt_user.user.id,
+              admin_user_id: this.$store.getters.xt_user.user.id
 
             }
             this.newOrderObj = obj

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -150,7 +150,7 @@ export default {
 
     },
     getInfo(order_id) {
-      if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919) {
+      if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919 ||  this.$store.getters.xt_user.org_id == 9671 ||  this.$store.getters.xt_user.org_id == 10106  ||  this.$store.getters.xt_user.org_id == 4) {
 
         var that = this
 

src/xt_pages/outpatientCharges/summary.vue

@@ -96,7 +96,7 @@
         <el-table-column align="center" prop="name" label="操作">
           <template slot-scope="scope">
             <el-button size="mini" type="primary" @click="toDetail(scope.row)">详情</el-button>
-            <el-button size="mini" type="primary" @click="toPrint(scope.row)" v-if="(scope.row.order_status == 2 || $store.getters.xt_user.org_id == 9504) && (scope.row.order_status == 2 || $store.getters.xt_user.org_id == 9919)">结算单</el-button>
+            <el-button size="mini" type="primary" @click="toPrint(scope.row)" v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9504) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9919) ||  (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10106) ||  (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 4)">结算单</el-button>
           </template>
         </el-table-column>
       </el-table>

src/xt_pages/outpatientCharges/summaryDetail.vue

@@ -29,11 +29,6 @@
                         </el-table-column>
 
 
-                        <el-table-column align="center" prop="statistical_classification" width="100" label="组">
-                          <template slot-scope="scope">
-                            {{getGroup(scope.row.statistical_classification)}}
-                          </template>
-                        </el-table-column>
                         <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
                           <template slot-scope="scope">{{scope.row.single_dose}}&nbsp;&nbsp;{{scope.row.single_dose_unit}}</template>
 
@@ -65,6 +60,16 @@
 
                           </template>
                         </el-table-column>
+
+                          <el-table-column align="center" prop="name" width="60" label="总价">
+                              <template slot-scope="scope">
+                                  <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
+                                  {{scope.row.price}}元
+
+                              </template>
+                          </el-table-column>
+
+
                         <el-table-column align="center" prop="name" width="80" label="备注">
                           <template slot-scope="scope">
                             <!--<el-input v-model="scope.row.remark" readonly></el-input>-->

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -1584,6 +1584,11 @@
             this.allDrugs = response.data.data.drugs
             this.advices_template = response.data.data.advices_template
             this.doctors = response.data.data.doctors
+            for (let i = 0; i < this.doctors.length; i++){
+              if(this.doctors[i].user_type == 1){
+                this.doctors.splice(i,1)
+              }
+            }
             this.department = response.data.data.department
             this.sick = response.data.data.sick
             this.diagnoses = response.data.data.diagnose
@@ -1699,6 +1704,11 @@
 
       },
       setData(data, info, admin_info, doctors, department, hisPatientInfo, month_data) {
+        for (let i = 0; i < doctors.length; i++){
+          if(doctors[i].user_type == 1){
+            doctors.splice(i,1)
+          }
+        }
 
         this.curMonthPrescriptions = {}
         this.curPrescriptions = {}

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -748,6 +748,11 @@
             this.doctors = response.data.data.doctors
             this.department = response.data.data.department
 
+            for (let i = 0; i < this.doctors.length; i++){
+              if(this.doctors[i].user_type == 1){
+                this.doctors.splice(i,1)
+              }
+            }
 
             var month_prescriptions = response.data.data.month_prescriptions
             this.setMonthPrescription(month_prescriptions)
@@ -898,7 +903,7 @@
       },
 
       choosePatient(val) {
-        
+
         var nowDate = new Date()
         var nowYear = nowDate.getFullYear()
         var nowMonth = nowDate.getMonth() + 1

src/xt_pages/outpatientRecord/outpatientRecord.vue

@@ -12,8 +12,16 @@
                                @click="searchAction">
                         搜索
                     </el-button>
+                    <!--<el-select v-model="is_put_on_record" style="width:160px;" placeholder="请选择" @change="changeStatus">-->
+                        <!--<el-option-->
+                                <!--v-for="item,index in datas"-->
+                                <!--:key="index"-->
+                                <!--:label="item.name"-->
+                                <!--:value="item.id">-->
+                        <!--</el-option>-->
+                    <!--</el-select>-->
                 </div>
-                <el-button size="small" type="primary" @click="dialogFormVisible = true">医保对账</el-button>
+                <!--<el-button size="small" type="primary" @click="dialogFormVisible = t 。rue">医保对账</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'}"
@@ -28,17 +36,17 @@
                 >
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="流水号">
-                    <template slot-scope="scope">{{scope.row.trt_dcla_detl_sn}}</template>
+                    <template slot-scope="scope">{{scope.row.record.trt_dcla_detl_sn}}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="时间">
-                    <template slot-scope="scope" v-if="scope.row.ctime > 0">{{getTimes(scope.row.ctime)}}</template>
+                    <template slot-scope="scope" v-if="scope.row.record.ctime > 0">{{getTimes(scope.row.record.ctime)}}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="姓名">
                     <template slot-scope="scope">{{scope.row.name}}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="人员编号">
                     <template slot-scope="scope">
-                        <div>{{scope.row.psn_no}}</div>
+                        <div>{{scope.row.record.psn_no}}</div>
                     </template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="联系电话">
@@ -84,19 +92,19 @@
 
                 <el-table-column align="center" prop="name" label="险种类型">
                     <template slot-scope="scope">
-                        <div v-if="scope.row.insutype == '310'">职工基本医疗保险</div>
-                        <div v-if="scope.row.insutype == '320'">公务员医疗补助</div>
-                        <div v-if="scope.row.insutype == '330'">大额医疗费用补助</div>
-                        <div v-if="scope.row.insutype == '340'">离休人员医疗保障</div>
-                        <div v-if="scope.row.insutype == '390'">城乡居民基本医疗保险</div>
-                        <div v-if="scope.row.insutype == '392'">城乡居民大病医疗保险</div>
-                        <div v-if="scope.row.insutype == '510'">生育保险</div>
+                        <div v-if="scope.row.record.insutype == '310'">职工基本医疗保险</div>
+                        <div v-if="scope.row.record.insutype == '320'">公务员医疗补助</div>
+                        <div v-if="scope.row.record.insutype == '330'">大额医疗费用补助</div>
+                        <div v-if="scope.row.record.insutype == '340'">离休人员医疗保障</div>
+                        <div v-if="scope.row.record.insutype == '390'">城乡居民基本医疗保险</div>
+                        <div v-if="scope.row.record.insutype == '392'">城乡居民大病医疗保险</div>
+                        <div v-if="scope.row.record.insutype == '510'">生育保险</div>
                     </template>
                 </el-table-column>
 
                 <el-table-column align="center" prop="name" label="疾病类型">
                     <template slot-scope="scope">
-                        <el-select style="width:100%;" v-model="scope.row.sick_type" placeholder="请选择">
+                        <el-select style="width:100%;" v-model="scope.row.record.sick_type" placeholder="请选择">
                             <el-option
                                     v-for="(item,index) in sick"
                                     :key="index"
@@ -109,9 +117,12 @@
 
                 <el-table-column prop="date" label="操作" width="80" align="center" fixed="right">
                     <template slot-scope="scope">
-                        <el-button type="primary" size="small" icon="el-icon-refresh-left">
-                            <span v-if="scope.row.record.is_cancel == 0 ||scope.row.record.is_cancel == 2" @click="putOnRecord(1,scope.row)">备案</span>
-                            <span v-if="scope.row.record.is_cancel == 1" @click="putOnRecord(2,scope.row)">撤消</span>
+                        <el-button type="primary" size="small" icon="el-icon-tickets" v-if="scope.row.record.is_cancel == 0 ||scope.row.record.is_cancel == 2" >
+                            <span @click="putOnRecord(1,scope.row)">备案</span>
+                        </el-button>
+
+                        <el-button type="danger" size="small" icon="el-icon-tickets" v-if="scope.row.record.is_cancel == 1" >
+                            <span @click="putOnRecord(2,scope.row)">撤消</span>
                         </el-button>
                     </template>
                 </el-table-column>
@@ -120,7 +131,7 @@
             <el-dialog title="备案" :visible.sync="dialogFormVisible">
                 <el-form :model="form" label-width="100px">
                     <el-form-item label="险种类型" :label-width="formLabelWidth">
-                        <el-select v-model="insutype" placeholder="请选择" style="width: 200px;">
+                        <el-select v-model="insutype_value" placeholder="请选择" style="width: 200px;">
                             <el-option
                                     v-for="item in insutypes"
                                     :key="item.value"
@@ -166,6 +177,19 @@
     },
     data() {
       return {
+        is_put_on_record:0,
+        datas: [
+          {
+            id: 0,
+            name: '全部'
+          }, {
+            id: 1,
+            name: '已备案'
+          }, {
+            id: 2,
+            name: '未备案'
+          }
+        ],
         currentObject: null,
         crumbs: [
           { path: false, name: '门诊收费' },
@@ -177,6 +201,8 @@
         patientLoading: false,
         sick: [],
         limit: 10,
+        insutype_value:"",
+        psn_no:"",
         page: 1,
         dialogFormVisible: false,
         total: 0,
@@ -195,6 +221,32 @@
             label: '明细'
           }
         ],
+        insutype_arr: [
+          {
+            value: '310',
+            label: '职工基本医疗保险'
+          }, {
+            value: '320',
+            label: '公务员医疗补助'
+          }, {
+            value: '330',
+            label: '大额医疗费用补助'
+          }, {
+            value: '340',
+            label: '离休人员医疗保障'
+          },
+          {
+            value: '390',
+            label: '城乡居民基本医疗保险'
+          }, {
+            value: '392',
+            label: '城乡居民大病医疗保险'
+          }, {
+            value: '510',
+            label: '生育保险'
+          }
+
+        ],
 
         insutypes: [
           {
@@ -226,10 +278,74 @@
       }
     },
     methods: {
+      changeStatus(id){
+        this.keywords = ""
+        this.getList()
+      },
+      getName(value){
+        console.log(value)
+        for(let i = 0; i < this.insutype_arr.length; i++){
+          console.log(this.insutype_arr[i].value)
+          if(this.insutype_arr[i].value == value){
+            return this.insutype_arr[i].label
+          }
+        }
+        return "未知"
+      },
+      getGdybPatientInfo(){
+        let params ={
+          id_card_no:this.currentObject.id_card_no,
+          admin_user_id:  this.$store.getters.xt_user.user.id,
+        }
+        var that = this
+        axios.get('http://127.0.0.1:9532/api/patient/info', {
+          params: params
+        })
+          .then(function(response) {
+            if (response.data.state == 0) {
+              that.$message.error(response.data.msg)
+              return false
+            } else {
+
+              if(response.data.data.failed_code == -10){
+                that.$message.error(response.data.data.msg)
+              }else{
+                that.dialogFormVisible = true
+                that.insutypes = []
+                that.psn_no =  response.data.data.info.output.baseinfo.psn_no
+                for (let i =0; i < response.data.data.info.output.insuinfo.length; i++){
+                  let obj = {
+                    value:response.data.data.info.output.insuinfo[i].insutype,
+                    label:""
+                  }
+                  for(let b = 0; b < that.insutype_arr.length; b++){
+                    if(that.insutype_arr[b].value == response.data.data.info.output.insuinfo[i].insutype){
+                      obj.label = that.insutype_arr[b].label
+                    }
+                  }
+                  if(response.data.data.info.output.insuinfo[i].psn_insu_stas == 1){
+                    obj.label =  obj.label
+
+                  }else{
+                    obj.label =  obj.label +"(已暂停)"
+                  }
+
+                  that.insutypes.push(obj)
+
+                }
+              }
+            }
+          })
+          .catch(function(error) {
+
+          })
+      },
       putOnRecord(type, row) {
         if (type == 1) {
-          this.dialogFormVisible = true
           this.currentObject = row
+
+          this.getGdybPatientInfo()
+
         } else {
           this.$confirm('是否撤销备案', '撤销备案', {
             confirmButtonText: '确 定',
@@ -237,7 +353,7 @@
             type: 'warning'
           }).then(() => {
             let params = {
-              'id': row.id,
+              'id': row.record.id,
               'admin_user_id': this.$store.getters.xt_user.user.id
 
             }
@@ -299,9 +415,34 @@
 
       },
       confirm() {
+        if(this.currentObject.record.doctor_id == '' || this.currentObject.record.doctor_id  == 0){
+          this.$message.error("请选择医生")
+          return
+        }
+
+        if(this.currentObject.record.department_id == '' || this.currentObject.record.department_id  == 0){
+          this.$message.error("请选择科室")
+          return
+        }
+
+        if(this.currentObject.record.sick_type == '' || this.currentObject.record.sick_type  == 0){
+          this.$message.error("请选择疾病类型")
+          return
+        }
+
+        if(this.currentObject.record.insutype_value == '' || this.currentObject.record.insutype_value  == 0){
+          this.$message.error("请选择险种")
+          return
+        }
+
         let params = {
           record_type: 0,
           patient_id: this.currentObject.id,
+          insutype: this.insutype_value,
+          psn_no: this.psn_no,
+          sick_id: this.currentObject.record.sick_type,
+          doctor_id: this.currentObject.record.doctor_id,
+          department_id:this.currentObject.record.department_id,
           admin_user_id: this.$store.getters.xt_user.user.id
         }
 
@@ -317,9 +458,20 @@
               if(response.data.data.failed_code == -10){
                 that.$message.error(response.data.data.msg)
               }else{
+                that.$message.success("备案成功")
+                that.dialogFormVisible = false
                 for (let i = 0; i < that.tableData.length; i++) {
                   if (that.tableData[i].id == that.currentObject.id) {
-                    that.tableData[i].record.is_cancel == 1
+                    that.tableData[i].record.is_cancel =response.data.data.result.is_cancel
+                    that.tableData[i].record.id = response.data.data.result.id
+                    that.tableData[i].record.trt_dcla_detl_sn = response.data.data.result.trt_dcla_detl_sn
+                    that.tableData[i].record.psn_no = response.data.data.result.psn_no
+                    that.tableData[i].record.doctor_id = response.data.data.result.doctor_id
+                    that.tableData[i].record.department_id = response.data.data.result.department_id
+                    that.tableData[i].record.ctime = response.data.data.result.ctime
+                    that.tableData[i].record.insutype = response.data.data.result.insutype
+                    that.tableData[i].record.sick_type = response.data.data.result.sick_type
+
                   }
                 }
               }
@@ -356,7 +508,8 @@
         let params = {
           'page': this.page,
           'limit': this.limit,
-          'keywords': this.keywords
+          'keywords': this.keywords,
+          'is_put_on_record':this.is_put_on_record
         }
         this.tableData = []
         this.patientLoading = true
@@ -381,6 +534,10 @@
                 this.tableData[i].record.department_id = ''
               }
 
+              if (this.tableData[i].record.sick_type == 0) {
+                this.tableData[i].record.sick_type = ''
+              }
+
             }
 
           }

src/xt_pages/outpatientRegistration/index.vue

@@ -427,7 +427,7 @@
     saveHisPatient
   } from '@/api/project/project'
   import { getDictionaryDataConfig } from '@/utils/data'
-  import { uParseTime } from '@/utils/tools'
+  import { uParseTime,jsGetAge } from '@/utils/tools'
   import { getInitData } from '@/api/his/his'
   import axios from 'axios'
 
@@ -655,6 +655,21 @@
         this.form.birthday = uParseTime(val.birthday, '{y}-{m}-{d}')
         this.form.phone = val.phone
         this.form.idCard = val.id_card_no
+
+        var thisLen =  this.form.idCard.length;
+        var birth = "";
+        if (thisLen == 15) {
+          birth = "19" + this.form.idCard.substr(6, 6);
+        } else {
+          birth = this.form.idCard.substr(6, 8);
+        }
+        var births =
+          birth.substr(0, 4) +
+          "-" +
+          birth.substr(4, 2) +
+          "-" +
+          birth.substr(6, 2);
+        this.form.age = jsGetAge(births, "-");
       },
       querySearchAsync(keyword, cb) {
         let key = ''
@@ -900,11 +915,6 @@
           return
         }
 
-        // if (this.form.p_type == '') {
-        //   this.$message.error('处方类型不能为空')
-        //   this.is_Name = true
-        //   return
-        // }
 
         this.$refs[formName].validate((valid) => {
           if (valid) {
@@ -965,7 +975,7 @@
                 .catch(function(error) {
 
                 })
-            } else if (this.$store.getters.xt_user.org_id == 9919) {
+            } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106) {
               var that = this
 
               axios.get('http://127.0.0.1:9532/api/register/get', {
@@ -981,11 +991,15 @@
                     that.$refs.register.hide()
                     return false
                   } else {
-                    that.$refs.register.hide()
-                    that.getPatientList()
-                    that.$message({ message: '挂号成功', type: 'success' })
-                    that.loadingone = false
-
+                    if (response.data.data.failed_code == -10) {
+                      that.$message.error(response.data.data.msg)
+                      return
+                    } else {
+                      that.$refs.register.hide()
+                      that.getPatientList()
+                      that.$message({ message: '挂号成功', type: 'success' })
+                      that.loadingone = false
+                    }
                     // var his_info = response.data.data.his_info
                     // that.hisPatientInfo = his_info
                   }
@@ -1172,7 +1186,7 @@
                 .catch(function(error) {
 
                 })
-            } else if (this.$store.getters.xt_user.org_id == 9919) {
+            } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106) {
               var that = this
 
               axios.get('http://127.0.0.1:9532/api/register/get', {
@@ -1302,6 +1316,10 @@
             this.sick = response.data.data.sick
             this.diagnoses = response.data.data.diagnose
 
+            this.form.p_type = 14
+            this.form.sick_type = this.sick[0].id
+            this.form.diagnosis = this.diagnoses[0].id
+
           }
         })
 

src/xt_pages/stock/detail/print.vue

@@ -53,13 +53,24 @@
                 <span v-if="stock.type && stock.type.type_name.length > 0">{{stock.type.type_name}}</span>
               </td> -->
               <td style="line-height: 50px">
-                <span v-if="type == 3">{{getStockCount(stock.id)}}</span>
-                 <span v-else>{{calCount(stock)}}</span> 
+                <span v-if="type == 3">
+                  <span v-if="org_id == 10090">{{getWareOut(stock.id)}}</span>
+                  <span else>{{getStockCount(stock.id)}}</span>
+                </span>
+                <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">{{(getStockCount(stock.id) * stock.query_warehouseout_info[0].price).toFixed(2)}}</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) * getPrice(stock.id)).toFixed(2)}}</span> 
+               
+             </td>
               <td style="line-height: 50px"></td>
             </tr>
             </tbody>
@@ -124,7 +135,10 @@
         type: this.$route.query.type,
         start_time: this.$route.query.start_time,
         end_time: this.$route.query.end_time,
-        stockTotal:[]
+        stockTotal:[],
+        wareOutInfo:[],
+        org_id:0,
+        informationList:[]
       }
     },
     methods: {
@@ -172,6 +186,16 @@
             console.log("stocktOTl",stockTotal)
             this.stockTotal = stockTotal
             console.log("导出数据",response.data.data.list)
+            var info = response.data.data.info
+            console.log("infor2222222",info)
+            this.wareOutInfo = info
+            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) {
@@ -323,6 +347,43 @@
           }
        }
        return count
+     },
+     getWareOut(id){
+      var count = ""
+      for(let i=0;i<this.wareOutInfo.length;i++){
+         if(id == this.wareOutInfo[i].good_id){
+            count = this.wareOutInfo[i].count
+         }
+      }
+      return count
+     },
+     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].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

@@ -397,6 +397,7 @@ export default {
           for (let i = 0; i < response.data.data.list.length; i++) {
             this.Warehouse.warehouseDate.push(response.data.data.list[i]);
           }
+          
         }
       });
     },
@@ -421,6 +422,7 @@ export default {
           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

@@ -586,10 +586,21 @@ export default {
               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

@@ -35,8 +35,8 @@
                                     <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>
@@ -98,7 +98,8 @@ export default {
             is_use:"",
             good_kind:"",
             is_charge:"",
-            list:[]
+            list:[],
+            wareoutList:[],
         }
     },
     methods:{
@@ -147,6 +148,10 @@ export default {
               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
           }
         })
       },
@@ -241,6 +246,16 @@ export default {
         }
         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

@@ -383,7 +383,7 @@ export default {
     },
 
     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

@@ -134,7 +134,7 @@
         </el-button>
       </div>
 
-      <el-button  type="primary" plain style="float:right;" icon="el-icon-download" @click="putOnRecord(2,{})" >备案</el-button>
+      <!-- <el-button  type="primary" plain style="float:right;" icon="el-icon-download" @click="putOnRecord(2,{})" >备案</el-button> -->
 
     </div>
     <div class="app-container">
@@ -453,21 +453,6 @@
               ></el-button>
             </el-tooltip>
 
-            <el-tooltip
-                    class="item"
-                    effect="dark"
-                    content="备案"
-                    placement="top"
-            >
-              <el-button
-                      type="danger"
-                      icon="el-icon-tickets"
-                      size="small"
-                      @click="
-                  putOnRecord(1,scope.row)
-                "
-              ></el-button>
-            </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
@@ -861,9 +846,7 @@
 
       },
       handleSuccess({ results, header }) {
-        console.log("999999999")
-
-        console.log(results)
+        console.log("header22222",results)
         if (header != undefined && header.length > 0) {
           var isHasName = header.includes('*姓名')
           var isHasGender = header.includes('*性别')
@@ -888,8 +871,7 @@
           this.dialogVisible = true
           return
         }
-        getMaxDialysisNo().then(
-          response => {
+        getMaxDialysisNo().then(response => {
             if (response.data.state === 1) {
               this.max_dialysis_no = response.data.data.dialysis_no
               if (this.max_dialysis_no == 0) {
@@ -1080,7 +1062,7 @@
                     }
                   }
 
-                  // console.log(obj)
+                  console.log("2222222",obj)
 
                   if (results[i]['家庭住址'] === undefined) {
                     obj['home_address'] = ''
@@ -1090,12 +1072,12 @@
                     }
                   }
                 }
-
+               
                 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
@@ -1186,6 +1168,8 @@
               let params = {
                 'patients': this.export_date
               }
+              console.log("export2222",this.export_date)
+              
               postExportPatients(params).then(
                 response => {
                   if (response.data.state === 1) {

src/xt_pages/workforce/appointment.vue

@@ -215,6 +215,7 @@
         clen:7,
         nowYear: new Date().getFullYear(),
         schedule_week:0,
+        newDay:[]
 
       }
     },
@@ -478,6 +479,8 @@
             '区号',
             '机号'
           ]
+        if(this.export_type == 0){
+             
           const multiHeader = [['区号', '机号', '周一'+"("+this.days[0]+")" , '', '', '周二'+"("+this.days[1]+")", '', '', '周三'+"("+this.days[2]+")" , '', '', '周四'+"("+this.days[3]+")" , '', '', '周五'+"("+this.days[4]+")" , '', '', '周六'+"("+this.days[5]+")" , '', '', '周日'+"("+this.days[6]+")" , '', '', '周一'+"("+this.days[7]+")" , '', '', '周二'+"("+this.days[8]+")" , '', '', '周三'+"("+this.days[9]+")" , '', '', '周四'+"("+this.days[10]+")" , '', '', '周五'+"("+this.days[11]+")" , '', '', '周六'+"("+this.days[12]+")" , '', '', '周日'+"("+this.days[13]+")", '', '', '周一'+"("+this.days[14]+")", '', '', '周二'+"("+this.days[15]+")", '', '', '周三'+"("+this.days[16]+")", '', '', '周四'+"("+this.days[17]+")", '', '', '周五'+"("+this.days[18]+")", '', '', '周六'+"("+this.days[19]+")", '', '', '周日'+"("+this.days[20]+")", '', '']]
           const header = ['', '', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上']
           const merges = ['A1:A2', 'B1:B2', 'C1:E1', 'F1:H1', 'I1:K1', 'L1:N1', 'O1:Q1', 'R1:T1', 'U1:W1', 'X1:Z1', 'AA1:AC1', 'AD1:AF1', 'AG1:AI1', 'AJ1:AL1', 'AM1:AO1', 'AP1:AR1', 'AS1:AU1', 'AV1:AX1', 'AY1:BA1', 'BB1:BD1', 'BE1:BG1', 'BH1:BJ1', 'BK1:BM1']
@@ -502,13 +505,11 @@
               obj['机号'] = jihaos[b].number.toString()
               list.push(obj)
             }
-
             i++
           }
           console.log("listw22222222",list)
             var data = []
-          // const data = this.formatJson(filterVal, this.tableList)
-        
+
           this.tableList.map(item=>{
             data.push(Object.values(item))
 
@@ -516,6 +517,7 @@
           console.log("data",data)
           
           const filename = '排班模版'
+        
           excel.export_json_to_excel({
             multiHeader,
             header,
@@ -524,6 +526,55 @@
             filename
           })
           this.downloadLoading = false
+          }
+          
+          if(this.export_type == 1){
+            console.log("333333",this.newDay)
+             const multiHeader = [['区号', '机号', '周一'+"("+this.newDay[0]+")" , '', '', '周二'+"("+this.newDay[1]+")", '', '', '周三'+"("+this.newDay[2]+")" , '', '', '周四'+"("+this.newDay[3]+")" , '', '', '周五'+"("+this.newDay[4]+")" , '', '', '周六'+"("+this.newDay[5]+")" , '', '', '周日'+"("+this.newDay[6]+")" , '', '', '周一'+"("+this.days[7]+")" , '', '', '周二'+"("+this.days[8]+")" , '', '', '周三'+"("+this.days[9]+")" , '', '', '周四'+"("+this.days[10]+")" , '', '', '周五'+"("+this.days[11]+")" , '', '', '周六'+"("+this.days[12]+")" , '', '', '周日'+"("+this.days[13]+")", '', '', '周一'+"("+this.days[14]+")", '', '', '周二'+"("+this.days[15]+")", '', '', '周三'+"("+this.days[16]+")", '', '', '周四'+"("+this.days[17]+")", '', '', '周五'+"("+this.days[18]+")", '', '', '周六'+"("+this.days[19]+")", '', '', '周日'+"("+this.days[20]+")", '', '']]
+             const header = ['', '', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上']
+             const merges = ['A1:A2', 'B1:B2', 'C1:E1', 'F1:H1', 'I1:K1', 'L1:N1', 'O1:Q1', 'R1:T1', 'U1:W1', 'X1:Z1', 'AA1:AC1', 'AD1:AF1', 'AG1:AI1', 'AJ1:AL1', 'AM1:AO1', 'AP1:AR1', 'AS1:AU1', 'AV1:AX1', 'AY1:BA1', 'BB1:BD1', 'BE1:BG1', 'BH1:BJ1', 'BK1:BM1']
+            var list = []
+            let i = 0
+            for (let key  in this.partitions) {
+              var tempValue
+              var jihaos = this.partitions[key].jihaos
+
+              if (i == 0) {
+                let m = 'A3' + ':' + 'A' + (2 + jihaos.length)
+                tempValue = (2 + jihaos.length)
+                merges.push(m)
+              } else {
+                let m = 'A' + (tempValue + 1) + ':' + 'A' + ((tempValue + 1) + jihaos.length - 1)
+                tempValue = ((tempValue + 1) + jihaos.length - 1)
+                merges.push(m)
+              }
+              for (let b = 0; b < jihaos.length; b++) {
+                let obj = {}
+                obj['区号'] = this.partitions[key].name
+                obj['机号'] = jihaos[b].number.toString()
+                list.push(obj)
+              }
+              i++
+            }
+          
+            var data = []
+            this.tableList.map(item=>{
+              data.push(Object.values(item))
+
+            })
+            console.log("data",data)
+            
+            const filename = '排班模版'
+           
+            excel.export_json_to_excel({
+              multiHeader,
+              header,
+              merges,
+              data,
+              filename
+            })
+            this.downloadLoading = false
+          }
         })
       },
       export_fileTwo:function(){
@@ -1115,6 +1166,7 @@
             return false
           }
           this.days = response.data.data.days
+          console.log("日期22222222",this.days)
         })
       },
       getWeekByResultsStr(key) {
@@ -2016,100 +2068,7 @@
                 for (let b = 0; b < jihaos.length; b++) {
                  var obj = {}
 
-                  // obj['区号'] = partitions[key].name
-                  // obj['机号'] = jihaos[b].number.toString()
-
-
-                  // obj['上午'] = ''
-                  // obj['下午'] = ''
-                  // obj['晚上'] = ''
-
-                  // obj['上午1'] = ''
-                  // obj['下午1'] = ''
-                  // obj['晚上1'] = ''
-
-                  // obj['上午2'] = ''
-                  // obj['下午2'] = ''
-                  // obj['晚上2'] = ''
-
-                  // obj['上午3'] = ''
-                  // obj['下午3'] = ''
-                  // obj['晚上3'] = ''
-
-                  // obj['上午4'] = ''
-                  // obj['下午4'] = ''
-                  // obj['晚上4'] = ''
-
-
-                  // obj['上午5'] = ''
-                  // obj['下午5'] = ''
-                  // obj['晚上5'] = ''
-
-                  // obj['上午6'] = ''
-                  // obj['下午6'] = ''
-                  // obj['晚上6'] = ''
-
-                  // obj['上午7'] = ''
-                  // obj['下午7'] = ''
-                  // obj['晚上7'] = ''
-
-                  // obj['上午8'] = ''
-                  // obj['下午8'] = ''
-                  // obj['晚上8'] = ''
-
-                  // obj['上午9'] = ''
-                  // obj['下午9'] = ''
-                  // obj['晚上9'] = ''
-
-                  // obj['上午10'] = ''
-                  // obj['下午10'] = ''
-                  // obj['晚上10'] = ''
-
-                  // obj['上午11'] = ''
-                  // obj['下午11'] = ''
-                  // obj['晚上11'] = ''
-
-
-                  // obj['上午12'] = ''
-                  // obj['下午12'] = ''
-                  // obj['晚上12'] = ''
-
-                  // obj['上午13'] = ''
-                  // obj['下午13'] = ''
-                  // obj['晚上13'] = ''
-
-
-                  // obj['上午14'] = ''
-                  // obj['下午14'] = ''
-                  // obj['晚上14'] = ''
-
-
-                  // obj['上午15'] = ''
-                  // obj['下午15'] = ''
-                  // obj['晚上15'] = ''
-
-                  // obj['上午16'] = ''
-                  // obj['下午16'] = ''
-                  // obj['晚上16'] = ''
-
-                  // obj['上午17'] = ''
-                  // obj['下午17'] = ''
-                  // obj['晚上17'] = ''
-
-                  // obj['上午18'] = ''
-                  // obj['下午18'] = ''
-                  // obj['晚上18'] = ''
-
-                  // obj['上午19'] = ''
-                  // obj['下午19'] = ''
-                  // obj['晚上19'] = ''
-
-
-                  // obj['上午20'] = ''
-                  // obj['下午20'] = ''
-                  // obj['晚上20'] = ''
-
-
+                
                   obj['区号'] = partitions[key].name
                   obj['机号'] = jihaos[b].number.toString()
 
@@ -2233,7 +2192,7 @@
               console.log("下下周数据时间",laststart)
               var lastend = this.getTimestamp(last_end) - 28800
               console.log("下下周数据时间",lastend)
-
+               
               if(this.export_type == 0){
                 for(let i = 0;i<scheduleList.length;i++){
                  if(scheduleList[i].schedule_date >= start && scheduleList[i].schedule_date<=end){
@@ -2246,7 +2205,7 @@
                  if(scheduleList[i].schedule_date>=laststart && scheduleList[i].schedule_date<=lastend){
                    lastWeek.push(scheduleList[i])
                  }
-              }
+               }
               }
 
             if(this.export_type == 1){
@@ -2346,7 +2305,7 @@
                   }
 
                }
-             }
+              }
              }
 
              console.log("list5555555555",list)
@@ -2576,12 +2535,44 @@
        },
 
        changeWeek(val){
-         console.log("Val",val)
+       
          var start = this.getTimestamp(val) - 57600
-         console.log("start",start)
+        //  console.log("第一天时间错",start)
          this.start_time = this.getTime(start)
+        //  console.log("第一天",this.start_time)
+         this.newDay.push(this.start_time)  
+         var next = start + 86400
+         var nest_day = this.getTime(next)
+        //  console.log("第二天",nest_day)
+         this.newDay.push(nest_day)
+         var last_days = start + 172800
+         
+         var last_day = this.getTime(last_days)
+        //  console.log("第三天",last_day)
+         this.newDay.push(last_day)
+         
+         var tuesdays = start + 259200
+        //  console.log("tuesdays",tuesdays)
+         var tuesday =  this.getTime(tuesdays)
+        //  console.log("第四天",tuesday)
+         this.newDay.push(tuesday)
+         var fivdays = start + 345600
+         var fiveday = this.getTime(fivdays)
+        //  console.log("第五天",fiveday)
+         this.newDay.push(fiveday)
+         var sixday =  start + 432000
+         var sixdays = this.getTime(sixday)
+        //  console.log("第六天",sixdays)
+         this.newDay.push(sixdays)
          var end = this.getTimestamp(val) + 460800
+       
          this.end_time = this.getTime(end)
+        //  console.log("第七天",this.end_time)
+         this.newDay.push(this.end_time)
+      
+     
+
+         console.log("33333333",this.newDay)
          this.export_type = 1
          this.getThreeWeekList()
        },