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

src/xt_pages/data/components/drugs.vue

@@ -671,20 +671,25 @@
           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("params2222")
+       
         var that = this
         axios.get('http://127.0.0.1:9532/sz/api/drug/get',{ params: params }).then(function(response) {
          if (response.data.state == 0) {
                that.$message.error(response.data.msg)
                return false
             } else {
-              that.$message({ message: '备案成功', type: 'success' })
+              if(response.data.msg != ""){
+                that.$message.success(response.data.msg)
+              }
+              if(response.data.msg == ""){
+               that.$message.success("备案成功")
+              }
               that.getList()
              }
            }).catch(function(error) {

src/xt_pages/outpatientCharges/newStatementPrintTwo.vue

@@ -64,12 +64,12 @@
         this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
 
         const style =
-          '@media print {.statementTitle{font-size: 28px;text-align: center;font-weight: bold;margin-bottom: 10px;}.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 16px;border-color: #000;}}';
+        '@media print {.printTitle{font-size: 20px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;font-size:12px;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;font-size:12px;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;padding: 0 10px;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none;font-size:12px;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;font-size:12px;}.actionBar div{width:150px;}}';
         printJS({
-          printable: "statement-print",
-          type: "html",
-          style: style,
-          scanStyles: false
+            printable: "prescription-print",
+            type: "html",
+            style: style,
+            scanStyles: false
         });
 
         // if (this.org_template_info.template_id == 1) {

src/xt_pages/outpatientCharges/newTreatTemplate/printOne.vue

@@ -1,8 +1,8 @@
 <template>
     <div>
         <div id='prescription-print' class="prescription-print">
-            <div>
-                <div class="printTitle">&nbsp血液透析中心医药费收据及收费项目清单</div>
+            <div v-for='(i,pageIndex) in pageArr.length' :key="pageIndex">
+                <div class="printTitle">血液透析中心医药费收据及收费项目清单</div>
                 <div class="infoMain">
                     <div class="infoP">医院(药店)编号：{{info.org_code}}</div>
                     <div class="infoP">名称：{{info.org_name}}</div>
@@ -51,25 +51,25 @@
                                 <p style="width:50%;">{{info.transBody.akb067?info.transBody.akb067:0}}元</p>
                             </div>
                         </div>
-                        <div style="width:80%;display:flex;height:300px;">
+                        <div style="width:80%;display:flex;max-height:500px;">
 
                             <div style="border-left:1px solid #000;border-right:1px solid #000;width:40%;text-align:center;">
-                                <p v-for="(item,i) in info.name_arr" :key="i" class="chargeP">
+                                <p v-for="(item,i) in info.name_arr.slice(pageIndex * 13,(pageIndex * 13) + pageArr[pageIndex])" :key="i" class="chargeP">
                                     {{item}}</p>
                             </div>
                             <div style="border-right:1px solid #000;width:15%;text-align:center;">
-                                <p v-for="(item,y) in info.spec_arr" :key="y" class="chargeP">
+                                <p v-for="(item,y) in info.spec_arr.slice(pageIndex * 13,(pageIndex * 13) + pageArr[pageIndex])" :key="y" class="chargeP">
                                     {{item}}</p>
                             </div>
                             <div style="border-right:1px solid #000;width:15%;text-align:center;">
-                                <p v-for="(item,z) in info.count_arr" :key="z" class="chargeP">
+                                <p v-for="(item,z) in info.count_arr.slice(pageIndex * 13,(pageIndex * 13) + pageArr[pageIndex])" :key="z" class="chargeP">
                                     {{item}}次</p>
                             </div>
                             <div style="border-right:1px solid #000;width:15%;text-align:center;">
-                                <p v-for="(item,f) in info.price_arr" :key="f" class="chargeP">{{item}}元</p>
+                                <p v-for="(item,f) in info.price_arr.slice(pageIndex * 13,(pageIndex * 13) + pageArr[pageIndex])" :key="f" class="chargeP">{{item}}元</p>
                             </div>
                             <div style="width:15%;text-align:center;">
-                                <p v-for="(item,d) in info.total_arr" :key="d" class="chargeP">{{item}}元</p>
+                                <p v-for="(item,d) in info.total_arr.slice(pageIndex * 13,(pageIndex * 13) + pageArr[pageIndex])" :key="d" class="chargeP">{{item}}元</p>
                             </div>
                         </div>
                     </div>
@@ -114,7 +114,10 @@
         spec_arr: [],
         count_arr: [],
         price_arr: [],
-        total_arr: []
+        total_arr: [],
+
+        page:1,
+        pageArr:[],
 
       }
     },
@@ -230,11 +233,38 @@
         }
 
       },
