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

src/api/common/common.js

@@ -134,11 +134,14 @@ export function DeleteCheck(id, params) {
   })
 }
 
-export function getDialysisModeType(startime, endtime) {
+export function getDialysisModeType(startime, endtime,lapsetotype,sourcetype) {
   const params = {
     startime: startime,
-    endtime: endtime
+    endtime: endtime,
+    lapsetotype:lapsetotype,
+    sourcetype:sourcetype,
   }
+  console.log("parasm22222",params)
   return request({
     url: '/com/api/getdialysismodetype',
     method: 'get',
@@ -146,10 +149,12 @@ export function getDialysisModeType(startime, endtime) {
   })
 }
 
-export function getTotalLapseCount(startime, endtime) {
+export function getTotalLapseCount(startime, endtime,lapsetotype,sourcetype) {
   const params = {
     startime: startime,
-    endtime: endtime
+    endtime: endtime,
+    lapsetotype:lapsetotype,
+    sourcetype:sourcetype,
   }
   console.log('转归params', params)
   return request({
@@ -159,10 +164,12 @@ export function getTotalLapseCount(startime, endtime) {
   })
 }
 
-export function getTotalSexCount(startime, endtime) {
+export function getTotalSexCount(startime, endtime,lapsetotype,sourcetype) {
   const params = {
     startime: startime,
-    endtime: endtime
+    endtime: endtime,
+    lapsetotype:lapsetotype,
+    sourcetype:sourcetype,
   }
   return request({
     url: '/com/api/gettotalsexcount',
@@ -171,10 +178,12 @@ export function getTotalSexCount(startime, endtime) {
   })
 }
 
-export function getTotalInfectiousCount(startime, endtime) {
+export function getTotalInfectiousCount(startime, endtime,lapsetotype,sourcetype) {
   const params = {
     startime: startime,
-    endtime: endtime
+    endtime: endtime,
+    lapsetotype:lapsetotype,
+    sourcetype:sourcetype,
   }
   console.log('传染病', params)
   return request({
@@ -184,10 +193,12 @@ export function getTotalInfectiousCount(startime, endtime) {
   })
 }
 
-export function getTotalAgeCount(startime, endtime) {
+export function getTotalAgeCount(startime, endtime,lapsetotype,sourcetype) {
   const params = {
     startime: startime,
-    endtime: endtime
+    endtime: endtime,
+    lapsetotype:lapsetotype,
+    sourcetype:sourcetype,
   }
   return request({
     url: '/com/api/gettotalagecount',
@@ -196,10 +207,12 @@ export function getTotalAgeCount(startime, endtime) {
   })
 }
 
-export function getTotalDialysisCount(startime, endtime) {
+export function getTotalDialysisCount(startime, endtime,lapsetotype,sourcetype) {
   const params = {
     startime: startime,
-    endtime: endtime
+    endtime: endtime,
+    lapsetotype:lapsetotype,
+    sourcetype:sourcetype,
   }
   return request({
     url: '/com/api/gettotaldialysiscount',

src/api/drug/drug_stock.js

@@ -418,6 +418,15 @@ export function getDrugCancelDetail(params){
 }
 
 
+export function getDrugAutoMaticList(params){
+  
+  return request({
+    url:"/api/drugstock/getdrugautomaticlist",
+    method:"Get",
+    params:params,
+  })
+}
+
 
 
 

src/api/stock.js

@@ -602,4 +602,12 @@ export function postDrugInformation(params){
     method:"post",
     data:params
   })
+}
+
+export function getInitializtion(params){
+  return request({
+    url:"/api/good/initializtion",
+    method:"get",
+    params:params
+  })
 }

src/store/modules/globalConfig.js

@@ -1844,7 +1844,10 @@ const global_config = {
         id: 32,
         name: '米'
       },
-
+      {
+        id: 33,
+        name: '万份'
+      },
     ],
     body_fluid: [{
       id: 1,

src/xt_pages/components/DrugExcel/index.vue → src/xt_pages/components/GoodExcel/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <input id="excel-drug-input" ref="excel-drug-input" type="file" accept=".xlsx, .xls, .xltx" @change="handleClick">
+    <input id="excel-good-input" ref="excel-good-input" type="file" accept=".xlsx, .xls, .xltx" @change="handleClick">
     <el-button :loading="loading" style="margin-left:16px;" size="mini" type="primary" @click="handleUpload">导入模板
     </el-button>
   </div>
@@ -54,7 +54,7 @@
         e.dataTransfer.dropEffect = 'copy'
       },
       handleUpload() {
-        document.getElementById('excel-drug-input').click()
+        document.getElementById('excel-good-input').click()
       },
       handleClick(e) {
         const files = e.target.files
@@ -63,7 +63,7 @@
         this.upload(rawFile)
       },
       upload(rawFile) {
-        this.$refs['excel-drug-input'].value = null // fix can't select the same excel
+        this.$refs['excel-good-input'].value = null // fix can't select the same excel
 
         if (!this.beforeUpload) {
           this.readerData(rawFile)
@@ -127,7 +127,7 @@
 </script>
 
 <style scoped>
-  #excel-project-input {
+  #excel-good-input {
     display: none;
     z-index: -9999;
   }

src/xt_pages/data/components/addDrugs.vue

@@ -37,10 +37,10 @@
                         <el-form-item label="药品类别 : " prop="drug_category">
                             <el-select v-model="form.drug_category" style="width:160px;" placeholder="请选择">
                                 <el-option
-                                        v-for="item,index in getDictionaryDataConfig('system','drug_category')"
+                                        v-for="(item,index) in drugCategoryList"
                                         :key="index"
                                         :label="item.name"
-                                        :value="item.id">
+                                        :value="item.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -51,10 +51,10 @@
                         <el-form-item label="药品类型 : " prop="drug_type">
                             <el-select v-model="form.drug_type" style="width:160px;" placeholder="请选择">
                                 <el-option
-                                        v-for="item,index in getDictionaryDataConfig('system','drug_type')"
+                                        v-for="(item,index) in drugTypeList"
                                         :key="index"
                                         :label="item.name"
-                                        :value="item.id">
+                                        :value="item.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -69,20 +69,20 @@
                         <el-form-item label="药品剂型 : " prop="drug_dosage_form">
                             <el-select v-model="form.drug_dosage_form" style="width:160px;" placeholder="请选择">
                                 <el-option
-                                        v-for="item,index in getDictionaryDataConfig('system','drug_dosage_form')"
+                                        v-for="(item,index) in drugDosageFormList"
                                         :key="index"
                                         :label="item.name"
-                                        :value="item.id">
+                                        :value="item.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
                         <el-form-item label="医保等级 : ">
                             <el-select v-model="form.medical_insurance_level" style="width:160px;" placeholder="请选择">
                                 <el-option
-                                        v-for="item,index in getDictionaryDataConfig('system','medical_insurance_level')"
+                                        v-for="(item,index) in medicalInsuranceLevelList"
                                         :key="index"
                                         :label="item.name"
-                                        :value="item.id">
+                                        :value="item.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -121,10 +121,10 @@
                         <el-form-item label="开药控制 : " prop="drug_control">
                             <el-select v-model="form.drug_control" style="width:160px;" placeholder="请选择">
                                 <el-option
-                                        v-for="item,index in getDictionaryDataConfig('system','drug_control')"
+                                        v-for="(item,index) in drugControlList"
                                         :key="index"
                                         :label="item.name"
-                                        :value="item.id">
+                                        :value="item.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -135,10 +135,10 @@
                         <el-form-item label="药物分类 : " prop="drug_classify">
                             <el-select v-model="form.drug_classify" style="width:160px;" placeholder="请选择">
                                 <el-option
-                                        v-for="item, index in getDictionaryDataConfig('system','drug_classify')"
+                                        v-for="(item, index) in drugClassifyList"
                                         :key="index"
                                         :label="item.name"
-                                        :value="item.id">
+                                        :value="item.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -156,7 +156,7 @@
                         </el-form-item>
 
 
-                        <el-form-item label="限制性用药 : " prop="lmt_used_flag">
+                        <el-form-item label="限制性用药 : ">
                             <el-select v-model="form.lmt_used_flag" style="width:160px;" placeholder="请选择">
                                 <el-option
                                         v-for="item,index in lmt_used_flags"
@@ -196,8 +196,8 @@
 
                             <el-select v-model="form.manufacturer" style="width:160px;" filterable placeholder="请选择">
                                 <el-option
-                                        v-for="item in manufacturerList"
-                                        :key="item.id"
+                                        v-for="(item,index) in manufacturerList"
+                                        :key="index"
                                         :label="item.manufacturer_name"
                                         :value="item.id">
                                 </el-option>
@@ -207,20 +207,20 @@
                         <el-form-item label="药理分类 : " prop="pharmacology_category">
                             <el-select v-model="form.pharmacology_category" style="width:160px;" placeholder="请选择">
                                 <el-option
-                                        v-for="item,index  in getDictionaryDataConfig('system','pharmacology_category')"
+                                        v-for="(item,index)  in pharmacologyCategoryList"
                                         :key="index"
                                         :label="item.name"
-                                        :value="item.id">
+                                        :value="item.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
                         <el-form-item label="统计分类 : " prop="statistics_category">
                             <el-select v-model="form.statistics_category" style="width:160px;" placeholder="请选择">
                                 <el-option
-                                        v-for="item,index  in getDictionaryDataConfig('system','statistics_category')"
+                                        v-for="(item,index)  in statisticsCategoryList"
                                         :key="index"
                                         :label="item.name"
-                                        :value="item.id">
+                                        :value="item.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -423,7 +423,7 @@
 <script>
   import { getDataConfig, getDictionaryDataConfig } from '@/utils/data'
   import { getAdviceConfig } from '@/api/advice'
-  import { GetAllConfig, getManufacturerList } from '@/api/stock'
+  import { GetAllConfig, getManufacturerList,getInitializtion } from '@/api/stock'
 
   export default {
     data() {
@@ -552,7 +552,15 @@
         page: 1,
         limit: 500,
         manufacturerList: [],
-        dealer: []
+        dealer: [],
+        drugTypeList:[],
+        drugCategoryList:[],
+        drugDosageFormList:[],
+        medicalInsuranceLevelList:[],
+        drugControlList:[],
+        drugClassifyList:[],
+        statisticsCategoryList:[],
+        pharmacologyCategoryList:[]
       }
     },
     props: {
@@ -569,7 +577,8 @@
       isCreated: {
         type: Number,
         default: 1
-      }
+      },
+     
 
     },
     methods: {
@@ -602,8 +611,15 @@
         this.form.intro = ''
       },
       show(id, obj) {
-        console.log('obj222', obj)
-        // this.clear()
+        console.log("obj333333333",obj)
+        this.getInitializtion()
+        this.getlist()
+        this.GetAllConfig()
+        obj.drug_classify = parseInt(obj.drug_classify)
+        if(obj.dealer == 0){
+           obj.dealer = ""
+        }
+        
         this.visible = true
         if (id == 0) {
           this.formTitle = '新增'
@@ -714,7 +730,7 @@
 
         form['hosp_appr_flag'] = this.form.hosp_appr_flag
         form['lmt_used_flag'] = this.form.lmt_used_flag
-
+       
         return form
       },
       getlist() {
@@ -725,7 +741,7 @@
 
         getManufacturerList(params).then(response => {
           var manufacturerList = response.data.data.manufacturer
-          console.log('列表2222222', manufacturerList)
+         
           this.manufacturerList = manufacturerList
         })
       },
@@ -736,9 +752,39 @@
             return false
           } else {
             this.dealer = response.data.data.dealer
-            console.log('经销商', this.dealer)
+            // console.log('经销商', this.dealer)
           }
         })
+      },
+      getInitializtion(){
+        getInitializtion().then(response=>{
+           if(response.data.state ==1){
+             var drugCategoryList =  response.data.data.drugCategoryList
+             console.log("药品类别",drugCategoryList) 
+             this.drugCategoryList = drugCategoryList
+             var drugTypeList = response.data.data.drugTypeList
+              console.log("药物分类",drugTypeList)
+              this.drugTypeList = drugTypeList
+             var drugDosageFormList =  response.data.data.drugDosageFormList
+             console.log("药品剂型",drugDosageFormList) 
+             this.drugDosageFormList = drugDosageFormList
+             var medicalInsuranceLevelList =  response.data.data.medicalInsuranceLevelList
+             console.log("医保等级",medicalInsuranceLevelList)
+             this.medicalInsuranceLevelList = medicalInsuranceLevelList
+             var drugControlList = response.data.data.drugControlList
+             console.log("开药控制",drugControlList)
+             this.drugControlList = drugControlList
+             var drugClassifyList = response.data.data.drugClassifyList
+             console.log("药物分类",drugClassifyList)
+             this.drugClassifyList = drugClassifyList
+             var statisticsCategoryList =  response.data.data.statisticsCategoryList
+             console.log("统计分类",statisticsCategoryList)
+             this.statisticsCategoryList = statisticsCategoryList
+             var pharmacologyCategoryList = response.data.data.pharmacologyCategoryList
+             console.log("药理分类",pharmacologyCategoryList)
+             this.pharmacologyCategoryList = pharmacologyCategoryList
+           }
+        })
       }
     }, watch: {
       visible(val) {
@@ -747,9 +793,13 @@
       }
     },
     created() {
-      this.getlist()
-      //获取所有经销商
+      this.getInitializtion()
+       //获取所有经销商
       this.GetAllConfig()
+      this.getlist()
+      
+      
+     
     }
   }
 </script>

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/stockTemplate.xlsx" :underline="false"
                  style="margin-left:15px">
           <el-button
             class="filter-item"
@@ -75,14 +75,14 @@
           >下载模版
           </el-button>
         </el-link>
-        <upload-excel :on-success='handleSuccess'></upload-excel>
+        <good-excel :on-success='handleSuccess'></good-excel>
         <el-button
           style="margin-left:10px;"
           @click="generateLog()"
           class="filter-item"
           type="primary"
           size="small"
-        >下载日志 -->
+        >下载日志
         </el-button>
       </div>
 
@@ -241,15 +241,18 @@
     GetGoodInfoByGoodId,
     getGoodInfoList,
     modifyGoodInfo,
-    postGoodInformation
+    postGoodInformation,
+    getInitializtion
   } from '@/api/stock'
   import UploadExcel from '@/xt_pages/components/UploadExcel'
+  import GoodExcel from '@/xt_pages/components/GoodExcel'
   import { generateLog } from '@/api/config'
   export default {
     components: {
       GoodInfoDailog,
       selfPayment,
       UploadExcel,
+      GoodExcel
     },
     data() {
       return {
@@ -350,6 +353,7 @@
         dealers:[],
         exportLogVisible:false,
         logs: [],
+        goodKindList:[]
       }
     },
     methods: {
@@ -458,10 +462,12 @@
         return ""
       },
       getGoodKind(id){
-        var data = this.getDictionaryDataConfig('system','good_kind')
+        // var data = this.getDictionaryDataConfig('system','good_kind')
+        var data = this.goodKindList
+       
         var name = ""
         for(let i = 0; i < data.length; i++){
-          if(id == data[i].id){
+          if(id == data[i].value){
             name = data[i].name
           }
 
@@ -531,8 +537,6 @@
               response.data.data.goodInfo.good_type_id
 
 
-
-
             this.goodInfo.goodInfoDialog.formValue.good_name =
               response.data.data.goodInfo.good_name
 
@@ -552,8 +556,6 @@
                 response.data.data.goodInfo.good_kind
             }
 
-
-
             if (response.data.data.goodInfo.medical_insurance_level <= 0) {
               this.goodInfo.goodInfoDialog.formValue.medical_insurance_level = ''
             } else {
@@ -723,7 +725,7 @@
           is_mark:this.is_record,
           manufacturer:this.manufacturer,
         }
-        console.log("222222",params)
+      
         getGoodInfoList(params).then(response => {
           if (response.data.state == 0) {
             this.goodInfo.loading = false
@@ -767,11 +769,16 @@
         })
       },
       goodInfoDialogComfirm: function(val) {
+       
         if (val.isCreated == 2) {
           //修改
           val['id'] = this.goodInfo.editGoodId
           val['good_code'] = this.goodInfo.good_code
+        
+          
 
+
+          
           modifyGoodInfo(val).then(response => {
             if (response.data.state == 0) {
               // this.$message.error(response.data.msg)
@@ -803,6 +810,20 @@
             }
           })
         } else if (val.isCreated == 1) {
+         
+          
+          if(val.is_reuse == ""){
+             val.is_reuse = 0
+          }else{
+            val.is_reuse = parseInt(val.is_reuse)
+          }
+          
+          if(val.stock_warn_count == ""){
+             val.stock_warn_count = 0
+          }else{
+            val.stock_warn_count = parseInt(val.stock_warn_count)
+          }
+         
           //新增
           createGoodInfo(val).then(response => {
             if (response.data.state == 0) {
@@ -881,7 +902,7 @@
               )
               this.manufacturers.push(response.data.data.manufacturer[i])
             }
-            console.log("生产厂商888222",this.manufacturers)
+           
           }
         })
       },
@@ -1017,13 +1038,13 @@
               ids.push(this.selectDrug[index].id);
               idMap[this.selectDrug[index].id] = this.selectDrug[index].id;
             }
-            console.log('ids222222222',ids)
+          
             var idss = ids.join(',')
             let params = {
               ids:idss,
               admin_user_id:this.$store.getters.xt_user.user.id
             }
-            console.log("paramsw2",params)
+          
 
             var that = this
             axios.get('http://127.0.0.1:9532/sz/api/goods/get',{ params: params }).then(function(response) {
@@ -1077,30 +1098,26 @@
          this.getList()
       },
       handleSuccess({ results, header }) {
-        console.log("header",header)
-        var goods = []
+       
         if (header != undefined && header.length > 0) {
             
           var isHasMedicalInsuranceLevel = header.includes('*医保等级')
-          // console.log("医保等级",isHasMedicalInsuranceLevel)
+         
           var isHasGoodUnit = header.includes('*单位')
-          // console.log("单位",isHasGoodUnit)
+        
           var isHasStockWarnCount = header.includes('*库存警戒')
-          // console.log("库存警戒",isHasStockWarnCount)
+       
           var isHasManuFacturer =  header.includes('*生产厂商')
-          // console.log("生产厂商",isHasManuFacturer)
-          var isHasDealer =  header.includes('*经销商')
-          // console.log("经销商",isHasDealer)
+         
           var isHasGoodName = header.includes('*耗材名称')
-          // console.log("耗材名称",isHasGoodName)
+        
           var isHasGoodKand = header.includes('*耗材种类')
-          // console.log("耗材种类",isHasGoodKand)
+          
           var isHasSpecificationName = header.includes('*规格型号')
-          // console.log("规格型号",isHasSpecificationName)
+        
           var isHasBuyPrice = header.includes('*零价')
-          // console.log("零价",isHasBuyPrice)
-         
-          if (!(isHasMedicalInsuranceLevel && isHasGoodUnit && isHasStockWarnCount && isHasManuFacturer && isHasDealer && isHasGoodName && isHasGoodKand && isHasSpecificationName &&  isHasBuyPrice)) {
+                
+          if (!(isHasMedicalInsuranceLevel && isHasGoodUnit && isHasStockWarnCount && isHasManuFacturer  && isHasGoodName && isHasGoodKand && isHasSpecificationName &&  isHasBuyPrice)) {
             this.dialogVisible = true
             return
           }
@@ -1110,7 +1127,7 @@
         }
        
        var tableData = []
-       for(let i=0;i<results.length;i++){
+       for(let i=1;i<results.length;i++){
          let obj = {"good_kind_id":0,"good_type_id":0,"medical_insurance_id":0,"dealer_id":0,"statistic_id":0,"manufacturer_id":0,"unit_id":0}
          for (var key in results[i]) {
 
@@ -1186,10 +1203,10 @@
               }
            }
 
-           if (results[i]['*经销商'] === undefined) {
+           if (results[i]['经销商'] === undefined) {
                 obj['dealer'] = ''
               } else {
-             if (key == '*经销商') {
+             if (key == '经销商') {
                obj['dealer'] = results[i][key].replace(/\s/g,"")
               }
            }
@@ -1294,60 +1311,11 @@
 
          }
          tableData.push(obj)
-         console.log("表哥2222",tableData)
-         var goodKind  =  this.getDictionaryDataConfig('system','good_kind')
-         
-        //  console.log("耗材种类",goodKind)
-        //  console.log("耗材类型",this.goodType)
-        var medicalInsuranceLevel = this.getDictionaryDataConfig('system','medical_insurance_level')
-        // console.log("医保等级",medicalInsuranceLevel)
-        // console.log("生产厂商",this.manufacturers)
-        // console.log("经销商",this.dealers)
-        var statisticsCategory = getDictionaryDataConfig('system','statistics_category')
-        // console.log("统计分类",statisticsCategory)
-       
         var goodUnit =  this.$store.getters.good_unit
        
 
         for(let i=0;i<tableData.length;i++){ 
-          for(let j=0;j<goodKind.length;j++){
-             
-             if(tableData[i].good_kind == goodKind[j].name){
-                tableData[i].good_kind_id = goodKind[j].id
-             }    
-          }
-
-       for(let z=0;z<this.goodType.length;z++){
-          if(tableData[i].type_name == this.goodType[z].type_name){
-             tableData[i].good_type_id = this.goodType[z].id
-           }
-        }
-        
-        for(let y=0;y<medicalInsuranceLevel.length;y++){
-           if(tableData[i].medical_insurance_level == medicalInsuranceLevel[y].name){
-               tableData[i].medical_insurance_id = medicalInsuranceLevel[y].id
-           }
-        }
-
-        
-        for(let a=0;a<this.manufacturers.length;a++){
-           if(tableData[i].manufacturer == this.manufacturers[a].manufacturer_name){
-               tableData[i].manufacturer_id = this.manufacturers[a].id
-           }
-        }
-       
-        for(let s=0;s<this.dealers.length;s++){
-           if(tableData[i].dealer == this.dealers[s].dealer_name){
-               tableData[i].dealer_id = this.dealers[s].id
-           }
-        }
-        
-        for(let h=0;h<statisticsCategory.length;h++){
-           if(tableData[i].statistics_category == statisticsCategory[h].name){
-               tableData[i].statistic_id = statisticsCategory[h].id
-           }
-         }
-
+      
          for(let c=0;c<goodUnit.length;c++){
             if(tableData[i].good_unit == goodUnit[c].name){
                tableData[i].unit_id = goodUnit[c].id
@@ -1377,22 +1345,15 @@
          
 
           if(tableData[i].special_medical == "是"){
-             tableData[i].special_medical = 1
+             tableData[i].special_medical = "1"
           }
           if(tableData[i].special_medical == "否"){
-             tableData[i].special_medical = 2
+             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{
@@ -1411,15 +1372,17 @@
        let params = {
           'goods':tableData 
         }
-       console.log("params2222",params)
+     
        
        
         postGoodInformation(params).then(response=>{
            if(response.data.state == 1){
              var msg =  response.data.data.msg
              this.$message.success("导入成功!")
+             this.getList()
+             this.getInitializtion()
            }else{
-             this.$message.error("导入失败")
+             this.$message.error("导入失败,请下载日志查看")
            }
         })
       },
@@ -1474,6 +1437,18 @@
         )
 
       },
+      getInitializtion(){
+       getInitializtion().then(response=>{
+         if(response.data.state == 1){
+           var goodKindList = response.data.data.goodKindList
+          
+           this.goodKindList = goodKindList
+         
+
+         }
+       })
+      }
+
     }, 
     created() {
       this.getList()
@@ -1481,6 +1456,7 @@
       this.getAllManufacturer()
       this.getAllGoodType()
       this.goodInfo.goodInfoDialog.formValue.goodUnit = this.$store.getters.good_unit
+      this.getInitializtion()
     }
   }
 </script>

src/xt_pages/data/components/drugs.vue

@@ -64,7 +64,7 @@
     <div style="display:flex; align-items:center;margin-bottom:10px;">
         <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"
+        <el-link target="_blank" href="https://kuyi.shengws.com/drugTemplate.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'}"
@@ -480,11 +480,11 @@
         return name
       },
       goodInfoDialogComfirm: function(val) {
-
+        
         //修改自备药
         var untit = ""
         var untis = getDataConfig('hemodialysis','units')
-        console.log("999999",untis)
+        
         for(let i=0;i<untis.length;i++){
            if(val.min_unit == untis[i].id){
               untit = untis[i].name
@@ -505,7 +505,7 @@
           })
         } else if (val.id == 0) {
           //新增
-          console.log("vale222222",val)
+         
 
           createBaseDrugLib(val).then(response => {
             if (response.data.state == 0) {
@@ -560,7 +560,7 @@
               this.$message.error(response.data.msg)
               return false
             } else {
-              console.log("数据", response.data.data.drug)
+           
               for (let key in response.data.data.drug) {
                 this.formValue[key] = response.data.data.drug[key]
               }
@@ -673,6 +673,7 @@
               if(this.formValue.hosp_appr_flag == 0){
                 this.formValue.hosp_appr_flag = ""
               }
+              
               this.$refs.addDrugs.show(id, this.formValue)
 
             }
@@ -686,7 +687,7 @@
       },
 
        deleteDurg(id,index){
-         console.log("id",id)
+      
             this.$confirm('确认删除吗?', '删除', {
             confirmButtonText: '确 定',
             cancelButtonText: '取 消',
@@ -803,7 +804,7 @@
       //   })
       // },
       toReturn(id,isMark){
-        console.log("id2222",id)
+     
          var that = this
          let params = {
              'id':id,
@@ -905,13 +906,11 @@
      },
 
       handleSuccessTwo({ results, header }) {
-       console.log("hhhhhhhh",results)
+     
         if (header != undefined && header.length > 0) {
             
           var isHasDrugName = header.includes('*药品名称')
          
-          var isHasDrugAlias = header.includes('*药品别名')
-          
           var isHasDrugSpec = header.includes('*药品规格')
         
           var isHasDrugType =  header.includes('*药品类型')
@@ -936,8 +935,11 @@
 
          var isHasManufacturer = header.includes('*生产厂商')
 
-          var isHasDealer =  header.includes('*经销商')
-          if (!(isHasDrugName && isHasDrugAlias && isHasDrugSpec && isHasDrugType && isHasDrugStockLimit && isHasDrugOriginPlace && isHasDrugDosageForm && isHasMaxUnit &&  isHasMinUnit && isHasUnitMatrixing &&  isHasRetailPrice && isHasLastPrice && isHasDrugClassifye && isHasManufacturer && isHasDealer)) {
+         var isHasDrugDose = header.includes('*剂量')
+           
+         var isDrugDoseUnit = header.includes('*剂量单位')
+     
+          if (!(isHasDrugName  && isHasDrugSpec && isHasDrugType && isHasDrugStockLimit && isHasDrugOriginPlace && isHasDrugDosageForm && isHasMaxUnit &&  isHasMinUnit && isHasUnitMatrixing &&  isHasRetailPrice && isHasLastPrice && isHasDrugClassifye && isHasManufacturer && isHasDrugDose && isDrugDoseUnit)) {
             this.dialogVisible = true
             return
           }
@@ -947,8 +949,8 @@
         }
        
        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,"statistics_category_id":0,"drug_control_id":0,"pharmacology_category_id":0}
+       for(let i=1;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,"statistics_category_id":0,"drug_control_id":0,"pharmacology_category_id":0,"drug_category_id":0}
          for (var key in results[i]) {
 
            if (results[i]['*药品名称'] === undefined) {
@@ -960,10 +962,10 @@
            }
 
 
-           if (results[i]['*药品别名'] === undefined) {
+           if (results[i]['药品别名'] === undefined) {
                 obj['drug_alias'] = ''
               } else {
-           if (key == '*药品别名') {
+           if (key == '药品别名') {
                obj['drug_alias'] = results[i][key].replace(/\s/g,"")
               }
            }
@@ -1077,10 +1079,10 @@
               }
            }
 
-            if (results[i]['*经销商'] === undefined) {
+            if (results[i]['经销商'] === undefined) {
                 obj['dealer'] = ''
               } else {
-            if (key == '*经销商') {
+            if (key == '经销商') {
                 obj['dealer'] = results[i][key].replace(/\s/g,"")
               }
            }
@@ -1101,11 +1103,13 @@
               }
            }
 
-            if (results[i]['药品别名'] === undefined) {
-                obj['drug_alias'] = ''
+          
+
+            if (results[i]['别名拼音'] === undefined) {
+                obj['drug_alias_pinyin'] = ''
               } else {
-            if (key == '药品别名') {
-                obj['drug_alias'] = results[i][key].replace(/\s/g,"")
+            if (key == '别名拼音') {
+                obj['drug_alias_pinyin'] = results[i][key].replace(/\s/g,"")
               }
            }
 
@@ -1117,6 +1121,22 @@
               }
            }
 
+            if (results[i]['别名五笔'] === undefined) {
+                obj['drug_alias_wubi'] = ''
+              } else {
+            if (key == '别名五笔') {
+                obj['drug_alias_wubi'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+             if (results[i]['药品类别'] === undefined) {
+                obj['drug_category'] = ''
+              } else {
+            if (key == '药品类别') {
+                obj['drug_category'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
            if (results[i]['开药控制'] === undefined) {
                 obj['drug_control'] = ''
               } else {
@@ -1246,86 +1266,37 @@
               }
            }
 
+          if (results[i]['*剂量'] === undefined) {
+                obj['drug_dose'] = ''
+              } else {
+            if (key == '*剂量') {
+                obj['drug_dose'] = results[i][key].replace(/\s/g,"")
+              }
+           }
 
-         }
-         tableData.push(obj)
-         console.log("表哥2222",tableData)
-      
-        var drugType =  this.getDictionaryDataConfig('system','drug_type')
-       
-       
-        var drugDosageForm = this.getDictionaryDataConfig('system','drug_dosage_form')
-       
-        var medicalInsuranceLevel = this.getDictionaryDataConfig('system','medical_insurance_level')
-        
+           if (results[i]['*剂量单位'] === undefined) {
+                obj['drug_dose_unit'] = ''
+              } else {
+            if (key == '*剂量单位') {
+                obj['drug_dose_unit'] = results[i][key].replace(/\s/g,"")
+              }
+           }
 
-        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)
+           if (results[i]['限制性用药'] === undefined) {
+                obj['lmt_used_flag'] = ''
+              } else {
+            if (key == '限制性用药') {
+                obj['lmt_used_flag'] = results[i][key].replace(/\s/g,"")
+              }
+           }
 
-        var statistics_category = this.getDictionaryDataConfig('system','statistics_category')
-        console.log("统计分类",statistics_category)
-         
+
+         }
+         var newArr = []
+         tableData.push(obj)
        
         for(let i=0;i<tableData.length;i++){ 
-          for(let j=0;j<drugType.length;j++){
-            if(tableData[i].drug_type == drugType[j].name){
-                tableData[i].drug_type_id = drugType[j].id
-             }    
-          }
-
-          for(let j=0;j<drugDosageForm.length;j++){
-            if(tableData[i].drug_dosage_form == drugDosageForm[j].name){
-                tableData[i].drug_dosage_form_id = drugDosageForm[j].id
-            }
-          }
-
-          for(let j=0;j<medicalInsuranceLevel.length;j++){
-            if(tableData[i].medical_insurance_level == medicalInsuranceLevel[j].name){
-                tableData[i].medical_insurance_level_id = medicalInsuranceLevel[j].id
-            }
-          }
-
-          for(let j=0;j<drugClassify.length;j++){
-             if(tableData[i].drug_classify == drugClassify[j].name){
-                tableData[i].drug_classify_id = drugClassify[j].id
-             }
-          } 
-         
-          console.log("生产",this.manufacturers)
-          for(let j=0;j<this.manufacturers.length;j++){
-            if(tableData[i].manufacturer == this.manufacturers[j].manufacturer_name){
-               tableData[i].manufacturer_id = this.manufacturers[j].id
-            }
-          }
-          console.log("经销商",this.dealer)
-          for(let j=0;j<this.dealer.length;j++){
-            if(tableData[i].dealer == this.dealer[j].dealer_name){
-               tableData[i].dealer_id = this.dealer[j].id
-            }
-          }
-
-          for(let 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
          }
@@ -1372,27 +1343,36 @@
           if(tableData[i].hosp_appr_flag == "审批不通过"){
               tableData[i].hosp_appr_flag = 3
           }
-         
+          if(tableData[i].lmt_used_flag == ""){
+             tableData[i].lmt_used_flag = 0
+          }
+          
+          if(tableData[i].lmt_used_flag == "否"){
+              tableData[i].lmt_used_flag = 0
+          }
+
+            
+          if(tableData[i].lmt_used_flag == "是"){
+              tableData[i].lmt_used_flag = 1
+          }
+      
         }
        }
-       for(let i=0;i<tableData.length;i++){
-          tableData[i].retail_price = parseInt(tableData[i].retail_price)
-          tableData[i].last_price = parseInt(tableData[i].last_price)
-       }
-
-
-       
+     
        let params = {
           'drugs':tableData 
         }
-       console.log("params2222",params)
-    
+   
         postDrugInformation(params).then(response=>{
            if(response.data.state == 1){
              var msg =  response.data.data.msg
+             this.getList()
+             this.getAllManufacturer()
+             this.GetAllConfig()
              this.$message.success("导入成功!")
+
            }else{
-             this.$message.error("导入失败")
+             this.$message.error("导入失败,请下载日志查看")
            }
         })
       },
@@ -1449,11 +1429,14 @@
       getDictionaryDataConfig(module,filed_name){
         return getDictionaryDataConfig(module,filed_name)
       },
+     
     },
     created() {
+     
       this.getList()
       this.getAllManufacturer()
       this.GetAllConfig()
+      
     }
   }
 </script>

src/xt_pages/data/components/editProject.vue

@@ -34,10 +34,10 @@
                         <el-form-item label="费用类别 : " prop="cost_classify">
                             <el-select v-model="form.cost_classify" style="width:160px;" placeholder="请选择">
                                 <el-option
-                                v-for="(item,index) in getDictionaryDataConfig('system','cost_classify')"
+                                v-for="(item,index) in costClassifyList"
                                 :key="index"
                                 :label="item.name"
-                                :value="item.id">
+                                :value="item.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -64,10 +64,10 @@
                         <el-form-item label="统计分类 : " prop="statistical_classification">
                             <el-select v-model="form.statistical_classification" style="width:160px;" placeholder="请选择">
                                 <el-option
-                                v-for="(item,index) in getDictionaryDataConfig('system','statistics_category')"
+                                v-for="(item,index) in statisticsCategoryList"
                                 :key="index"
                                 :label="item.name"
-                                :value="item.id">
+                                :value="item.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -97,10 +97,10 @@
                         <el-form-item label="试管颜色 : " prop="tube_color">
                             <el-select v-model="form.tube_color" style="width:160px;" placeholder="请选择">
                               <el-option
-                                v-for="(item,index) in getDictionaryDataConfig('system','tube_color')"
+                                v-for="(item,index) in tubeColorList"
                                 :key="index"
                                 :label="item.name"
-                                :value="item.id">
+                                :value="item.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -248,6 +248,7 @@
 import { uParseTime } from '@/utils/tools'
 import { getDictionaryDataConfig,getDataConfig } from "@/utils/data";
 import { getProjectDetail,updatedProject,getDePartmentList } from "@/api/project/project"
+ import {getInitializtion} from '@/api/stock'
 export default {
     data(){
         return{
@@ -318,7 +319,10 @@ export default {
            ],
           limit:100,
            page:1,
-           departMentList:[]
+           departMentList:[],
+           statisticsCategoryList:[],
+           tubeColorList:[],
+           costClassifyList:[]
         }
     },
     methods:{
@@ -341,10 +345,12 @@ export default {
             this.form.intro = "";
         },
         show(id) {
-          
+           this.getlist()
+           this.getInitializtion()
            this.visible = true
            this.formTitle = '编辑'
            this.getProjectDetail(id)
+          
         },
         hide() {
          this.visible = false
@@ -478,11 +484,25 @@ export default {
             this.departMentList = department
             }
         })
-        },
+      },
+     getInitializtion(){
+       getInitializtion().then(response=>{
+         if(response.data.state == 1){
+           var statisticsCategoryList = response.data.data.statisticsCategoryList
+           this.statisticsCategoryList = statisticsCategoryList
+           var tubeColorList = response.data.data.tubeColorList
+           this.tubeColorList = tubeColorList
+           var costClassifyList =  response.data.data.costClassifyList
+           this.costClassifyList = costClassifyList
+         }
+       })
+      }
+
     },
 
     created(){
        this.getlist() 
+       this.getInitializtion()
     }
 }
 </script>

src/xt_pages/data/components/project.vue

@@ -41,7 +41,7 @@
         <div style="display:flex; align-items:center;margin-bottom:10px;">
         <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"
+        <el-link target="_blank" href="https://kuyi.shengws.com/itemTemplate.xlsx" :underline="false"
                  style="margin-left:15px">
           <el-button
             class="filter-item"
@@ -52,7 +52,7 @@
         </el-link>
 
         <project-excel :on-success='handleSuccessOne'></project-excel>
-     
+
         <el-button
           style="margin-left:10px;"
           @click="generateLog()"
@@ -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
@@ -234,7 +234,7 @@ export default {
            dialogVisible:false,
            exportLogVisible:false,
            logs:[]
-          
+
         }
     },
     methods:{
@@ -375,14 +375,14 @@ export default {
                page:this.page,
                is_mark:this.is_mark,
             }
-          
+
           getProjectList(params).then(response=>{
              if(response.data.state == 1){
                var projecList = response.data.data.projecList
-               console.log('projectlist',projecList)
+              
                this.tableData = projecList
                var total = response.data.data.total
-               console.log("total",total)
+            
                this.total = total
              }
           })
@@ -422,7 +422,7 @@ export default {
       },
 
      toReturn(id,isMark){
-        console.log("id2222",id)
+      
          var that = this
          let params = {
              'id':id,
@@ -430,7 +430,7 @@ export default {
              'is_mark':isMark,
              'admin_user_id':this.$store.getters.xt_user.user.id,
           }
-          console.log("params22222222",params)
+      
 
          axios.get('http://127.0.0.1:9532/sz/api/revocation/get',{params:params}).then(function(response) {
           if (response.data.state == 0) {
@@ -483,7 +483,7 @@ export default {
           ids:idss,
           admin_user_id:this.$store.getters.xt_user.user.id
         }
-       console.log("prams22",params)
+      
         var that = this
         axios.get('http://127.0.0.1:9532/sz/api/treatment/get',{ params: params }).then(function(response) {
          if (response.data.state == 0) {
@@ -512,17 +512,17 @@ export default {
         getDePartmentList(params).then(response=>{
             if(response.data.state == 1){
             var department =   response.data.data.departMentList
-            console.log("科室列表",department)
+           
             this.departMentList = department
             }
         })
      },
       handleSuccessOne({ results, header }) {
-       
+
         if (header != undefined && header.length > 0) {
-            
+
           var isHasProjectName = header.includes('*项目名称')
-        
+
           var isHasProjectPrice = header.includes('*零价')
 
           var isHasProjectUnit = header.includes('*单位')
@@ -530,9 +530,9 @@ export default {
           var isHasProjectCostClassify = header.includes('*费用类别')
 
           var isHasProjectExecutiveSection = header.includes('*执行科室')
-         
+
           var isHasProjectMedicalCoverage = header.includes('*医保等级')
-         
+
           if (!(isHasProjectName && isHasProjectPrice && isHasProjectUnit && isHasProjectCostClassify && isHasProjectExecutiveSection && isHasProjectMedicalCoverage )) {
             this.dialogVisible = true
             return
@@ -541,9 +541,9 @@ export default {
           this.dialogVisible = true
           return
         }
-       
+
        var tableData = []
-       for(let i=0;i<results.length;i++){
+       for(let i=1;i<results.length;i++){
          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) {
@@ -682,7 +682,7 @@ export default {
               }
           }
 
- 
+
          if (results[i]['总量'] === undefined) {
                 obj['total'] = ''
               } else {
@@ -710,8 +710,8 @@ export default {
             if (results[i]['特检项目'] === undefined) {
                 obj['specail_project'] = ''
               } else {
-          if (key == 'specail_project') {
-               obj['category'] = results[i][key].replace(/\s/g,"")
+          if (key == '特检项目') {
+               obj['specail_project'] = results[i][key].replace(/\s/g,"")
               }
           }
 
@@ -739,49 +739,9 @@ export default {
           }
          }
          tableData.push(obj)
-         console.log("项目列表",tableData)
-        
-        var costClassify =  this.getDictionaryDataConfig('system','cost_classify')
-        console.log("费用类别",costClassify)
-        var medicalInsuranceLevel = this.getDictionaryDataConfig('system','medical_insurance_level')
-        console.log("医保等级",medicalInsuranceLevel)
-        
-        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++){
-          
-             if(tableData[i].cost_classify === costClassify[j].name){
-                 tableData[i].cost_classify_id = costClassify[j].id
-             }
-          }  
-
-          for(let j=0;j<medicalInsuranceLevel.length;j++){
-             if(tableData[i].medical_coverage == medicalInsuranceLevel[j].name ){
-                 tableData[i].medical_insurance_level_id = medicalInsuranceLevel[j].id
-             }
-          }
-
          
-          
-          for(let j=0;j<this.departMentList.length;j++){
-             if(tableData[i].executive_section == this.departMentList[j].name){
-                tableData[i].executive_section_id = this.departMentList[j].id
-             }
-          }
-
 
-          for(let 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
-             }
-          }
-
-       
+        for(let i=0;i<tableData.length;i++){
 
           if(tableData[i].disease_directory == ""){
               tableData[i].disease_directory = 0
@@ -805,11 +765,7 @@ export default {
              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
@@ -845,25 +801,18 @@ export default {
           if(tableData[i].medical_status == "收费"){
             tableData[i].medical_status = 2
           }
-
-        
         }
        }
-
-       for(let i=0;i<tableData.length;i++){
-          tableData[i].price = parseInt(tableData[i].price)
-       }
-       
        let params = {
-          'projects':tableData 
+          'projects':tableData
         }
-       console.log("params2222",params)
-       
+       console.log("params222",params)
+
         postProjectInformation(params).then(response=>{
            if(response.data.state == 1){
              var msg =  response.data.data.msg
              this.$message.success("导入成功!")
-             
+             this.getlist()
            }else{
              this.$message.error("导入失败")
            }
@@ -892,7 +841,7 @@ export default {
 
       },
       getContent(log) {
-         console.log("日志",log)
+       
         return '您导入的文档共' + log.total_num + '条患者数据' + '，' + '已成功导入' + log.success_num + '条，导入失败' + log.fail_num + '条,'
       },
       timestampToTime(timestamp) {

src/xt_pages/dialysis/batch_print/batch_print_order_thirty.vue

@@ -122,10 +122,30 @@
                         <tbody>
                             <tr>
                                 <td width="70">血管通路:</td>
-                                <td width="370">
+                                <td width="560">
                                     <div>
-                                        <label-box :isChecked="isBbloodAccessParOperaCheck(record.assessment_before_dislysis, '内瘘')" showValue="内瘘"></label-box>
+                                        <label-box :isChecked="isBbloodAccessParOperaCheck(record.assessment_before_dislysis, '绳梯')" showValue="绳梯"></label-box>
                                         &nbsp;
+                                        A：( 
+                                          <span style="width:50px;display:inline-block;text-align:center;">
+                                            &nbsp;<span v-if="record.assessment_before_dislysis.puncture_way.indexOf('A1')>-1">A1</span>
+                                            <span v-if="record.assessment_before_dislysis.puncture_way.indexOf('A2')>-1">A2</span>
+                                            <span v-if="record.assessment_before_dislysis.puncture_way.indexOf('A3')>-1">A3</span>
+                                            <span v-if="record.assessment_before_dislysis.puncture_way.indexOf('A4')>-1">A4</span>
+                                            <span v-if="record.assessment_before_dislysis.puncture_way.indexOf('A5')>-1">A5</span>
+                                            <span v-if="record.assessment_before_dislysis.puncture_way.indexOf('A6')>-1">A6</span>
+                                          </span>
+                                        )&nbsp;
+                                        V：( 
+                                          <span style="width:50px;display:inline-block;text-align:center;">
+                                            <span v-if="record.assessment_before_dislysis.puncture_way.indexOf('V1')>-1">V1</span>
+                                            <span v-if="record.assessment_before_dislysis.puncture_way.indexOf('V2')>-1">V2</span>
+                                            <span v-if="record.assessment_before_dislysis.puncture_way.indexOf('V3')>-1">V3</span>
+                                            <span v-if="record.assessment_before_dislysis.puncture_way.indexOf('V4')>-1">V4</span>
+                                            <span v-if="record.assessment_before_dislysis.puncture_way.indexOf('V5')>-1">V5</span>
+                                            <span v-if="record.assessment_before_dislysis.puncture_way.indexOf('V6')>-1">V6</span>
+                                          </span>
+                                        )
                                         <label-box :isChecked="isBbloodAccessParOperaCheck(record.assessment_before_dislysis, '长期管')" showValue="长期管"></label-box>
                                         &nbsp;
                                         <label-box :isChecked="isBbloodAccessParOperaCheck(record.assessment_before_dislysis, '临时管')" showValue="临时管"></label-box>
@@ -337,7 +357,7 @@
                                     <tr>
                                     <td wdith='70'>下机情况:</td>
                                     <td wdith='30'>凝血:</td>
-                                    <td width="240">
+                                    <td width="260">
                                         <label-box :isChecked="record.assessment_after_dislysis.cruor?(record.assessment_after_dislysis.cruor.indexOf('无凝血') > -1 ? true : false):false" showValue="无"></label-box>&nbsp;
                                         <label-box :isChecked="record.assessment_after_dislysis.cruor?(record.assessment_after_dislysis.cruor.indexOf('有凝血') > -1 ? true : false):false" showValue="有"></label-box>&nbsp;
                                         <label-box :isChecked="record.assessment_after_dislysis.cruor?(record.assessment_after_dislysis.cruor.indexOf('透析器-Ⅰ度') > -1 ? true : false):false" showValue="Ⅰ"></label-box>&nbsp;

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -106,8 +106,8 @@
           <span class="content">{{
             target_ultrafiltration != "0" ? target_ultrafiltration : ""
           }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.org_id != 9555" class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.org_id == 9555" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.org_id != 9555" class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.org_id == 9555" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
         </li>
         <li v-if="isShow('葡萄糖')">
           <label>葡萄糖 : </label>

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -17,8 +17,8 @@
           <span class="content" v-if="actual_ultrafiltration != '0'">{{
             actual_ultrafiltration
           }}</span>
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.org_id == 9555) " >ml</span>
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 &&  this.$store.getters.xt_user.template_info.org_id == 9555 " >L</span>
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.org_id == 9555) " >ml</span>
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 &&  this.$store.getters.xt_user.template_info.org_id == 9555 " >L</span>
         </li>
         <li v-if="isShow('导管')">
           <label>导管 : </label>
@@ -296,6 +296,10 @@
           <span class="content" >{{ this.record.stroke_volume ? this.record.stroke_volume : ""  }}</span>
           <span class="unit">{{ this.record.stroke_volume ? "ml" : "" }}</span>
         </li>
+        <li v-if="isShow('KT/V')">
+          <label>KT/V: </label>
+          <span class="content" >{{ this.record.ktv ? this.record.ktv : ""  }}</span>
+        </li>
       </ul>
     </div>
     <div class="note">

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

@@ -28,7 +28,7 @@
           <el-col :span="8" v-if="isShow('实际超滤量')">
             <el-form-item
               label="实际超滤量(ml): "
-              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.$store.getters.xt_user.template_info.org_id == 9555 "  >
+              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.$store.getters.xt_user.template_info.org_id == 9555 "  >
               <el-input v-model="form.actual_ultrafiltration"></el-input>
             </el-form-item>
             <el-form-item label="实际超滤量(L): " v-else>
@@ -595,8 +595,13 @@
             <el-input v-model="form.other_complication"></el-input>
           </el-form-item>
         </el-col>
-
+        <el-col :span="24" v-if="isShow('KT/V')">
+            <el-form-item label="KT/V：">
+              <el-input type="textarea" :rows="4" v-model="form.ktv"></el-input>
+            </el-form-item>
+        </el-col>
       </el-form>
+         
 
       <span slot="footer" class="dialog-footer">
         <el-button @click="hide">取 消</el-button>
@@ -748,7 +753,8 @@ export default {
         supine_diastolic_blood_pressure:'',
         diastolic_pressure:'',
         additional_weight:'',
-        other_complication:''
+        other_complication:'',
+        ktv:""
       }
     }
   },
@@ -952,6 +958,7 @@ export default {
       data["diastolic_pressure"] = this.form.diastolic_pressure
       data["additional_weight"] = this.form.additional_weight ? parseFloat(this.form.additional_weight) : 0
       data["other_complication"] = this.form.other_complication
+      data["ktv"] = this.form.ktv
       postAssessmentAfterDislysis(ParamsQuery, data)
         .then(response => {
           this.loading = false

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

@@ -67,7 +67,7 @@
 
 
            <el-col :span="8"
-                  v-if="isShows('预冲量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23)">
+                  v-if="isShows('预冲量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 36)">
             <el-form-item label="预冲量(ml)：">
               <el-input
                 type="number"
@@ -77,7 +77,7 @@
           </el-col>
 
           <el-col :span="8"
-                  v-if="isShows('预冲量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id !=23">
+                  v-if="isShows('预冲量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id !=23 && this.$store.getters.xt_user.template_info.template_id !=36">
             <el-form-item label="预冲量(L)：">
               <el-input
                 type="number"
@@ -87,7 +87,7 @@
           </el-col>
 
           <el-col :span="8"
-                  v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.org_id == 9555 )">
+                  v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.org_id == 9555 )">
             <el-form-item label="目标超滤量(ml)：">
               <el-input
                 type="number"
@@ -97,7 +97,7 @@
           </el-col>
 
           <el-col :span="8"
-                  v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.org_id != 9555 ">
+                  v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.org_id != 9555 ">
             <el-form-item label="目标超滤量(L)：">
               <el-input
                 type="number"
@@ -1617,13 +1617,16 @@
         if (minites < 10) {
           minites = '0' + minites
         }
-
-        if(schedual.schedule_type == 1){
-          this.start_time = year +"-"+month +"-"+day +" " + "07:00"
-        }else if(schedual.schedule_type == 2){
-          this.start_time = year +"-"+month +"-"+day +" " + "12:00"
-        }else if(schedual.schedule_type ==3){
-          this.start_time = year +"-"+month +"-"+day +" " + "18:00"
+        if(this.$store.getters.xt_user.org.id == 10016){
+          this.start_time = year +"-"+month +"-"+day +" " + hours + ':' + minites
+        }else{
+          if(schedual.schedule_type == 1){
+            this.start_time = year +"-"+month +"-"+day +" " + "07:00"
+          }else if(schedual.schedule_type == 2){
+            this.start_time = year +"-"+month +"-"+day +" " + "12:00"
+          }else if(schedual.schedule_type ==3){
+            this.start_time = year +"-"+month +"-"+day +" " + "18:00"
+          }
         }
 
         if (pre.anticoagulant == 3) {
@@ -1631,8 +1634,6 @@
         }
         // 入口
         var pre = pre
-        console.log("香锅2222222",this.dialysisPrescription)
-        console.log("列表2223323323223",this.schedual)
         this.dialysisPrescription.mode_id = this.$route.query.mode_id
         if (pre.mode_id == 2 || pre.mode_id == 5 || pre.mode_id == 12 || this.schedual.mode_id == 2 || this.schedual.mode_id == 5 || this.schedual.mode_id == 12) {
           this.zhiShow = true

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

@@ -164,6 +164,7 @@
                   template_id == 32 ||
                   template_id == 34 ||
                   template_id == 35 ||
+                  template_id == 36 ||
                   org_id == 9555)
             "
           >
@@ -204,6 +205,7 @@
                 template_id != 32 &&
                 template_id != 34 &&
                 template_id != 35 &&
+                template_id != 36 &&
                 org_id!=9555
             "
           >
@@ -556,7 +558,7 @@
 
           <el-col
             :span="8"
-            v-if=" isShow('超滤量') && (template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || org_id == 9555) " >
+            v-if=" isShow('超滤量') && (template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || org_id == 9555) " >
             <el-form-item label="超滤量(ml)：">
               <el-input v-model="form.ultrafiltration_volume"></el-input>
             </el-form-item>
@@ -564,7 +566,7 @@
 
           <el-col
             :span="8"
-            v-if=" isShow('超滤量') && template_id != 6 && template_id !=9 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id!=27 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && org_id !=9555" >
+            v-if=" isShow('超滤量') && template_id != 6 && template_id !=9 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id!=27 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && org_id !=9555" >
             <el-form-item label="超滤量(L)：">
               <el-input v-model="form.ultrafiltration_volume"></el-input>
             </el-form-item>

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -14,8 +14,8 @@
           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || this.$store.getters.xt_user.template_info.org_id == 9555)" width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && this.$store.getters.xt_user.template_info.org_id != 9555"  width="76px"> 超滤量(L) </th>
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || this.$store.getters.xt_user.template_info.org_id == 9555)" width="76px" > 超滤量(ml)</th>
+          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && this.$store.getters.xt_user.template_info.org_id != 9555"  width="76px"> 超滤量(L) </th>
           <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35)" width="50px"> 超滤率 <br />(ml/h) </th>
           <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -523,6 +523,16 @@
           >
         </div>
       </template>
+      <template v-if="org_template_info.template_id == 37">
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container" style="min-height:0;">
       <!--<div class="order-print-btn"-->
@@ -783,6 +793,11 @@
             v-if="org_template_info.template_id == 36"
           >
           </DialysisPrintOrderThirtySix>
+          <DialysisPrintOrderThirtySeven
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 37"
+          >
+          </DialysisPrintOrderThirtySeven>
         </div>
       </el-container>
     </div>
@@ -838,9 +853,11 @@ import DialysisPrintOrderThirtyThree from "./template/DialysisPrintOrderThirtyTh
 import DialysisPrintOrderThirtyFour from "./template/DialysisPrintOrderThirtyFour";
 import DialysisPrintOrderThirtyFive from "./template/DialysisPrintOrderThirtyFive";
 import DialysisPrintOrderThirtySix from "./template/DialysisPrintOrderThirtySix";
+import DialysisPrintOrderThirtySeven from "./template/DialysisPrintOrderThirtySeven";
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderThirtySeven,
     DialysisPrintOrderThirtySix,
     DialysisPrintOrderThirtyFive,
     DialysisPrintOrderThirtyFour,
@@ -1291,6 +1308,13 @@ export default {
           style: style,
           scanStyles: false
         });
+      } else if (this.org_template_info.template_id == 37) {
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style,
+          scanStyles: false
+        });
       }
     },
     printThisOnePage() {

src/xt_pages/dialysis/template/DialysisPrintOrderThirty.vue

@@ -100,10 +100,30 @@
           <tbody>
             <tr>
                 <td width="70">血管通路:</td>
-                <td width="370">
+                <td width="560">
                     <div>
-                        <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('内瘘') > -1 ? true : false" showValue="内瘘"></label-box>
+                        <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('绳梯') > -1 ? true : false" showValue="绳梯"></label-box>
                         &nbsp;
+                        A：( 
+                          <span style="width:50px;display:inline-block;text-align:center;">
+                            &nbsp;<span v-if="predialysis.puncture_way.indexOf('A1')>-1">A1</span>
+                            <span v-if="predialysis.puncture_way.indexOf('A2')>-1">A2</span>
+                            <span v-if="predialysis.puncture_way.indexOf('A3')>-1">A3</span>
+                            <span v-if="predialysis.puncture_way.indexOf('A4')>-1">A4</span>
+                            <span v-if="predialysis.puncture_way.indexOf('A5')>-1">A5</span>
+                            <span v-if="predialysis.puncture_way.indexOf('A6')>-1">A6</span>
+                          </span>
+                        )&nbsp;
+                        V：( 
+                          <span style="width:50px;display:inline-block;text-align:center;">
+                            <span v-if="predialysis.puncture_way.indexOf('V1')>-1">V1</span>
+                            <span v-if="predialysis.puncture_way.indexOf('V2')>-1">V2</span>
+                            <span v-if="predialysis.puncture_way.indexOf('V3')>-1">V3</span>
+                            <span v-if="predialysis.puncture_way.indexOf('V4')>-1">V4</span>
+                            <span v-if="predialysis.puncture_way.indexOf('V5')>-1">V5</span>
+                            <span v-if="predialysis.puncture_way.indexOf('V6')>-1">V6</span>
+                          </span>
+                         )
                         <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('长期管') > -1 ? true : false" showValue="长期管"></label-box>
                         &nbsp;
                         <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('临时管') > -1 ? true : false" showValue="临时管"></label-box>
@@ -112,9 +132,11 @@
                         &nbsp;
                        <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('人造血管') > -1 ? true : false" showValue="人造血管"></label-box>
                         &nbsp;
+                       <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('扣眼') > -1 ? true : false" showValue="扣眼"></label-box>
+                        &nbsp;
                     </div>
                 </td>
-                <td width='20'></td>
+                <td width='10'></td>
                 <td width="70">封管用药:</td>
                 <td>
                     <div class="under-line" style="text-align:left;">&nbsp;{{prescription.remark?prescription.remark:''}}</div>
@@ -315,7 +337,7 @@
                     <tr>
                       <td wdith='70'>下机情况:</td>
                       <td wdith='30'>凝血:</td>
-                      <td width="240">
+                      <td width="250">
                           <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('无凝血') > -1 ? true : false):false" showValue="无"></label-box>&nbsp;
                           <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('有凝血') > -1 ? true : false):false" showValue="有"></label-box>&nbsp;
                           <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('透析器-Ⅰ度') > -1 ? true : false):false" showValue="Ⅰ"></label-box>&nbsp;

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyOne.vue

@@ -139,25 +139,15 @@
           （<label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('内瘘-左') > -1 ? true : false" showValue="左"></label-box>
               <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('内瘘-右') > -1 ? true : false" showValue="右"></label-box>）
           &nbsp;
-          <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-左') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-右') > -1 ? true : false" showValue="中心静脉置管"></label-box>
-          （<label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-左') > -1 ? true : false" showValue="左"></label-box>
-              <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-右') > -1 ? true : false" showValue="右"></label-box>）部位
+          <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-左-颈内') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-左-锁骨下') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-左-股') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-右-颈内') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-右-锁骨下') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-右-股') > -1 ? true : false" showValue="中心静脉置管"></label-box>
+          （<label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-左-颈内') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-左-锁骨下') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-左-股') > -1 ? true : false" showValue="左"></label-box>
+              <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-右-颈内') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-右-锁骨下') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-右-股') > -1 ? true : false" showValue="右"></label-box>）部位
           &nbsp;
-          <!-- <label-box :isChecked="predialysis.blood_access_part_id > 0 ? (getPartName(predialysis.blood_access_part_id).indexOf('颈内') > -1 ? true : false) : false" showValue="颈内"></label-box>
+          <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-左-颈内')>-1?true:predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-右-颈内')>-1?true:false" showValue="颈内"></label-box>
           &nbsp;
-          <label-box :isChecked="predialysis.blood_access_part_id > 0 ? (getPartName(predialysis.blood_access_part_id).indexOf('锁骨下') > -1 ? true : false) : false" showValue="锁骨下"></label-box>
+          <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-左-锁骨下')>-1?true:predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-右-锁骨下')>-1?true:false" showValue="锁骨下"></label-box>
           &nbsp;
-          <label-box :isChecked="predialysis.blood_access_part_id > 0 ? (getPartName(predialysis.blood_access_part_id).indexOf('股') > -1 ? true : false) : false" showValue="股"></label-box>
-          &nbsp;
-          <label-box :isChecked="predialysis.blood_access_part_id > 0 ? (getPartName(predialysis.blood_access_part_id).indexOf('其他') > -1? true : false) :false" showValue="其他"></label-box>
-          &nbsp; -->
-          <label-box :isChecked="predialysis.blood_access_part_id.indexOf('颈内')>-1?true:false" showValue="颈内"></label-box>
-          &nbsp;
-          <label-box :isChecked="predialysis.blood_access_part_id.indexOf('锁骨下')>-1?true:false" showValue="锁骨下"></label-box>
-          &nbsp;
-          <label-box :isChecked="predialysis.blood_access_part_id.indexOf('股')>-1?true:false" showValue="股"></label-box>
-          &nbsp;
-          <label-box :isChecked="predialysis.blood_access_part_id.indexOf('其他')>-1?true:false" showValue="其他"></label-box>
+          <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-左-股')>-1?true:predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-右-股')>-1?true:false" showValue="股"></label-box>
           &nbsp;
         </div>
       </div>
@@ -311,7 +301,9 @@
         </div>
         出血
         <div class="inline_block under_line" style="width:150px;text-align: center;margin-right:30px;">
-          {{ predialysis.is_hemorrhage == 1 && predialysis.hemorrhage ? predialysis.hemorrhage : "" }}
+          <span v-if="predialysis.is_hemorrhage == 1">{{ predialysis.is_hemorrhage == 1 && predialysis.hemorrhage ? predialysis.hemorrhage : "" }}</span>
+          <span v-if="predialysis.is_hemorrhage == 2">无</span>
+          <span v-if="predialysis.is_hemorrhage != 2 && predialysis.is_hemorrhage != 1">/</span>
         </div>
         跌倒风险预防措施
         <div class="inline_block under_line" style="width:100px;text-align: center;">
@@ -446,110 +438,159 @@
       <table class="print-table" border="1">
         <tbody>
           <tr style="height:30px;line-height:30px">
-            <td width="70" rowspan="3" style="padding-left:5px;border:none;border-right:1px solid #000;">
+            <td width="30" rowspan="4" style="padding-left:5px;border:none;border-right:1px solid #000;">
               透后小结
             </td>
-
-            <td width="25" style="border:none;padding-left:5px;">
-              体温:
-            </td>
-            <td width="70" style="text-align:left;border:none;">
-              <div>
-                <span class="under_line" style="width:50px;display:inline-block;">
-                  {{ afterdialysis.temperature ? afterdialysis.temperature : "" }}
-                </span>℃
-              </div>
-            </td>
-            <!-- <td width="10" style="border:none;"></td> -->
-
-            <td width="20" style="border:none;padding-left:5px;">血压:</td>
-            <td width="60" style="text-align:left;border:none;line-height: 30px;">
-              <div>
-                <span class="under_line" style="width:100px;display:inline-block">
-                  {{ afterdialysis.systolic_blood_pressure ? afterdialysis.systolic_blood_pressure : "" }}/
-                  {{ afterdialysis.diastolic_blood_pressure ? afterdialysis.diastolic_blood_pressure : "" }}
-                </span>mmHg
-              </div>
-            </td>
-            <td width="10" style="border:none;padding-left:5px">脉搏:</td>
-            <td width="70" style="text-align:left;border:none;">
-              <div>
-                <span class="under_line" style="width:50px;display:inline-block">
-                  {{ afterdialysis.pulse_frequency ? afterdialysis.pulse_frequency : "" }}
-                </span>次/分
-              </div>
-            </td>
-            <td width="50" style="border:none;padding-left:5px">透后症状:</td>
-            <td width="100" style="text-align:left;border:none;">
-              <div>
-                <span class="under_line" style="width:100px;display:inline-block">
-                  {{ afterdialysis.symptom_after_dialysis ? afterdialysis.symptom_after_dialysis : "" }}
-                </span>
-              </div>
+            <td colspan="8">
+              <table class="table-box">
+                <tbody>
+                  <tr>
+                    <td width="50" style="border:none;padding-left:5px;">
+                      体温:
+                    </td>
+                    <td width="70" style="text-align:left;border:none;">
+                      <div>
+                        <span class="under_line" style="width:50px;display:inline-block;">
+                          {{ afterdialysis.temperature ? afterdialysis.temperature : "" }}
+                        </span>℃
+                      </div>
+                    </td>
+                    <!-- <td width="10" style="border:none;"></td> -->
+
+                    <td width="50" style="border:none;padding-left:5px;">血压:</td>
+                    <td width="120" style="text-align:left;border:none;line-height: 30px;">
+                      <div>
+                        <span class="under_line" style="width:100px;display:inline-block">
+                          {{ afterdialysis.systolic_blood_pressure ? afterdialysis.systolic_blood_pressure : "" }}/
+                          {{ afterdialysis.diastolic_blood_pressure ? afterdialysis.diastolic_blood_pressure : "" }}
+                        </span>mmHg
+                      </div>
+                    </td>
+                    <td width="50" style="border:none;padding-left:5px">脉搏:</td>
+                    <td width="70" style="text-align:left;border:none;">
+                      <div>
+                        <span class="under_line" style="width:50px;display:inline-block">
+                          {{ afterdialysis.pulse_frequency ? afterdialysis.pulse_frequency : "" }}
+                        </span>次/分
+                      </div>
+                    </td>
+                    <td width="70" style="border:none;padding-left:5px">透后症状:</td>
+                    <td width="100" style="text-align:left;border:none;">
+                      <div>
+                        <span class="under_line" style="width:100px;display:inline-block">
+                          {{ afterdialysis.symptom_after_dialysis ? afterdialysis.symptom_after_dialysis : "" }}
+                        </span>
+                      </div>
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+              <table class="table-box">
+                <tbody>
+                  <tr style="height:30px;line-height:30px;">
+                    <td width="80" style="border:none;padding-left:5px">实际置换量:</td>
+                    <td width="60" style="text-align:left;border:none;">
+                      <div>
+                        <span class="under_line" style="width:50px;display:inline-block">
+                          {{ afterdialysis.actual_displacement ? afterdialysis.actual_displacement : "" }}
+                        </span>L
+                      </div>
+                    </td>
+                    
+                    
+                    <!-- <td width="50" style="text-align:left;border:none;"></td> -->
+                    <!-- <td width="110" style="text-align:left;border:none;"></td> -->
+                    <td width="120" style="border:none;padding-left:5px">透析期间进食:</td>
+                    <td width="120" style="text-align:left;border:none;">
+                      <div>
+                        <span class="under_line" style="width:120px;display:inline-block">
+                          <span v-if='afterdialysis.is_eat == 1'>是</span>
+                          <span v-if='afterdialysis.is_eat == 2'>否</span>
+                        </span>
+                      </div>
+                    </td>
+                    <td width='20'></td>
+                    <td width="70" style="border:none;padding-left:5px">透析进食:</td>
+                    <td width="70" style="text-align:left;border:none;">
+                      <div>
+                        <span class="under_line" style="width:50px;display:inline-block">
+                          {{ afterdialysis.is_eat == 1 && afterdialysis.dialysis_during ? afterdialysis.dialysis_during : '' }}
+                        </span>g
+                      </div>
+                    </td>
+                    <td></td>
+                    <!-- <td width="10" style="text-align:left;border:none;"></td>
+                    <td width="110" style="text-align:left;border:none;"></td> -->
+                  </tr>
+                </tbody>
+              </table>
+              <table class="table-box">
+                <tbody>
+                  <tr>
+                    <td width="90" style="border:none;padding-left:5px">透析器凝血:</td>
+                    <td width="220" style="text-align:left;border:none;">
+                      <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器0') > -1 ? true : false) :false" showValue="0"></label-box>
+                      <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器+') > -1 ? true : false) :false" showValue="+"></label-box>
+                      <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器++') > -1 ? true : false) :false" showValue="+ +"></label-box>
+                      <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器+++') > -1 ? true : false) :false" showValue="+ + +"></label-box>
+                    </td>
+                    <td width="90" style="border:none;padding-left:5px">静脉管道:</td>
+                    <td width="220" style="text-align:left;border:none;">
+                      <label-box :isChecked="afterdialysis.intravenous_tube == 1 ? true : false" showValue="无"></label-box>&nbsp;
+                      <label-box :isChecked="afterdialysis.intravenous_tube == 2 ? true : false" showValue="+"></label-box>&nbsp;
+                      <label-box :isChecked="afterdialysis.intravenous_tube == 3 ? true : false" showValue="+ +"></label-box>&nbsp;
+                      <label-box :isChecked="afterdialysis.intravenous_tube == 4 ? true : false" showValue="+ + +"></label-box>&nbsp;
+                    </td>
+                    <td width="90" style="border:none;padding-left:5px">动脉管道:</td>
+                    <td width="220" style="text-align:left;border:none;">
+                      <label-box :isChecked="afterdialysis.arterial_tube == 1 ? true : false" showValue="无"></label-box>&nbsp;
+                      <label-box :isChecked="afterdialysis.arterial_tube == 2 ? true : false" showValue="+"></label-box>&nbsp;
+                      <label-box :isChecked="afterdialysis.arterial_tube == 3 ? true : false" showValue="+ +"></label-box>&nbsp;
+                      <label-box :isChecked="afterdialysis.arterial_tube == 4 ? true : false" showValue="+ + +"></label-box>&nbsp;
+                    </td>
+                    <td></td>
+                    <!-- <td width="10" style="text-align:left;border:none;"></td>
+                    <td width="110" style="text-align:left;border:none;"></td> -->
+                  </tr>
+                </tbody>
+              </table>
+              <table class="table-box">
+                <tbody>
+                  <tr style="height:30px;line-height:30px;">
+                    <td width="50" style="border:none;padding-left:5px;">内瘘:</td>
+                    <td width="150" colspan="3" style="text-align:left;border:none;">
+                      <div>
+                        <span class="under_line" style="width:150px;display:inline-block;">
+                          {{ afterdialysis.internal_fistula ? afterdialysis.internal_fistula : "" }}
+                        </span>
+                      </div>
+                    </td>
+                    <td width="70" style="border:none;padding-left:5px">下机护士:</td>
+                    <td width="100" style="text-align:left;border:none;">
+                      <div>
+                        <span class="under_line" style="width:100px;display:inline-block">
+                          <span v-if="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.finish_nurse) == ''">
+                            {{ getAdminUser(dialysisOrder == null ? 0 : dialysisOrder.finish_nurse) }}</span>
+                          <img class="es-img" style="height:30px" :src="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.finish_nurse)" alt="" srcset="" v-else />
+                        </span>
+                      </div>
+                    </td>
+                    <td></td>
+                    <!-- <td width="10" style="text-align:left;border:none;"></td>
+                    <td width="110" style="text-align:left;border:none;"></td> -->
+                    <!-- <td width="110" style="text-align:left;border:none;"></td> -->
+                    <!-- <td width="110" style="text-align:left;border:none;"></td> -->
+                  </tr>
+                </tbody>
+              </table>
             </td>
-          </tr>
             
-          <tr style="height:30px;line-height:30px;">
-            <td width="90" style="border:none;padding-left:5px">实际置换量:</td>
-            <td width="30" style="text-align:left;border:none;">
-              <div>
-                <span class="under_line" style="width:50px;display:inline-block">
-                  {{ afterdialysis.actual_displacement ? afterdialysis.actual_displacement : "" }}
-                </span>L
-              </div>
-            </td>
             
-            <td width="90" style="border:none;padding-left:5px">透析器凝血:</td>
-            <td width="200" style="text-align:left;border:none;">
-              <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器-0度') > -1 ? true : false) :false" showValue="0"></label-box>
-              <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器-Ⅰ度') > -1 ? true : false) :false" showValue="+"></label-box>
-              <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器-Ⅱ度') > -1 ? true : false) :false" showValue="+ +"></label-box>
-              <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器-Ⅲ度') > -1 ? true : false) :false" showValue="+ + +"></label-box>
-            </td>
-            <!-- <td width="50" style="text-align:left;border:none;"></td> -->
-            <!-- <td width="110" style="text-align:left;border:none;"></td> -->
-            <td width="100" style="border:none;padding-left:5px">透析期间进食:</td>
-            <td width="50" style="text-align:left;border:none;">
-              <div>
-                <span class="under_line" style="width:50px;display:inline-block">
-                  <span v-if='afterdialysis.is_eat == 1'>是</span>
-                  <span v-if='afterdialysis.is_eat == 2'>否</span>
-                </span>
-              </div>
-            </td>
-            <td width="70" style="border:none;padding-left:5px">透析进食:</td>
-            <td width="50" style="text-align:left;border:none;">
-              <div>
-                <span class="under_line" style="width:50px;display:inline-block">
-                  {{ afterdialysis.is_eat == 1 && afterdialysis.dialysis_during ? afterdialysis.dialysis_during : '' }}
-                </span>g
-              </div>
-            </td>
-          </tr>
-          <tr style="height:30px;line-height:30px;">
-            <td width="20" style="border:none;padding-left:5px;">内瘘:</td>
-            <td width="150" colspan="3" style="text-align:left;border:none;">
-              <div>
-                <span class="under_line" style="width:150px;display:inline-block;">
-                  {{ afterdialysis.internal_fistula ? afterdialysis.internal_fistula : "" }}
-                </span>
-              </div>
-            </td>
-            <td width="50" style="border:none;padding-left:5px">下机护士:</td>
-            <td width="100" style="text-align:left;border:none;">
-              <div>
-                <span class="under_line" style="width:100px;display:inline-block">
-                  <span v-if="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.finish_nurse) == ''">
-                    {{ getAdminUser(dialysisOrder == null ? 0 : dialysisOrder.finish_nurse) }}</span>
-                  <img class="es-img" style="height:30px" :src="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.finish_nurse)" alt="" srcset="" v-else />
-                </span>
-              </div>
-            </td>
-            <td width="10" style="text-align:left;border:none;"></td>
-            <td width="110" style="text-align:left;border:none;"></td>
-            <!-- <td width="110" style="text-align:left;border:none;"></td> -->
-            <!-- <td width="110" style="text-align:left;border:none;"></td> -->
           </tr>
+            
+          
+          
+          
         </tbody>
       </table>
 

src/xt_pages/dialysis/template/DialysisPrintOrderThirtySix.vue

@@ -2,7 +2,7 @@
   <div id="dialysis-print-box-1">
     <div id="dialysis-print-box-1-1" class="dialysis-print-order" style="page-break-after: always;">
       <div class="order-yy-name" style="font-size:24px;">{{ orgname }}</div>
-      <div class="order-title" style="font-size:18px;">首次血液净化治疗记录单</div>
+      <div class="order-title" style="font-size:18px;">血液净化治疗记录单</div>
       <table class="table-box" style="margin-top: 10px;">
         <tbody>
           <tr>
@@ -377,7 +377,7 @@
                         <span v-if="prescription.anticoagulant == 7">{{ prescription.anticoagulant_zongliang }}</span>
                         </div>
                     </td>
-                    <td width='10'>ml</td>
+                    <td width='10'>IU</td>
 
                     <td width="80">
                       <label-box :isChecked="prescription.anticoagulant == 1 ? true : false" showValue="无肝素"></label-box>
@@ -386,7 +386,7 @@
                     <td width='90'>预设冲管NS</td>
                     <td width='50'>
                         <div class="under-line">
-                            &nbsp;
+                            &nbsp;{{ prescription.pre_impulse ? prescription.pre_impulse : '' }}
                         </div>
                     </td>
                     <td width='10'>ml</td>
@@ -459,7 +459,7 @@
                             &nbsp;{{ prescription.target_ultrafiltration ? prescription.target_ultrafiltration : ' ' }}
                         </div>
                     </td>
-                    <td width="10">L</td>
+                    <td width="10">ml</td>
                     <!-- <td width="50">吸氧:</td>
                     <td width='80'>
                         <div>
@@ -503,6 +503,12 @@
                     <td width='100'>
                         <label-box :isChecked="prescription.dialysate_flow == 500" showValue="500ml/min"></label-box>
                     </td>
+                    <td width='30'>其他</td>
+                    <td width='150'>
+                        <div class="under-line">
+                            &nbsp;<span v-if="prescription.dialysate_flow != 500 && prescription.dialysate_flow != ''">{{ prescription.dialysate_flow ? prescription.dialysate_flow : "" }} ml/min</span> 
+                        </div>
+                    </td>
                     <td></td>
                   </tr>
                 </tbody>
@@ -511,12 +517,7 @@
                 <tbody>
                   <tr>
                     <td width="80"></td>
-                    <td width='30'>其他</td>
-                    <td width='150'>
-                        <div class="under-line">
-                            &nbsp;<span v-if="prescription.dialysate_flow != 500 && prescription.dialysate_flow != ''">{{ prescription.dialysate_flow ? prescription.dialysate_flow : "" }} ml/min</span> 
-                        </div>
-                    </td>
+                    
                     <td width='60'>透析器:</td>
                     <td width='150'>
                         <div class="under-line">
@@ -561,7 +562,7 @@
             <td width="100">
                 <div>
                     <span v-if="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) == ''"> {{ getAdminUser(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) }} </span>
-                    <img class="es-img" :src="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:''))" alt="" srcset="" v-else />
+                    <img class="es-img" style="height:38px;" :src="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:''))" alt="" srcset="" v-else />
                 </div>
             </td>
             <td width="70">预冲护士:</td>
@@ -569,7 +570,7 @@
 
                 <div>
                     <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.washpipe_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.washpipe_nurse)}}</span>
-                    <img class="es-img" style="height:30px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.washpipe_nurse)" alt="" srcset="" v-else>
+                    <img class="es-img" style="height:38px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.washpipe_nurse)" alt="" srcset="" v-else>
                 </div>
             </td>
             <td width="100">穿刺/开管护士:</td>
@@ -577,18 +578,26 @@
 
                 <div>
                     <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.puncture_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.puncture_nurse)}}</span>
-                    <img class="es-img" style="height:30px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.puncture_nurse)" alt="" srcset="" v-else>
+                    <img class="es-img" style="height:38px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.puncture_nurse)" alt="" srcset="" v-else>
                     /
                     <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.new_fistula_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.new_fistula_nurse)}}</span>
-                    <img class="es-img" style="height:30px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.new_fistula_nurse)" alt="" srcset="" v-else>
+                    <img class="es-img" style="height:38px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.new_fistula_nurse)" alt="" srcset="" v-else>
                 </div>
             </td>
             <td width="70">核对护士:</td>
             <td width="100">
 
                 <div>
-                    <!-- <span v-if="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) == ''"> {{ getAdminUser(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:prescription.creater)) }} </span>
-                    <img class="es-img" :src="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:''))" alt="" srcset="" v-else /> -->
+                  <span v-if="setAdminUserES(check == null ? 0 : check.modifier) == ''">
+                  {{ getAdminUser(check == null ? 0 : check.modifier) }}
+                  </span>
+                  <img style="height:38px;" :src="setAdminUserES(check == null ? 0 : check.modifier)" alt srcset v-else />
+
+
+                  <!-- <span v-if="setAdminUserES(check == null ? 0 : check.modifier) == ''">
+                    {{ getAdminUser(check == null ? 0 : check.modifier) }}
+                  </span>
+                  <img style="height:20px;" :src="setAdminUserES(check == null ? 0 : check.modifier)" alt srcset v-else /> -->
                 </div>
             </td>
           </tr>
@@ -616,6 +625,7 @@
             <td width="60">钠浓度<br/>mmol/L</td>
             <td width="60">电导度<br/>ms/cm</td>
             <td width="40">液温<br/>℃</td>
+            <td width="40">ktv</td>
             <td width="">特殊处理</td>
             <td width='60'>执行护士</td>
           </tr>
@@ -662,12 +672,16 @@
             <td>
               &nbsp;{{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }}
             </td>
+            <td>
+              &nbsp;{{ monitor.ktv ? monitor.ktv : "" }}
+            </td>
             <td>
               &nbsp;{{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
             </td>
             <td>
                 <span>
-                    {{ getAdminUser(monitor.monitoring_nurse) }}
+                    <span v-if="setAdminUserES(monitor.monitoring_nurse) == ''">{{ getAdminUser(monitor.monitoring_nurse) }}</span>
+                    <img class="es-img" style="height:38px" :src="setAdminUserES(monitor.monitoring_nurse)" alt srcset v-else />
                 </span>
             </td>
 
@@ -704,7 +718,7 @@
                         &nbsp;{{ afterdialysis.actual_ultrafiltration ? afterdialysis.actual_ultrafiltration : "" }}
                       </div>
                     </td>
-                    <td width="20">L</td>
+                    <td width="20">ml</td>
                     <td width="20"></td>
                     <td width="50">血流量</td>
                     <td width='140'>
@@ -754,13 +768,14 @@
                         <label-box :isChecked="afterdialysis.puncture_point_haematoma == 2 ? true : false" showValue="无"></label-box>
                         <label-box :isChecked="afterdialysis.puncture_point_haematoma == 1 ? true : false" showValue="有"></label-box>
                     </td>
-                    <!-- <td width="10"></td>
-                    <td width="30">部位</td>
-                    <td width='100'>
+                    <td width="10"></td>
+                    <td width="50">补液量</td>
+                    <td width='50'>
                         <div class="under-line">
-                            &nbsp;
+                            &nbsp;{{ afterdialysis.rehydration_volume ? afterdialysis.rehydration_volume : '' }}
                         </div>
-                    </td> -->
+                    </td>
+                    <td width="20">ml</td>
                     <td></td>
                   </tr>
                 </tbody>
@@ -917,7 +932,7 @@
                     <td width="100">
                       <div>
                         <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.start_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.start_nurse)}}</span>
-                        <img class="es-img" style="height:30px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.start_nurse)" alt="" srcset="" v-else>
+                        <img class="es-img" style="height:38px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.start_nurse)" alt="" srcset="" v-else>
                       </div>
                     </td>
                     <td width="150"></td>
@@ -926,7 +941,7 @@
                       <div>
                         <span v-if="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.finish_nurse) == ''">
                           {{ getAdminUser(dialysisOrder == null ? 0 : dialysisOrder.finish_nurse) }}</span>
-                        <img class="es-img" :src="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.finish_nurse)" alt="" srcset="" v-else />
+                        <img class="es-img" style="height:38px" :src="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.finish_nurse)" alt="" srcset="" v-else />
                       </div>
                     </td>
                     <td></td>
@@ -965,7 +980,7 @@
               {{ getAdminUser(advice.advice_doctor) }}
             </span>
             <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
-              <img style="height:30px;" :src="setAdminUserES(advice.advice_doctor)" alt srcset />
+              <img style="height:38px;" :src="setAdminUserES(advice.advice_doctor)" alt srcset />
             </span>
           </td>
           
@@ -976,7 +991,7 @@
               {{ getAdminUser(advice.execution_staff) }}
             </span>
             <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
-              <img style="height:30px;" :src="setAdminUserES(advice.execution_staff)" alt srcset />
+              <img style="height:38px;" :src="setAdminUserES(advice.execution_staff)" alt srcset />
             </span>
           </td>
         </tr>

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFour.vue

@@ -768,6 +768,16 @@
                             </span>
                         </div>
                     </td>
+                    <td width='50'>其他:</td>
+                    <td width='100'>
+                      
+                      <div class="under-line">
+                        <span>
+                          {{afterdialysis.sealing_fluid_dispose ? otherSealingFluidDispose(afterdialysis.sealing_fluid_dispose) : ''}}
+                        </span>   
+                      </div>
+                    </td>
+
                     <td width='10'>A:</td>
                     <td width='50'>
                         <div class="under-line">
@@ -783,16 +793,24 @@
                         </div>
                     </td>
                     <td width='10'>ml</td>
+                    
+                    
+                    <td></td>
+                  </tr>
+                </tbody>
+              </table>
+              <table class="table-box">
+                <tbody>
+                  <tr>
+                    <td></td>
                     <td width='70'>医生签名</td>
                     <td width='100'>
-                        <div class="under-line">
-                            &nbsp;
-                            <span v-if="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) == ''"> {{ getAdminUser(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) }} </span>
-                            <img style="height:30px;" :src="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:''))" alt="" srcset="" v-else />
-                        </div>
+                      <div class="under-line">
+                          &nbsp;
+                          <span v-if="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) == ''"> {{ getAdminUser(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) }} </span>
+                          <img style="height:30px;" :src="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:''))" alt="" srcset="" v-else />
+                      </div>
                     </td>
-                    
-                    <td></td>
                   </tr>
                 </tbody>
               </table>
@@ -1437,6 +1455,16 @@ export default {
     }
   },
   methods: {
+    otherSealingFluidDispose(sealing_fluid_dispose){
+      let sealing_fluid_dispose_name = ''
+      let str = sealing_fluid_dispose.split(',')
+      str.map(item => {
+        if(item.indexOf('肝素') == -1 && item.indexOf('NS') == -1 && item.indexOf('特殊')){
+          sealing_fluid_dispose_name += item + " "
+        }
+      })
+      return sealing_fluid_dispose_name
+    },
     getDialyzerPerfusionApparatus(dialyzer_perfusion_apparatus,name){
       let str = ''
       if(dialyzer_perfusion_apparatus.indexOf(',') > -1){
@@ -1588,6 +1616,9 @@ export default {
        if(arr[i] == "肝素1.7ml"){
           strname = "肝素1.7ml"
         }
+       if(arr[i] == "肝素4ml"){
+          strname = "肝素4ml"
+        }
       }
       return strname
     },

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyNine.vue

@@ -132,7 +132,7 @@
                 <tbody>
                   <tr>
                     <td width="70">血管通路:</td>
-                    <td width="460">
+                    <td width="480">
                       <div>
                         <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('自体内瘘') > -1 ? true : false" showValue="自体内瘘"></label-box>
                         &nbsp;
@@ -297,13 +297,6 @@
                             &nbsp;{{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus : "" }}
                         </div>
                         </td>
-                        <td width="20"></td>
-                        <td width="80">透析机:</td>
-                        <td width="80">
-                        <div class="under-line">
-                            &nbsp;{{ predialysis.machine_type ? predialysis.machine_type : "" }}
-                        </div>
-                        </td>
                         <td></td>
                     </tr>
                     </tbody>
@@ -526,12 +519,15 @@
                 <tbody>
                   <tr>
                     <!-- <td width="70">其他记录:</td> -->
-                    <td width="70">治疗方案:</td>
-                    <td width="">
-                      <div style="width: 95%;line-height: 25px;text-align: left;margin-left: 2px;text-underline-position: under; text-decoration: underline;">
-                        {{ summary.dialysis_summary ? summary.dialysis_summary : "" }}
+                    <td width="70" style="text-align:left;">治疗方案:
+                      <div style="width: 95%;line-height: 25px;text-align: left;margin-left: 2px;text-underline-position: under; text-decoration: underline;display:inline;">
+                        <span>宣教:{{ summary.mission ? summary.mission : "" }}</span>
+                        <span>小结:{{ summary.dialysis_summary ? summary.dialysis_summary : "" }}</span>
                       </div>
                     </td>
+                    <!-- <td width="">
+                      
+                    </td> -->
                   </tr>
                 </tbody>
               </table>

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -514,7 +514,9 @@
         //   this.form.social_type = ""
         // }
 
-      }, hide: function() {
+      },
+
+      hide: function () {
         this.visibility = false
         this.$refs['formValue'].resetFields()
       }, cancel: function(formName) {

src/xt_pages/outpatientCharges/newStatementPrint.vue

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

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -133,7 +133,7 @@
                         </el-button>
 
                         <el-button
-                                v-if="this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 10106"
+                                v-if="this.$store.getters.xt_user.org_id == 9919   || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 10106"
                                 size="small" @click="open(10)" type="primary"
                         >退号
                         </el-button>
@@ -644,7 +644,7 @@
 
             })
 
