费用管理 - 签约

src/assets/js/common.js

@@ -31,6 +31,65 @@ export function dateFormat(dateValue,fmt){
   return fmt;
 }
 
+/*测试*/
+export function orderTime() {
+  const dateTime = new Date()
+  let year = dateTime.getFullYear()
+  let month = dateTime.getMonth() + 1
+  let date = dateTime.getDate()
+  let hour = dateTime.getHours()
+  let minute = dateTime.getMinutes()
+  let second = dateTime.getSeconds()
+	
+  return year.toString() + month.toString() + date.toString()+hour.toString()+minute.toString()+second.toString()
+}
+
+/*测试*/
+export function todayTime() {
+  const dateTime = new Date()
+  const year = dateTime.getFullYear()
+  const month = dateTime.getMonth() + 1
+  const date = dateTime.getDate()
+  return year + '-' + month + '-' + date
+}
+
+
+/*测试*/
+export function todayTime2() {
+  const dateTime = new Date()
+  let year = dateTime.getFullYear()
+  let month = dateTime.getMonth() + 1
+  let date = dateTime.getDate()
+  let hour = dateTime.getHours()
+  let minute = dateTime.getMinutes()
+  let second = dateTime.getSeconds()
+  return year + '-' + month + '-' + date + ' '+hour+':'+minute+':'+second
+}
+
+/*测试*/
+export function famartTime(value) {
+  const dateTime = new Date(value)
+  const year = dateTime.getFullYear()
+  let month = dateTime.getMonth() + 1
+  let date = dateTime.getDate()
+  let hour = dateTime.getHours()
+  let minute = dateTime.getMinutes()
+  let second = dateTime.getSeconds()
+
+  month = month < 10 ? '0' + month : month.toString()
+  date = date < 10 ? '0' + date : date.toString()
+  return year + '-' + month + '-' + date
+}
+
+/*测试*/
+export function famartTime2(value) {
+  let dateTime = new Date(value)
+  let year = dateTime.getFullYear()
+  let month = dateTime.getMonth() + 1
+  month = month < 10 ? '0' + month : month.toString()
+  return year + month
+}
+
 /**
  * 检查传来的参数是否为空
  * @param val
@@ -48,6 +107,7 @@ export function checkIsNull(val) {
  * @param {string} str
  * @returns {string}
  */
+//小数点取值问题，返回原值
 export function getActiveNum(str) {
 
   //转化float,后面全是四舍五入
@@ -65,6 +125,28 @@ export function getActiveNum(str) {
     } else {
       num = num.toPrecision(3);
     }
-    return Math.abs(num);
+    return num;
   }
 }
+
+//小数点取值问题，返回绝对值
+export function getActiveNumer(str) {
+
+  //转化float,后面全是四舍五入
+  if (checkIsNull(str) || str == "NaN" || str == "Infinity" || str == "-" || isNaN(str)) {
+    return "-";
+  } else {
+    var num = parseFloat(str);
+    if (Math.abs(num) < 0.1) {                 							//处理绝对值小于0.1的
+      num = num.toFixed(2);
+    } else if ((Math.abs(num) >= 0.1) && (Math.abs(num) <= 0.995)) {   //处理绝对值大于等于0.1小于等于0.995的
+      num = num.toPrecision(2);
+    } else if (Math.abs(num) >= 999.5) {									//处理绝对值大于等于999.5的
+      num = num.toFixed(0);
+    } else {
+      num = num.toPrecision(3);
+    }
+    return Math.abs(num);;
+  }
+}
+

src/components/common/sideNavbar/MainSideNavbar.vue

@@ -89,20 +89,23 @@
     text-align: center;
     background:linear-gradient(180deg,rgba(30,36,67,1) 0%,rgba(19,24,44,1) 100%)
   }
