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

src/components/SalesVisa/ModifyVisaProduct.vue

@@ -382,6 +382,17 @@
                     ref="addMsg"
                     label-width="120px"
                 >
+                   <el-form-item label="出团公司" prop="RB_Branch_Id">
+                        <el-select v-model="addMsg.RB_Branch_Id">
+                            <el-option label="不限" :value="-1" key="-1"></el-option>
+                            <el-option
+                          v-for="item in companyList"
+                :label="item.BName"
+                :value="item.Id"
+                :key="item.Id"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
                     <el-form-item label="产品名称" prop="Name">
                     <el-input v-model="addMsg.Name" placeholder="请输入"></el-input>
                     </el-form-item>
@@ -422,7 +433,7 @@
                     <el-form-item label="提前预定天数" prop="BookAdvance">
                       <el-input v-model="addMsg.BookAdvance" @keyup.native="checkInteger(addMsg,'BookAdvance')" placeholder="工作日"></el-input>
                     </el-form-item>
-                    <el-form-item label="价格有效日期">
+                    <el-form-item label="价格有效日期"  style="width:588px">
                         <el-date-picker
                             v-model="PriceDates"
                             type="daterange"
@@ -736,7 +747,7 @@ export default {
         saveBtn:true,
         fileList:[],
         checkList:[],
-
+ companyList: [],
         fonts: [
           "SimSun",
           "SimHei",
@@ -760,6 +771,7 @@ export default {
       loading: false,
       value6: "",
         VisaManagementList:[],
+        companyList:[],
       addMsg: {
         Id: 0,
         Name: "",
@@ -777,7 +789,7 @@ export default {
         },
         CoverImageList: [],
         VisaCountryId:"",
-        
+        RB_Branch_Id:-1,
       },
     
       rules: {
@@ -847,7 +859,7 @@ export default {
       }
         // this.ScrollMethod();
         this.Getvisacountry();
-        
+        this.getCompanyList();
         this.getVisaManagementList();
         this.initFileList();
   },
@@ -890,7 +902,34 @@ export default {
       });
     },
 
-
+getCompanyList() {
+   this.companyList=[];
+      let userInfo = this.getLocalStorage();
+      let RB_Group_id = userInfo.RB_Group_id;
+      let msg = {
+        Status: 0,
+        is_show: 0,
+        RB_Group_Id: RB_Group_id
+      };
+      this.apipost(
+        "admin_get_BranchGetList",
+        msg,
+        res => {
+          if (res.data.resultCode == 1) {
+            res.data.data.forEach(x => {
+              var obj = {
+                Id: "",
+                BName: ""
+              };
+              obj.Id = x.Id.toString();
+              obj.BName = x.BName;
+              this.companyList.push(obj);
+            });
+          }
+        },
+        err => {}
+      );
+    },
     //   请求签证产品详情
     GetVisaProductDetails(Pid){
         this.PriceDates=[];
@@ -900,6 +939,7 @@ export default {
             res => {
               if (res.data.resultCode == 1) {
                   let data=res.data.data;
+                  data.RB_Branch_Id = String(data.RB_Branch_Id)
                   this.addMsg=res.data.data;
                   this.PriceDates.push(data.EffectiveStartDate)
                   this.PriceDates.push(data.SendVisaDate)
@@ -944,7 +984,7 @@ export default {
         VisaB2CPrice: "",
         VisaProductInfo: {},
         CoverImageList: [],
-        
+        RB_Branch_Id:-1,
       };
       this.PriceDates=[]
     },

src/components/SalesVisa/VisaProductOrder.vue

@@ -443,7 +443,8 @@
             </span>
           </td>
           <td class="groupTourOrderIcon">
-            <el-tooltip effect="dark" content="签证详情" placement="top-start">
+            
+            <el-tooltip effect="dark" content="签证详情" placement="top-start" v-if="item.VisaPlanIdStr !=''">
               <el-button type="primary" @click="goUrlVisaList(item)" style='background:#00C6FF; border-color:#00C6FF'
                 icon="iconfont icon-sousuo"></el-button>
             </el-tooltip>