-        } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 10106) {
+        } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 10106) {
           var that = this
           axios.get('http://127.0.0.1:9532/api/upload/get', {
             params: form,
@@ -981,7 +981,7 @@
 
             })
 
-        } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 10106) {
+        } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 10106) {
 
           axios.get('http://127.0.0.1:9532/api/register/get', {
             params: forms,
@@ -1757,7 +1757,7 @@
           }
 
         } else if (index == 5) {
-          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) {
+          if (this.$store.getters.xt_user.org_id == 9919 || 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('是否退费', '退费', {

src/xt_pages/outpatientCharges/statementPrint.vue

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

src/xt_pages/outpatientCharges/summary.vue

@@ -106,6 +106,7 @@
                         <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>
+                        <!-- <el-button size="mini" type="primary" @click="invoicePrint(scope.row)">打印发票</el-button> -->
                     </template>
                 </el-table-column>
             </el-table>
@@ -156,6 +157,14 @@
             <new-statement-print-two ref="print" :paramsObj='orderObj9504'></new-statement-print-two>
         </el-dialog>
 
+        <!-- <el-dialog
+                class="centerDialog"
+                width="1200px"
+                title="打印"
+                :visible.sync="invoiceVisible">
+            <invoice-print ref="print" :invoiceParams='invoiceParams'></invoice-print>
+        </el-dialog> -->
+
 
     </div>
 </template>
@@ -171,6 +180,7 @@
   import NewStatementPrintTwo from './newStatementPrintTwo'
   import { fetchAllAdminUsers } from '@/api/doctor'
   import axios from 'axios'
+  // import invoicePrint from './invoicePrint'
 
   export default {
     components: {
@@ -178,7 +188,8 @@
       NewStatementPrint,
       BreadCrumb,
       listPrint,
-      allListPrint
+      allListPrint,
+      // invoicePrint
     },
     data() {
       return {
@@ -202,6 +213,9 @@
         listVisible: false,
         allListVisible: false,
         adminUserOptions:[],
+        invoiceVisible:false,
+        paramsObj:{},
+        invoiceParams:{}
 
       }
     },
@@ -222,7 +236,7 @@
         }
 
       },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) {
+        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 == 9674 || this.$store.getters.xt_user.org_id == 10106) {
           var that = this
           this.$confirm('是否退费', '退费', {
             confirmButtonText: '确 定',
@@ -475,6 +489,19 @@
         } else if (index == 2) {
           this.allListVisible = true
         }
+      },
+      invoicePrint(obj){
+        console.log(obj)
+        let paramsObj = {
+          order_id: obj.order_info.order_id,
+          patient_id: obj.patient_id,
+          name:obj.patient.name,
+          age:obj.age,
+          gend:obj.gend,
+          setl_time:obj.setl_time
+        }
+        this.invoiceParams = paramsObj
+        this.invoiceVisible = true
       }
     }, created() {
 

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -360,6 +360,9 @@
                 </div>
               </el-tab-pane>
               <el-tab-pane label="项目组套" name="2">
+                <el-input style="width:100%;" @input="searchProjectList" @keyup.enter.native='searchProjectList'
+                            v-model.trim="project_item_keyword"
+                            placeholder="请输入项目组套名称"></el-input>
                 <div style="width: 100%;flex:1;overflow-y: auto;">
                   <el-table :data="tabPrjectTeam" border
                             :height="multipleTableHeight != '' ? multipleTableHeight : '200'"
@@ -573,8 +576,9 @@
             }
           }
         },
-        hisList:[]
-
+        hisList:[],
+        project_item_keyword:"",
+        projectList:[] 
       }
     },
     methods: {
@@ -1393,7 +1397,8 @@
         }
         this.$refs.additionalCharges.hide()
 
