页面修改

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -1197,7 +1197,7 @@
             <div class="TC_remarkContent" v-if="item.BranchAuditState>0">
               <div class="clearfix TCL-redType">
                 <div class="TCL_remarkTitle" style="width: auto;">
-                  <span style="color: black;">出团公司</span>
+                  <span style="color: black;">修改出团公司</span>
                   {{item.BranchAuditStateStr}}
                 </div>
                 <div class="TCL_Content" v-if="item.BranchAuditStateStr=='驳回'">

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -883,7 +883,7 @@
             <div class="TC_remarkContent" v-if="item.BranchAuditState>0">
               <div class="clearfix TCL-redType">
                 <div class="TCL_remarkTitle" style="width: auto;">
-                  <span style="color: black;">出团公司</span>
+                  <span style="color: black;">修改出团公司</span>
                   {{item.BranchAuditStateStr}}
                 </div>
                 <div class="TCL_Content" v-if="item.BranchAuditStateStr=='驳回'">

src/components/TravelManager/TravelList/oneDayTrip.vue

@@ -768,7 +768,7 @@
             <div class="TC_remarkContent" v-if="item.BranchAuditState>0">
               <div class="clearfix TCL-redType">
                 <div class="TCL_remarkTitle" style="width: auto;">
-                  <span style="color: black;">出团公司</span>
+                  <span style="color: black;">修改出团公司</span>
                   {{item.BranchAuditStateStr}}
                 </div>
                 <div class="TCL_Content" v-if="item.BranchAuditStateStr=='驳回'">

src/components/dmc/manager/GroupOutCorporationAudit.vue

@@ -58,22 +58,6 @@
         </li>
       </ul>
     </div>
-    <ul class="_nav clearfix" v-if="false">
-      <li :class="active==1?'_active':''" @click="active=1, msg.OutGroupAuditState=1, getControlList()">待审批</li>
-      <li :class="active==2?'_active':''" @click="active=2, msg.OutGroupAuditState=2, getControlList()">已审批</li>
-      <div style="float: right;" v-if="multipleSelection.length>0">
-        <button class="hollowFixedBtn" @click="setAudit()">批量审核</button>
-      </div>
-      <li style="float: right;color: red;font-size: 14px;">
-        <!-- 注：落地团，小包团，国内线 均按订单利润的20%计算最大预计销售提成，实际发放提成不会超过最大预期销售提成 -->
-      </li>
-    </ul>
-
-    <ul style="overflow: initial!important">
-      <li style="margin-bottom:10px;width: 100%;">
-
-      </li>
-    </ul>
     <el-table v-loading="loading" ref="multipleTable" :data="dataList" tooltip-effect="dark" style="width: 100%"
       @selection-change="handleSelectionChange">
       <el-table-column label="团队编号" width="200">
@@ -141,7 +125,6 @@
         :page-sizes="[5, 10, 20, 30,50,100]" :page-size="msg.pageSize" :total="total">
       </el-pagination>
     </div>
-
     <el-dialog custom-class="w600" title="驳回缘由" :visible.sync="cancelOrderDialog">
       <div style="padding-bottom:20px">
         <el-input type="textarea" autofocus rows="5" placeholder="请填写驳回该团的缘由" clear="w300" v-model="cancelRemark">
@@ -262,28 +245,6 @@
           this.msg.QEndDate = ''
         }
       },
-      // 销售预期提成
-      goAnticipate(row, type) {
-        let userInfo = this.getLocalStorage();
-        let name
-        if (type == 1) { //国内
-          name = 'domesticCommissiondetails'
-        } else if (type == 2) { //单项
-          name = 'ServiceCommissiondetails'
-        } else if (type == 3) { //台湾
-          name = 'domesticCommissiondetailsTW'
-        } else if (type == 4) { //同业
-          name = 'TradeTicketDetails'
-        }
-        this.$router.push({
-          name: name,
-          query: {
-            Type: 1,
-            TCNUM: row.TCNUM,
-            blank: 'y'
-          }
-        });
-      },
       getCompany() {
         this.apipost('admin_get_BranchGetList', this.getCompanyMsg, res => {
           if (res.data.resultCode == 1) {
@@ -301,35 +262,8 @@
           this.$refs.dialog.getPostData()
         })
       },
-      selectable(row, index) {
-        if (this.active == 1) {
-          return true
-        } else {
-          return false
-        }
-      },
-      setAudit(type) {
-        let ids = this.multipleSelection.map(x => {
-          return x.TCID
-        })
-        if (ids.length == 0) {
-          return this.$message.error('请勾选需要批量审核的数据');
-        }
-        let that = this;
-        that.$confirm('是否通过该批量审核数据?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          for (let i = 0; i < ids.length; i++) {
-            setTimeout(() => {
-              this.groupAudit(2, ids[i], 'multiple', (i + 1) == ids.length ? ids.length : 0)
-            }, 500)
-          }
-        }).catch(() => {
-
-        });
-      },
+     
+    
       handleSelectionChange(val) {
         this.multipleSelection = val;
       },

src/components/newTravelmanager/travelLineTrip/trifficTripThree.vue

@@ -12,7 +12,7 @@
                 <el-form-item
                 class="StartCity"
                 :rules="trifficTripRules.StartCityId">
-                  <el-select :disabled="isOpenGroup" class="w120" :placeholder="$t('pub.pleaseSel')" filterable remote
+                  <el-select :disabled="isOpenGroup" class="w120" placeholder="出发城市" filterable remote
                     v-model="subTraffic.StartCityId" reserve-keyword :remote-method="GetDepartList1"
                     @change="changeGetDepartList(subTraffic.StartCityId)">
                     <el-option :label="$t('pub.unlimitedSel')" :value="DefaultSelectValue"></el-option>
@@ -38,7 +38,7 @@
               </span>
               <span>
                 <el-form-item :rules="trifficTripRules.ArrivalCityId">
-                  <el-select :disabled="isOpenGroup" class="w120" :placeholder="$t('pub.pleaseSel')" filterable remote
+                  <el-select :disabled="isOpenGroup" class="w120" placeholder="到达城市" filterable remote
                     v-model="subTraffic.ArrivalCityId" reserve-keyword :remote-method="GetArrivalList1"
                     @change="changeArrivalCity(subTraffic.ArrivalCityId)">
                     <el-option :label="$t('pub.unlimitedSel')" :value="DefaultSelectValue"></el-option>