+      getPage(){
+        this.page = 1
+        this.pageArr = []
+        if(this.info.name_arr.length <= 13){
+            this.page = 1
+            this.pageArr.push(this.info.name_arr.length)
+            console.log('this.pageArr',this.pageArr)
+        }else if(this.info.name_arr.length > 13){
+            this.page = parseInt(this.info.name_arr.length / 13)
+            let num = this.info.name_arr.length % 13
+            for (var i=0;i<this.page;i++){
+                this.pageArr.push(13)
+            }
+            if(num != 0){
+                this.pageArr.push(num)
+            }
+        }
+      }
     },
     created() {
 
 
     },
+    watch:{
+      info: {
+        handler(newVal) {
+            this.getPage()
+        },
+        deep: true,
+        immediate:true
+      }
+    }
 
   }
 </script>

src/xt_pages/qcd/patientComplianceDetails.vue

@@ -103,7 +103,7 @@
                 >
                   <p>{{ item.item_name }}</p>
                    <span v-if="item.range_type == 1 && getvlist(item.inspection_minor)!=0"><span v-if="parseInt(item.min_range)<=getvlist(item.inspection_minor) && getvlist(item.inspection_minor)<=parseInt(item.large_range) "><i class="iconfont icon-gou gou"></i></span></span>
-                   <span v-if="item.range_type == 1 && getvlist(item.inspection_minor)!=0"><span v-if="parseInt(item.min_range)>getvlist(item.inspection_minor) || getvlist(item.inspection_minor)>parseInt(item.large_range)"><i class="iconfont icon-gantanhao gth"></i></span></span> 
+                   <span v-if="item.range_type == 1 && getvlist(item.inspection_minor)!=0"><span v-if="parseInt(item.min_range)>getvlist(item.inspection_minor) || getvlist(item.inspection_minor)>parseInt(item.large_range)"><i class="iconfont icon-gantanhao gth"></i></span></span>
                    <span v-if="item.range_type == 1 && getvlist(item.inspection_minor)==0"></span>
                    <span v-if="item.range_type == 2 && getvlistwo(item.inspection_minor)!=''"><span v-if="getvlistwo(item.inspection_minor)==item.range_value"><i class="iconfont icon-gou gou"></i></span></span>
                    <span v-if="item.range_type == 2 && getvlistwo(item.inspection_minor)!=''"><span v-if="getvlistwo(item.inspection_minor)!=item.range_value"><i class="iconfont icon-gantanhao gth"></i></span></span>
@@ -386,9 +386,9 @@ export default {
                     { offset: 1, color: colorList[index][1] }
                   ]);
                 },
-                lineStyle:{ 
+                lineStyle:{
                   color:'#409eff' //改变折线颜色
-                }, 
+                },
                 barBorderRadius: [5, 5, 0, 0] //柱状角成椭圆形
               },
 
@@ -456,17 +456,17 @@ export default {
          this.listQuery.end_time =""
          this.monthActive = 1
         const startDate = moment().subtract('month', 3).format('YYYY-MM-DD')
-    
+
         this.startime = Date.parse(startDate)/1000
-       
+
         const endDate = moment(new Date()).format('YYYY-MM-DD')
-      
+
         this.endtime = Date.parse(endDate)/1000
-    
+
         this.getlistDetail()
          this.getIdSlist()
       }
-    
+
 
        //近半年
       if(month == 2){
@@ -474,7 +474,7 @@ export default {
         this.listQuery.end_time =""
         this.monthActive = 2
         const startDate = moment().subtract('month', 6).format('YYYY-MM-DD')
-        
+
         this.startime = Date.parse(startDate)/1000
         const endDate = moment(new Date()).format('YYYY-MM-DD')
         this.endtime = Date.parse(endDate)/1000
@@ -507,7 +507,7 @@ export default {
            }
            if(this.normData[i].range_type == 2){
              itemName = this.normData[i].item_name
-           } 
+           }
          }
       }
       this.itemName = itemName
@@ -620,12 +620,12 @@ export default {
             // console.log("list是什么",list)
             for(let i=0;i<list.length;i++){
               if(parseInt(list[i].inspect_value)>= parseInt(list[i].range_min) && parseInt(list[i].inspect_value)<= parseInt(list[i].range_max)){
-                    this.isTrue = 1  
+                    this.isTrue = 1
                }
                if(parseInt(list[i].inspect_value)< parseInt(list[i].range_min) || parseInt(list[i].inspect_value) > parseInt(list[i].range_max)){
                     this.isTrue =0
                }
-               
+
               if(list[i].range_type == 1){
                     this.rangetype = 1
                     this.modesData.xAxis.push(this.getTime(list[i].inspect_date));
@@ -647,7 +647,7 @@ export default {
               }else{
                 this.getArrLength(this.char2.xAxis.data,2)
               }
-       
+
           }
 
        })
