111

src/components/TravelManager/TravelTeam/travelTeamList.vue

@@ -139,6 +139,7 @@
             <div class="TC_remarkContent">
               <div class="el-col w_20">
                 <div class="p20">
+
                   <div class="mb title"><i
                       class="iconfont icon-biaoti1"></i><span>{{$t('objFill.v101.baojixinx')}}</span></div>
                   <div class="mb"><span>{{item.GTeamName}}</span></div>
@@ -151,6 +152,15 @@
                   <div class="mb"><span
                       class="item-title">{{$t('scen.sc_cp')}}：</span><span>{{ item.OutBranchName }}</span>
                   </div>
+                  <div class="mb">
+                    <el-tag type="success" v-if="item.PriceStatus == 2"
+                    :title="$t('objFill.jietuansj') + item.OutGroupAuditDate">{{ $t("Operation.Op_jietuan") }}</el-tag>
+                  <el-tag type="success" v-if="item.PriceStatus == 5" :title="$t('objFill.jietuanshz')"
+                    style="background: rgb(0 128 255)">{{ $t("fnc.a_shezhong") }}</el-tag>
+                  <el-tag type="success" v-if="item.PriceStatus == 1" :title="$t('visaT.sale')">{{
+                      $t("visaT.sale")
+                    }}</el-tag>
+                  </div>
                   <el-button size="mini" v-if="item.WordUrl"><a :href="item.WordUrl" type="download"
                       download="">{{$t('Operation.Op_downLoadword')}}</a></el-button>
                 </div>
@@ -564,6 +574,10 @@
                       <el-dropdown-item @click.native="goTeamBalance(item.TCID, item.OutBranchId)">
                         {{ $t("Operation.Op_shouzhiDetail") }}
                       </el-dropdown-item>
+                      <el-dropdown-item v-if="item.PriceStatus == 1"
+                        @click.native="OutGroup(item.TCID, 2, item.TravelEndAudit)">
+                        {{ $t("Operation.Op_jietuan") }}
+                      </el-dropdown-item>
                     </el-dropdown-menu>
                   </el-dropdown>
                 </div>
@@ -703,6 +717,38 @@
 
     },
     methods: {
+      //结团/正常
+      OutGroup(TCID, Status, TravelEndAudit) {
+        let msg = {
+          TCID: TCID,
+          Status: Status,
+        };
+        if (TravelEndAudit == 1) {
+          let that = this;
+          that
+            .$confirm(this.$t("objFill.cituanxlykq"), this.$t("tips.tips"), {
+              confirmButtonText: this.$t("pub.sureBtn"),
+              cancelButtonText: this.$t("pub.cancelBtn"),
+              type: "warning",
+            })
+            .then(() => {
+              that.setPriceStatus(msg);
+            })
+            .catch(() => {});
+        } else {
+          this.setPriceStatus(msg);
+        }
+      },
+      setPriceStatus(msg) {
+        this.apipost("travel_post_SetPriceStatus", msg, (res) => {
+          if (res.data.resultCode == 1) {
+            this.Success(res.data.message);
+            this.refreshPage();
+          } else {
+            this.Info(res.data.message);
+          }
+        });
+      },
       //复制、新增报价单
       NewCopyPriceSheet(item, type) {
         this.gotoOffer(item, 1);
@@ -929,7 +975,7 @@
       if (this.$route.query) {
         if (this.$route.query.tcmun) {
           this.queryMsg.TCNUM = this.$route.query.tcmun;
-        }else this.queryMsg.SelectStartDate = nowDate;
+        } else this.queryMsg.SelectStartDate = nowDate;
       }
     }
   };

src/plug/index.js

@@ -122,9 +122,8 @@ export default {
         let locationName = window.location.hostname;
         let isOnline = 0; //0-本地测试，1-线上
         let ocrUrl = "http://192.168.5.46:8888";
-        domainUrl = "http://192.168.5.39:8083"
+        //domainUrl = "http://192.168.5.46"
         domainUrl = "http://192.168.5.204:8046"
- 
         let crmLocalFileStreamDownLoadUrl = "";
         crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";
         let javaUrldo = "";
@@ -143,12 +142,12 @@ export default {
           erpSiteUrl = "http://admin.oytour.com/#/";
           isOnline = 1;
         } else if (locationName.indexOf('ys.oytour') !== -1) {
-          domainUrl = "http://testapi.oytour.com";
+          domainUrl = "http://reborn.oytour.com";
           mallUrl = "https://mallapi.oytour.com";
           lxymallUrl = "https://erpmallapi.oytour.com";
           crmUrl = "http://crm.oytour.com";
           ocrUrl = "http://ocr.oytour.com";
-          erpSiteUrl = "http://admin.oytour.com/#/";
+          erpSiteUrl = "http://ys.oytour.com/#/";
           isOnline = 1;
         } else if (locationName.indexOf('oytour') !== -1) {
           domainUrl = "http://reborn.oytour.com";