-      }, searchProjectAction() {
+      }, 
+      searchProjectAction() {
 
         if (this.search_project_keyword.length == 0) {
           this.tabProject = this.allProject
@@ -1410,6 +1415,20 @@
         }
 
       },
+      searchProjectList(){
+         if(this.project_item_keyword.length == 0){
+             this.tabPrjectTeam = this.projectList
+         }else{
+           let arr = []
+           for(let i=0;i<this.projectList.length;i++){
+              if(this.projectList[i].project_team.indexOf(this.project_item_keyword)!=-1){
+                 arr = arr.concat(this.projectList[i])
+              }
+           }
+           this.tabPrjectTeam = arr
+         }
+      },
+
       searchAction() {
         if (this.search_keyword.length == 0) {
           this.drugs = this.allDrugs
@@ -1946,6 +1965,8 @@
               'prescriptions': this.prescriptions
             }
             isLoading = true
+           
+            
             createHisPrescription(data, params).then(response => {
               if (response.data.state == 1) {
                 this.$emit('change')
@@ -2498,6 +2519,7 @@
             var team = response.data.data.team
             console.log("team2222",team)
             this.tabPrjectTeam = team
+            this.projectList = team
           }
         })
       },

src/xt_pages/outpatientDoctorStation/recordTemplate/printOne.vue

