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

src/api/his/his.js

@@ -365,6 +365,16 @@ export function getRecordList (params) {
 
 
 
+export function getCheckAccountFormData (params) {
+  return request({
+    url: '/api/comparedata/get',
+    method: 'get',
+    params:params,
+  })
+}
+
+
+
 
 
 

src/store/modules/globalConfig.js

@@ -1829,6 +1829,20 @@ const global_config = {
       },{
         id: 30,
         name: '次'
+      },{
+        id: 31,
+        name: '米'
+      },{
+        id: 32,
+        name: '对'
+      },
+      {
+        id: 31,
+        name: '对'
+      },
+      {
+        id: 32,
+        name: '米'
       },
 
     ],

src/xt_pages/data/components/consumables.vue

@@ -66,7 +66,7 @@
      <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"
+        <el-link target="_blank" href="https://kuyi.shengws.com/stock_template.xlsx" :underline="false"
                  style="margin-left:15px">
           <el-button
             class="filter-item"
@@ -83,7 +83,7 @@
           type="primary"
           size="small"
         >下载日志
-        </el-button> -->
+        </el-button>
       </div>
 
     <el-table
@@ -1284,10 +1284,10 @@
            }
 
            if (results[i]['备注'] === undefined) {
-                obj['is_mark'] = ''
+                obj['remark'] = ''
               } else {
              if (key == '备注') {
-               obj['is_mark'] = results[i][key].replace(/\s/g,"")
+               obj['remark'] = results[i][key].replace(/\s/g,"")
               }
            }
 
@@ -1383,7 +1383,30 @@
              tableData[i].special_medical = 2
           }
        }
-     
+        
+       for(let i=0;i<tableData.length;i++){
+          tableData[i].retail_price = parseInt(tableData[i].retail_price) 
+           
+          if(tableData[i].buy_price == ""){
+             tableData[i].buy_price = 0
+          }else{
+             tableData[i].buy_price = parseInt(tableData[i].buy_price)
+          }
+
+          if(tableData[i].is_special_diseases == ""){
+             tableData[i].is_special_diseases = 0
+          }else{
+            tableData[i].is_special_diseases = parseInt(tableData[i].is_special_diseases)
+          }
+
+          if(tableData[i].is_record == ""){
+             tableData[i].is_record = 0
+          }else{
+            tableData[i].is_record = parseInt(tableData[i].is_record)
+          }
+         
+        
+       }
        
        let params = {
           'goods':tableData 

src/xt_pages/data/components/drugs.vue

@@ -62,9 +62,9 @@
       
     </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"
+        <el-button type="primary" size="small" @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="small" 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"
@@ -81,7 +81,7 @@
           type="primary"
           size="small"
         >下载日志
-        </el-button> -->
+        </el-button>
       </div>
     <el-table :data="list" border style="width: 100%" :row-style="{ color: '#303133' }"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}"
@@ -948,7 +948,7 @@
        
        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}