@@ -672,7 +672,7 @@ export default {
           var monthEndDate = moment().endOf('month').format('YYYY-MM-DD HH:mm:ss');
           this.endtime =Date.parse(monthEndDate)/1000-1;//s
         }
-     
+
           const params = {
             patientid:this.patientid,
             startime:this.startime,
@@ -685,7 +685,7 @@ export default {
               var list =  response.data.data.list
               for(let i=0;i<list.length;i++){
                 if(parseInt(list[i].inspect_value)>= parseInt(list[i].range_min) && parseInt(list[i].inspect_value)<= parseInt(list[i].range_max)){
-                      this.isTrue = 1  
+                      this.isTrue = 1
                 }
                 if(parseInt(list[i].inspect_value)< parseInt(list[i].range_min) || parseInt(list[i].inspect_value) > parseInt(list[i].range_max)){
                       this.isTrue =0
@@ -704,9 +704,9 @@ export default {
                   this.char2.xAxis.data.push(this.getTime(list[i].inspect_date))
                   this.char2.series[0].name = list[i].range_value
                 }
-                
 
-            
+
+
             }
               this.chart.series[0].data = this.modesData.series
               this.chart.xAxis.data = this.modesData.xAxis
@@ -787,7 +787,7 @@ export default {
              }else{
                itemvalue = 0
              }
-             
+
           }
         }
         return itemvalue
@@ -801,7 +801,7 @@ export default {
               }else{
                 itemvalue = ''
               }
-              
+
             }
         }
         return itemvalue
@@ -810,7 +810,7 @@ export default {
 
    created(){
      this.patientid =  this.$route.query.patientid
-    
+
      this.inspect_date = this.$route.query.date
      //获取指标项
       this.getNormData()

src/xt_pages/role/components/AdminInfoForm.vue

@@ -705,7 +705,11 @@
                 }
                 this.form.user_title = admin.user_title
                 this.form.role = admin.role_ids
+               
                 this.form.department_id = admin.department_id
+                if(admin.department_id == 0){
+                   this.form.department_id = ""
+                }
                 this.form.role_ids = []
                 for (let i = 0; i < this.form.role.split(",").length; i++) {
                   if (this.form.role.split(',')[i].length > 0) {
@@ -734,20 +738,43 @@
                 }
                 this.isSubSuperAdmin = resp.data.isSubSuperAdmin
                 this.org = resp.data.org
+                
+               
                 this.form.sex = admin.sex
+                if(admin.sex == 0){
+                   this.form.sex = ""
+                }
                 this.form.age = admin.age
+                if(admin.age == 0){
+                  this.form.age = ""
+                }
                 this.form.nation = admin.nation
                 this.form.card_type = admin.card_type
+                if(admin.card_type == 0){
+                  this.form.card_type = ""
+                }
                 this.form.id_card = admin.id_card
                 this.form.education = admin.education
+                if(admin.education == 0){
+                  this.form.education = ""
+                }
                 this.form.study_major_name = admin.study_major_name
                 this.form.work_major_name = admin.work_major_name
                 this.form.role_type = admin.role_type
+                if(admin.role_type == 0){
+                  this.form.role_type = ""
+                }
                 this.form.medical_code = admin.medical_code
                 this.form.doctor_code = admin.doctor_code
                 this.form.licensing = admin.licensing
+                if(admin.licensing == 0){
+                  this.form.licensing = ""
+                }
                 this.form.job_number = admin.job_number
                 this.form.prescription_qualification_identification = admin.prescription_qualification_identification
+                if(admin.prescription_qualification_identification == 0){
+                   this.form.prescription_qualification_identification = ""
+                }
                 this.form.identification_outpatients = admin.identification_outpatients
                 this.form.start_time = this.getTime(admin.start_time)
                 this.form.medical_range_code = admin.medical_range_code
@@ -760,7 +787,11 @@
                 this.form.doctor_number = admin.doctor_number
                 this.form.is_active = admin.is_active
                 console.log("2222222",this.form.is_active)
+               
                 this.form.active_status = admin.active_status
+                if(admin.active_status == 0){
+                   this.form.active_status = ""
+                }
               
                 var id = 0
                 for(let i=0;i<this.numberList.length;i++){
@@ -770,7 +801,9 @@
                 }
                 console.log("id2222222",id)
                 this.form.outpatient_illnessCategory = id
-              
+                 if(id == 0){
+                   this.form.outpatient_illnessCategory = ""
+                 }
                 //如果当前用户是超级管理员而且编辑自己的信息
 
                 if(!this.isSubSuperAdmin) {