领队报账修改

src/components/SalesModule/productQuery.vue

@@ -774,16 +774,13 @@
               </p>
             </div>
             <div class="d7">
-              <!--<p><input type="button" :class="{normalBtn:true,disabledBtn:item.IsSubstitution!=1&&item.SurplusSeat==0}" :disabled="item.IsSubstitution!=1&&item.SurplusSeat==0" value="立即下单" @click="goBuy(item)"></p>
-							<p><input type="button" class="hollowFixedBtn" value="下载行程"></p>
-							<p><input type="button" class="hollowFixedBtn" value="分享行程"></p>
-							<p><input type="button" class="hollowFixedBtn" value="查看报名"></p>	-->
               <el-button-group style="display:block;">
                 <el-tooltip class="item" effect="dark" content="查看报名" placement="top-start">
                   <el-button @click="goUrl('groupTourOrderByTuan',item.TCID,item.TCNUM)" type="primary" style='background:#00C6FF; border-color:#00C6FF'
                     icon="iconfont icon-sousuo"></el-button>
                 </el-tooltip>
-                <el-tooltip class="item" effect="dark" content="立即下单" placement="top-start" v-if="item.IsPayOrder!==1">
+                <!--关内团后不能在报名-->
+                <el-tooltip class="item" effect="dark" content="立即下单" placement="top-start" v-if="item.IsPayOrder!==1 && item.IsB2B===1">
                   <el-button type="primary" style='background:#F16C3C; border-color:#F16C3C' v-if="!TCIDList" icon="iconfont icon-fukuan1"
                     @click="goBuy(item)"></el-button>
                 </el-tooltip>

src/components/dmc/manager/dmcTotalTable.vue

@@ -215,7 +215,7 @@
                 </div>
               </td>
               <td>
-                <div class="w180">
+                <div class="w250">
                   <el-button-group>
                     <el-button @click="goUrlT('teamRevenueExpenditure',item.TCID,'团队收支')" type="primary" style="background:#00C6FF; border-color:#00C6FF">收付款</el-button>
                     <el-popover placement="bottom" width="300" trigger="click">
@@ -225,8 +225,8 @@
                       </p>
                       <el-button type="primary" slot="reference" @click='CkedItem(item)' style="background:#AD9AF6; border-color:#AD9AF6; border-radius: 0;">添加备注</el-button>
                     </el-popover>
+                    <br/>
                     <el-button @click='openChart(item)' type="primary" style="background:#6DD875; border-color:#6DD875">联系OP</el-button>
-
                     <el-popover placement="bottom" width="300" trigger="click">
                       <el-input class='mt10' v-model='NumObj.newCombinationNum' type='textarea'></el-input>
                       <p class="alcenter mt10">

src/components/dmc/manager/teamReimbursement.vue

 <style>
-@import "../../../assets/css/newTravelManager.css";
+  @import "../../../assets/css/newTravelManager.css";
 
 .TravelQueryList {
   width: 100%;
@@ -51,9 +51,7 @@
   line-height: 20px;
   display: -webkit-box;
   overflow: hidden;
-  /*! autoprefixer: off */
   -webkit-box-orient: vertical;
-  /* autoprefixer: on */
   text-overflow: ellipsis;
   -webkit-line-clamp: 3;
 }
@@ -335,92 +333,43 @@
     <div class="TC_Content TravelControlList">
       <div class="query-box">
         <ul>
-          <!-- <li>
-            <span>
-              <em>所属线路</em>
-              <el-select
-                class="w150"
-                v-model="queryMsg.LineId"
-                filterable
-                :placeholder="$t('pub.pleaseSel')"
-                @change="getLineTeamList()"
-              >
-                <el-option
-                  :label="$t('pub.unlimitedSel')"
-                  :value="queryCommonData.SelectDefaultValue"
-                ></el-option>
-                <el-option
-                  v-for="item in queryCommonData.LineList"
-                  :label="item.LineName"
-                  :value="item.LineID"
-                  :key="item.LineID"
-                ></el-option>
-              </el-select>
-            </span>
-          </li> -->
           <li>
             <span>
               <em>系列名称</em>
