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

src/components/FinancialModule/ConsolidationOfAccounts/index.vue

@@ -398,8 +398,7 @@
               <el-table-column v-if="msg.IsAirTicketSelect=='1'"
               prop=""
               :label="$t('objFill.caiwubz')"
-              show-overflow-tooltip
-              width="120">
+              width="160">
               <template slot-scope="scope">
                 <div>{{scope.row.Remark}}</div>
                 <template v-if="scope.row.vorcherInos">

src/components/FinancialModule/DataAnalysis/index.vue

@@ -380,6 +380,8 @@ export default {
         this.dateTime = [sDate,eDate]
         this.msg.startDate = sDate
         this.msg.endDate = eDate
+
+        this.msg.LineId =14;
       }else{
         let eDate = moment().subtract(1, 'months').format('YYYY-MM');
         if(this.msg.startDate == this.msg.endDate && this.msg.startDate== eDate){

src/components/administrative/ContractManage.vue

@@ -42,7 +42,6 @@
   .ContractManage .Ec_cha:hover {
     color: red;
   }
-
 </style>
 
 <template>
@@ -51,7 +50,8 @@
       <ul>
         <li>
           <span><em>{{$t('objFill.hetongbh')}}</em>
-            <el-input class="w210" v-model="msg.T_ContractNum" :placeholder="$t('objFill.qingshurhtbh')" @keyup.enter.native="getList">
+            <el-input class="w210" v-model="msg.T_ContractNum" :placeholder="$t('objFill.qingshurhtbh')"
+              @keyup.enter.native="getList">
             </el-input>
           </span>
         </li>
@@ -67,25 +67,29 @@
         </li>
         <li>
           <span><em>{{$t('objFill.jiafangmc')}}</em>
-            <el-input class="w210" v-model="msg.Tourists_Name" :placeholder="$t('rule.EnterCusNameC')" @keyup.enter.native="getList">
+            <el-input class="w210" v-model="msg.Tourists_Name" :placeholder="$t('rule.EnterCusNameC')"
+              @keyup.enter.native="getList">
             </el-input>
           </span>
         </li>
         <li>
           <span><em>{{$t('objFill.kehudianh')}}</em>
-            <el-input class="w210" v-model="msg.Tourists_Tel" :placeholder="$t('objFill.qingsrkhdh')" @keyup.enter.native="getList">
+            <el-input class="w210" v-model="msg.Tourists_Tel" :placeholder="$t('objFill.qingsrkhdh')"
+              @keyup.enter.native="getList">
             </el-input>
           </span>
         </li>
         <li>
           <span><em>{{$t('visa.v_tuanhao')}}</em>
-            <el-input class="w210" v-model="msg.C_TCNUM" :placeholder="$t('visa.v_shurutuanhao')" @keyup.enter.native="getList">
+            <el-input class="w210" v-model="msg.C_TCNUM" :placeholder="$t('visa.v_shurutuanhao')"
+              @keyup.enter.native="getList">
             </el-input>
           </span>
         </li>
         <li>
           <span><em>{{$t('system.query_lineName')}}</em>
-            <el-input class="w210" v-model="msg.C_ProductName" :placeholder="$t('system.ph_lineName')" @keyup.enter.native="getList">
+            <el-input class="w210" v-model="msg.C_ProductName" :placeholder="$t('system.ph_lineName')"
+              @keyup.enter.native="getList">
             </el-input>
           </span>
         </li>
@@ -110,15 +114,15 @@
         </li>
         <li>
           <span><em>{{$t('scen.sc_temID')}}</em>
-            <el-input class="w210" v-model="msg.TCID" :placeholder="$t('objFill.qingsrtdbh')" @keyup.enter.native="getList" clearable
-              @clear="getList">
+            <el-input class="w210" v-model="msg.TCID" :placeholder="$t('objFill.qingsrtdbh')"
+              @keyup.enter.native="getList" clearable @clear="getList">
             </el-input>
           </span>
         </li>
         <li>
           <span><em>{{$t('hotel.order_Number')}}</em>
-            <el-input class="w210" v-model="msg.OrderId" :placeholder="$t('rule.qsrdingdanhao')" @keyup.enter.native="getList" clearable
-              @clear="getList">
+            <el-input class="w210" v-model="msg.OrderId" :placeholder="$t('rule.qsrdingdanhao')"
+              @keyup.enter.native="getList" clearable @clear="getList">
             </el-input>
           </span>
         </li>
@@ -180,7 +184,8 @@
         </td>
         <td>{{ item.T_ContractNum }}</td>
         <td style="text-align:left">
-          <span v-if="item.Tourists_Sign&&item.Tourists_Sign!=''" style="color:green;">【{{$t('objFill.yiqianzi')}}】</span>
+          <span v-if="item.Tourists_Sign&&item.Tourists_Sign!=''"
+            style="color:green;">【{{$t('objFill.yiqianzi')}}】</span>
           <span v-else style="color:red;">【{{$t('objFill.weiqianzi')}}】</span>
           {{ item.Tourists_Name }}
         </td>
@@ -319,25 +324,21 @@
       //提交并盖章
       SubmitContract(item) {
         var that = this;
-        this.Confirm(that.$t('objFill.shifoutjbgzcht'), function () {
-          console.log(res,'----444')
-          this.apipost(
-            "travelcontract_post_UpdateTravelContractStatusService", {
-              ID: item.ID,
-              Status: 1
-            },
+        var tipMsg = that.$t('objFill.shifoutjbgzcht');
+        var postMsg = {
+          ID: item.ID,
+          Status: 1
+        }
+        this.Confirm(tipMsg, function () {
+          that.apipost("travelcontract_post_UpdateTravelContractStatusService", postMsg,
             res => {
-              console.log(res,'----111')
-              if (res.data.resultCode == 1) {
+            if (res.data.resultCode == 1) {
                 that.Success(res.data.message);
                 that.getList();
               } else {
-                console.log('----22')
                 that.Error(res.data.message);
               }
-            },
-            err => { console.log(res,'----333')}
-          );
+            }, null);
         });
       },
       //复制合同
@@ -525,5 +526,4 @@
       }
     }
   };
-
-</script>
+</script>
\ No newline at end of file