Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/Contract/ElectronicContract.vue

@@ -920,7 +920,7 @@
       <div class="EC_div" :class="{'checkedNav':cked==7}">
         <div class="EC_ComTitle">委托授权书</div>
         <template v-for="(item,index) in dataList.guestList">
-          <p class="shouquanNum">{{index+1}}</p>
+          <p class="shouquanNum" >{{index+1}}</p>
           <div class="shouquanDiv">
             <p class="ShouDiv_Title">委托授权书</p>
             <p><span>{{dataList.company}}</span>：</p>
@@ -939,7 +939,7 @@
               联系电话：<span>{{dataList.clientCall}}</span>
             </p>
             <p>受托人承诺：本授权委托书为<span>{{item.surName+''+item.name}}
-                </span（委托人姓名）本人出具，若不属实，因此产生的全部法律责任由受托人承担。受托人代表其他委托人在本合同书上签字，将严格履行受托人的权利和义务，将本合同的全部内容逐一向我代表的每一位委托人转达。>
+                </span>（委托人姓名）本人出具，若不属实，因此产生的全部法律责任由受托人承担。受托人代表其他委托人在本合同书上签字，将严格履行受托人的权利和义务，将本合同的全部内容逐一向我代表的每一位委托人转达。>
             </p>
             <p style="text-align:right;margin:20px 40px 20px 0">委托日期：<span>{{getDate(dataList.payDate)}}</span></p>
           </div>
@@ -1192,7 +1192,7 @@
       return {
         //选中切换
         cked: 1,
-        //查询参数  
+        //查询参数
         msg: {
           TCID: 0,
           orderID: 0
@@ -1209,7 +1209,7 @@
       // 生成二维码
       GetQrCode: function () {
         let urlObj = this.domainManager();
-        
+
         let msg = {
           TCID: this.$route.query.TCID,
           orderID: this.$route.query.orderID,

src/components/FinancialModule/Kingdee/SubjectContrast.vue

@@ -6,12 +6,12 @@
       cursor: pointer;
       font-size: 14px;
     }
-  
+
     .suject-title-box span.active {
       color: #E95252;
       border-bottom: 2px solid #E95252;
     }
-  
+
     ._vMG_edit {
       display: none;
       position: absolute;
@@ -26,32 +26,32 @@
       /* margin: 15px;
       width: calc(100% - 30px); */
     }
-  
+
     ._vMG_edit ._tit {
       padding-left: 10px;
       border-left: 3px solid #E95252;
       font-size: 16px;
       color: #000000
     }
-  
+
     ._vMG_edit ._tit span {
       color: #666666;
       font-size: 14px
     }
-  
+
     ._edHeight {
       height: 400px;
     }
-  
+
     .edHeight {
       display: block !important;
       min-height: 230px;
     }
-  
+
     ._add_saveBtn {
       text-align: right;
     }
-  
+
   </style>
   <template>
     <div class="dianshangannualRatio" ref="barparent">
@@ -68,13 +68,13 @@
           <li class="hight_query">
               <button class="hollowFixedBtn" @click="title='关联',outerVisible=true,clickDaoRu(11)">关联导入</button>
               <button class="normalBtn">
-                <template v-slot:default>
+                <template>
                   <a style="color:#fff;width:84px;" :href="downList">导入模板下载</a>
               </template>
               </button>
           </li>
       </ul>
-        
+
       </div>
       <div class="cm_content _scrollbar"
         style="position: absolute;top:63px;bottom: 20px;left: 19px;right:19px;overflow-y: scroll;">
@@ -127,7 +127,7 @@
           </el-row>
         </el-form>
       </div>
-  
+
     </div>
   </template>
   <script>
@@ -221,7 +221,7 @@
         this.GetKingdeeSubjectList()
       },
       mounted() {
-  
+
       },
       methods: {
         Financial_post_GetEduBranchEnumList() {
@@ -325,7 +325,7 @@
           let userInfo = this.getLocalStorage();
           this.importFileUrl2 = this.domainManager().UploadFileUrl +
               `?cmd=dmc_post_LocalFileUpload&KingdeeBId=0&Type=${type}&fileType=1&fileLimit=10&EmployeeId=${userInfo.EmployeeId}&RB_Group_id=${userInfo.RB_Group_id}`;
-          
+
         },
         beforeAvatarUpload(file) {
           return;
@@ -343,7 +343,7 @@
             cancelButtonText: '取消',
             type: 'warning'
             }).then(() => {
-                
+
             }).catch(() => {
 
             });
@@ -364,7 +364,7 @@
         },
       },
     }
-  
+
   </script>
   <style scoped>
     .dianshangannualRatio .el-card__header {
@@ -376,7 +376,6 @@
     padding: 18px 20px;
   }
 
-  
+
 
   </style>
-  
\ No newline at end of file

src/components/Hotel/reservation/HotelOrderList.vue