@@ -66,7 +66,7 @@
         </div>
         <div class="otherInfo">
             <div class="otherName">药物过敏史：</div>
-            <div style="flex:1;">{{history.past_history?history.past_history:''}}</div>
+            <div style="flex:1;">{{history.allergic_history?history.allergic_history:''}}</div>
         </div>
         <div class="otherInfo">
             <div class="otherName">个人史：</div>
@@ -88,8 +88,13 @@
             <div class="otherName">门诊医嘱：</div>
             <div style="flex:1;">{{history.doctor_advice?history.doctor_advice:''}}</div>
         </div>
-        <div style="margin-top:20px;text-align:right;">
-            医生签名：{{getDoctor(history.doctor)?getDoctor(history.doctor):''}}
+        <div style="display:flex;justify-content: space-between;">
+            <div style="margin-top:20px;">
+                打印日期：{{ printDate }}
+            </div>
+            <div style="margin-top:20px;text-align:right;">
+                医生签名：{{getDoctor(history.doctor)?getDoctor(history.doctor):''}}
+            </div>
         </div>
     </div>
 </div>
@@ -110,7 +115,8 @@ export default {
             educationOptions:[],
             departmentList:[],
             orgname:'',
-            history:{}
+            history:{},
+            printDate:''
         }                   
     },
     methods:{
@@ -176,13 +182,16 @@ export default {
     }
     },
     created(){
-      this.educationOptions = getDataConfig("patient", "education_types");
-      console.log("22222",this.educationOptions)
-      this.getAllDoctorList()
-      this.getPatientCaseHistory()
+        this.educationOptions = getDataConfig("patient", "education_types");
+        this.getAllDoctorList()
+        this.getPatientCaseHistory()
 
-     var xtuser = this.$store.getters.xt_user
-     this.orgname = xtuser.org.org_name
+        var xtuser = this.$store.getters.xt_user
+        this.orgname = xtuser.org.org_name
+        var data = new Date();
+        var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
+        var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
+        this.printDate = data.getFullYear() + "-" + month + "-" + date;
     }
 }
 </script>

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -22,7 +22,7 @@
           <div class="prescriptionBox">
               <div class="Rp">Rp:</div>
               <div class="drugsBox" v-for="(it,index) in item.advices" :key="index">
