导出

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/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/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=>{