-              <el-select
-                class="w150"
-                v-model="queryMsg.LineteamId"
-                filterable
-                :placeholder="$t('pub.pleaseSel')"
-              >
-                <el-option
-                  :label="$t('pub.unlimitedSel')"
-                  :value="queryCommonData.SelectDefaultValue"
-                ></el-option>
-                <el-option
-                  v-for="item in queryCommonData.LineTeamList"
-                  :label="item.LtName"
-                  :value="item.LtID"
-                  :key="item.LtID"
-                ></el-option>
+              <el-select class="w150" v-model="queryMsg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')">
+                <el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option>
+                <el-option v-for="item in queryCommonData.LineTeamList" :label="item.LtName" :value="item.LtID" :key="item.LtID"></el-option>
               </el-select>
             </span>
           </li>
           <li>
             <span>
               <em>团号</em>
-              <el-input
-                maxlength="50"
-                v-model="queryMsg.TCNUM"
-                class="permiss-input w150"
-                @keyup.native.enter="getControlList"
-                :placeholder="$t('pub.pleaseImport')"
-              ></el-input>
+              <el-input maxlength="50" v-model="queryMsg.TCNUM" class="permiss-input w150" @keyup.native.enter="getControlList"
+                :placeholder="$t('pub.pleaseImport')"></el-input>
             </span>
           </li>
           <li>
             <span>
               <em>发团日期</em>
-              <el-date-picker
-                class="w150"
-                type="date"
-                v-model="queryMsg.StartGroupDate"
-                value-format="yyyy-MM-dd"
-                placeholder
-              ></el-date-picker>
-              <el-date-picker
-                class="w150"
-                type="date"
-                v-model="queryMsg.EndGroupDate"
-                value-format="yyyy-MM-dd"
-                placeholder
-              ></el-date-picker>
+              <el-date-picker class="w150" type="date" v-model="queryMsg.StartGroupDate" value-format="yyyy-MM-dd"
+                placeholder></el-date-picker>
+              <el-date-picker class="w150" type="date" v-model="queryMsg.EndGroupDate" value-format="yyyy-MM-dd"
+                placeholder></el-date-picker>
+            </span>
+          </li>
+          <li>
+            <span>
+              <em>合团团号</em>
+              <el-input maxlength="50" v-model="queryMsg.CombinationNum" class="permiss-input w150" @keyup.native.enter="getControlList"
+                :placeholder="$t('pub.pleaseImport')"></el-input>
             </span>
           </li>
-
           <li>
-            <button
-              class="hollowFixedBtn"
-              @click="getControlList(),resetPageIndex()"
-            >{{$t('pub.searchBtn')}}</button>
+            <button class="hollowFixedBtn" @click="getControlList(),resetPageIndex()">{{$t('pub.searchBtn')}}</button>
           </li>
         </ul>
       </div>
-      
       <table class="TravelControlListTable TravelQueryList">
         <tbody v-for="(outItem,i) in queryCommonData.dataList" :key="i">
           <template v-for="(item,index) in outItem.TravelPriceList">
@@ -433,16 +382,8 @@
               <td width="240" v-if="index==0" :rowspan="outItem.TravelPriceList.length*3">
                 <div class="d7">
                   <el-button-group>
-			                  <el-button
-			                    @click.native="goUrl('leaderReimbursement',outItem,'用款计划')"
-			                    type="primary"
-			                    style="background:#E95252; border-color:#E95252"
-			                  >领队用款</el-button>
-                        <el-button 
-			                    @click.native="goUrl('leaderPay',outItem,'领队报账')"
-			                    type="primary"
-			                    style="background:#297BEF; border-color:#297BEF"
-			                  >领队报账
+                    <el-button @click.native="goUrl('leaderReimbursement',outItem,'用款计划')" type="primary" style="background:#E95252; border-color:#E95252">领队用款</el-button>
+                    <el-button @click.native="goUrl('leaderPay',outItem,'领队报账')" type="primary" style="background:#297BEF; border-color:#297BEF">领队报账
                     </el-button>
                   </el-button-group>
                 </div>
