Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

src/xt_pages/upload/config/Province.vue

@@ -6,7 +6,7 @@
           <!--<div>质控平台的上报对接，是为了解决手工录入的效率和易出错的问题，对接涉及各种技术，请勿随意配置，联系酷医云客服协助处理。</div>-->
           <div class="titleOne">
             质控平台的上报对接，是为了解决手工录入的效率和易出错的问题，对接涉及各种技术，请勿随意配置，联系酷医云客服协助处理。<br />&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;微信:kuyicloud
-            电话：18682074632
+            电话：18682078150
           </div>
         </el-col>
       </el-row>

src/xt_pages/upload/fast/FastCity.vue

@@ -7,9 +7,9 @@
       >
       <div style="text-align: center">
         <p>您选择的区域酷医云暂未对接，请联系酷医云客服，我们将免费为您实现对接</p>
-        <img style="width: 150px;height: 150px" src="../../../assets/home/wechat_qrcode.png"/>
+        <img style="width: 150px;height: 150px" src="../../../assets/home/kuyi_wechat.jpg"/>
         <p>服务热线</p>
-        <p style="font-size: 16px">18682074632</p>
+        <p style="font-size: 16px">18682078150</p>
       </div>
 
       <span slot="footer" class="dialog-footer">

src/xt_pages/upload/fast/FastProvince.vue

@@ -9,7 +9,7 @@
         <p>您选择的区域酷医云暂未对接，请联系酷医云客服，我们将免费为您实现对接</p>
         <img style="width: 150px;height: 150px" src="../../../assets/home/kuyi_wechat.jpg"/>
         <p>服务热线</p>
-        <p style="font-size: 16px">18682074632</p>
+        <p style="font-size: 16px">18682078150</p>
       </div>
 
 

src/xt_pages/upload/fast/Two.vue

@@ -603,13 +603,13 @@
         radio:'',
 
 
-        xcg_date:'',
-        gkwz_date:'',
-        tdx_date:'',
-        shjc_date:'',
-        yyyyz_date:'',
-        crbxzb_date:'',
-        jh_date:'',
+        xcg_date:[],
+        gkwz_date:[],
+        tdx_date:[],
+        shjc_date:[],
+        yyyyz_date:[],
+        crbxzb_date:[],
+        jh_date:[],
 
 
 
@@ -690,6 +690,16 @@
       }
     },
     created() {
+      var start_time = new Date(this.getQuarterStartDate().replace(/-/g, '/')).getTime()
+      var end_time = new Date(this.getQuarterEndDate().replace(/-/g, '/')).getTime()
+      this.xcg_date.push(start_time,end_time)
+      this.gkwz_date.push(start_time,end_time)
+      this.tdx_date.push(start_time,end_time)
+      this.shjc_date.push(start_time,end_time)
+      this.yyyyz_date.push(start_time,end_time)
+      this.crbxzb_date.push(start_time,end_time)
+      this.jh_date.push(start_time,end_time)
+
     },
     methods: {
       GetInitInspections(){
@@ -716,6 +726,7 @@
         return uParseTime(val, '{y}年{m}月{d}日')
       }, GetUploadInspections(id,start_time,end_time,type,project) {
         this.patient_id = id
+
         let params = {
           patient: id,
           project_id: project,
@@ -967,6 +978,59 @@
 
 
 
+      }, getQuarterStartDate: function() {
+        var now = new Date() //当前日期
+        var nowYear = now.getFullYear() //当前年
+        nowYear += (nowYear < 2000) ? 1900 : 0
+
+        var quarterStartDate = new Date(nowYear, this.getQuarterStartMonth(), 1)
+        return this.formatDate(quarterStartDate)
+      }, getQuarterEndDate: function() {
+        var now = new Date() //当前日期
+        var nowYear = now.getFullYear() //当前年
+        nowYear += (nowYear < 2000) ? 1900 : 0
+        var quarterEndMonth = this.getQuarterStartMonth() + 2
+        var quarterStartDate = new Date(nowYear, quarterEndMonth, this.getMonthDays(quarterEndMonth))
+        return this.formatDate(quarterStartDate)
+      }, formatDate: function(date) {
+        var myyear = date.getFullYear()
+        var mymonth = date.getMonth() + 1
+        var myweekday = date.getDate()
+
+        if (mymonth < 10) {
+          mymonth = '0' + mymonth
+        }
+        if (myweekday < 10) {
+          myweekday = '0' + myweekday
+        }
+        return (myyear + '-' + mymonth + '-' + myweekday)
+      }, getQuarterStartMonth: function() {
+        var now = new Date() //当前日期
+        var nowMonth = now.getMonth() //当前月
+
+        var quarterStartMonth = 0
+        if (nowMonth < 3) {
+          quarterStartMonth = 0
+        }
+        if (2 < nowMonth && nowMonth < 6) {
+          quarterStartMonth = 3
+        }
+        if (5 < nowMonth && nowMonth < 9) {
+          quarterStartMonth = 6
+        }
+        if (nowMonth > 8) {
+          quarterStartMonth = 9
+        }
+        return quarterStartMonth
+      },  //获得某月的天数
+      getMonthDays(myMonth) {
+        var now = new Date() //当前日期
+        var nowYear = now.getYear() //当前年
+        nowYear += (nowYear < 2000) ? 1900 : 0
+        var monthStartDate = new Date(nowYear, myMonth, 1)
+        var monthEndDate = new Date(nowYear, myMonth + 1, 1)
+        var days = (monthEndDate - monthStartDate) / (1000 * 60 * 60 * 24)
+        return days
       }
 
     }
@@ -1153,7 +1217,7 @@
     }
     .copy {
       float: left;
-      margin-left: 20px;
+      margin-left: 20px !important;
       margin-top: 6px;
     }
     .copy1 {