@@ -3,31 +3,31 @@
     .el-table th.is-leaf {
       background-color: #EAEAEA !important;
     }
-  
+
     .HotelWorkList .HW_hotelDialog {
       width: 900px;
     }
-  
+
     .HotelWorkList .Hw_tableOne {
       width: 100%;
       height: 40px;
       background-color: #EAEAEA;
     }
-  
+
     .HotelWorkList .Hw_tableOne th {
       text-align: center;
     }
-  
+
     .HotelWorkList .HotelWorkInput .el-input {
       width: 223px;
     }
-  
+
     .HotelWorkList .HworkInput .el-input {
       width: 110px;
     }
-  
+
   </style>
-  
+
   <template>
     <div class="HotelWorkList">
         <div class="query-box HotelWorkInput" style="border-bottom: none;">
@@ -109,7 +109,7 @@
             <OrderList :OrderList="OrderList" v-loading="loading" @success="GetList"> </OrderList>
             <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
             </el-pagination>
-            
+
         </template>
     </div>
   </template>
@@ -163,14 +163,14 @@
           Datelist:''
         };
       },
-  
+
       methods: {
         getDates(){
           console.log(this.Datelist)
           if(this.Datelist[0]){
             this.msg.StartTime = this.Datelist[0]
           }if(this.Datelist[1]){
-            this.msg.EndTime = this.Datelist[1] 
+            this.msg.EndTime = this.Datelist[1]
           }
         },
         setEdate() {
@@ -197,34 +197,34 @@
                 err => {}
             );
         },
-        getyMDOne(){ 
+        getyMDOne(){
           let myDate = new Date()
-          let myYear = myDate.getFullYear();//获取完整的年份(4位,1970-????) 
-          let myMonth = myDate.getMonth()+ 1;//获取当前月份(0-11,8代表1月) 
-          let myToday = myDate.getDate(); //获取当前日(1-31) 
-          myMonth = myMonth > 9 ? myMonth : '0'+ myMonth 
-          myToday = myToday > 9 ? myToday : '0'+ myToday 
+          let myYear = myDate.getFullYear();//获取完整的年份(4位,1970-????)
+          let myMonth = myDate.getMonth()+ 1;//获取当前月份(0-11,8代表1月)
+          let myToday = myDate.getDate(); //获取当前日(1-31)
+          myMonth = myMonth > 9 ? myMonth : '0'+ myMonth
+          myToday = myToday > 9 ? myToday : '0'+ myToday
           let nowDate = myYear +'-'+ myMonth +'-01'
           return nowDate
         },
-        getyMDTwo(){ 
+        getyMDTwo(){
           let myDate = new Date()
-          let myYear = myDate.getFullYear();//获取完整的年份(4位,1970-????) 
-          let myMonth = myDate.getMonth()+ 1;//获取当前月份(0-11,8代表1月) 
-          let myToday = myDate.getDate(); //获取当前日(1-31) 
-          myMonth = myMonth > 9 ? myMonth : '0'+ myMonth 
-          myToday = myToday > 9 ? myToday : '0'+ myToday 
+          let myYear = myDate.getFullYear();//获取完整的年份(4位,1970-????)
+          let myMonth = myDate.getMonth()+ 1;//获取当前月份(0-11,8代表1月)
+          let myToday = myDate.getDate(); //获取当前日(1-31)
+          myMonth = myMonth > 9 ? myMonth : '0'+ myMonth
+          myToday = myToday > 9 ? myToday : '0'+ myToday
           let nowDate = myYear +'-'+ myMonth +'-'+ myToday
           return nowDate
         },
         //获取酒店订单列表
         GetList() {
-          if(this.msg.StartTime==''){
-            this.msg.StartTime = this.getyMDOne()
-          }
-          if(this.msg.EndTime==''){
-            this.msg.EndTime = this.getyMDTwo()
-          }
+          // if(this.msg.StartTime==''){
+          //   this.msg.StartTime = this.getyMDOne()
+          // }
+          // if(this.msg.EndTime==''){
+          //   this.msg.EndTime = this.getyMDTwo()
+          // }
           this.loading = true
           this.apipost(
             "dict_post_GetAdminCustomerOrderPageList", this.msg,
@@ -252,7 +252,7 @@
                     x.Money = x.HotelMoeny+x.TaxesPrice
                   })
                 })
-                
+
                 this.OrderList = data;
                 this.OrderList.forEach(item=>{
                   let datas = {
@@ -293,8 +293,8 @@
         this.Datelist = this.getyMDOne()
         this.userInfo = this.getLocalStorage();
         this.GetList();
-        
-  
+
+
         this.initHotels();//酒店名称下拉
         //自适应高度调节
         this.com_onresize();
@@ -303,10 +303,9 @@
         }
       },
     };
-  
+
   </script>
-  
+
   <style>
-  
+
   </style>
-  
\ No newline at end of file