-	.feeclass{width: 70px;
+	.feeclass {
+    width: 70px;
     height: 39px;
     padding-top: 0;
     line-height: 39px;
     border-bottom: 1px solid #242c4a;
-    color: #A6AED6;}
+    color: #A6AED6;
+  }
 	
-	.feeactive{width: 70px;
+	.feeactive {
+    width: 70px;
     height: 39px;
     padding-top: 0;
     line-height: 39px;
     border-bottom: 1px solid #242c4a;
     color: #A6AED6;
-	background-color: #2E88FF;
+    background-color: #2E88FF;
     color: #fff;
     background: -webkit-linear-gradient(top,#4CBBFF,#2E88FF);
 	}

src/components/common/sideNavbar/SideNavbarItem.vue

@@ -26,7 +26,11 @@
 
     computed: {
       isActive() {
-        return this.$route.path.indexOf(this.link) !== -1
+        if(this.$route.path==='/gpHome/gpContractExpense' || this.$route.path==='/gpHome/gpVisitExpense' ){
+          return false
+        }else{
+          return this.$route.path.indexOf(this.link) !== -1
+        }
       },
       activeClass() {
         if(this.$route.path==='/gpHome/gpContractExpense' || this.$route.path==='/gpHome/gpVisitExpense' ){

src/views/gp/contract/GpContract.vue

@@ -793,7 +793,7 @@
             ydata01.push(obj2)
 
             let obj3 = {value: 0, val: 0, val2: 0}
-            obj3.value = this.commonJs.getActiveNum(item.GXS_TBL)
+            obj3.value = this.commonJs.getActiveNumer(item.GXS_TBL)
             obj3.val = item.QYRS
             obj3.val2 = item.GXS_TBL
             ydata02.push(obj3)
@@ -801,23 +801,23 @@
             let obj4 = {value: 0, val: 0, val2: 0}
             obj4.value = item.QYRS_TBZ
             obj4.val2 = item.QYRS_TBZ
-            obj4.val = this.commonJs.getActiveNum(item.QYRS_TBL)
+            obj4.val = this.commonJs.getActiveNumer(item.QYRS_TBL)
             ydata03.push(obj4)
 
             let obj5 = {value: 0, val: 0, val2: 0}
-            obj5.value = this.commonJs.getActiveNum(item.QYL)
-            obj5.val = this.commonJs.getActiveNum(item.GXS_TBL)
+            obj5.value = this.commonJs.getActiveNumer(item.QYL)
+            obj5.val = this.commonJs.getActiveNumer(item.GXS_TBL)
             obj5.val2 = item.QYL
             ydata04.push(obj5)
 
             let obj6 = {value: 0, val: 0, val2: 0}
-            obj6.value = this.commonJs.getActiveNum(item.QYL_PLD)
-            obj6.val = this.commonJs.getActiveNum(item.QYL)
+            obj6.value = this.commonJs.getActiveNumer(item.QYL_PLD)
+            obj6.val = this.commonJs.getActiveNumer(item.QYL)
             obj6.val2 = item.QYL_PLD
             ydata05.push(obj6)
 
             let obj7 = {value: 0, val: 0, val2: 0}
-            obj7.value = this.commonJs.getActiveNum(item.QYL_PLD_TBZ)
+            obj7.value = this.commonJs.getActiveNumer(item.QYL_PLD_TBZ)
             obj7.val = 0
             obj7.val2 = item.QYL_PLD_TBZ
             ydata06.push(obj7)
@@ -917,7 +917,6 @@
         this.$router.push('/' + path);
       },
       dataSearch(value) {
-        console.log(famartTime2(value));
         let val = famartTime2(value)
         this.cxsj = val
         this.initHome()

src/views/gp/expense/VisitAnalysis.vue

@@ -67,6 +67,18 @@
           </div>
         </div>
       </div>
+      <!-- 点击问号弹出层 -->
+      <div class="explainbox" v-if="explain">
+        <div class="explainboxtitle"><span>累计就诊人均门诊费用标准</span></div>
+        <div class="explainboxtcontent">
+          <div class="explainboxtcontentleft">
+            <i class="icls"></i>说明
+          </div>
+          <div class="explainboxtcontentright">
+            <span>全年人均累计就诊费用为4839元,4月份 时标为 1613元,计算公式=(4839/12)*4</span>
+          </div>
+        </div>
+      </div>
     </div>
     <div class="div-model fr001">
       <div class="title">
@@ -504,19 +516,6 @@
       <div style="clear: both;"></div>
       <div class="outServicewords">占比 = 当前医院级别累计人均门诊费用(次数)/累计人均门诊总费用(次数)*100%</div>
     </div>
-
-    <!-- 点击问号弹出层 -->
-    <div class="explainbox" v-if="explain">
-      <div class="explainboxtitle"><span>累计就诊人均门诊费用标准</span></div>
-      <div class="explainboxtcontent">
-        <div class="explainboxtcontentleft">
-          <i class="icls"></i>说明
-        </div>
-        <div class="explainboxtcontentright">
-          <span>全年人均累计就诊费用为4839元,4月份 时标为 1613元,计算公式=(4839/12)*4</span>
-        </div>
-      </div>
-    </div>
   </div>
 </template>
 
@@ -1348,7 +1347,7 @@
         let token = localStorage.getItem('token')
         let param = {
           "key": "fygl-jz-mzljfyfx",
-          "tjsj": this.nowdate,
+          "tjsj": this.cxsj,
           "gpgh": this.loginMsg.gpNumber,
           "yljgdm": this.loginMsg.orgCode,
           "parameter": {
@@ -1381,7 +1380,7 @@
         let token = localStorage.getItem('token')
         let param = {
           "key": "fygl-qy-ljrjjzfx",
-          "tjsj": this.nowdate,
+          "tjsj": this.cxsj,
           "gpgh": this.loginMsg.gpNumber,
           "yljgdm": this.loginMsg.orgCode,
           "parameter": {
@@ -1413,7 +1412,7 @@
         let param = {
           "key": "fygl-jz-mz-zy-ljfyfx",
           // "tjsj": "201907",
-          "tjsj": this.nowdate,
+          "tjsj": this.cxsj,
           "gpgh": this.loginMsg.gpNumber,
           "yljgdm": this.loginMsg.orgCode,
           "parameter": {
@@ -1446,7 +1445,7 @@
         let param = {
           "key": "fygl-qy-mzfyqx",
           // "tjsj": "201907",
-          "tjsj": this.nowdate,
+          "tjsj": this.cxsj,
           "gpgh": this.loginMsg.gpNumber,
           "yljgdm": this.loginMsg.orgCode,
           "parameter": {
@@ -1472,7 +1471,7 @@
         let param = {
           "key": "fygl-jz-mz-jgrj",
           // "tjsj": "201907",
-          "tjsj": this.nowdate,
+          "tjsj": this.cxsj,
           "gpgh": this.loginMsg.gpNumber,
           "yljgdm": this.loginMsg.orgCode,
           "parameter": {
@@ -1583,7 +1582,7 @@
         let param = {
           "key": "fygl-jz-mz-jgyc",
           // "tjsj": "201907",
-          "tjsj": this.nowdate,
+          "tjsj": this.cxsj,
           "gpgh": this.loginMsg.gpNumber,
           "yljgdm": this.loginMsg.orgCode,
           "parameter": {
@@ -1616,7 +1615,7 @@
         let param = {
           "key": "fygl-jz-zy-jgrj",
           // "tjsj": "201907",
-          "tjsj": this.nowdate,
+          "tjsj": this.cxsj,
           "gpgh": this.loginMsg.gpNumber,
           "yljgdm": this.loginMsg.orgCode,
           "parameter": {
@@ -1693,7 +1692,7 @@
         let param = {
           "key": "fygl-jz-zy-jgyc",
           // "tjsj": "201907",
-          "tjsj": this.nowdate,
+          "tjsj": this.cxsj,
           "gpgh": this.loginMsg.gpNumber,
           "yljgdm": this.loginMsg.orgCode,
           "parameter": {
@@ -1718,7 +1717,7 @@
         let param = {
           "key": "fygl-jz-zy-qx",
           // "tjsj": "201907",
-          "tjsj": this.nowdate,
+          "tjsj": this.cxsj,
           "gpgh": this.loginMsg.gpNumber,
           "yljgdm": this.loginMsg.orgCode,
           "parameter": {
@@ -1745,7 +1744,7 @@
         let param = {
           "key": "fygl-qy-ljfy-jg",
           // "tjsj": "201907",
-          "tjsj": this.nowdate,
+          "tjsj": this.cxsj,
           "gpgh": this.loginMsg.gpNumber,
           "yljgdm": this.loginMsg.orgCode,
           "parameter": {
@@ -1845,9 +1844,8 @@
         this.loading = true
       },
       dataSearch(value) {
-        console.log(famartTime2(value));
         let val = famartTime2(value)
-        this.nowdate = val
+        this.cxsj = val
         this.initHome()
         this.initsignup()
         this.initsigndown()
@@ -1972,10 +1970,9 @@
       },
       mounted: function() {
         this.token = localStorage.getItem('token')
-        this.loginMsg = JSON.parse(localStorage.getItem('userinfo'))
+        this.loginMsg = localStorage.getItem('userinfo')
+		
         if (this.loginMsg.roleCode == 'hcms.APP_SQYZ') {
-          // console.log('家医数据信息：')
-          // console.log(this.loginMsg)
           this.loginMsg.gpNumber = localStorage.getItem('ygh')
         }
         this.yname = this.loginMsg.userName
@@ -1983,7 +1980,7 @@
           this.yzback = true
           this.yname = localStorage.getItem('yname')
         }
-        this.nowdate = famartTime2(this.loginMsg.dataTime)
+        this.cxsj = this.loginMsg.dataTime
         this.bigclk = this.$route.query.jz ? true : false;
         this.initHome()
         this.initsignup()
@@ -2308,9 +2305,9 @@
     width: 350px;
     border-radius: 5px;
     z-index: 99;
-    position: fixed;
-    top: 110px;
-    left: 93px;
+    position: relative;
+    top: -150px;
+    left: 1%;
     background: rgba(1, 1, 1, 0.8);
     padding-bottom: 5px;
   }