-                  <div class="drugsOne">{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
+                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
                   <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}&nbsp;{{it.delivery_way}}&nbsp;{{it.day}}天</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
               </div>
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
@@ -30,7 +30,7 @@
                </div>
                
               <div class="drugsBox" v-for="(it,index) in item.project" :key="index">
-                  <div class="drugsOne">{{getProjectName(it.project_id)?getProjectName(it.project_id):""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.count}}{{unit}}</div>
+                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{getProjectName(it.project_id)?getProjectName(it.project_id):""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.count}}{{unit}}</div>
                   <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.delivery_way}}</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
               </div>
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">

src/xt_pages/qcd/basicInformationAnalysis.vue

@@ -63,6 +63,36 @@
           :picker-options="pickerOptions"
         ></el-date-picker>
       </div>
+       <div class="cell clearfix">
+        <label class="title"><span class="name">转归情况</span> : </label>
+        <div class="time ">
+          <ul class="">
+            <li
+              :class="item.lapseto == lapsetoType ? 'active' : ''"
+              @click="selectLapseOne(item.lapseto)"
+              v-for="item in lapsetoArr"
+              :key="item.value"
+            >
+              {{ item.label }}
+            </li>
+          </ul>
+        </div>
+      </div>
+      <div class="cell clearfix">
+        <label class="title"><span class="name">病人来源</span> : </label>
+        <div class="time ">
+          <ul class="">
+            <li
+              :class="item.source == sourceType ? 'active' : ''"
+              @click="selectSource(item.source)"
+              v-for="item in sourceArr"
+              :key="item.value"
+            >
+              {{ item.label }}
+            </li>
+          </ul>
+        </div>
+      </div>
 
        <div class="cell clearfix" v-show="treatShow">
         <label class="title">
