no message

src/components/FinancialModule/groupApproval.vue

@@ -18,7 +18,7 @@
                     <span>
                         <em>团号</em>
                         <el-input maxlength="50" v-model="msg.TCNUM" class="permiss-input w200"
-                            @keyup.native.enter="getControlList" :placeholder="$t('pub.pleaseImport')"></el-input>
+                            @keyup.enter="getControlList" :placeholder="$t('pub.pleaseImport')"></el-input>
                     </span>
                 </li>
                 <li>
@@ -29,7 +29,10 @@
                             @keyup.native="checkInteger(msg,'TCID')"></el-input>
                     </span>
                 </li>
-                <li></li>
+                <li>
+                <button class="hollowFixedBtn" type="button"
+                    @click="getControlList">{{$t('pub.searchBtn')}}</button>
+                </li>
             </ul>
         </div>
         <ul class="_nav clearfix">
@@ -141,7 +144,7 @@
                   type="button"
                   class="hollowFixedBtn"
                   value="关闭"
-                  @click="cancelOrderDialog = false"
+                  @click="cancelOrderDialog = false,cancelRemark=''"
                 />
               </el-col>
             </el-row>
@@ -282,7 +285,7 @@
                         this.Error(res.data.message);
                     }   
                 },
-                    err => {  }
+                    err => { }
                 );
             },
             goTeamBalance(id, OutBranchId) {//团队收支明细

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -1047,7 +1047,7 @@
             <div class="TC_remarkContent" v-if="item.OPRemark||item.OPInnerRemark||item.DmcRemarkLast||item.OutGroupAuditRemark">
               <div class="clearfix TCL-redType" v-if="item.OutGroupAuditState==3&&item.OutGroupAuditRemark">
                   <div class="TCL_remarkTitle">驳回缘由：</div>
-                  <div class="TCL_Content">{{item.OutGroupAuditRemark}} 日期：{{item.OutGroupAuditDate}}</div>
+                  <div class="TCL_Content">{{item.OutGroupAuditRemark}} {{item.OutGroupAuditDate}}</div>
               </div>
               <div class="clearfix TCL-redType" v-if="item.OPRemark">
                 <div class="TCL_remarkTitle">{{$t('Operation.Op_duiwaiRemark')}}：</div>

src/components/TravelManager/TravelList/oneDayTrip.vue

@@ -637,7 +637,7 @@
             <div class="TC_remarkContent" v-if="item.OPRemark||item.OPInnerRemark||item.DmcRemarkLast||item.OutGroupAuditRemark">
               <div class="clearfix TCL-redType" v-if="item.OutGroupAuditState==3&&item.OutGroupAuditRemark">
                 <div class="TCL_remarkTitle">驳回缘由：</div>
-                <div class="TCL_Content">{{item.OutGroupAuditRemark}} 日期：{{item.OutGroupAuditDate}}</div>
+                <div class="TCL_Content">{{item.OutGroupAuditRemark}} {{item.OutGroupAuditDate}}</div>
               </div>
               <div class="clearfix TCL-redType" v-if="item.OPRemark">
                 <div class="TCL_remarkTitle">{{$t('Operation.Op_duiwaiRemark')}}：</div>

src/components/busManagement/CharteringManagement/CharteringProductList.vue

@@ -252,7 +252,7 @@
               @click="resetPageIndex(),selectResource()">{{$t('pub.searchBtn')}}</button>
             <button class="normalBtn" type="button"
               @click="$router.push('CharteringInfoManage')">{{$t('pub.addBtn')}}</button>
-            <button class="hollowFixedBtn" type="button" @click="DownLoadFile()">{{$t('adm.adm_download')}}</button>
+            <!-- <button class="hollowFixedBtn" type="button" @click="DownLoadFile()">{{$t('adm.adm_download')}}</button> -->
           </li>
         </ul>
       </div>
@@ -296,6 +296,7 @@
           <div class="btnList">
             <button @click="goUrl('CharteringInfoManage',item.Id)" class="hotelBtn">{{$t('pub.updateMsg')}}</button>
             <button @click="goUrlT('CharteringQuotation',item.Id,item.Name)" class="hotelBtn">报价</button>
+            <button class="hotelBtn" @click="clickShelf(item)">{{item.ProductState==2?'上架':'下架'}}</button>
           </div>
         </div>
         <div class="noData" v-show="noData">{{$t('system.content_noData')}}</div>
@@ -355,6 +356,34 @@
         };
       },
       methods: {
+        // 上下架
+        clickShelf(item){
+          var that = this;
+          let text
+          if(item.ProductState==1){
+            text = '下架'
+          }if(item.ProductState==2){
+            text = '上架'
+          }
+          that.Confirm(`是否要${text}该包车产品?`, function () {
+            var msg = {
+              ProductId: item.Id
+            };
+            that.apipost(
+              "CarSingle_post_SetCarSingleProcudtState",
+              msg,
+              res => {
+                if (res.data.resultCode == 1) {
+                  that.Success(res.data.message);
+                  that.selectResource();
+                } else {
+                  that.Error(res.data.message);
+                }
+              },
+              null
+            );
+          });
+        },
         CopyScenic(Id) {
           var that = this;
           that.Confirm('是否要复制此景点?', function () {
@@ -435,7 +464,7 @@
               },
               response => {
                 if (response.data.resultCode == 1) {
-                  that.Success(that.$$t('tips.shanchuchenggong'));
+                  that.Success(that.$t('tips.shanchuchenggong'));
                   that.selectResource();
                 } else {
                   that.Error(response.data.message);
@@ -508,12 +537,15 @@
             }
           });
         },
-        goUrlT(path, id) {
+        goUrlT(path, id,Name) {
+          let data = {
+            id: id,
+            Name: Name,
+          }
           this.$router.push({
             path: path,
             query: {
-              id: id,
-              Name: Name,
+              obj: JSON.stringify(data),
               blank: 'y',
               tab: '产品报价'
             }

src/components/busManagement/CharteringManagement/components/Map.vue

@@ -4,7 +4,7 @@
       <el-input class="w300" style="margin-right: 10px;" id="suggestId" v-model="city" placeholder="请输入搜索名称" name="address_detail" />
       <input type="button" class="normalBtn sureBtn" value="搜索" @click="search"/>
     </div>
-    <div style="height: 330px;width: 100%;margin-top: 15px;" :id="`allmap_${id}`"></div>
+    <div style="height: 330px;width: 100%;margin-top: 15px;" :id="`allmap_${id}${type}_${index}`"></div>
     <div class="btnList">
         <input type="button" class="normalBtn sureBtn" value="确定" @click="sendMsg"/>
         <input type="button" class="hollowFixedBtn" value="取消" @click="closeDialog"/>
@@ -14,7 +14,7 @@
 
 <script>
 export default {
-  props: ["Address","id"],
+  props: ["Address","id","type","index"],
   data(){
     return{
       city: '',
@@ -47,15 +47,15 @@ export default {
     },
     sendMsg() {
         if (!this.point.lng) {
-          this.tips("请搜索选择", "info");
+          this.Error("请搜索选择");
         } else {
-          this.$emit("headCallBack", this.point);
+          this.$emit("headCallBack", this.point,this.type);
           this.$emit("refList");
         }
       },
     search(){
       var that = this
-      var map = new BMap.Map(`allmap_${that.id}`)
+      var map = new BMap.Map(`allmap_${that.id}${that.type}_${that.index}`)
       var local = new BMap.LocalSearch(map, { // 智能搜索
         onSearchComplete: function (){
           if(local.getResults()&&local.getResults().getPoi(0)&&local.getResults().getPoi(0).point){
@@ -85,7 +85,7 @@ export default {
       this.$nextTick(function() {
         var that = this
         // 创建Map实例
-        var map = new BMap.Map(`allmap_${that.id}`)
+        var map = new BMap.Map(`allmap_${that.id}${that.type}_${that.index}`)
         // 初始化地图,设置中心点坐标，
         var point = new BMap.Point(120.211877, 30.255194) // 创建点坐标
         map.centerAndZoom(point, 15)

src/router/config.js

@@ -2066,7 +2066,15 @@ export default {
         name: 'CharteringQuotation',
         component: resolve => require(['@/components/busManagement/CharteringManagement/CharteringQuotation'], resolve),
         meta: {
-          title: '产品报价'
+          title: '包车产品类型'
+        },
+      },
+      {
+        path: '/CharteringPackagePrice', //包车产品报价
+        name: 'CharteringPackagePrice',
+        component: resolve => require(['@/components/busManagement/CharteringManagement/CharteringPackagePrice'], resolve),
+        meta: {
+          title: '包车产品报价'
         },
       },
       {