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

src/App.vue

@@ -173,7 +173,7 @@ export default {
 }
 </script>
 <style>
-  @import "//at.alicdn.com/t/font_635492_3ih8u0oth65.css";
+  @import "//at.alicdn.com/t/font_635492_ocvro9vim9q.css";
   @import "./assets/css/Semibold.css";
   @import "./assets/css/global/config.css";
   @import "./assets/css/fileIcon.css";

src/components/LeaderManagement/leaderReimbursement.vue

@@ -122,9 +122,9 @@
           <span v-else-if="item.PayType === 3">预付</span>
           <span v-else-if="item.PayType === 7">自由活动-无用车</span>
           <span v-else-if="item.PayType === 6">合团公司支付</span>
-          <span v-else-if="item.PayType === 8">酒店接送~免車資</span>
+          <span v-else-if="item.PayType === 8">酒店接送</span>
           <span v-else></span>
-          </br>
+          <br/>
           <span v-show="item.PayType==6">付款团号：{{item.PayTypeTCNUM}}</span>
         </td>
         <td>
@@ -136,7 +136,7 @@
           <span v-else-if="item.HighSpeedPayType === 3">预付</span>
           <span v-else-if="item.HighSpeedPayType ===6">合团公司支付</span>
           <span v-else-if="item.HighSpeedPayType === 7">自由活动-无用车</span>
-          <span v-else-if="item.HighSpeedPayType === 8">酒店接送~免車資</span>
+          <span v-else-if="item.HighSpeedPayType === 8">酒店接送</span>
           <span v-else></span>
           </br>
           <span v-show="item.HighSpeedPayType==6">付款团号：{{item.PayTypeTCNUM}}</span>

src/components/TravelManager/TravelList/todayOrderTotal.vue

@@ -206,7 +206,7 @@
         <th v-if="isEditOrderCreate==1||userId==1" width="130">{{$t('system.table_operation')}}</th>
       </tr>
       <tr>
-        <td v-show="OrderList.length==0" colspan="17" align="center">{{$t('system.content_noData')}}</td>
+        <td v-show="OrderList.length==0"  :colspan="(isEditOrderCreate==1||userId==1)?18:17" align="center">{{$t('system.content_noData')}}</td>
       </tr>
       <tbody v-for="(item,index) in OrderList" :key="index">
         <tr>

src/components/administrative/ElectronicAudit.vue

@@ -283,7 +283,7 @@
             <td>{{ item.CreateTimeStr }}</td>
             <td>
               <el-tooltip class="item" effect="dark" content="审核通过" placement="top-start" v-if="item.Status==1">
-                <el-button type="info" icon="iconfont icon-shenpi" circle @click="SubmitContract(item,2)"></el-button>
+                <el-button type="primary" icon="iconfont icon-shenpi" circle @click="SubmitContract(item,2)"></el-button>
               </el-tooltip>
               <el-tooltip class="item" effect="dark" content="驳回" placement="top-start" v-if="item.Status==1">
                 <el-button type="info" icon="iconfont icon-shenhebohui" circle @click="SubmitContract(item,3)">
@@ -310,13 +310,13 @@
     data() {
       return {
         msgOut: {
-          contractNum: '',
-          productName: '',
-          orderID: '',
-          tcid: '',
-          startDate: '',
-          returnDate: '',
-          auditContract: ''
+          ContractNum: '',
+          ProductName: '',
+          OrderID: '',
+          Tcid: '',
+          StartDate: '',
+          ReturnDate: '',
+          AuditContract: ''
         },
         dataListOut: [],
         loadingOut: false,
@@ -405,14 +405,25 @@
       },
       getListOutTract() {
         this.loadingOut = true;
-        this.apiJavaPost("/api/contract/auditContract", this.msgOut, res => {
+        //travelcontract_post_GetContractPageListService
+        this.apipost("travelcontract_post_GetContractPageListService",this.msgOut,res => {
           this.loadingOut = false;
+          console.log(res,'ressss');
           if (res.data.resultCode === 1) {
-            this.dataListOut = res.data.data;
+            this.dataListOut = res.data.data.pageData;
           } else {
             this.Error(res.data.message);
           }
-        }, null);
+        });
+
+        // this.apiJavaPost("/api/contract/auditContract", this.msgOut, res => {
+        //   this.loadingOut = false;
+        //   if (res.data.resultCode === 1) {
+        //     this.dataListOut = res.data.data;
+        //   } else {
+        //     this.Error(res.data.message);
+        //   }
+        // }, null);
       },
       //审核通过或者驳回
       AuditElec(item, type) {

src/components/index.vue

@@ -186,6 +186,12 @@
                       常用付款对象
                        <i class="iconfont icon-right1"></i>
                     </el-dropdown-item>
+                    <el-dropdown-item class="clearfix _dropdown_other"  @click.native="goUrlContract()">
+                      <i class="iconfont icon-hetong" style="color:#f39c12"></i>
+                      合同管理
+                       <i class="iconfont icon-right1"></i>
+                    </el-dropdown-item>
+
                     <!-- <el-dropdown-item class="clearfix _dropdown_other"  @click.native="settingSys">
                       <i class="iconfont icon-menu-shezhi1" style="color:#2c3e50"></i>
                       设置
@@ -3537,6 +3543,11 @@ export default {
        let eid=this.getLocalStorage().EmployeeId;
         this.$router.push({ path: 'empBankAccount', query: { id: eid,type:10,blank:'y' } });
     },
+    //跳转至合同管理
+    goUrlContract() {
+        this.$router.push({ path: 'ContractManage', query: {blank:'y' } });
+    },
+
     //跳转至个人信息设置
     goUrlPersonal(){
         this.$router.push({ path: 'PersonalInfoSet', query:{} });