@@ -213,10 +243,12 @@
                 <p class="infoTitle">转归统计(总人数{{patientCount}}人)</p>
               </div>
               <div class="borderBox1">
-                <p>留治:{{rollOutTotal}}人({{(rollOutTotal/patientCount*100).toFixed(1)}}%)</p>
-                <el-progress :percentage="(rollOutTotal/patientCount*100).toFixed(1)"></el-progress>
-                <p>转出:{{outTotal}}人({{(outTotal/patientCount*100).toFixed(1)}}%)</p>
-                <el-progress :percentage="(outTotal/patientCount*100).toFixed(1)"></el-progress>
+                 <span v-if="lapsetoType == 0 || lapsetoType == 1"><p>留治:{{rollOutTotal}}人({{(rollOutTotal/patientCount*100).toFixed(1)}}%)</p>
+                  <el-progress :percentage="(rollOutTotal/patientCount*100).toFixed(1)"></el-progress>
+                </span>
+                <span v-if="lapsetoType == 0 || lapsetoType == 2"><p>转出:{{outTotal}}人({{(outTotal/patientCount*100).toFixed(1)}}%)</p>
+                 <el-progress :percentage="(outTotal/patientCount*100).toFixed(1)"></el-progress>
+                </span> 
               </div>
             </div>
             <div class="infoOne">
@@ -297,7 +329,7 @@
         </div>
         <div>
 
-        <div class="cell clearfix" v-show="treatShow">
+        <!-- <div class="cell clearfix" v-show="treatShow">
         <label class="title">
           <span class="name">转归状态</span> :
         </label>
@@ -311,7 +343,7 @@
             >{{ item.label }}</li>
           </ul>
         </div>
-       </div>
+       </div> -->
 
           <p style="font-size: 16px;font-weight: bold;color: #000;">转归统计</p>
           <line-chart :options="bar"></line-chart>