+         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,"statistics_category_id":0,"drug_control_id":0,"pharmacology_category_id":0}
          for (var key in results[i]) {
 
            if (results[i]['*药品名称'] === undefined) {
@@ -1080,11 +1080,173 @@
             if (results[i]['*经销商'] === undefined) {
                 obj['dealer'] = ''
               } else {
-           if (key == '*经销商') {
-               obj['dealer'] = results[i][key].replace(/\s/g,"")
+            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['drug_alias'] = ''
+              } else {
+            if (key == '药品别名') {
+                obj['drug_alias'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+            if (results[i]['别名拼音'] === undefined) {
+                obj['drug_alias_pinyin'] = ''
+              } else {
+            if (key == '别名拼音') {
+                obj['drug_alias_pinyin'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+           if (results[i]['开药控制'] === undefined) {
+                obj['drug_control'] = ''
+              } else {
+            if (key == '开药控制') {
+                obj['drug_control'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+            if (results[i]['批准文号'] === undefined) {
+                obj['number'] = ''
+              } else {
+            if (key == '批准文号') {
+                obj['number'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+          if (results[i]['审批标志'] === undefined) {
+                obj['hosp_appr_flag'] = ''
+              } else {
+            if (key == '审批标志') {
+                obj['hosp_appr_flag'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+            if (results[i]['审批标志'] === undefined) {
+                obj['hosp_appr_flag'] = ''
+              } else {
+            if (key == '审批标志') {
+                obj['hosp_appr_flag'] = 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['pharmacology_category'] = ''
+              } else {
+            if (key == '药理分类') {
+                obj['pharmacology_category'] = 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['code'] = ''
+              } else {
+            if (key == '本位码') {
+                obj['code'] = 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['prescription_mark'] = ''
+              } else {
+            if (key == '处方药标志') {
+                obj['prescription_mark'] = 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['record_date'] = ''
+              } else {
+            if (key == '备案日期') {
+                obj['record_date'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+            if (results[i]['药品备注'] === undefined) {
+                obj['drug_remark'] = ''
+              } else {
+            if (key == '药品备注') {
+                obj['drug_remark'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+             if (results[i]['状态'] === undefined) {
+                obj['drug_status'] = ''
+              } else {
+            if (key == '状态') {
+                obj['drug_status'] = results[i][key].replace(/\s/g,"")
               }
-          
            }
+
+            if (results[i]['限制说明'] === undefined) {
+                obj['limit_remark'] = ''
+              } else {
+            if (key == '限制说明') {
+                obj['limit_remark'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+
          }
          tableData.push(obj)
          console.log("表哥2222",tableData)
@@ -1099,10 +1261,16 @@
 
         var drugClassify =  this.getDictionaryDataConfig('system','drug_classify')
        
-
+        var drug_control =  this.getDictionaryDataConfig('system','drug_control')
         var goodUnit =  this.$store.getters.good_unit
-       
+        
+        var pharmacology_category = this.getDictionaryDataConfig('system','pharmacology_category')
+        console.log("药理分类",pharmacology_category)
 
+        var statistics_category = this.getDictionaryDataConfig('system','statistics_category')
+        console.log("统计分类",statistics_category)
+         
+       
         for(let i=0;i<tableData.length;i++){ 
           for(let j=0;j<drugType.length;j++){
             if(tableData[i].drug_type == drugType[j].name){
@@ -1140,18 +1308,85 @@
                tableData[i].dealer_id = this.dealer[j].id
             }
           }
+
+          for(let j=0;j<pharmacology_category.length;j++){
+             if(tableData[i].pharmacology_category == pharmacology_category[j].name){
+                tableData[i].pharmacology_category_id = pharmacology_category[j].id  
+             }
+          }
+
+         for(let j=0;j<statistics_category.length;j++){
+            if(tableData[i].statistics_category == statistics_category[j].name){
+                tableData[i].statistics_category_id = statistics_category[j].id
+            }
+         } 
+
+         for(let j=0;j<drug_control.length;j++){
+           if(tableData[i].drug_control == drug_control[j].name){
+               tableData[i].drug_control_id = drug_control[j].id
+            }
+         } 
+         if(tableData[i].is_special_diseases == ""){
+            tableData[i].is_special_diseases = 0
+         }
+
+         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 = 0
+          }
+          if(tableData[i].is_record == "是"){
+            tableData[i].is_record = 1
+          }
+          if(tableData[i].is_record == "否"){
+            tableData[i].is_record = 2
+          }
+         
+          if(tableData[i].prescription_mark == ""){
+              tableData[i].prescription_mark = 0
+          }
+          if(tableData[i].prescription_mark == "是"){
+             tableData[i].prescription_mark =1
+          }
+          if(tableData[i].prescription_mark == "否"){
+            tableData[i].prescription_mark =2 
+          }
+
+          if(tableData[i].hosp_appr_flag == ""){
+             tableData[i].hosp_appr_flag = 0
+          } 
           
+          if(tableData[i].hosp_appr_flag == "无需审批"){
+              tableData[i].hosp_appr_flag = 1
+          }
+          if(tableData[i].hosp_appr_flag == "审批通过"){
+              tableData[i].hosp_appr_flag = 2
+          }
+          if(tableData[i].hosp_appr_flag == "审批不通过"){
+              tableData[i].hosp_appr_flag = 3
+          }
+         
         }
        }
        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

src/xt_pages/data/components/project.vue

@@ -39,9 +39,9 @@
             </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"
+        <el-button type="primary" size="small" @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="small" 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"
@@ -60,7 +60,7 @@
           type="primary"
           size="small"
         >下载日志
-        </el-button> -->
+        </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
@@ -375,7 +375,7 @@ export default {
                page:this.page,
                is_mark:this.is_mark,
             }
-           console.log("222",params)
+          
           getProjectList(params).then(response=>{
              if(response.data.state == 1){
                var projecList = response.data.data.projecList
@@ -544,7 +544,7 @@ export default {
        
        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}
+         let obj = {"cost_classify_id":0,"medical_insurance_level_id":0,"executive_section_id":0,"tube_color_id":0,"statistical_classification_id":0,"category":0,"specail_project":0,"medical_status":0}
          for (var key in results[i]) {
            if (results[i]['*项目名称'] === undefined) {
                 obj['project_name'] = ''
@@ -593,6 +593,150 @@ export default {
                obj['medical_coverage'] = 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['statistical_classification'] = ''
+              } else {
+         if (key == '统计分类') {
+               obj['statistical_classification'] = results[i][key].replace(/\s/g,"")
+              }
+          }
+
+         if (results[i]['是否特病目录'] === undefined) {
+                obj['disease_directory'] = ''
+              } else {
+         if (key == '是否特病目录') {
+               obj['disease_directory'] = 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['medical_code'] = ''
+              } else {
+         if (key == '医保编码') {
+               obj['medical_code'] = results[i][key].replace(/\s/g,"")
+              }
+          }
+
+         if (results[i]['试管颜色'] === undefined) {
+                obj['tube_color'] = ''
+              } else {
+         if (key == '试管颜色') {
+               obj['tube_color'] = results[i][key].replace(/\s/g,"")
+              }
+          }
+
+          if (results[i]['单次用量'] === undefined) {
+                obj['single_dose'] = ''
+              } else {
+         if (key == '单次用量') {
+               obj['single_dose'] = results[i][key].replace(/\s/g,"")
+              }
+          }
+
+           if (results[i]['用法'] === undefined) {
+                obj['delivery_way'] = ''
+              } else {
+          if (key == '用法') {
+               obj['delivery_way'] = results[i][key].replace(/\s/g,"")
+              }
+          }
+
+          if (results[i]['频率'] === undefined) {
+                obj['execution_frequency'] = ''
+              } else {
+          if (key == '频率') {
+               obj['execution_frequency'] = results[i][key].replace(/\s/g,"")
+              }
+          }
+
+
+          if (results[i]['天数'] === undefined) {
+                obj['number_days'] = ''
+              } else {
+          if (key == '天数') {
+               obj['number_days'] = results[i][key].replace(/\s/g,"")
+              }
+          }
+
+ 
+         if (results[i]['总量'] === undefined) {
+                obj['total'] = ''
+              } else {
+          if (key == '总量') {
+               obj['total'] = results[i][key].replace(/\s/g,"")
+              }
+          }
+
+          if (results[i]['状态'] === undefined) {
+                obj['medical_status'] = ''
+              } else {
+          if (key == '状态') {
+               obj['medical_status'] = results[i][key].replace(/\s/g,"")
+              }
+          }
+
+          if (results[i]['类别'] === undefined) {
+                obj['category'] = ''
+              } else {
+          if (key == '类别') {
+               obj['category'] = results[i][key].replace(/\s/g,"")
+              }
+          }
+
+            if (results[i]['特检项目'] === undefined) {
+                obj['specail_project'] = ''
+              } else {
+          if (key == 'specail_project') {
+               obj['category'] = 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['record_date'] = ''
+              } else {
+           if (key == '备案日期') {
+               obj['record_date'] = results[i][key].replace(/\s/g,"")
+              }
+          }
+           if (results[i]['备注'] === undefined) {
+                obj['remark'] = ''
+              } else {
+           if (key == '备注') {
+               obj['remark'] = results[i][key].replace(/\s/g,"")
+              }
+          }
          }
          tableData.push(obj)
          console.log("项目列表",tableData)
@@ -601,10 +745,16 @@ export default {
         console.log("费用类别",costClassify)
         var medicalInsuranceLevel = this.getDictionaryDataConfig('system','medical_insurance_level')
         console.log("医保等级",medicalInsuranceLevel)
-      
+        
+        var statistical_classification = getDictionaryDataConfig('system','statistics_category')
+        console.log("统计分类",statistical_classification)
+
+        var tube_color = this.getDictionaryDataConfig('system','tube_color')
+        console.log("试管颜色",tube_color)
+
         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
              }
@@ -623,6 +773,80 @@ export default {
                 tableData[i].executive_section_id = this.departMentList[j].id
              }
           }
+
+
+          for(let j=0;j<statistical_classification.length;j++){
+             if(tableData[i].statistical_classification == statistical_classification[j].name){
+                 tableData[i].statistical_classification_id = statistical_classification[j].id
+             }
+          }
+
+       
+
+          if(tableData[i].disease_directory == ""){
+              tableData[i].disease_directory = 0
+          }
+          if(tableData[i].disease_directory == "是"){
+             tableData[i].disease_directory = 1
+          }
+
+         if(tableData[i].disease_directory == "否"){
+             tableData[i].disease_directory = 2
+          }
+
+          if(tableData[i].is_record == ""){
+             tableData[i].is_record = 0
+          }
+           if(tableData[i].is_record == "是"){
+             tableData[i].is_record = 1
+          }
+
+          if(tableData[i].is_record == "否"){
+             tableData[i].is_record = 2
+          }
+
+          for(let j=0;j<tube_color.length;j++){
+             if(tableData[i].tube_color == tube_color[j].name){
+                tableData[i].tube_color_id = tube_color[j].id
+             }
+          }
+
+          if(tableData[i].category == ""){
+             tableData[i].category = 0
+          }
+          if(tableData[i].category == "常规诊疗项目"){
+             tableData[i].category = 1
+          }
+
+           if(tableData[i].category == "辅助器具项目"){
+             tableData[i].category = 2
+          }
+
+          if(tableData[i].category == "加收项目"){
+             tableData[i].category = 3
+          }
+
+          if(tableData[i].specail_project == ""){
+            tableData[i].specail_project = 0
+          }
+          if(tableData[i].specail_project == "是"){
+             tableData[i].specail_project = 1
+          }
+          if(tableData[i].specail_project == "否"){
+             tableData[i].specail_project = 2
+          }
+          if(tableData[i].medical_status == ""){
+             tableData[i].medical_status = 0
+          }
+
+          if(tableData[i].medical_status == "停用"){
+            tableData[i].medical_status = 1
+          }
+          if(tableData[i].medical_status == "收费"){
+            tableData[i].medical_status = 2
+          }
+
+        
         }
        }
 
@@ -634,10 +858,12 @@ export default {
           '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("导入失败")
            }

src/xt_pages/data/specialDictionary.vue

@@ -12,7 +12,7 @@
           <consumables></consumables>
         </el-tab-pane>
         <el-tab-pane label="项目" name="3">
-        <project></project>
+         <project></project>
         </el-tab-pane>
         <el-tab-pane label="项目组套" name="4">
         <inspection></inspection>

src/xt_pages/dialysis/components/consumables.vue

@@ -160,7 +160,9 @@
       this.query.page = 1
       this.GetDialysisgoods()
     },
-    methods: { handleSizeChange(val) {
+    methods: {
+
+      handleSizeChange(val) {
         this.query.limit = val;
         this.GetDialysisgoods();
       },
@@ -180,7 +182,7 @@
 
       },
       getGoodUserInfo(good_type_id,good_user,last_good_user) {
-        var arrlist =[] 
+        var arrlist =[]
         if (good_user != null && good_user.length > 0) {
           let desc = ""
           for (let b = 0; b < good_user.length; b++){
@@ -191,7 +193,7 @@
           return desc
         }
         return ""
-       
+
         // else if (good_user != null && good_user.length <= 0) {
         //   if (last_good_user != null && last_good_user.length > 0) {
         //     let desc = ""
@@ -213,7 +215,7 @@
             this.$message.error(response.data.msg)
             return false
           } else {
-           
+
             this.list = []
             this.good_types = []
             this.allGoodInfo = []
@@ -233,9 +235,9 @@
             }
 
             this.arrKey.push(...arr)
-          
+
             this.allGoodInfo = res.data.dialysis_goods
-           
+
             for(let i = 0; i < res.data.dialysis_goods.length; i++){
               let arr =[]
               let obj = {
@@ -276,15 +278,15 @@
 
               }
             }
-           
+
           //  console.log("99999999",this.list)
-           let a = [] 
+           let a = []
           this.list.map(item => {
             a.push(item.good_type)
           })
           // console.log('aaaaaaaaa',a)
           let b = []
-       
+
           a.map(item => {
             let obj = []
             item.map((it,index) => {
@@ -293,9 +295,9 @@
               let str = 'name' + index
               c[str] = it.name
               obj.push(c)
-              
+
             })
-            
+
             b.push(obj)
           })
           var temp = []
@@ -304,7 +306,7 @@
             var objC = {...b[i]}
             temp.push(objC)
           }
-       
+
           // console.log("temp--------",temp)
           var tempTwo = []
           temp.map(item => {
@@ -314,18 +316,18 @@
             })
             let obj2 = {}
             obj.map((i,ind) => {
-            
+
               let str = 'name' + ind
               obj2[str] = i[str]
             })
             tempTwo.push(obj2)
             console.log(325556574342354234234,tempTwo)
           })
-          
+
           this.arrList.push(...tempTwo)
           console.log("cccccccc",this.arrList)
           }
-        })  
+        })
       },
       selectSchedulType(scheduleType) {
         this.schedulType = scheduleType
@@ -368,9 +370,9 @@
 
        exportList(){
          import('@/vendor/Export2Excel').then(excel => {
-         
-        
-       
+
+
+
          var arrTwo = []
          for(let i=0;i<this.arrKey.length;i++){
             arrTwo.push('name'+i)
@@ -385,7 +387,7 @@
          console.log("33333",this.arrList)
          const data = this.formatJson(filterVal,this.arrList)
          console.log("data",data)
-      
+
          excel.export_json_to_excel({
            header: tHeader,
            data,

src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue

@@ -1386,8 +1386,13 @@ export default {
 
           // this.advices = response.data.data.advices
 
-          this.advices =  response.data.data.advices.concat(response.data.data.doctorAdvice)
+           var advices =  response.data.data.advices.concat(response.data.data.doctorAdvice)
+           
+          var newAdvices = this.unique(advices)
+           console.log("newAdvices",newAdvices)
 
+           this.advices = newAdvices
+          console.log("去重后",this.advices)
           this.monitors = response.data.data.monitors
           this.summary = response.data.data.summary
           this.org_template_info = response.data.data.org_template_info
@@ -1588,7 +1593,11 @@ export default {
           // checker: 0,
         }
       )
-    }
+    },
+     unique(arr) {
+        const res = new Map();
+        return arr.filter((arr) => !res.has(arr.id) && res.set(arr.id, 1));
+    },
   },
   watch: {
     'patientInfo.gender': function() {
@@ -1614,7 +1623,8 @@ export default {
         this.patientInfo_source_2 = false
         this.patientInfo_source_1 = false
       }
-    }
+    },
+   
   },
   created() {
     var xtuser = this.$store.getters.xt_user

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -484,6 +484,8 @@
         this.form.p_type = 14
         this.form.sick_type = this.sick[0].id
         this.form.diagnosis = this.diagnoses[0].id
+        this.form.id_card_type = 2
+        this.form.certificates = 1
 
         // this.form.name = patientInfo.name
         // this.form.gender = patientInfo.gender
@@ -493,7 +495,6 @@
         // this.form.birthday = patientInfo.birthday
         // this.form.id_card = patientInfo.id_card_no
         // this.form.social_type = patientInfo.health_care_type
-        // this.form.id_card_type = 1
         // if( this.form.social_type == 0){
         //   this.form.social_type = ""
         // }

src/xt_pages/outpatientCharges/costComparison.vue

@@ -1,140 +1,219 @@
 <template>
-  <div class="main-contain incomeStatistics">
-    <div class="position">
-      <bread-crumb :crumbs='crumbs'></bread-crumb>
-    </div>
-    <div class="app-container">
-      <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
-        <div>
-          <el-input size="small" style="width:150px;" v-model="keywords"
-                    class="filter-item"/>
-          <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @click="searchAction">
-            搜索
-          </el-button>
+    <div class="main-contain incomeStatistics">
+        <div class="position">
+            <bread-crumb :crumbs='crumbs'></bread-crumb>
         </div>
-        <el-button size="small" type="primary" @click="dialogFormVisible = true" >医保对账</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'}" highlight-current-row>
-        <el-table-column
-          prop="date"
-          label="序号"
-          width="60"
-          align="center"
-          type="index"
-        >
-        </el-table-column>
-        <el-table-column align="center" prop="name" label="对账申请人">
-          <template slot-scope="scope">{{getName(scope.row.creator)}}</template>
-        </el-table-column>
-        <el-table-column align="center" prop="name" label="开始日期">
-          <template slot-scope="scope">{{getTimes(scope.row.start_time)}}</template>
-        </el-table-column>
-        <el-table-column align="center" prop="name" label="结束日期">
-          <template slot-scope="scope">{{getTimes(scope.row.end_time)}}</template>
-        </el-table-column>
-        <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>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" prop="name" label="对账类型">
-          <template slot-scope="scope">
-            <div  v-if="scope.row.check_type == 1">总账</div>
-            <div  v-if="scope.row.check_type == 2">明细</div>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" prop="name" label="结算笔数">
-          <template slot-scope="scope">{{scope.row.num}}</template>
-        </el-table-column>
-        <el-table-column align="center" prop="name" label="医疗费用总数">
-          <template slot-scope="scope">
-            {{scope.row.cost_total}}元
-          </template>
-        </el-table-column>
-        <el-table-column align="center" prop="name" width="160" label="基本医疗基金总费用">
-          <template slot-scope="scope">
-            {{scope.row.func_total}}元
-          </template>
-        </el-table-column>
-        <el-table-column align="center" prop="name" label="个人支付总费用">
-          <template slot-scope="scope">
-            {{scope.row.psn_pay}}元
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :page-sizes="[10, 50, 100]"
-        :page-size="10"
-        background
-        style="margin-top:20px;float: right"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-
-      >
-      </el-pagination>
-      <el-dialog title="医保对账" :visible.sync="dialogFormVisible">
-        <el-form :model="form" label-width="100px">
-          <el-form-item label="时间" :label-width="formLabelWidth">
-            <el-date-picker v-model="start_time" prefix-icon="el-icon-date"
-                            @change="handleStartTimeChange" :editable="false" :clearable="false"
-                            style="width: 200px;" type="date" placeholder="选择开始日期"
-                            format="yyyy-MM-dd"
-                            value-format="yyyy-MM-dd"
-                            align="right"></el-date-picker>
-            -
-
-            <el-date-picker v-model="end_time" prefix-icon="el-icon-date"
-                            @change="handleEndTimeChange" :editable="false" :clearable="false"
-                            style="width: 200px;margin-right:10px;" type="date" placeholder="选择结束日期"
-                            format="yyyy-MM-dd"
-                            value-format="yyyy-MM-dd"
-                            align="right"></el-date-picker>
-          </el-form-item>
-          <el-form-item label="险种类型" :label-width="formLabelWidth">
-            <el-select v-model=" insutype" placeholder="请选择" style="width: 200px;">
-              <el-option
-                v-for="item in insutypes"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="对账类型" :label-width="formLabelWidth">
-            <el-select v-model="check_type" placeholder="请选择" style="width: 200px;">
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button @click="dialogFormVisible = false">取 消</el-button>
-          <el-button type="primary" @click="confirm">确 定</el-button>
+        <div class="app-container">
+            <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
+                <div>
+                    <el-input size="small" style="width:130px;" v-model="keywords"
+                              class="filter-item"/>
+                    <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"
+                               @click="searchAction">
+                        搜索
+                    </el-button>
+                    <el-date-picker v-model="query_start_time" prefix-icon="el-icon-date"
+                                    @change="handleStartTimeChange" :editable="false" :clearable="false"
+                                    style="width: 130px;" type="date" placeholder="选择开始日期"
+                                    format="yyyy-MM-dd"
+                                    value-format="yyyy-MM-dd"
+                                    align="right"></el-date-picker>
+                    -
+
+                    <el-date-picker v-model="query_end_time" prefix-icon="el-icon-date"
+                                    @change="handleEndTimeChange" :editable="false" :clearable="false"
+                                    style="width: 130px;margin-right:10px;" type="date" placeholder="选择结束日期"
+                                    format="yyyy-MM-dd"
+                                    value-format="yyyy-MM-dd"
+                                    align="right"></el-date-picker>
+
+
+                    <label class="title">险种<span class="name"></span> : </label>
+                    <el-select v-model="query_insutype" style="width:140px;margin-right:10px;" placeholder="请选择"
+                               @change="changeInsutype">
+                        <el-option
+                                v-for="item in insutypes"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
+                        </el-option>
+                    </el-select>
+
+
+                    <label class="title">清算类别<span class="name"></span> : </label>
+                    <el-select v-model="query_clr_type" style="width:100px;margin-right:10px;" placeholder="请选择"
+                               @change="changeClrType">
+                        <el-option
+                                v-for="item in clrOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
+                        </el-option>
+                    </el-select>
+
+                </div>
+
+            </div>
+            <div style="float: right;margin-bottom: 10px">
+                <el-button size="small" type="primary" @click="dialogFormVisible = true">医保对账</el-button>
+                <el-button size="small" type="primary" @click="getFormData">下载对账报表</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'}"
+                      highlight-current-row
+                      @select="selectCostInfo"
+                      @selection-change="changeCostInfoTableData"
+                      @select-all="changeAllCostInfoTableData"
+                      row-key="row_key"
+                      ref="multipleTable"
+            >
+                <el-table-column
+                        align="center"
+                        type="selection"
+                        width="55"
+                ></el-table-column>
+                <el-table-column
+                        prop="date"
+                        label="序号"
+                        width="60"
+                        align="center"
+                        type="index"
+                >
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="对账结果">
+                    <template slot-scope="scope">{{'平'}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="操作机构">
+                    <!--<template slot-scope="scope">{{// this.$store.getters.xt_user.org.org_name}}</template>-->
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="对账申请人">
+                    <template slot-scope="scope">{{getName(scope.row.creator)}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="开始时间">
+                    <template slot-scope="scope">{{getTimes(scope.row.start_time)}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="结束时间">
+                    <template slot-scope="scope">{{getTimes(scope.row.end_time)}}</template>
+                </el-table-column>
+                <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>
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="对账类型">
+                    <template slot-scope="scope">
+                        <div v-if="scope.row.check_type == 1">总账</div>
+                        <div v-if="scope.row.check_type == 2">明细</div>
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="清算经办机构">
+                    <template slot-scope="scope">{{getName(scope.row.creator)}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="定点医药机构医疗费总额(元)">
+                    <template slot-scope="scope">{{scope.row.setl_optins}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="医保中心医疗费总额(元)">
+                    <template slot-scope="scope">{{scope.row.cost_total}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="定点医药机构基金总额(元)">
+                    <template slot-scope="scope">{{scope.row.cost_total}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="医保中心基金总额(元)">
+                    <template slot-scope="scope">{{scope.row.func_total}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="定点医药机构个人账号总额(元)">
+                    <template slot-scope="scope">{{scope.row.func_total}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="医保中心个人账号总额(元)">
+                    <template slot-scope="scope">{{scope.row.psn_pay}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="定点医药机构结算笔数">
+                    <template slot-scope="scope">{{scope.row.psn_pay}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="医保中心结算笔数">
+                    <template slot-scope="scope">{{scope.row.num}}</template>
+                </el-table-column>
+
+            </el-table>
+            <el-pagination
+                    @size-change="handleSizeChange"
+                    @current-change="handleCurrentChange"
+                    :page-sizes="[10, 50, 100]"
+                    :page-size="10"
+                    background
+                    style="margin-top:20px;float: right"
+                    layout="total, sizes, prev, pager, next, jumper"
+                    :total="total"
+            >
+            </el-pagination>
+            <el-dialog title="医保对账" :visible.sync="dialogFormVisible">
+                <el-form :model="form" label-width="100px">
+                    <el-form-item label="时间" label-width="100px">
+                        <el-date-picker v-model="start_time" prefix-icon="el-icon-date"
+                                        @change="handleStartTimeChange" :editable="false" :clearable="false"
+                                        style="width: 200px;" type="date" placeholder="选择开始日期"
+                                        format="yyyy-MM-dd"
+                                        value-format="yyyy-MM-dd"
+                                        align="right"></el-date-picker>
+                        -
+
+                        <el-date-picker v-model="end_time" prefix-icon="el-icon-date"
+                                        @change="handleEndTimeChange" :editable="false" :clearable="false"
+                                        style="width: 200px;margin-right:10px;" type="date" placeholder="选择结束日期"
+                                        format="yyyy-MM-dd"
+                                        value-format="yyyy-MM-dd"
+                                        align="right"></el-date-picker>
+                    </el-form-item>
+                    <el-form-item label="险种类型" :label-width="formLabelWidth">
+                        <el-select v-model="insutype" placeholder="请选择" style="width: 200px;">
+                            <el-option
+                                    v-for="item in insutypes"
+                                    :key="item.value"
+                                    :label="item.label"
+                                    :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="对账类型" :label-width="formLabelWidth">
+                        <el-select v-model="check_type" placeholder="请选择" style="width: 200px;">
+                            <el-option
+                                    v-for="item in options"
+                                    :key="item.value"
+                                    :label="item.label"
+                                    :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-form>
+                <div slot="footer" class="dialog-footer">
+                    <el-button @click="dialogFormVisible = false">取 消</el-button>
+                    <el-button type="primary" @click="confirm">确 定</el-button>
+                </div>
+            </el-dialog>
         </div>
-      </el-dialog>
-    </div>
 
 
-  </div>
+    </div>
 </template>
 
 
 <script>
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import { getDoctorList, getExportConsumeDetailList, getHisOrderList, getList } from '@/api/his/his'
+  import {
+    getCheckAccountFormData,
+    getDoctorList,
+    getExportConsumeDetailList,
+    getHisOrderList,
+    getList
+  } from '@/api/his/his'
   import { uParseTime } from '@/utils/tools'
   import { fetchAllAdminUsers } from '@/api/doctor'
   import axios from 'axios'
@@ -145,6 +224,7 @@
     },
     data() {
       return {
+        form: {},
         crumbs: [
           { path: false, name: '门诊收费' },
           { path: false, name: '医保费用对照' }
@@ -155,65 +235,207 @@
         dialogFormVisible: false,
         total: 0,
         adminUserOptions: [],
-        start_time:"",
-        end_time:"",
-        insutype:"",
-        check_type:"",
-
-        options:[
+        start_time: '',
+        end_time: '',
+        insutype: '',
+        check_type: '',
+        keywords: '',
+        query_start_time: '',
+        query_end_time: '',
+        selection:[],
+        query_insutype: '',
+        query_clr_type: '',
+        fromData: [],
+        options: [
           {
-            value:1,
-            label:"总账",
-          },  {
-            value:2,
-            label:"明细",
-          },
+            value: 1,
+            label: '总账'
+          }, {
+            value: 2,
+            label: '明细'
+          }
         ],
-
-        insutypes:[
+        clrOptions: [
           {
-            value:"310",
-            label:"职工基本医疗保险",
-          },  {
-            value:"320",
-            label:"公务员医疗补助",
-          },  {
-            value:"330",
-            label:"大额医疗费用补助",
-          },  {
-            value:"340",
-            label:"离休人员医疗保障",
+            value: '11',
+            label: '门诊'
+          }, {
+            value: '21',
+            label: '住院'
+          }, {
+            value: '41',
+            label: '药店购药'
+          }, {
+            value: '99',
+            label: '其他'
+          }
+        ],
+        insutypes: [
+          {
+            value: '310',
+            label: '职工基本医疗保险'
+          }, {
+            value: '320',
+            label: '公务员医疗补助'
+          }, {
+            value: '330',
+            label: '大额医疗费用补助'
+          }, {
+            value: '340',
+            label: '离休人员医疗保障'
           },
           {
-            value:"390",
-            label:"城乡居民基本医疗保险",
+            value: '390',
+            label: '城乡居民基本医疗保险'
           }, {
-            value:"392",
-            label:"城乡居民大病医疗保险",
+            value: '392',
+            label: '城乡居民大病医疗保险'
           }, {
-            value:"510",
-            label:"生育保险",
+            value: '510',
+            label: '生育保险'
           }
 
-
+          // 1617724800
 
         ]
 
       }
     },
     methods: {
-      confirm(){
-        if(this.check_type == 1){
+      changeInsutype() {
+        let params = {
+          'page': 1,
+          'limit': 10,
+          'keywords': this.keywords,
+          'insutype': this.query_insutype,
+          'clr_type': "11",
+          'start_time': this.query_start_time,
+          'end_time': this.query_end_time,
+        }
+        this.tableData = []
+        getList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.tableData = response.data.data.list
+            this.total = response.data.data.total
+          }
+        })
+
+      }, changeClrType(val) {
+        if (val != "11"){
+          this.tableData = []
+          this.total = 0
+        }else{
+          let params = {
+            'page': 1,
+            'limit': 10,
+            'keywords': this.keywords,
+            'insutype': this.query_insutype,
+            'clr_type': "11",
+            'start_time': this.query_start_time,
+            'end_time': this.query_end_time,
+          }
+          this.tableData = []
+          getList(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.tableData = response.data.data.list
+              this.total = response.data.data.total
+            }
+          })
+        }
+      },
+      handleStartTimeChange() {
+
+        let params = {
+          'page': 1,
+          'limit': 10,
+          'keywords': this.keywords,
+          'insutype': "",
+          'clr_type': "11",
+          'start_time': this.query_start_time,
+          'end_time': this.query_end_time,
+        }
+        this.tableData = []
+        getList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.tableData = response.data.data.list
+            this.total = response.data.data.total
+          }
+        })
+
+      }, handleEndTimeChange() {
+
+        let params = {
+          'page': 1,
+          'limit': 10,
+          'keywords': this.keywords,
+          'insutype': "",
+          'clr_type': "11",
+          'start_time': this.query_start_time,
+          'end_time': this.query_end_time,
+        }
+        this.tableData = []
+        getList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.tableData = response.data.data.list
+            this.total = response.data.data.total
+          }
+        })
+
+      },
+
+      searchAction() {
+        let params = {
+          'page': 1,
+          'limit': 10,
+          'keywords': this.keywords,
+          'insutype': "",
+          'clr_type': "11",
+          'start_time': "",
+          'end_time': "",
+        }
+        this.tableData = []
+        getList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.tableData = response.data.data.list
+            this.total = response.data.data.total
+          }
+        })
+
+      },
+      selectCostInfo(selection, row) {
+        this.selection = selection
+
+      }, changeCostInfoTableData(val) {
+        this.selection = val
+      }, changeAllCostInfoTableData(selection) {
+        this.selection = selection
+
+
+      }, confirm() {
+        if (this.check_type == 1) {
           let params = {
             start_time: this.start_time,
             end_time: this.end_time,
             insutype: this.insutype,
             clr_type: '11'
           }
-
           var that = this
-
-          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106) {
+          if (this.$store.getters.xt_user.org_id == 4 || 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
             })
@@ -222,11 +444,32 @@
                   that.$message.error(response.data.msg)
                   return false
                 } else {
-                  this.page =1
-                  this.limit = 10
-                  this.keywords = ""
-                  this.getList()
+                  var result_desc = ''
+
+                  if (response.data.data.stmt_rslt == 0) {
+                    result_desc = '对账平'
+                  } else if (response.data.data.stmt_rslt == 1) {
+                    result_desc = '中心多' + '\n' + response.data.data.stmt_rslt_dscr
+
+                  } else if (response.data.data.stmt_rslt == 2) {
+                    result_desc = '机构多' + '\n' + response.data.data.stmt_rslt_dscr
+                  }
+
+                  that.$alert(result_desc, '对账结果', {
+                    confirmButtonText: '确定',
+                    callback: action => {
+                      this.dialogFormVisible = false
+                    }
+                  })
 
+                  that.page = 1
+                  that.limit = 10
+                  that.keywords = ''
+                  that.query_start_time = ''
+                  that.query_end_time = ''
+                  that.query_insutype = ''
+                  that.query_clr_type = ''
+                  that.getList()
                 }
               })
               .catch(function(error) {
@@ -235,10 +478,10 @@
 
           }
 
-        }else {
+        } else {
           let params = {
             start_time: this.start_time,
-            end_time: this.end_time,
+            end_time: this.end_time
           }
           var that = this
           axios.get('http://127.0.0.1:9532/api/checkdetailaccount/get', {
@@ -249,20 +492,16 @@
                 that.$message.error(response.data.msg)
                 return false
               } else {
-                this.page =1
+                this.page = 1
                 this.limit = 10
-                this.keywords = ""
+                this.keywords = ''
                 this.getList()
               }
             })
             .catch(function(error) {
 
             })
-
-
         }
-
-
       },
       getInsutype(type) {
 
@@ -290,8 +529,11 @@
         let params = {
           'page': this.page,
           'limit': this.limit,
-          'keywords': this.keywords
-
+          'keywords': this.keywords,
+          'insutype': this.query_insutype,
+          'clr_type': this.query_clr_type,
+          'start_time': this.query_start_time,
+          'end_time': this.query_end_time
         }
         this.tableData = []
         getList(params).then(response => {
@@ -313,6 +555,65 @@
         this.page = page
         this.getList()
 
+      }, getFormData() {
+        if (this.selection.length == 0) {
+          this.$message.error('请选择要下载的对账记录')
+          return
+        }
+
+        let params = {
+          'start_time': this.getTimes(this.selection[0].start_time),
+          'end_time': this.getTimes(this.selection[0].end_time),
+          'insutype': this.selection[0].insutype
+        }
+        getCheckAccountFormData(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.fromData = response.data.data.list
+            var list = []
+
+            for (let i = 0; i < this.fromData.length; i++) {
+              let obj = {
+                '结算金额': this.fromData[i].medfee_sumamt,
+                '姓名': this.fromData[i].psn_name,
+                '身份证': this.fromData[i].id_card_no,
+                '个人编号': this.fromData[i].psn_no,
+                '门诊流水号': this.fromData[i].mdtrt_id,
+                '挂号日期': this.getTimes(this.fromData[i].settle_accounts_date),
+                '起付线': this.fromData[i].act_pay_dedc,
+                '统筹基金': this.fromData[i].fund_pay_sumamt,
+                '个人支付': this.fromData[i].psn_cash_pay,
+                '个账支付': this.fromData[i].acct_pay,
+                '现金支付': this.fromData[i].cash_pay,
+                '总费用': this.fromData[i].sumamt,
+                '冲销标志': '已结算'
+              }
+              list.push(obj)
+            }
+            var insutype_name = ''
+            if (this.query_insutype == '310') {
+              insutype_name = '职工基本医疗保险'
+            } else if (this.query_insutype == '390') {
+              insutype_name = '城乡居民基本医疗保险'
+            }
+
+            import('@/vendor/Export2Excel').then(excel => {
+              const tHeader = ['结算金额', '姓名', '身份证', '个人编号', '门诊流水号', '挂号日期', '起付线', '统筹基金', '个人支付', '个账支付', '现金支付', '总费用', '冲销标志']
+              const filterVal = ['结算金额', '姓名', '身份证', '个人编号', '门诊流水号', '挂号日期', '起付线', '统筹基金', '个人支付', '个账支付', '现金支付', '总费用', '冲销标志']
+              const data = this.formatJson(filterVal, list)
+              excel.export_json_to_excel({
+                header: tHeader,
+                data,
+                filename:this.getTimes(this.selection[0].start_time)+ '~' + this.getTimes(this.selection[0].end_time)+ insutype_name + '对账报表'
+              })
+            })
+          }
+        })
+
+      }, formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]))
       }
     },
     created() {

src/xt_pages/outpatientCharges/incomeStatistics.vue

@@ -51,18 +51,27 @@
           type="index"
         >
         </el-table-column>
-        <el-table-column align="center" prop="name" label="就诊号">
-          <template slot-scope="scope">{{ scope.row.his_patient.number }}</template>
+        <el-table-column align="center" prop="name" label="收费日期">
+          <template slot-scope="scope">{{ scope.row.selt_time }}</template>
         </el-table-column>
+
+
         <el-table-column align="center" prop="name" label="患者名字">
-          <template slot-scope="scope">{{ scope.row.patient.name }}</template>
+          <template slot-scope="scope">{{ scope.row.psn_name }}</template>
         </el-table-column>
         <!--<el-table-column align="center" prop="name" label="患者类型">-->
           <!--<template slot-scope="scope"></template>-->
         <!--</el-table-column>-->
-        <el-table-column align="center" prop="name" label="应收金额">
+        <el-table-column align="center" prop="name" label="总金额">
           <template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>
         </el-table-column>
+
+        <el-table-column align="center" prop="name" label="总金额">
+          <template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>
+        </el-table-column>
+
+
+
         <el-table-column align="center" prop="name" label="实收金额">
           <template slot-scope="scope">{{scope.row.reality_price}}</template>
         </el-table-column>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -138,11 +138,11 @@
                         >退号
                         </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>-->
+                        <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"
+                        >撤销明细
+                        </el-button>
 
                     </div>
                     <!--<el-button size="small" @click="query" type="primary"-->

src/xt_pages/outpatientCharges/summary.vue

@@ -1,167 +1,176 @@
 <template>
-  <div class="main-contain outpatientChargesManagement">
-    <div class="position">
-      <bread-crumb :crumbs='crumbs'></bread-crumb>
-    </div>
-    <div class="app-container">
-      <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
-        <div>
-          <el-input size="small" style="width:150px;"  v-model="keywords"
-                    class="filter-item"/>
-          <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @click="searchAction">
-            搜索
-          </el-button>
-          <el-select size="small" v-model="admin_user_id" placeholder="请选择" style="width:150px;margin-left:10px;" @change="changeDoctor">
-            <el-option
-              label="全部"
-              value="0">
-            </el-option>
-            <el-option
-              v-for="item,index in doctors"
-              :key="index"
-              :label="item.user_name"
-              :value="item.admin_user_id">
-            </el-option>
-          </el-select>
-          <el-date-picker size="small" v-model="start_time" prefix-icon="el-icon-date"
-                          @change="handleStartTimeChange" :editable="false" :clearable="false"
-                          style="width: 196px;margin-right:10px;" type="date" placeholder="选择开始日期"
-                          format="yyyy-MM-dd"
-                          value-format="yyyy-MM-dd"
-                          align="right"></el-date-picker>
-
-          <el-date-picker size="small" v-model="end_time" prefix-icon="el-icon-date"
-                          @change="handleEndTimeChange" :editable="false" :clearable="false"
-                          style="width: 196px;margin-right:10px;" type="date" placeholder="选择结束日期"
-                          format="yyyy-MM-dd"
-                          value-format="yyyy-MM-dd"
-                          align="right"></el-date-picker>
-          <!--<el-radio v-model="radio" label="1">明细</el-radio>-->
-          <!--<el-radio v-model="radio" label="2">汇总</el-radio>-->
+    <div class="main-contain outpatientChargesManagement">
+        <div class="position">
+            <bread-crumb :crumbs='crumbs'></bread-crumb>
         </div>
-        <div>
-          <!-- <el-popover
-            placement="bottom"
-            width="210"
-            trigger="click">
-            <el-button size="small" ref="button_two" @click="open(1)">打印清单</el-button>
-            <el-button size="small" ref="button_six" @click="open(2)">打印汇总</el-button>
-            <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
-
-          </el-popover> -->
-          <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
+        <div class="app-container">
+            <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
+                <div>
+                    <el-input size="small" style="width:150px;" v-model="keywords"
+                              class="filter-item"/>
+                    <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"
+                               @click="searchAction">
+                        搜索
+                    </el-button>
+                    <el-select size="small" v-model="admin_user_id" placeholder="请选择"
+                               style="width:150px;margin-left:10px;" @change="changeDoctor">
+                        <el-option
+                                label="全部"
+                                value="0">
+                        </el-option>
+                        <el-option
+                                v-for="item,index in doctors"
+                                :key="index"
+                                :label="item.user_name"
+                                :value="item.admin_user_id">
+                        </el-option>
+                    </el-select>
+                    <el-date-picker size="small" v-model="start_time" prefix-icon="el-icon-date"
+                                    @change="handleStartTimeChange" :editable="false" :clearable="false"
+                                    style="width: 196px;margin-right:10px;" type="date" placeholder="选择开始日期"
+                                    format="yyyy-MM-dd"
+                                    value-format="yyyy-MM-dd"
+                                    align="right"></el-date-picker>
+
+                    <el-date-picker size="small" v-model="end_time" prefix-icon="el-icon-date"
+                                    @change="handleEndTimeChange" :editable="false" :clearable="false"
+                                    style="width: 196px;margin-right:10px;" type="date" placeholder="选择结束日期"
+                                    format="yyyy-MM-dd"
+                                    value-format="yyyy-MM-dd"
+                                    align="right"></el-date-picker>
+                    <!--<el-radio v-model="radio" label="1">明细</el-radio>-->
+                    <!--<el-radio v-model="radio" label="2">汇总</el-radio>-->
+                </div>
+                <div>
+                    <!-- <el-popover
+                      placement="bottom"
+                      width="210"
+                      trigger="click">
+                      <el-button size="small" ref="button_two" @click="open(1)">打印清单</el-button>
+                      <el-button size="small" ref="button_six" @click="open(2)">打印汇总</el-button>
+                      <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
+
+                    </el-popover> -->
+                    <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
+                </div>
+            </div>
+            <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }"
+                      :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                      highlight-current-row>
+                <el-table-column
+                        prop="date"
+                        label="序号"
+                        width="60"
+                        align="center"
+                        type="index"
+                >
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="就诊号">
+                    <template slot-scope="scope">{{ scope.row.his_patient.number }}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="患者名字">
+                    <template slot-scope="scope">{{ scope.row.patient.name }}</template>
+                </el-table-column>
+                <!--<el-table-column align="center" prop="name" label="患者类型">-->
+                <!--<template slot-scope="scope"></template>-->
+                <!--</el-table-column>-->
+                <el-table-column align="center" prop="name" label="应收金额">
+                    <template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="实收金额">
+                    <template slot-scope="scope">{{scope.row.reality_price}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="科室">
+                    <template slot-scope="scope">{{scope.row.department_name}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="收费日期">
+                    <template slot-scope="scope"> {{scope.row.setl_time}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="收费员">
+                    <template slot-scope="scope">{{ getName(scope.row.creator) }}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="状态">
+                    <template slot-scope="scope">
+                        <div v-if="scope.row.order_status == 1">待结算</div>
+                        <div v-if="scope.row.order_status == 2">已结算</div>
+                        <div v-if="scope.row.order_status == 3">已退费</div>
+                    </template>
+                </el-table-column>
+                <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) ||  ($store.getters.xt_user.org_id == 10106) ||  (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 4)">
+                            结算单
+                        </el-button>
+                        <el-button size="mini" type="primary" @click="toRefund(scope.row)" v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10106)">
+                            退费
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <el-pagination
+                    @size-change="handleSizeChange"
+                    @current-change="handleCurrentChange"
+                    :page-sizes="[10, 50, 100]"
+                    :page-size="10"
+                    background
+                    style="margin-top:20px;float: right"
+                    layout="total, sizes, prev, pager, next, jumper"
+                    :total="total"
+
+            >
+            </el-pagination>
         </div>
-      </div>
-      <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }"
-                :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-        <el-table-column
-          prop="date"
-          label="序号"
-          width="60"
-          align="center"
-          type="index"
-        >
-        </el-table-column>
-        <el-table-column align="center" prop="name" label="就诊号">
-          <template slot-scope="scope">{{ scope.row.his_patient.number }}</template>
-        </el-table-column>
-        <el-table-column align="center" prop="name" label="患者名字">
-          <template slot-scope="scope">{{ scope.row.patient.name }}</template>
-        </el-table-column>
-        <!--<el-table-column align="center" prop="name" label="患者类型">-->
-          <!--<template slot-scope="scope"></template>-->
-        <!--</el-table-column>-->
-        <el-table-column align="center" prop="name" label="应收金额">
-          <template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>
-        </el-table-column>
-        <el-table-column align="center" prop="name" label="实收金额">
-          <template slot-scope="scope">{{scope.row.reality_price}}</template>
-        </el-table-column>
-        <el-table-column align="center" prop="name" label="科室">
-          <template slot-scope="scope">{{scope.row.department_name}}</template>
-        </el-table-column>
-        <el-table-column align="center" prop="name" label="收费日期">
-          <template slot-scope="scope">  {{getTimes(scope.row.settle_accounts_date)}}</template>
-        </el-table-column>
-        <el-table-column align="center" prop="name" label="收费员">
-          <template slot-scope="scope">{{ scope.row.doctor_name }}</template>
-        </el-table-column>
-        <el-table-column align="center" prop="name" label="状态">
-          <template slot-scope="scope">
-            <div v-if="scope.row.order_status == 1">待结算</div>
-            <div v-if="scope.row.order_status == 2">已结算</div>
-            <div v-if="scope.row.order_status == 3">已退费</div>
-          </template>
-        </el-table-column>
-        <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) ||  (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>
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :page-sizes="[10, 50, 100]"
-        :page-size="10"
-        background
-        style="margin-top:20px;float: right"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-
-      >
-      </el-pagination>
-    </div>
 
-    <el-dialog
-      class="centerDialog"
-      width="1200px"
-      title="打印"
-      :visible.sync="statementVisible">
-      <!--<statementPrint ref="print" :paramsObj='orderObj'></statementPrint>-->
-    <new-statement-print ref="print" :paramsObj='orderObj'></new-statement-print>
-    </el-dialog>
-    <el-dialog
-      class="centerDialog"
-      width="900px"
-      title="打印"
-      :visible.sync="listVisible">
-      <listPrint></listPrint>
-    </el-dialog>
-    <el-dialog
-      class="centerDialog"
-      width="900px"
-      title="打印"
-      :visible.sync="allListVisible">
-      <allListPrint :paramsObj='paramsObj'></allListPrint>
-    </el-dialog>
-
-    <el-dialog
-            class="centerDialog"
-            width="1200px"
-            title="打印"
-            :visible.sync="statementVisible9504">
-      <!--<statementPrint ref="print" :paramsObj='orderObj'></statementPrint>-->
-      <!--<new-statement-print ref="print" :paramsObj='orderObj9504'></new-statement-print>-->
-      <new-statement-print-two ref="print" :paramsObj='orderObj9504'></new-statement-print-two>
-    </el-dialog>
-
-
-  </div>
+        <el-dialog
+                class="centerDialog"
+                width="1200px"
+                title="打印"
+                :visible.sync="statementVisible">
+            <!--<statementPrint ref="print" :paramsObj='orderObj'></statementPrint>-->
+            <new-statement-print ref="print" :paramsObj='orderObj'></new-statement-print>
+        </el-dialog>
+        <el-dialog
+                class="centerDialog"
+                width="900px"
+                title="打印"
+                :visible.sync="listVisible">
+            <listPrint></listPrint>
+        </el-dialog>
+        <el-dialog
+                class="centerDialog"
+                width="900px"
+                title="打印"
+                :visible.sync="allListVisible">
+            <allListPrint :paramsObj='paramsObj'></allListPrint>
+        </el-dialog>
+
+        <el-dialog
+                class="centerDialog"
+                width="1200px"
+                title="打印"
+                :visible.sync="statementVisible9504">
+            <!--<statementPrint ref="print" :paramsObj='orderObj'></statementPrint>-->
+            <!--<new-statement-print ref="print" :paramsObj='orderObj9504'></new-statement-print>-->
+            <new-statement-print-two ref="print" :paramsObj='orderObj9504'></new-statement-print-two>
+        </el-dialog>
+
+
+    </div>
 </template>
 
 
 <script>
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import { getHisOrderList,getDoctorList,getExportConsumeDetailList } from '@/api/his/his'
+  import { getDoctorList, getExportConsumeDetailList, getHisOrderList, Refund} from '@/api/his/his'
   import { uParseTime } from '@/utils/tools'
-  import statementPrint from './statementPrint'
   import NewStatementPrint from './newStatementPrint'
   import listPrint from './listPrint'
   import allListPrint from './allListPrint'
   import NewStatementPrintTwo from './newStatementPrintTwo'
-
+  import { fetchAllAdminUsers } from '@/api/doctor'
+  import axios from 'axios'
 
   export default {
     components: {
@@ -175,38 +184,115 @@
       return {
         orderObj: {},
         statementVisible: false,
-        statementVisible9504:false,
-        orderObj9504:{},
+        statementVisible9504: false,
+        orderObj9504: {},
         crumbs: [
           { path: false, name: '门诊收费' },
           { path: false, name: '项目消费明细汇总' }
         ],
         tableData: [],
-        limit:10,
-        page:1,
-        keywords:"",
-        start_time:"",
-        end_time:"",
-        total:"",
-        doctors:[],
-        admin_user_id:"",
-        listVisible:false,
-        allListVisible:false
+        limit: 10,
+        page: 1,
+        keywords: '',
+        start_time: '',
+        end_time: '',
+        total: '',
+        doctors: [],
+        admin_user_id: '',
+        listVisible: false,
+        allListVisible: false,
+        adminUserOptions:[],
 
       }
     },
     methods: {
-      toPrint(row){
-        if(this.$store.getters.xt_user.org_id == 9504 ||this.$store.getters.xt_user.org_id == 10028){
+      fetchAllAdminUsers() {
+        fetchAllAdminUsers().then(response => {
+          if (response.data.state == 1) {
+            this.adminUserOptions = response.data.data.users
+
+          }
+        })
+      },
+      getName(admin_user_id) {
+        for (let i = 0; i < this.adminUserOptions.length; i++) {
+          if (this.adminUserOptions[i].id == admin_user_id) {
+            return this.adminUserOptions[i].name
+          }
+        }
+
+      },toRefund(row){
+        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('是否退费', '退费', {
+            confirmButtonText: '确 定',
+            cancelButtonText: '取 消',
+            type: 'warning'
+          }).then(() => {
+            let params = {
+              'order_id': row.id,
+              'patient_id': row.patient_id,
+              'record_time': that.getTimes(row.settle_accounts_date),
+              'admin_user_id': that.$store.getters.xt_user.user.id,
+            }
+            axios.get('http://127.0.0.1:9532/api/refund/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.$message({ message: '退费成功', type: 'success', duration: 5000 })
+                    that.getHisOrderList()
+
+                  }
+                }
+              })
+              .catch(function(error) {
+              })
+          }).catch(() => {
+          })
+
+        } else {
+          this.$confirm('是否退费', '退费', {
+            confirmButtonText: '确 定',
+            cancelButtonText: '取 消',
+            type: 'warning'
+          }).then(() => {
+            let params = {
+              'order_id': this.order.id,
+              'patient_id': this.patientInfo.id,
+              'record_time': this.record_date
+
+            }
+            Refund(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.$message({ message: '退费成功', type: 'success' })
+                this.getHisOrderList()
+              }
+            })
+          }).catch(() => {
+          })
+        }
+      },
+      toPrint(row) {
+        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028) {
           this.statementVisible9504 = true
           let obj = {
             order_id: row.id,
             patient_id: row.patient_id,
             record_time: this.getTimes(row.settle_accounts_date),
-            admin_user_id: this.$store.getters.xt_user.user.id,
+            admin_user_id: this.$store.getters.xt_user.user.id
           }
           this.orderObj9504 = obj
-        }else {
+        } else {
           this.statementVisible = true
           let obj = {
             order_id: row.id
@@ -215,10 +301,10 @@
         }
 
       },
-      export_detail(){
-        let params= {
-          start_time:this.start_time,
-          end_time: this.end_time,
+      export_detail() {
+        let params = {
+          start_time: this.start_time,
+          end_time: this.end_time
         }
         getExportConsumeDetailList(params).then(response => {
           if (response.data.state == 0) {
@@ -227,144 +313,139 @@
           } else {
 
             let list = []
-            for (let i =0; i < response.data.data.order.length; i++){
-            let order =   response.data.data.order[i]
-              let number = ""
-              let name = ""
-              let department = ""
-              let doctor_name = ""
-              let balance_accounts = ""
+            for (let i = 0; i < response.data.data.order.length; i++) {
+              let order = response.data.data.order[i]
+              let number = ''
+              let name = ''
+              let department = ''
+              let doctor_name = ''
+              let balance_accounts = ''
 
-              let order_status = ""
+              let order_status = ''
 
-
-
-              if(order.his_patient != null && order.his_patient.number.length > 0){
+              if (order.his_patient != null && order.his_patient.number.length > 0) {
                 number = order.his_patient.number
 
               }
 
-              if(order.his_patient != null ){
-                if(order.his_patient.balance_accounts_type == 1){
-                  balance_accounts = "自费"
+              if (order.his_patient != null) {
+                if (order.his_patient.balance_accounts_type == 1) {
+                  balance_accounts = '自费'
                 }
 
-                if(order.his_patient.balance_accounts_type == 2){
-                  balance_accounts = "医保"
+                if (order.his_patient.balance_accounts_type == 2) {
+                  balance_accounts = '医保'
                 }
               }
 
-              if(order.patient != null && order.patient.name.length > 0){
+              if (order.patient != null && order.patient.name.length > 0) {
                 name = order.patient.name
 
               }
 
-              if(order.p_info != null && order.p_info.department != null && order.p_info.department.name.length > 0){
+              if (order.p_info != null && order.p_info.department != null && order.p_info.department.name.length > 0) {
                 department = order.p_info.department.name
 
               }
 
-              if(order.p_info != null && order.p_info.doctor.length > 0){
+              if (order.p_info != null && order.p_info.doctor.length > 0) {
                 doctor_name = order.p_info.doctor
               }
 
-              if(order.order_status == 1){
-                order_status = "待结算"
+              if (order.order_status == 1) {
+                order_status = '待结算'
               }
 
-              if(order.order_status == 2){
-                order_status = "已结算"
+              if (order.order_status == 2) {
+                order_status = '已结算'
               }
 
-              if(order.order_status == 3){
-                order_status = "已退费"
+              if (order.order_status == 3) {
+                order_status = '已退费'
               }
 
-
               let obj = {
-                "就诊号":number,
-                "患者姓名":name,
-                "应收金额":order.medfee_sumamt,
-                "实收金额":order.medfee_sumamt,
-                "科室":department,
-                "医生姓名":doctor_name,
-                "收费类别":balance_accounts,
-                "收费者姓名":doctor_name,
-                "总金额":order.medfee_sumamt,
-                "现金支付":"",
-                "账户支付":"",
-                "支付宝支付":"",
-                "微信支付":"",
-                "其他支付":"",
-                "收费日期":"",
-                "收费状态":order_status,
-                "退费日期":"",
+                '就诊号': number,
+                '患者姓名': name,
+                '应收金额': order.medfee_sumamt,
+                '实收金额': order.medfee_sumamt,
+                '科室': department,
+                '医生姓名': doctor_name,
+                '收费类别': balance_accounts,
+                '收费者姓名': doctor_name,
+                '总金额': order.medfee_sumamt,
+                '现金支付': '',
+                '账户支付': '',
+                '支付宝支付': '',
+                '微信支付': '',
+                '其他支付': '',
+                '收费日期': '',
+                '收费状态': order_status,
+                '退费日期': ''
               }
               list.push(obj)
             }
             import('@/vendor/Export2Excel').then(excel => {
-              const tHeader = ['就诊号', '患者姓名', '应收金额', '实收金额', '科室',"医生姓名","收费类别","收费者姓名","总金额","现金支付","账户支付","支付宝支付","微信支付","其他支付","收费日期","收费状态","退费日期"]
-              const filterVal = ['就诊号', '患者姓名', '应收金额', '实收金额', '科室',"医生姓名","收费类别","收费者姓名","总金额","现金支付","账户支付","支付宝支付","微信支付","其他支付","收费日期","收费状态","退费日期"]
+              const tHeader = ['就诊号', '患者姓名', '应收金额', '实收金额', '科室', '医生姓名', '收费类别', '收费者姓名', '总金额', '现金支付', '账户支付', '支付宝支付', '微信支付', '其他支付', '收费日期', '收费状态', '退费日期']
+              const filterVal = ['就诊号', '患者姓名', '应收金额', '实收金额', '科室', '医生姓名', '收费类别', '收费者姓名', '总金额', '现金支付', '账户支付', '支付宝支付', '微信支付', '其他支付', '收费日期', '收费状态', '退费日期']
               const data = this.formatJson(filterVal, list)
               excel.export_json_to_excel({
                 header: tHeader,
                 data,
-                filename: "消费明细"
+                filename: '消费明细'
               })
             })
 
           }
         })
 
-      },  formatJson(filterVal, jsonData) {
+      }, formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]))
       },
-      changeDoctor(){
+      changeDoctor() {
         this.page = 1
-        this.keywords=""
+        this.keywords = ''
         this.getHisOrderList()
       },
-      handleSizeChange(limit){
-        this.limit = limit;
+      handleSizeChange(limit) {
+        this.limit = limit
         this.getHisOrderList()
 
-      },handleCurrentChange(page){
-        this.page = page;
+      }, handleCurrentChange(page) {
+        this.page = page
         this.getHisOrderList()
 
-
       },
-      handleStartTimeChange(){
+      handleStartTimeChange() {
         this.page = 1
-        this.keywords=""
+        this.keywords = ''
         this.getHisOrderList()
-      },handleEndTimeChange(){
+      }, handleEndTimeChange() {
         this.page = 1
-        this.keywords=""
+        this.keywords = ''
         this.getHisOrderList()
       },
-      searchAction(){
+      searchAction() {
         this.page = 1
         this.getHisOrderList()
 
-
       },
       getTimes(time) {
-        return uParseTime(time, "{y}-{m}-{d}");
+        return uParseTime(time, '{y}-{m}-{d}')
       },
       toDetail(row) {
-        this.$router.push('/outpatientCharges/summaryDetail?patient_id='+row.patient.id+"&number="+row.number+"&id="+row.id)
+        this.$router.push('/outpatientCharges/summaryDetail?patient_id=' + row.patient.id + '&number=' + row.number + '&id=' + row.id)
       }, getTime(value, temp) {
         if (value != undefined) {
           return uParseTime(value, temp)
         }
         return ''
-      },getHisOrderList(){
-        let params= {
-          page : this.page,
+      }, getHisOrderList() {
+        let params = {
+          page: this.page,
           limit: this.limit,
-          keywords:this.keywords,
-          start_time:this.start_time,
+          keywords: this.keywords,
+          start_time: this.start_time,
           end_time: this.end_time,
           type: this.admin_user_id
         }
@@ -378,7 +459,7 @@
           }
         })
 
-      },getDoctorList(){
+      }, getDoctorList() {
         getDoctorList().then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -388,16 +469,20 @@
           }
         })
       },
-      open(index){
-        if(index == 1){
+      open(index) {
+        if (index == 1) {
           this.listVisible = true
-        }else if(index == 2){
+        } else if (index == 2) {
           this.allListVisible = true
         }
       }
     }, created() {
-     this.getDoctorList()
-     this.getHisOrderList()
+
+
+      this.fetchAllAdminUsers()
+      this.getDoctorList()
+      this.getHisOrderList()
+
 
 
     }

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2251,10 +2251,6 @@
       comfirm() {
         console.log("222222222222",this.curPrescriptions)
 
-        if (this.dayorMonth == 'month') {
-          this.$message.error('月结状态下，无法添加药品或者项目')
-          return
-        }
 
         if (this.curPrescriptions.order_status == 2) {
           this.$message.error('该处方已经结算，无法继续添加药品或者项目')

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -982,7 +982,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)
+                  }
+                }
 
                 this.case_history = case_history
                 this.info = response.data.data.info
@@ -1154,7 +1158,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)
+                }
+              }
               this.patientInfo.birth = uParseTime(this.patientInfo.birthday, '{y}-{m}-{d}')
               if (this.case_history.breathing <= 0) {
                 this.case_history.breathing = ""

src/xt_pages/outpatientRegistration/index.vue

@@ -178,7 +178,9 @@
                         <el-input v-model.number="total" readonly></el-input>
                     </el-form-item>
                 </el-form>
-                <el-button style="float:right" v-loading="loadingone" @click="saveHisPatient9504('form')" type="primary">挂号</el-button>
+                <el-button style="float:right" v-loading="loadingone" @click="saveHisPatient9504('form')"
+                           type="primary">挂号
+                </el-button>
             </div>
 
         </div>
@@ -408,7 +410,7 @@
                         <!-- <el-input v-model="form.name"></el-input> -->
                     </el-form-item>
                 </el-form>
-                <el-button style="float:right" @click="saveHisPatient('form')" type="primary">挂号</el-button>
+                <el-button style="float:right" @click="saveHisPatient('form')" v-loading="loadingone" type="primary">挂号</el-button>
             </div>
 
         </div>
@@ -427,7 +429,7 @@
     saveHisPatient
   } from '@/api/project/project'
   import { getDictionaryDataConfig } from '@/utils/data'
-  import { uParseTime,jsGetAge } from '@/utils/tools'
+  import { jsGetAge, uParseTime } from '@/utils/tools'
   import { getInitData } from '@/api/his/his'
   import axios from 'axios'
 
@@ -438,6 +440,7 @@
     },
     data() {
       return {
+        loadingone: false,
         read_loading: false,
         registers: [
           { value: 11, label: '普通门诊' },
@@ -479,7 +482,7 @@
           total: '',
           phone: '',
           social_type: '',
-          id_card_type: 1
+          id_card_type: 2
 
         },
         medical_care: [
@@ -656,20 +659,20 @@
         this.form.phone = val.phone
         this.form.idCard = val.id_card_no
 
-        var thisLen =  this.form.idCard.length;
-        var birth = "";
+        var thisLen = this.form.idCard.length
+        var birth = ''
         if (thisLen == 15) {
-          birth = "19" + this.form.idCard.substr(6, 6);
+          birth = '19' + this.form.idCard.substr(6, 6)
         } else {
-          birth = this.form.idCard.substr(6, 8);
+          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, "-");
+          '-' +
+          birth.substr(6, 2)
+        this.form.age = jsGetAge(births, '-')
       },
       querySearchAsync(keyword, cb) {
         let key = ''
@@ -915,7 +918,6 @@
           return
         }
 
-
         this.$refs[formName].validate((valid) => {
           if (valid) {
             var params = {
@@ -966,16 +968,39 @@
                       that.$message.error(response.data.data.msg)
                     } else {
                       that.$message({ message: '挂号成功', type: 'success' })
-                      that.getPatientList()
+                      that.form.settlementValue = ''
+                      that.form.medicalInsuranceCard = ''
+                      that.form.name = ''
+                      that.form.sex = ''
+                      that.form.certificates = ''
+                      that.form.medicalCare = ''
+                      that.form.birthday = ''
+                      that.form.age = ''
+                      that.form.idCard = ''
+                      that.form.register = ''
+                      that.form.doctor = ''
+                      that.form.department = ''
+                      that.form.costChecked = false
+                      that.form.registrationFee = ''
+                      that.form.medicalExpenses = ''
+                      that.form.cost = ''
+                      that.form.total = ''
+                      that.form.phone = ''
+                      that.form.social_type = ''
                       that.loadingone = false
 
+
+                      that.form.p_type = 14
+                      that.form.sick_type = that.sick[0].id
+                      that.form.diagnosis = that.diagnoses[0].id
+
                     }
                   }
                 })
                 .catch(function(error) {
 
                 })
-            } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106) {
+            } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538) {
               var that = this
 
               axios.get('http://127.0.0.1:9532/api/register/get', {
@@ -991,14 +1016,36 @@
                     that.$refs.register.hide()
                     return false
                   } else {
+                    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
+                      that.form.settlementValue = ''
+                      that.form.medicalInsuranceCard = ''
+                      that.form.name = ''
+                      that.form.sex = ''
+                      that.form.certificates = ''
+                      that.form.medicalCare = ''
+                      that.form.birthday = ''
+                      that.form.age = ''
+                      that.form.idCard = ''
+                      that.form.register = ''
+                      that.form.doctor = ''
+                      that.form.department = ''
+                      that.form.costChecked = false
+                      that.form.registrationFee = ''
+                      that.form.medicalExpenses = ''
+                      that.form.cost = ''
+                      that.form.total = ''
+                      that.form.phone = ''
+                      that.form.social_type = ''
+
+                      that.form.p_type = 14
+                      that.form.sick_type = that.sick[0].id
+                      that.form.diagnosis = that.diagnoses[0].id
                     }
                     // var his_info = response.data.data.his_info
                     // that.hisPatientInfo = his_info
@@ -1012,26 +1059,32 @@
                 if (response.data.state == 1) {
                   var patient = response.data.data.patient
                   this.getTodaySchedulePatient()
-                  this.$message.success('保存成功')
-                  this.form.settlementValue = '',
-                    this.form.medicalInsuranceCard = '',
-                    this.form.name = '',
-                    this.form.sex = '',
-                    this.form.certificates = '',
-                    this.form.medicalCare = '',
-                    this.form.birthday = '',
-                    this.form.age = '',
-                    this.form.idCard = '',
-                    this.form.register = '',
-                    this.form.doctor = '',
-                    this.form.department = '',
-                    this.form.costChecked = false,
-                    this.form.registrationFee = '',
-                    this.form.medicalExpenses = '',
-                    this.form.cost = '',
-                    this.form.total = '' ,
-                    this.form.phone = '',
-                    this.form.social_type = ''
+                  that.$message({ message: '挂号成功', type: 'success' })
+                  that.form.settlementValue = ''
+                  that.form.medicalInsuranceCard = ''
+                  that.form.name = ''
+                  that.form.sex = ''
+                  that.form.certificates = ''
+                  that.form.medicalCare = ''
+                  that.form.birthday = ''
+                  that.form.age = ''
+                  that.form.idCard = ''
+                  that.form.register = ''
+                  that.form.doctor = ''
+                  that.form.department = ''
+                  that.form.costChecked = false
+                  that.form.registrationFee = ''
+                  that.form.medicalExpenses = ''
+                  that.form.cost = ''
+                  that.form.total = ''
+                  that.form.phone = ''
+                  that.form.social_type = ''
+                  that.loadingone = false
+
+                  that.form.p_type = 14
+                  that.form.sick_type = that.sick[0].id
+                  that.form.diagnosis = that.diagnoses[0].id
+
                 } else {
                   this.$message.error('今日患者已挂号!')
                 }
@@ -1169,15 +1222,35 @@
                     that.$refs.register.hide()
                     return false
                   } else {
+                    that.loadingone = false
+
                     if (response.data.data.failed_code == -10) {
                       that.$message.error(response.data.data.msg)
                     } 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
+                      that.form.settlementValue = ''
+                      that.form.medicalInsuranceCard = ''
+                      that.form.name = ''
+                      that.form.sex = ''
+                      that.form.certificates = ''
+                      that.form.medicalCare = ''
+                      that.form.birthday = ''
+                      that.form.age = ''
+                      that.form.idCard = ''
+                      that.form.register = ''
+                      that.form.doctor = ''
+                      that.form.department = ''
+                      that.form.costChecked = false
+                      that.form.registrationFee = ''
+                      that.form.medicalExpenses = ''
+                      that.form.cost = ''
+                      that.form.total = ''
+                      that.form.phone = ''
+                      that.form.social_type = ''
+
+                      that.form.p_type = 14
+                      that.form.sick_type = that.sick[0].id
+                      that.form.diagnosis = that.diagnoses[0].id
 
                     }
 
@@ -1186,7 +1259,7 @@
                 .catch(function(error) {
 
                 })
-            } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106) {
+            } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538) {
               var that = this
 
               axios.get('http://127.0.0.1:9532/api/register/get', {
@@ -1199,15 +1272,37 @@
                   if (response.data.state == 0) {
                     that.$message.error(response.data.msg)
                     that.loadingone = false
-                    that.$refs.register.hide()
                     return false
                   } 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
+                    if (response.data.data.failed_code == -10) {
+                      that.$message.error(response.data.data.msg)
+                    } else {
+                      that.$message({ message: '挂号成功', type: 'success' })
+                      that.form.settlementValue = ''
+                      that.form.medicalInsuranceCard = ''
+                      that.form.name = ''
+                      that.form.sex = ''
+                      that.form.certificates = ''
+                      that.form.medicalCare = ''
+                      that.form.birthday = ''
+                      that.form.age = ''
+                      that.form.idCard = ''
+                      that.form.register = ''
+                      that.form.doctor = ''
+                      that.form.department = ''
+                      that.form.costChecked = false
+                      that.form.registrationFee = ''
+                      that.form.medicalExpenses = ''
+                      that.form.cost = ''
+                      that.form.total = ''
+                      that.form.phone = ''
+                      that.form.social_type = ''
+
+                      that.form.p_type = 14
+                      that.form.sick_type = that.sick[0].id
+                      that.form.diagnosis = that.diagnoses[0].id
+                    }
                   }
                 })
                 .catch(function(error) {
@@ -1218,26 +1313,31 @@
                 if (response.data.state == 1) {
                   var patient = response.data.data.patient
                   this.getTodaySchedulePatient()
-                  this.$message.success('保存成功')
-                  this.form.settlementValue = '',
-                    this.form.medicalInsuranceCard = '',
-                    this.form.name = '',
-                    this.form.sex = '',
-                    this.form.certificates = '',
-                    this.form.medicalCare = '',
-                    this.form.birthday = '',
-                    this.form.age = '',
-                    this.form.idCard = '',
-                    this.form.register = '',
-                    this.form.doctor = '',
-                    this.form.department = '',
-                    this.form.costChecked = false,
-                    this.form.registrationFee = '',
-                    this.form.medicalExpenses = '',
-                    this.form.cost = '',
-                    this.form.total = '' ,
-                    this.form.phone = '',
-                    this.form.social_type = ''
+                  that.$message({ message: '挂号成功', type: 'success' })
+                  that.form.settlementValue = ''
+                  that.form.medicalInsuranceCard = ''
+                  that.form.name = ''
+                  that.form.sex = ''
+                  that.form.certificates = ''
+                  that.form.medicalCare = ''
+                  that.form.birthday = ''
+                  that.form.age = ''
+                  that.form.idCard = ''
+                  that.form.register = ''
+                  that.form.doctor = ''
+                  that.form.department = ''
+                  that.form.costChecked = false
+                  that.form.registrationFee = ''
+                  that.form.medicalExpenses = ''
+                  that.form.cost = ''
+                  that.form.total = ''
+                  that.form.phone = ''
+                  that.form.social_type = ''
+                  that.loadingone = false
+
+                  that.form.p_type = 14
+                  that.form.sick_type = that.sick[0].id
+                  that.form.diagnosis = that.diagnoses[0].id
                 } else {
                   this.$message.error('今日患者已挂号!')
                 }
@@ -1327,8 +1427,16 @@
 
     },
     created() {
-      this.getInitData()
 
+      if(this.$store.getters.xt_user.org_id == 9504 ||  this.$store.getters.xt_user.org_id == 10028){
+        this.form.certificates = 2
+        this.form.id_card_type = 1
+      }else{
+        this.form.certificates = 1
+        this.form.id_card_type = 2
+      }
+
+      this.getInitData()
       //获取当前机构有人员信息
       this.getAllDoctorList()
       //获取今日排班的患者

src/xt_pages/stock/detail/print.vue

@@ -68,7 +68,7 @@
               <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> 
+                  <span v-else>{{(getStockCount(stock.id) * getReailPrice(stock.id)).toFixed(2)}}</span> 
                
              </td>
               <td style="line-height: 50px"></td>
@@ -79,7 +79,10 @@
             <tbody>
             <tr>
               <td width="633" style="line-height: 50px">合计</td>
-              <td width="80" style="line-height: 50px">{{calTotalPrice()}}</td>
+              <td width="80" style="line-height: 50px">
+                <span v-if="type == 1">{{calTotalPrice()}}</span>
+                <span v-if="type == 3">{{getTotalPrice().toFixed(2)}}</span>
+              </td>
               <td></td>
             </tr>
 
@@ -196,6 +199,7 @@
             var informationlist = response.data.data.infomationList
             console.log('数据列表',informationlist)
             this.informationList = informationlist
+            this.stockDatas = []
             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) {
@@ -208,11 +212,12 @@
                 }
 
               } else if (this.type == 3) {
-              
+                
                 if (response.data.data.list[i].query_warehouseout_info.length > 0) {
                   this.stockDatas.push(response.data.data.list[i])
                 }
-              
+               
+                console.log("出库打印数据源",this.stockDatas)
                 
               } else if (this.type == 4) {
                 if (response.data.data.list[i].query_cancel_stock_info.length > 0) {
@@ -225,7 +230,12 @@
             for(let i = 0; i <this.stockDatas.length;i++){
               obj = this.stockDatas[i]
             }
-            console.log("9999999",this.stockDatas)
+           console.log("9999999",this.stockDatas)
+           
+           var newArr =  this.unique(this.stockDatas)
+           console.log("耗材出库去重",newArr)
+
+           this.stockDatas = newArr
             // if (this.stockDatas.length < 50) {
             //   var nl = 50 - this.stockDatas.length
             //   for (let index = 0; index < nl; index++) {
@@ -288,7 +298,8 @@
           }
         }
         return  Math.floor(total_price * 100) / 100
-      }, calTotalPrice() {
+      },
+       calTotalPrice() {
 
         var amountPrice = 0
         for (let i = 0; i < this.stockDatas.length; i++) {
@@ -384,7 +395,18 @@
           }
        }
        return price
-     }
+     },
+     getTotalPrice(){
+       var total_price = 0
+       for(let i=0;i<this.stockDatas.length;i++){
+         total_price += (this.getStockCount(this.stockDatas[i].id) * this.getReailPrice(this.stockDatas[i].id))
+       }
+       return total_price
+     },
+     unique(arr) {
+        const res = new Map();
+        return arr.filter((arr) => !res.has(arr.id) && res.set(arr.id, 1));
+     },
     },
     created() {
       var xtuser = this.$store.getters.xt_user

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -180,7 +180,7 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[10, 50, 100]"
+        :page-sizes="[10, 50, 100,1000,1500]"
         :page-size="10"
         background
         style="margin-top:20px;float: right"
@@ -195,7 +195,7 @@
 <script>
 import { uParseTime } from "@/utils/tools";
 import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from "@/api/doctor";
-import { deleteCancelStock, GetAllConfig, getStockDetail,getPrintStockGood } from "@/api/stock";
+import { deleteCancelStock, GetAllConfig, getStockDetail,getPrintStockGood,getGoodInfoList } from "@/api/stock";
 
 export default {
   name: "stockOutDetail",
@@ -226,6 +226,7 @@ export default {
     this.fetchAllAdminUsers();
     this.goodUnit = this.$store.getters.good_unit
     this.getPrintStockGood()
+    this.getList()
   },
   data() {
     return {
@@ -258,7 +259,8 @@ export default {
       dealer: [],
       goodUnit:[],
       tableList:[],
-      stockTotal:[]
+      stockTotal:[],
+      goodInfoData:[]
     };
   },
   methods: {
@@ -638,13 +640,14 @@ export default {
             console.log("stockTotal",stockTotal)
             this.stockTotal = stockTotal
             var list =  response.data.data.list
-            // console.log("导出数据",list)
+            console.log("导出数据",list)
+            this.tableList = []
             for(let i=0;i<list.length;i++){
               if (list[i].query_warehouseout_info.length > 0) {
                 this.tableList.push(list[i])
               }
             }
-          // console.log("表哥",this.tableList)
+           console.log("耗材出库表格数据",this.tableList)
           }
       })
     },
@@ -711,35 +714,66 @@ export default {
       },
       unique(arr) {
         const res = new Map();
-        return arr.filter((arr) => !res.has(arr.specification_name) && res.set(arr.specification_name, 1));
+        return arr.filter((arr) => !res.has(arr.id) && res.set(arr.id, 1));
+      },
+      getList() {
+        let params = {
+          page: 1,
+          limit: 1000,
+          keyword: "",
+          is_use:"",
+          good_kind:"",
+          is_charge: "",
+          is_mark:"",
+          manufacturer:"",
+        }
+       
+        getGoodInfoList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.goodInfoData = []
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.goodInfoData.push(response.data.data.list[i])
+            }
+           
+          }
+        })
       },
 
      exportList(){
-
+      console.log("数据22222",this.tableList)
+      console.log("数据3333",this.goodInfoData)
+      for(let i=0;i<this.tableList.length;i++){
+         for(let j=0;j<this.goodInfoData.length;j++){
+            if(this.tableList[i].id === this.goodInfoData[j].id){
+               this.tableList[i].retail_price = this.goodInfoData[j].retail_price
+            }
+         }
+      }
+      console.log('合并后',this.tableList)
       var obj = {index:"合计",total:0}
-       obj.total = this.calTotalPrice()
+       obj.total = this.getTotalPrice()
        for(let i=0;i<this.tableList.length;i++){
         this.tableList[i].index = i+1
         this.tableList[i].min_unit = this.getUnit(this.tableList[i].good_unit)
         this.tableList[i].count = this.getStockCount(this.tableList[i].id)
-        this.tableList[i].price = this.tableList[i].query_warehouseout_info[0].price
-        this.tableList[i].total = (this.getStockCount(this.tableList[i].id) * this.tableList[i].query_warehouseout_info[0].price).toFixed(2)
+        // this.tableList[i].price = this.tableList[i].query_warehouseout_info[0].buy_price
+        this.tableList[i].total = (this.getStockCount(this.tableList[i].id) * this.tableList[i].retail_price).toFixed(2)
         this.tableList[i].remark = this.tableList[i].query_warehouseout_info[0].remark
        }
        var arr = this.unique(this.tableList)
-       console.log("22222222222222222气",arr)
+     
        this.tableList = arr
        this.tableList.push(obj)
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
-       const filterVal = ['index','good_name', 'specification_name', 'min_unit','count','price','total','remark']
-
-
-
+       const filterVal = ['index','good_name', 'specification_name', 'min_unit','count','retail_price','total','remark']
 
        const data = this.formatJson(filterVal, this.tableList)
        console.log("data",data)
-
+       
         excel.export_json_to_excel({
            header: tHeader,
            data,
@@ -760,6 +794,15 @@ export default {
        }
       return name
      },
+    getTotalPrice(){
+       var total_price = 0
+       for(let i=0;i<this.tableList.length;i++){
+         total_price += this.getStockCount(this.tableList[i].id) * this.tableList[i].retail_price
+       }
+       return total_price
+     },
+
+     
   }
 };
 </script>

src/xt_pages/stock/drugs/components/drugOutDetail.vue

@@ -197,6 +197,7 @@ import { uParseTime } from "@/utils/tools";
 import { fetchAllAdminUsers } from "@/api/doctor";
 import {GetAllConfig } from "@/api/stock";
 import {getDrugOutDetail } from "@/api/drug/drug_stock"
+ import {getBaseDrugLibList} from '@/api/data'
 export default {
   name: "stockOutDetail",
 
@@ -224,6 +225,7 @@ export default {
     this.GetConfigInfo();
     this.fetchAllAdminUsers();
     this.getlist()
+    this.getBaseDrugLibList()
   },
   data() {
     return {
@@ -255,7 +257,8 @@ export default {
       selectedTableData: [],
       dealer: [],
       tableData:[],
-      tableList:[]
+      tableList:[],
+      drugList:[]
     };
   },
   methods: {
@@ -449,15 +452,21 @@ export default {
     },
 
      exportList(){
+
         for(let i=0;i<this.tableList.length;i++){
+          for(let j=0;j<this.drugList.length;j++){
+             if(this.tableList[i].drug_id == this.drugList[j].id){
+               this.tableList[i].retail_price = this.drugList[j].retail_price
+             }
+          }
           this.tableList[i].index = i+1
         }
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','药品名称', '规格型号', '单位','数量','单价','总价','备注']
-       const filterVal = ['index','drug_name', 'drug_spec', 'min_unit','count','price','total_price','remark']
+       const filterVal = ['index','drug_name', 'drug_spec', 'min_unit','count','retail_price','total_price','remark']
        let obj = {'index':'合计','total_price':0}
        for(let i=0;i<this.tableList.length;i++){
-         obj.total_price += this.tableList[i].price * this.tableList[i].count
+         obj.total_price += this.tableList[i].retail_price * this.tableList[i].count
        }
        for(let j=0;j<this.tableList.length;j++){
           this.tableList[j].total_price = this.tableList[j].total_price.toFixed(2)
@@ -478,6 +487,31 @@ export default {
      formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
      },
+
+    getBaseDrugLibList() {
+        let params = {
+          page: 1,
+          limit: 1000,
+          keyword:"",
+          is_use: "",
+          is_charge: "",
+          is_inject: "",
+          manufacturer:"",
+          is_record:""
+        }
+        getBaseDrugLibList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.drugList = []
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.drugList.push(response.data.data.list[i])
+            }
+            console.log("药品列表",this.drugList)
+          }
+        })
+      },
   }
 };
 </script>

src/xt_pages/stock/drugs/drugOutOrderPrint.vue

@@ -44,10 +44,11 @@
                   {{item.count}}
               </td>
               <td style="line-height:50px">
-                  {{item.price}}
+                  <!-- {{item.price}} -->
+                  {{getPrice(item.drug_id)}}
               </td>
               <td style="line-height:50px">
-                  {{(item.count * item.price).toFixed(2)}}
+                  {{(item.count * getPrice(item.drug_id)).toFixed(2)}}
               </td>
               <td style="line-height: 50px">
                  {{item.remark}}
@@ -84,6 +85,7 @@
 
 <script>
   import { getPrintStockGood } from '@/api/stock'
+  import { getBaseDrugLibList } from '@/api/data'
   import { getDataConfig } from '@/utils/data'
   import { jsGetAge, uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
@@ -114,6 +116,8 @@
         limit:this.$route.query.limit,
         page:this.$route.query.page,
         cancelStockDate:[],
+        drugList:[]
+       
       }
     },
     methods: {
@@ -215,15 +219,47 @@
             total += this.cancelStockDate[i].price * this.cancelStockDate[i].count
          }
          return total
+      },
+
+     getBaseDrugLibList() {
+        let params = {
+          page: 1,
+          limit: 1000,
+          keyword:"",
+          is_use: "",
+          is_charge: "",
+          is_inject: "",
+          manufacturer:"",
+          is_record:""
+        }
+        getBaseDrugLibList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.drugList = []
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.drugList.push(response.data.data.list[i])
+            }
+            console.log("药品列表",this.drugList)
+          }
+        })
+      },
+      getPrice(id){
+        var price = 0
+        for(let i=0;i<this.drugList.length;i++){
+          if(id == this.drugList[i].id){
+             price = this.drugList[i].retail_price
+          }
+        }
+        return price
       }
     },
     created() {
       var xtuser = this.$store.getters.xt_user
       this.orgname = xtuser.org.org_name
       this.getlist()
-
-      
-
+      this.getBaseDrugLibList()
     }
 
   }

src/xt_pages/workforce/appointment.vue

@@ -2537,37 +2537,37 @@
        changeWeek(val){
        
          var start = this.getTimestamp(val) - 57600
-        //  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)
       
      
@@ -2643,10 +2643,8 @@
           return (new Date(time)).getTime() / 1000
         },
         submitAction(formName){
-           
-             var start_time = ""
-             var end_time = ""
-             console.log("this222",this.form.lastweek)
+           var start_time = ""
+           var end_time = ""
              //上周
              if(this.form.lastweek == "1"){
                 let weekOfday = parseInt(moment().format('d')) 
@@ -2680,8 +2678,8 @@
               copy_startime:copy_startime,
               copy_endtime:copy_endtime,
             }
-           console.log("parasm",params)
-           
+           console.log("时间",params)
+         
            this.$refs[formName].validate(valid=>{
               if(valid){
                 copyPatientSchedule(params).then(response=>{