@@ -494,7 +435,8 @@
                       </tr>
                     </table>
                     <div class="FlightDiv-TCL" slot="reference">
-	                    <div v-for="subItem in item.flightList" slot="reference" :key="subItem.subCode" class="TCL-flighInfoList" style="text-align: center!important">
+                      <div v-for="subItem in item.flightList" slot="reference" :key="subItem.subCode" class="TCL-flighInfoList"
+                        style="text-align: center!important">
                         <span class="travelnowrap">
                           <span class="TCL-FlightNumber">{{subItem.Flight_number}}</span>{{subItem.DepartureName}}
                           {{subItem.StopoverName==""?"":"-"+subItem.StopoverName}}
@@ -545,7 +487,7 @@
                 </div>
               </td>
             </tr>
-      		 <tr height="40" >
+            <tr height="40">
               <td colspan="4" style="padding-left: 30px;">
                 备注：{{item.OPRemark}}
               </td>
@@ -556,19 +498,13 @@
           <td colspan="6">{{$t('system.content_noData')}}</td>
         </tr>
       </table>
-        <el-pagination
-          background
-          @current-change="handleCurrentChange"
-          :current-page.sync="queryMsg.currentPage"
-          layout="total,prev, pager, next, jumper"
-          :page-size="queryMsg.pageSize"
-          :total="queryMsg.total"
-        ></el-pagination>
+      <el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage" layout="total,prev, pager, next, jumper"
+        :page-size="queryMsg.pageSize" :total="queryMsg.total"></el-pagination>
     </div>
   </div>
 </template>
 <script>
-export default {
+  export default {
     data() {
       return {
         ArrList: [],
@@ -595,7 +531,9 @@ export default {
           total: 0,
           //是否有数据
           noData: false,
-        currentPage: 1
+          currentPage: 1,
+          //合团团号
+          CombinationNum:""
         },
         pickerBeginDateBefore: {
           disabledDate: time => {
@@ -612,8 +550,17 @@ export default {
       };
     },
     methods: {
-  	goUrl(path,obj,title){
-	 	   this.$router.push({ name:path,query:{"id":obj.TCIDs,'num':obj.CombinationNum,isUpdate:true,blank:'y',tab:title}}) 
+      goUrl(path, obj, title) {
+        this.$router.push({
+          name: path,
+          query: {
+            "id": obj.TCIDs,
+            'num': obj.CombinationNum,
+            isUpdate: true,
+            blank: 'y',
+            tab: title
+          }
+        })
       },
       //翻页
       handleCurrentChange(val) {
@@ -662,23 +609,6 @@ export default {
         );
       }
     },
-  filters: {
-    priceFormat(value) {
-      if (value == null) {
-        return 0.0;
-      }
-      let nStr = value.toFixed(2);
-      nStr += "";
-      let x = nStr.split(".");
-      let x1 = x[0];
-      let x2 = x.length > 1 ? "." + x[1] : "";
-      var rgx = /(\d+)(\d{3})/;
-      while (rgx.test(x1)) {
-        x1 = x1.replace(rgx, "$1" + "," + "$2");
-      }
-      return x1 + x2;
-    }
-  },
     mounted() {
       this.getLineTeamList();
     },
@@ -693,5 +623,5 @@ export default {
       this.queryMsg.StartGroupDate = nowDate;
       this.getControlList();
     }
-};
+  };
 </script>
\ No newline at end of file

src/router/config.js

@@ -1170,6 +1170,14 @@ export default {
                 title: '领队用款计划'
               },
             },
+            {
+              path: '/leaderPrint', //领队用款计划
+              name: 'leaderPrint',
+              component: resolve => require(['@/components/LeaderManagement/leaderPrint'], resolve),
+              meta: {
+                title: '领队用款计划打印'
+              },
+            },
             {
               path: '/leaderReimbursement', //领队领队报账
               name: 'leaderReimbursement',