@@ -386,7 +418,19 @@ export default {
       dialysisAge:[],
       start:0,
       end:0,
-
+      lapsetoType: 0,
+      lapsetoArr: [
+        { value: 0, label: '全部', source: 0, lapseto: 0 },
+        { value: 1, label: '转出', source: 0, lapseto: 2 },
+        { value: 2, label: '留治', source: 0, lapseto: 1 },
+        // { value: 3, label: '死亡', source:0,  lapseto: 3 },
+      ],
+      sourceType: 0,
+      sourceArr: [
+       { value: 0, label: '全部', source: 0, lapseto: 0 },
+       { value: 3, label: '门诊', source: 1, lapseto: 1 },
+       { value: 4, label: '住院', source: 2, lapseto: 1 }
+      ],
       way: 0,
       wayArr: [
         { value: 0, label: "统计图", state: 0 },
@@ -585,6 +629,8 @@ export default {
         { value: 1, label: "转出", state: 1}
       ],
       lapseid:0,
+      startDate:"",
+      endDate:"",
     };
 
 
@@ -604,21 +650,21 @@ export default {
         this.start_time = "";
       } else {
          //统计透析总量
-        this.getDialysisModeType(val,this.listQuery.end_time)
+        this.getDialysisModeType(val,this.listQuery.end_time,this.lapsetoType,this.sourceType)
         //统计转归状态
-        this.getTotalLapseCount(this.listQuery.start_time,this.listQuery.end_time)
+        this.getTotalLapseCount(this.listQuery.start_time,this.listQuery.end_time,this.lapsetoType,this.sourceType)
         //统计男女比例
-        this.getTotalSexCount(timeStar,timeEnd)
+        this.getTotalSexCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
         //统计传染病
-        this.getTotalInfectiousCount(this.listQuery.start_time,this.listQuery.end_time)
+        this.getTotalInfectiousCount(this.listQuery.start_time,this.listQuery.end_time,this.lapsetoType,this.sourceType)
         //统计年龄
-        this.getTotalAgeCount(timeStar,timeEnd)
+        this.getTotalAgeCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
         //统计透析年龄
-        this.getTotalDialysisCount(timeStar,timeEnd)
+        this.getTotalDialysisCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
         this.start = timeStar
         this.end =timeEnd
         this.getCountModeId()
-        this.getRolloutCount(timeStar,timeEnd)
+        this.getRolloutCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
       }
     },
     changeEndTime(val) {
@@ -632,21 +678,21 @@ export default {
         this.listQuery.end_time = "";
       } else {
           //统计透析总量
-        this.getDialysisModeType(this.listQuery.start_time,val)
+        this.getDialysisModeType(this.listQuery.start_time,val,this.lapsetoType,this.sourceType)
         //统计转归状态
-        this.getTotalLapseCount(this.listQuery.start_time,this.listQuery.end_time)
+        this.getTotalLapseCount(this.listQuery.start_time,this.listQuery.end_time,this.lapsetoType,this.sourceType)
         //统计男女比例
-        this.getTotalSexCount(timeStar,timeEnd)
+        this.getTotalSexCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
         //统计传染病
-        this.getTotalInfectiousCount(this.listQuery.start_time,this.listQuery.end_time)
+        this.getTotalInfectiousCount(this.listQuery.start_time,this.listQuery.end_time,this.lapsetoType,this.sourceType)
         //统计年龄
-        this.getTotalAgeCount(timeStar,timeEnd)
+        this.getTotalAgeCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
         //统计透析年龄
-        this.getTotalDialysisCount(timeStar,timeEnd)
+        this.getTotalDialysisCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
         this.start = timeStar
         this.end =timeEnd
         this.getCountModeId()
-        this.getRolloutCount(timeStar,timeEnd)
+        this.getRolloutCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
       }
     },
     selectLapseTo(state) {
@@ -655,6 +701,7 @@ export default {
       //获取本月当前机构的透析模式
       const startDate = moment().subtract('month', 0).format('YYYY-MM') + '-01'
       const endDate = moment(new Date()).format('YYYY-MM-DD')
+     
       var now = new Date()
       var nowMonth = now.getMonth(); //当前月
       var nowYear = now.getFullYear(); //当前年
@@ -669,28 +716,28 @@ export default {
       //本月
       if(state == 0){
        //统计透析总量
-        this.getDialysisModeType(startDate,endDate)
+        this.getDialysisModeType(startDate,endDate,this.lapsetoType,this.sourceType)
         //统计转归状态
-        this.getTotalLapseCount(startDate,endDate)
+        this.getTotalLapseCount(startDate,endDate,this.lapsetoType,this.sourceType)
         //统计男女比例
-        this.getTotalSexCount(timeStar,timeEnd)
+        this.getTotalSexCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
         //统计传染病
-        this.getTotalInfectiousCount(startDate,endDate)
+        this.getTotalInfectiousCount(startDate,endDate,this.lapsetoType,this.sourceType)
         //统计年龄
-        this.getTotalAgeCount(timeStar,timeEnd)
+        this.getTotalAgeCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
         //统计透析年龄
-        this.getTotalDialysisCount(timeStar,timeEnd)
+        this.getTotalDialysisCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
         this.start = timeStar
         this.end = timeEnd
         this.getCountModeId()
-        this.getRolloutCount(timeStar,timeEnd)
+        this.getRolloutCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
       }
       //近三月
       if(state == 1){
         this.listQuery.start_time = ""
         this.listQuery.end_time = ""
         const startDate = moment().subtract('month', 3).format('YYYY-MM-DD')
-        // console.log("三月前",startDate)
+       
         var startunitx = Date.parse(startDate)/1000
         // console.log("开始时间搓",startunitx)
         const endDate = moment(new Date()).format('YYYY-MM-DD')
@@ -698,21 +745,21 @@ export default {
          var endunitx = Date.parse(endDate)/1000
         // console.log("日期时间搓",endunitx)
          //统计透析总量
-        this.getDialysisModeType(startDate,endDate)
+        this.getDialysisModeType(startDate,endDate,this.lapsetoType,this.sourceType)
          //统计转归状态
-        this.getTotalLapseCount(startDate,endDate)
+        this.getTotalLapseCount(startDate,endDate,this.lapsetoType,this.sourceType)
         //统计男女比例
-        this.getTotalSexCount(startunitx,endunitx)
+        this.getTotalSexCount(startunitx,endunitx,this.lapsetoType,this.sourceType)
         //统计传染病
-        this.getTotalInfectiousCount(startDate,endDate)
+        this.getTotalInfectiousCount(startDate,endDate,this.lapsetoType,this.sourceType)
         //统计年龄
-        this.getTotalAgeCount(startunitx,endunitx)
+        this.getTotalAgeCount(startunitx,endunitx,this.lapsetoType,this.sourceType)
         //统计透析年龄
-        this.getTotalDialysisCount(startunitx,endunitx)
+        this.getTotalDialysisCount(startunitx,endunitx,this.lapsetoType,this.sourceType)
         this.start = startunitx
         this.end = endunitx
         this.getCountModeId()
-        this.getRolloutCount(startunitx,endunitx)
+        this.getRolloutCount(startunitx,endunitx,this.lapsetoType,this.sourceType)
       }
 
      //近半年
@@ -728,22 +775,22 @@ export default {
          var endunitx = Date.parse(endDate)/1000
         // console.log("日期时间搓",endunitx)
          //统计透析总量
-        this.getDialysisModeType(startDate,endDate)
+        this.getDialysisModeType(startDate,endDate,this.lapsetoType,this.sourceType)
          //统计转归状态
-        this.getTotalLapseCount(startDate,endDate)
+        this.getTotalLapseCount(startDate,endDate,this.lapsetoType,this.sourceType)
         //统计男女比例
-        this.getTotalSexCount(startunitx,endunitx)
+        this.getTotalSexCount(startunitx,endunitx,this.lapsetoType,this.sourceType)
         //统计传染病
-        this.getTotalInfectiousCount(startDate,endDate)
+        this.getTotalInfectiousCount(startDate,endDate,this.lapsetoType,this.sourceType)
         //统计年龄
-        this.getTotalAgeCount(startunitx,endunitx)
+        this.getTotalAgeCount(startunitx,endunitx,this.lapsetoType,this.sourceType)
         //统计透析年龄
-        this.getTotalDialysisCount(startunitx,endunitx)
+        this.getTotalDialysisCount(startunitx,endunitx,this.lapsetoType,this.sourceType)
 
         this.start = startunitx
         this.end = endunitx
         this.getCountModeId()
-        this.getRolloutCount(startunitx,endunitx)
+        this.getRolloutCount(startunitx,endunitx,this.lapsetoType,this.sourceType)
      }
 
      //近一年
@@ -759,22 +806,21 @@ export default {
          var endunitx = Date.parse(endDate)/1000
         // console.log("日期时间搓",endunitx)
          //统计透析总量
-        this.getDialysisModeType(startDate,endDate)
+        this.getDialysisModeType(startDate,endDate,this.lapsetoType,this.sourceType)
          //统计转归状态
-        this.getTotalLapseCount(startDate,endDate)
+        this.getTotalLapseCount(startDate,endDate,this.lapsetoType,this.sourceType)
         //统计男女比例
-        this.getTotalSexCount(startunitx,endunitx)
+        this.getTotalSexCount(startunitx,endunitx,this.lapsetoType,this.sourceType)
         //统计传染病
-        this.getTotalInfectiousCount(startDate,endDate)
+        this.getTotalInfectiousCount(startDate,endDate,this.lapsetoType,this.sourceType)
         //统计年龄
-        this.getTotalAgeCount(startunitx,endunitx)
+        this.getTotalAgeCount(startunitx,endunitx,this.lapsetoType,this.sourceType)
         //统计透析年龄
-        this.getTotalDialysisCount(startunitx,endunitx)
-
+        this.getTotalDialysisCount(startunitx,endunitx,this.lapsetoType,this.sourceType)
         this.start = startunitx
         this.end = endunitx
         this.getCountModeId()
-        this.getRolloutCount(startunitx,endunitx)
+        this.getRolloutCount(startunitx,endunitx,this.lapsetoType,this.sourceType)
      }
 
 
@@ -790,16 +836,19 @@ export default {
       this.lapseMode = state
       this.getRolloutCount(this.start,this.end)
     },
-    getDialysisModeType(startDate,endDate){
+    getDialysisModeType(startDate,endDate,lapsetoType,sourceType){
        this.modesData.series = []
        this.modesData.xAxis = []
-      getDialysisModeType(startDate,endDate).then(response=>{
+      getDialysisModeType(startDate,endDate,lapsetoType,sourceType).then(response=>{
          if(response.data.state == 1){
 
           var modetype =  response.data.data.modetype
+         
           this.modetype = modetype
           var total =  response.data.data.total
-          this.total = total
+          
+          this.total = total.count
+          // this.total = total
           // console.log("数据",this.modetype)
           var modedate = response.data.data.modetype
           for(let i=0;i<modedate.length;i++){
@@ -871,60 +920,52 @@ export default {
       })
     },
     //统计转归
-    getTotalLapseCount(startDate,endDate){
+    getTotalLapseCount(startDate,endDate,lapsetoType,sourceType ){
+   
        this.modesDataTwo.series = []
        this.modesDataTwo.xAxis = []
-      getTotalLapseCount(startDate,endDate).then(response=>{
+      getTotalLapseCount(startDate,endDate,lapsetoType,sourceType).then(response=>{
          if(response.data.state == 1){
            var arr = [
              {name:"留治",count:0},
              {name:"转出",count:0}
            ]
           var patients =  response.data.data.patients
-
+      
           this.rollOutTotal = patients.length
+
           var patienttwo = response.data.data.patienttwo
           this.outTotal = patienttwo.length
           var count = response.data.data.count
           this.patientCount = count
 
           var rollout = response.data.data.rollout
-          console.log("rollout",rollout)
+        
 
           for(let i=0;i<arr.length;i++){
             arr[0].count = this.rollOutTotal
             arr[1].count = this.outTotal
           }
-
-          // for(let j=0;j<arr.length;j++){
-          //   this.modesDataTwo.xAxis.push(arr[j].name)
-          //   this.modesDataTwo.series.push(((arr[j].count/count)*100).toFixed(1))
-          // }
-          // this.bar.series[0].data = this.modesDataTwo.series
-          // this.bar.xAxis.data = this.modesDataTwo.xAxis
-          // this.getArrLength(this.bar.xAxis.data)
-
          }
       })
     },
     //统计男女比例
-    getTotalSexCount(timeStar,timeEnd){
-      getTotalSexCount(timeStar,timeEnd).then(response=>{
+    getTotalSexCount(timeStar,timeEnd,lapsetoType,sourceType){
+      getTotalSexCount(timeStar,timeEnd,lapsetoType,sourceType).then(response=>{
         if(response.data.state === 1){
+          console.log("resp2222",response.data.data.totalWoman)
           var total = response.data.data.total
-        //  console.log("总人数",total)
           this.totalGender = total
           var totalMan = response.data.data.totalSex
-       //  console.log("男人",totalMan)
           this.totalMan = totalMan
-          var totalWoman = total - totalMan
+          var totalWoman = response.data.data.totalWoman
           this.totalWoman = totalWoman
         }
       })
     },
     //统计传染病
-    getTotalInfectiousCount(timeStar,timeEnd){
-       getTotalInfectiousCount(timeStar,timeEnd).then(response=>{
+    getTotalInfectiousCount(timeStar,timeEnd,lapsetoType,sourceType){
+       getTotalInfectiousCount(timeStar,timeEnd,lapsetoType,sourceType).then(response=>{
            if(response.data.state === 1){
              this.InfectiousTotal = response.data.data.total
              var infectious = response.data.data.count
@@ -947,11 +988,10 @@ export default {
            }
        })
     },
-    getTotalAgeCount(timeStar,timeEnd){
-      getTotalAgeCount(timeStar,timeEnd).then(response=>{
+    getTotalAgeCount(timeStar,timeEnd,lapsetoType,sourceType){
+      getTotalAgeCount(timeStar,timeEnd,lapsetoType,sourceType).then(response=>{
          if(response.data.state == 1){
           var ageCount =  response.data.data.ageCount
-          // console.log("ageCount",ageCount)
           var arr = []
           arr =  ageCount.sort(this.compare('age'))
           this.ageCount = arr
@@ -969,8 +1009,8 @@ export default {
           }
       },
     //统计透析年龄
-    getTotalDialysisCount(timeStar,timeEnd){
-      getTotalDialysisCount(timeStar,timeEnd).then(response=>{
+    getTotalDialysisCount(timeStar,timeEnd,lapsetoType,sourceType){
+      getTotalDialysisCount(timeStar,timeEnd,lapsetoType,sourceType).then(response=>{
          if(response.data.state == 1){
            var dataage =  response.data.data.dataage
           //  console.log("dataage",dataage)
@@ -1127,7 +1167,9 @@ export default {
        this.modesDataTwo.xAxis = []
         const params = {
           start_time:this.start,
-          end_time:this.end
+          end_time:this.end,
+          lapsetotype:this.lapsetoType,
+          sourcetype:this.sourceType,
         }
       getRolloutCount(params).then(response=>{
          if(response.data.state == 1){
@@ -1167,7 +1209,28 @@ export default {
 
          }
       })
-    }
+    },
+    selectSource(source) {
+      this.sourceType = source
+      this.getDialysisModeType(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
+      this.getTotalLapseCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
+      this.getTotalSexCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
+      this.getTotalInfectiousCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
+      this.getTotalAgeCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
+      this.getTotalDialysisCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
+      this.getRolloutCount(this.lapsetoType,this.sourceType)
+    },
+    selectLapseOne(lapseto) {
+      console.log("lapseto22222",lapseto)
+      this.lapsetoType = lapseto
+      this.getDialysisModeType(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
+      this.getTotalLapseCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
+      this.getTotalSexCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
+      this.getTotalInfectiousCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
+      this.getTotalAgeCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
+      this.getTotalDialysisCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
+      this.getRolloutCount(this.lapsetoType,this.sourceType)
+    },
   },
   created() {
         //获取本月当前机构的透析模式
@@ -1182,25 +1245,28 @@ export default {
       //本月的结束时间
       var monthEndDate = new Date(nowYear, nowMonth+1, 0);
       var timeEnd=Date.parse(monthEndDate)/1000-1;//s
+
+      this.startDate = startDate
+      this.endDate = endDate
       //统计透析总量
-      this.getDialysisModeType(startDate,endDate)
+      this.getDialysisModeType(startDate,endDate,this.lapsetoType,this.sourceType)
       //统计转归状态
-      this.getTotalLapseCount(startDate,endDate)
+      this.getTotalLapseCount(startDate,endDate,this.lapsetoType,this.sourceType)
       //统计男女比例
-      this.getTotalSexCount(timeStar,timeEnd)
+      this.getTotalSexCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
       //统计传染病
-      this.getTotalInfectiousCount(startDate,endDate)
+      this.getTotalInfectiousCount(startDate,endDate,this.lapsetoType,this.sourceType)
       //统计年龄
-      this.getTotalAgeCount(timeStar,timeEnd)
+      this.getTotalAgeCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
       //统计透析年龄
-      this.getTotalDialysisCount(timeStar,timeEnd)
+      this.getTotalDialysisCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
 
       //获取当前选中时间所有的透析模式
       this.getTreatModeList(timeStar,timeEnd)
       this.start = timeStar
       this.end = timeEnd
 
-     this.getRolloutCount(timeStar,timeEnd)
+     this.getRolloutCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
 
 
   },

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -23,10 +23,10 @@
             <el-form-item label="耗材种类 : " prop="good_kind">
               <el-select v-model="form.good_kind" style="width:160px;" placeholder="请选择">
                 <el-option
-                  v-for="item,index in getDictionaryDataConfig('system','good_kind')"
+                  v-for="(item,index) in goodKindList"
                   :key="index"
                   :label="item.name"
-                  :value="item.id">
+                  :value="item.value">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -43,10 +43,10 @@
             <el-form-item label="医保等级 : " prop="medical_insurance_level">
               <el-select v-model="form.medical_insurance_level" style="width:160px;" placeholder="请选择">
                 <el-option
-                  v-for="item, index in getDictionaryDataConfig('system','medical_insurance_level')"
+                  v-for="(item, index) in medicalInsuranceLevelList"
                   :key="index"
                   :label="item.name"
-                  :value="item.id">
+                  :value="item.value">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -116,10 +116,10 @@
             <el-form-item label="统计分类:" prop="statistics_category">
               <el-select v-model="form.statistics_category" style="width:160px;" placeholder="请选择">
                 <el-option
-                  v-for="item,index in getDictionaryDataConfig('system','statistics_category')"
+                  v-for="(item,index) in statisticsCategoryList"
                   :key="index"
                   :label="item.name"
-                  :value="item.id">
+                  :value="item.value">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -273,7 +273,7 @@
 
 <script>
   import { getDictionaryDataConfig,getDataConfig } from '@/utils/data'
-  import { getManufacturerList,GetAllConfig } from "@/api/stock";
+  import { getManufacturerList,GetAllConfig,getInitializtion } from "@/api/stock";
 
   export default {
     name: 'goodInfoDailog',
@@ -372,7 +372,10 @@
             {required:true,message:"请填写特殊医院材料标志",trigger:"blur"}
           ]
         },
-        dealer:[]
+        dealer:[],
+        goodKindList:[],
+        medicalInsuranceLevelList:[],
+        statisticsCategoryList:[]
       }
     },
     props: {
@@ -401,8 +404,10 @@
       show(id,form) {
         this.visible = true
         this.good_status =[]
+        this.getlist()
+        this.GetAllConfig()
+        this.getInitializtion()
         if (id == 0) {
-
           var tempform = {
               good_id: '',
               specification_name: '',
@@ -516,10 +521,10 @@
              page:this.page,
              limit:this.limit
           }
-          console.log("params2222222",params)
+        
         getManufacturerList(params).then(response=>{
            var manufacturerList =   response.data.data.manufacturer
-           console.log("列表2222222",manufacturerList)
+         
            this.manufacturerList = manufacturerList
         })
       },
@@ -533,6 +538,22 @@
           
         }
        });
+      },
+      getInitializtion(){
+       getInitializtion().then(response=>{
+         if(response.data.state == 1){
+           var goodKindList = response.data.data.goodKindList
+           console.log("耗材种类",goodKindList)
+           this.goodKindList = goodKindList
+           var medicalInsuranceLevelList =  response.data.data.medicalInsuranceLevelList
+           console.log("医保等级",medicalInsuranceLevelList)
+           this.medicalInsuranceLevelList = medicalInsuranceLevelList
+           var statisticsCategoryList = response.data.data.statisticsCategoryList
+           console.log("统计分类",statisticsCategoryList)
+           this.statisticsCategoryList = statisticsCategoryList
+
+         }
+       })
       }
     },
     watch: {
@@ -549,6 +570,7 @@
       this.getlist()
       //获取所有经销商
       this.GetAllConfig()
+      this.getInitializtion()
     }
   }
 

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -293,7 +293,7 @@ import {
   GetAllConfig,
   getDrugWarehouseInfoList,
   getDrugWarehouseList,
-  
+ 
 } from "@/api/drug/drug_stock";
 import BreadCrumb from "../../components/bread-crumb";
 
@@ -339,6 +339,7 @@ export default {
     this.GetWarehouse();
     // this.GetConfigInfo();
     this.fetchAllAdminUsers();
+   
   },
   data() {
     return {
@@ -665,7 +666,8 @@ export default {
           });
         })
         .catch(() => {});
-    }
+    },
+   
   }
 };
 </script>

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -145,7 +145,7 @@
                 size="small"
                 type="warning"
                 icon="el-icon-document"
-                @click="handleSearch(scope.row.id)"
+                @click="handleSearch(scope.row.id,scope.row.warehouse_out_time,scope.row.warehouse_out_order_number)"
               >
               </el-button>
             </el-tooltip>
@@ -233,7 +233,8 @@
               <span>单价</span>
             </template>
             <template slot-scope="scope">
-              <span>{{scope.row.price}}</span>
+              <!-- <span>{{scope.row.price}}</span> -->
+              <span>{{getRetailPrice(scope.row.drug_id)}}</span>
             </template>
           </el-table-column>
 
@@ -242,13 +243,15 @@
               <span>出库数量</span>
             </template>
             <template slot-scope="scope">
-              <span>{{scope.row.count}}</span>
-
+              <span v-if="drugConfig.is_open == 0 || drugConfig.is_open ==2 ">{{scope.row.count}}</span>
+              <span v-if="drugConfig.is_open ==1">{{getDrugCount(scope.row.drug_id)}}</span>
             </template>
           </el-table-column>
           <el-table-column label="总价" min-width="20" align="center">
             <template slot-scope="scope">
-              {{calculate(scope.row.price*scope.row.count)}}
+              <!-- {{calculate(scope.row.price*scope.row.count)}} -->
+              <span v-if="drugConfig.is_open == 0 || drugConfig.is_open == 2">{{(scope.row.count * getRetailPrice(scope.row.drug_id)).toFixed(2)}}</span>
+              <span v-if="drugConfig.is_open == 1">{{(getRetailPrice(scope.row.drug_id) * getDrugCount(scope.row.drug_id)).toFixed(2)}}</span>
             </template>
           </el-table-column>
 
@@ -357,7 +360,8 @@ import {
   GetAllConfig,
   getDrugWarehouseOutList,
   getDrugWarehouseOutInfo,
-  getDrugWarehouseOutUser
+  getDrugWarehouseOutUser,
+  getDrugAutoMaticList
 } from "@/api/drug/drug_stock";
 import BreadCrumb from "../../components/bread-crumb";
 
@@ -436,7 +440,9 @@ export default {
        info: {}
       },
       userList:[],
-     
+      list:[],
+      drugConfig:{},
+      drugList:[]
     };
   },
   methods: {
@@ -486,6 +492,7 @@ export default {
           for (let i = 0; i < response.data.data.list.length; i++) {
             this.warehouseOutDate.push(response.data.data.list[i]);
           }
+          console.log("列表22222",this.warehouseOutDate)
         }
       });
     },
@@ -581,9 +588,12 @@ export default {
         query: { id: row.id, type: this.type }
       });
     },
-    handleSearch(id){
+    handleSearch(id,time,warehouse_out_order_number){
+    
       this.warehousingOutInfo.warehousingOutData = []
       this.GetOrderDetail(id)
+      this.list = []
+      this.getDrugAutoMaticList(id,time,warehouse_out_order_number)
       this.dialogVisible = true
       
     },
@@ -777,7 +787,46 @@ export default {
           }
         })
         this.sameRowArr = sameRowArr
+      },
+    getDrugAutoMaticList(id,recordTime,warehouse_out_order_number){
+        var params = {
+          warehous_out_id:id,
+          record_time:recordTime,
+          warehouse_out_order_number:warehouse_out_order_number,
+        }
+      getDrugAutoMaticList(params).then(response=>{
+         if(response.data.state ==1){
+           var list =   response.data.data.list
+           console.log("list222222",list)
+           this.list = list
+           var drugConfig =  response.data.data.drugConfig
+           console.log("drugconfig",drugConfig)
+           this.drugConfig = drugConfig
+           var drugList = response.data.data.drugList
+           console.log("药品列表",drugList)
+           this.drugList = drugList
+         }
+      })
+    },
+    getDrugCount(id){
+      
+      var count = 0 
+      for(let i=0;i<this.list.length;i++){
+         if(this.list[i].drug_id == id){
+            count = this.list[i].Total
+         }
       }
+      return count
+    },
+    getRetailPrice(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
+    }
   }
 };
 </script>

src/xt_pages/stock/stockInOrderDetailPrint.vue

@@ -22,25 +22,39 @@
                             <thead>
                                 <tr>
                                     <td width="80">耗材名称</td>
+                                    <td width="80">注册证号/批准文号/备案凭证号</td>
                                     <td width="80">规格型号</td>
+                                    <td width="80">生产厂商</td>
                                     <td width="80">单位</td>
                                      <td width="80">进货价</td>
                                     <td width="80">入库数量</td> 
                                     <td width="80">总价</td>
+                                    <td width="80">批号</td>
+                                    <td width="80">生产日期</td>
+                                    <td width="80">有效日期</td>
+                                    <td width="80">质检意见</td>
+                                    <td width="80">验收结论</td>
                                 </tr>
                             </thead>
                             <tbody>
                                 <tr v-for='(item,index) in WarehouseInfo.warehouseInfoDate' :key="index">
                                     <td><span v-if="item.good_id != 0">{{getTypeNameOne(item.good_id)}}</span></td>
+                                    <td></td>
                                     <td><span v-if="item.good_id != 0">{{getSpecificationName(item.good_id)}}</span></td>
+                                    <td>{{ getManufacturer(item.manufacturer) }}</td>
                                     <td><span v-if="item.good_id!=0">{{getUnit(item.good_id)}}</span></td>
                                     <td>{{item.price}}</td>
                                     <td>{{item.warehousing_count}}</td> 
                                     <td>{{(item.warehousing_count*item.price).toFixed(2)}}</td>
+                                    <td>{{ item.number }}</td>
+                                    <td>{{ item.product_date | parseTime("{y}-{m}-{d}") }}</td>
+                                    <td>{{ item.expiry_date | parseTime("{y}-{m}-{d}") }}</td>
+                                    <td></td>
+                                    <td></td>
                                 </tr>
                                 <tr>
                                   <td>合计</td>
-                                  <td colspan="4"></td>
+                                  <td colspan="11"></td>
                                   <td>{{allPrice.toFixed(2)}}</td>
                                </tr>
                             </tbody>
@@ -229,6 +243,15 @@ export default {
         }
         return ""
       },
+      getManufacturer(id){
+        let name = ''
+        this.manufacturer.map(item => {
+          if(item.id == id){
+            name = item.manufacturer_name
+          }
+        })
+        return name
+      }
     },
     created(){
 

src/xt_pages/user/dialysisSolution.vue

@@ -389,8 +389,8 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="isShows('电导度')">
-            <el-form-item label="电导度（mS/cm）: " prop="conductivity">
+          <el-col :span="8" v-if="isShows('电导率')">
+            <el-form-item label="电导率（mS/cm）: " prop="conductivity">
               <el-input v-model="addPlan.conductivity"></el-input>
             </el-form-item>
           </el-col>

src/xt_pages/user/patients.vue

@@ -846,7 +846,7 @@
 
       },
       handleSuccess({ results, header }) {
-        console.log("header22222",results)
+       
         if (header != undefined && header.length > 0) {
           var isHasName = header.includes('*姓名')
           var isHasGender = header.includes('*性别')

src/xt_pages/user/scheduling.vue

@@ -29,6 +29,22 @@
             }})
           </template>
         </el-table-column>
+        <el-table-column
+          prop="schedule_type"
+          label="星期"
+          align="center"
+          min-width="60"
+        >
+          <template slot-scope="scope">
+             <span v-if="scope.row.schedule_week == 0">星期日</span>
+             <span v-if="scope.row.schedule_week == 1">星期一</span>
+             <span v-if="scope.row.schedule_week == 2">星期二</span>
+             <span v-if="scope.row.schedule_week == 3">星期三</span>
+             <span v-if="scope.row.schedule_week == 4">星期四</span>
+             <span v-if="scope.row.schedule_week == 5">星期五</span>
+             <span v-if="scope.row.schedule_week == 6">星期六</span>
+          </template>
+        </el-table-column>
         <el-table-column
           prop="schedule_type"
           label="班次"
@@ -115,6 +131,7 @@ export default {
       GetPatientSchedules(id).then(response => {
         if (response.data.state == 1) {
           this.schedules = response.data.data.schedules;
+          
         }
       });
     },

src/xt_pages/workforce/appointment.vue

@@ -529,11 +529,15 @@
           }
           
           if(this.export_type == 1){
-            console.log("333333",this.newDay)
-             const multiHeader = [['区号', '机号', '周一'+"("+this.newDay[0]+")" , '', '', '周二'+"("+this.newDay[1]+")", '', '', '周三'+"("+this.newDay[2]+")" , '', '', '周四'+"("+this.newDay[3]+")" , '', '', '周五'+"("+this.newDay[4]+")" , '', '', '周六'+"("+this.newDay[5]+")" , '', '', '周日'+"("+this.newDay[6]+")" , '', '', '周一'+"("+this.days[7]+")" , '', '', '周二'+"("+this.days[8]+")" , '', '', '周三'+"("+this.days[9]+")" , '', '', '周四'+"("+this.days[10]+")" , '', '', '周五'+"("+this.days[11]+")" , '', '', '周六'+"("+this.days[12]+")" , '', '', '周日'+"("+this.days[13]+")", '', '', '周一'+"("+this.days[14]+")", '', '', '周二'+"("+this.days[15]+")", '', '', '周三'+"("+this.days[16]+")", '', '', '周四'+"("+this.days[17]+")", '', '', '周五'+"("+this.days[18]+")", '', '', '周六'+"("+this.days[19]+")", '', '', '周日'+"("+this.days[20]+")", '', '']]
-             const header = ['', '', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上']
+
+            console.log("44444444",this.tableList)
+            //  const multiHeader = [['区号', '机号', '周一'+"("+this.newDay[0]+")" , '', '', '周二'+"("+this.newDay[1]+")", '', '', '周三'+"("+this.newDay[2]+")" , '', '', '周四'+"("+this.newDay[3]+")" , '', '', '周五'+"("+this.newDay[4]+")" , '', '', '周六'+"("+this.newDay[5]+")" , '', '', '周日'+"("+this.newDay[6]+")" , '', '', '周一'+"("+this.days[7]+")" , '', '', '周二'+"("+this.days[8]+")" , '', '', '周三'+"("+this.days[9]+")" , '', '', '周四'+"("+this.days[10]+")" , '', '', '周五'+"("+this.days[11]+")" , '', '', '周六'+"("+this.days[12]+")" , '', '', '周日'+"("+this.days[13]+")", '', '', '周一'+"("+this.days[14]+")", '', '', '周二'+"("+this.days[15]+")", '', '', '周三'+"("+this.days[16]+")", '', '', '周四'+"("+this.days[17]+")", '', '', '周五'+"("+this.days[18]+")", '', '', '周六'+"("+this.days[19]+")", '', '', '周日'+"("+this.days[20]+")", '', '']]
+            //  const header = ['', '', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上']
+            //  const merges = ['A1:A2', 'B1:B2', 'C1:E1', 'F1:H1', 'I1:K1', 'L1:N1', 'O1:Q1', 'R1:T1', 'U1:W1', 'X1:Z1', 'AA1:AC1', 'AD1:AF1', 'AG1:AI1', 'AJ1:AL1', 'AM1:AO1', 'AP1:AR1', 'AS1:AU1', 'AV1:AX1', 'AY1:BA1', 'BB1:BD1', 'BE1:BG1', 'BH1:BJ1', 'BK1:BM1']
+            const multiHeader = [['区号', '机号', '周一'+"("+this.newDay[0]+")" , '', '', '周二'+"("+this.newDay[1]+")", '', '', '周三'+"("+this.newDay[2]+")" , '', '', '周四'+"("+this.newDay[3]+")" , '', '', '周五'+"("+this.newDay[4]+")" , '', '', '周六'+"("+this.newDay[5]+")" , '', '', '周日'+"("+this.newDay[6]+")" , '', '']]
+             const header = ['', '', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上']
              const merges = ['A1:A2', 'B1:B2', 'C1:E1', 'F1:H1', 'I1:K1', 'L1:N1', 'O1:Q1', 'R1:T1', 'U1:W1', 'X1:Z1', 'AA1:AC1', 'AD1:AF1', 'AG1:AI1', 'AJ1:AL1', 'AM1:AO1', 'AP1:AR1', 'AS1:AU1', 'AV1:AX1', 'AY1:BA1', 'BB1:BD1', 'BE1:BG1', 'BH1:BJ1', 'BK1:BM1']
-            var list = []
+           var list = []
             let i = 0
             for (let key  in this.partitions) {
               var tempValue
@@ -664,7 +668,8 @@
         for (let key in results[0]) {
           headers.push(key)
         }
-        if (results.length > 0) {
+        if (header.length == 65) {
+          console.log("进来了吗")
           var isHas_1 = headers.includes('区号')
           console.log("1"+isHas_1)
           var isHas_2 = headers.includes('机号')
@@ -889,9 +894,93 @@
             this.dialogVisible = true
             return
           }
-        } else {
+        }else if(header.length == 23){
+            var isHas_1 = headers.includes('区号')
+          console.log("1"+isHas_1)
+          var isHas_2 = headers.includes('机号')
+          console.log("2"+isHas_2)
+
+
+          var isHas_3 = headers.includes('周一'+"("+this.days[0]+")")
+          console.log("3"+isHas_3)
+
+
+          var isHas_4 = headers.includes('')
+          console.log("4"+isHas_4)
+
+
+          var isHas_5 = headers.includes('_1')
+          console.log("5"+isHas_5)
+
+          var isHas_6 = headers.includes('周二'+"("+this.days[1]+")")
+          console.log("6"+isHas_6)
+
+          var isHas_7 = headers.includes('_2')
+          console.log("7"+isHas_7)
+
+          var isHas_8 = headers.includes('_3')
+          console.log("8"+isHas_8)
+
+          var isHas_9 = headers.includes('周三'+"("+this.days[2]+")")
+          console.log("9"+isHas_9)
+
+          var isHas_10 = headers.includes('_4')
+          console.log("10"+isHas_10)
+
+          var isHas_11 = headers.includes('_5')
+          console.log("11"+isHas_11)
+
+          var isHas_12 = headers.includes('周四'+"("+this.days[3]+")")
+          console.log("12"+isHas_12)
+
+          var isHas_13 = headers.includes('_6')
+          console.log("13"+isHas_13)
+
+          var isHas_14 = headers.includes('_7')
+          console.log("14"+isHas_14)
+
+          var isHas_15 = headers.includes('周五'+"("+this.days[4]+")")
+          console.log("15"+isHas_15)
+
+          var isHas_16 = headers.includes('_8')
+          console.log("16"+isHas_16)
+
+
+          var isHas_17 = headers.includes('_9')
+          console.log("17"+isHas_17)
+
+
+          var isHas_18 = headers.includes('周六'+"("+this.days[5]+")")
+          console.log("18"+isHas_18)
+
+
+          var isHas_19 = headers.includes('_10')
+          console.log("19"+isHas_19)
+
+
+          var isHas_20 = headers.includes('_11')
+          console.log("20"+isHas_20)
+
+
+          var isHas_21 = headers.includes('周日'+"("+this.days[6]+")")
+          console.log("21"+isHas_21)
 
+          var isHas_22 = headers.includes('_12')
+          console.log("22"+isHas_22)
 
+          var isHas_23 = headers.includes('_13')
+          console.log("23"+isHas_23)
+         
+         if (!(isHas_1 && isHas_2 && isHas_3 && isHas_4 && isHas_5 &&
+            isHas_6 && isHas_7 && isHas_8 && isHas_9 && isHas_10 &&
+            isHas_11 && isHas_12 && isHas_13 && isHas_14 && isHas_15 &&
+            isHas_16 && isHas_17 && isHas_18 && isHas_19 && isHas_20 &&
+            isHas_21)) {
+            this.dialogVisible = true
+            return
+          }
+
+        } else {
 
           this.dialogVisible = true
           return
@@ -2071,97 +2160,128 @@
                 
                   obj['区号'] = partitions[key].name
                   obj['机号'] = jihaos[b].number.toString()
+                
+                if(this.export_type == 0){
+                    obj['shangwu'] = ''
+                    obj['xiawu'] = ''
+                    obj['wanshang'] = ''
 
+                    obj['shangwu1'] = ''
+                    obj['xiawu1'] = ''
+                    obj['wanshang1'] = ''
 
-                  obj['shangwu'] = ''
-                  obj['xiawu'] = ''
-                  obj['wanshang'] = ''
+                    obj['shangwu2'] = ''
+                    obj['xiawu2'] = ''
+                    obj['wanshang2'] = ''
 
-                  obj['shangwu1'] = ''
-                  obj['xiawu1'] = ''
-                  obj['wanshang1'] = ''
+                    obj['shangwu3'] = ''
+                    obj['xiawu3'] = ''
+                    obj['wanshang3'] = ''
 
-                  obj['shangwu2'] = ''
-                  obj['xiawu2'] = ''
-                  obj['wanshang2'] = ''
+                    obj['shangwu4'] = ''
+                    obj['xiawu4'] = ''
+                    obj['wanshang4'] = ''
 
-                  obj['shangwu3'] = ''
-                  obj['xiawu3'] = ''
-                  obj['wanshang3'] = ''
 
-                  obj['shangwu4'] = ''
-                  obj['xiawu4'] = ''
-                  obj['wanshang4'] = ''
+                    obj['shangwu5'] = ''
+                    obj['xiawu5'] = ''
+                    obj['wanshang5'] = ''
 
+                    obj['shangwu6'] = ''
+                    obj['xiawu6'] = ''
+                    obj['wanshang6'] = ''
 
-                  obj['shangwu5'] = ''
-                  obj['xiawu5'] = ''
-                  obj['wanshang5'] = ''
+                    obj['shangwu7'] = ''
+                    obj['xiawu7'] = ''
+                    obj['wanshang7'] = ''
 
-                  obj['shangwu6'] = ''
-                  obj['xiawu6'] = ''
-                  obj['wanshang6'] = ''
+                    obj['shangwu8'] = ''
+                    obj['xiawu8'] = ''
+                    obj['wanshang8'] = ''
 
-                  obj['shangwu7'] = ''
-                  obj['xiawu7'] = ''
-                  obj['wanshang7'] = ''
+                    obj['shangwu9'] = ''
+                    obj['xiawu9'] = ''
+                    obj['wanshang9'] = ''
 
-                  obj['shangwu8'] = ''
-                  obj['xiawu8'] = ''
-                  obj['wanshang8'] = ''
+                    obj['shangwu10'] = ''
+                    obj['xiawu10'] = ''
+                    obj['wanshang10'] = ''
 
-                  obj['shangwu9'] = ''
-                  obj['xiawu9'] = ''
-                  obj['wanshang9'] = ''
+                    obj['shangwu11'] = ''
+                    obj['xiawu11'] = ''
+                    obj['wanshang11'] = ''
 
-                  obj['shangwu10'] = ''
-                  obj['xiawu10'] = ''
-                  obj['wanshang10'] = ''
 
-                  obj['shangwu11'] = ''
-                  obj['xiawu11'] = ''
-                  obj['wanshang11'] = ''
+                    obj['shangwu12'] = ''
+                    obj['xiawu12'] = ''
+                    obj['wanshang12'] = ''
 
+                    obj['shangwu13'] = ''
+                    obj['xiawu13'] = ''
+                    obj['wanshang13'] = ''
 
-                  obj['shangwu12'] = ''
-                  obj['xiawu12'] = ''
-                  obj['wanshang12'] = ''
 
-                  obj['shangwu13'] = ''
-                  obj['xiawu13'] = ''
-                  obj['wanshang13'] = ''
+                    obj['shangwu14'] = ''
+                    obj['xiawu14'] = ''
+                    obj['wanshang14'] = ''
 
 
-                  obj['shangwu14'] = ''
-                  obj['xiawu14'] = ''
-                  obj['wanshang14'] = ''
+                    obj['shangwu15'] = ''
+                    obj['xiawu15'] = ''
+                    obj['wanshang15'] = ''
 
+                    obj['shangwu16'] = ''
+                    obj['xiawu16'] = ''
+                    obj['wanshang16'] = ''
 
-                  obj['shangwu15'] = ''
-                  obj['xiawu15'] = ''
-                  obj['wanshang15'] = ''
+                    obj['shangwu17'] = ''
+                    obj['xiawu17'] = ''
+                    obj['wanshang17'] = ''
 
-                  obj['shangwu16'] = ''
-                  obj['xiawu16'] = ''
-                  obj['wanshang16'] = ''
+                    obj['shangwu18'] = ''
+                    obj['xiawu18'] = ''
+                    obj['wanshang18'] = ''
 
-                  obj['shangwu17'] = ''
-                  obj['xiawu17'] = ''
-                  obj['wanshang17'] = ''
+                    obj['shangwu19'] = ''
+                    obj['xiawu19'] = ''
+                    obj['wanshang19'] = ''
 
-                  obj['shangwu18'] = ''
-                  obj['xiawu18'] = ''
-                  obj['wanshang18'] = ''
 
-                  obj['shangwu19'] = ''
-                  obj['xiawu19'] = ''
-                  obj['wanshang19'] = ''
+                    obj['shangwu20'] = ''
+                    obj['xiawu20'] = ''
+                    obj['wanshang20'] = ''
+                }
+                
+                 if(this.export_type == 1){
+                    obj['shangwu'] = ''
+                    obj['xiawu'] = ''
+                    obj['wanshang'] = ''
 
+                    obj['shangwu1'] = ''
+                    obj['xiawu1'] = ''
+                    obj['wanshang1'] = ''
 
-                  obj['shangwu20'] = ''
-                  obj['xiawu20'] = ''
-                  obj['wanshang20'] = ''
+                    obj['shangwu2'] = ''
+                    obj['xiawu2'] = ''
+                    obj['wanshang2'] = ''
 
+                    obj['shangwu3'] = ''
+                    obj['xiawu3'] = ''
+                    obj['wanshang3'] = ''
+
+                    obj['shangwu4'] = ''
+                    obj['xiawu4'] = ''
+                    obj['wanshang4'] = ''
+
+
+                    obj['shangwu5'] = ''
+                    obj['xiawu5'] = ''
+                    obj['wanshang5'] = ''
+
+                    obj['shangwu6'] = ''
+                    obj['xiawu6'] = ''
+                    obj['wanshang6'] = ''
+                 }
                   list.push(obj)
 
                 }