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

src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue

@@ -130,10 +130,17 @@
                 </el-select>
               </td>
               <td width="80" class="txtRightCost">出发时间</td>
-              <td colspan="3">
+              <td>
                 <el-date-picker type="date" v-model="postConfig.OutDateTime" value-format="yyyy-MM-dd" placeholder>
                 </el-date-picker>
               </td>
+              <td width="80" class="txtRightCost">出团类型</td>
+              <td>
+                <el-select class="  multiple_input" v-model="postConfig.TeamType" filterable>
+                  <el-option v-for='item in teamList' :key="item.id" :label="item.bName" :value="item.id">
+                  </el-option>
+                </el-select>
+              </td>
             </tr>
           </table>
           <div class="seat-box" style="display:none;">
@@ -259,7 +266,7 @@
                   <td align="center" v-if="childIndex==0" :rowspan="CostNumberList.length">
                     {{subItem.DayNum}}
                   </td>
-                  <td v-if="childIndex==0" :rowspan="CostNumberList.length" colspan="2">
+                  <td v-if="childIndex==0" :rowspan="CostNumberList.length">
                     <el-input type="textarea" resize="none" class="w250" v-model="subItem.Title"></el-input>
                   </td>
                   <td v-if="childIndex==0" :rowspan="CostNumberList.length">
@@ -1148,6 +1155,7 @@
         currencyTypeArr: [], //币种下拉列表
         LineTeamList: [], //系列下拉列表
         companyList: [], //出团公司
+        teamList: [],
         payTypeList: [{
           value: 1,
           label: '现金'
@@ -1200,6 +1208,18 @@
           err => {}
         );
       },
+      getTeamList() {
+        //出团公司
+        this.apipost(
+          "travel_GetTeamTypeEnumList", {},
+          res => {
+            if (res.data.resultCode == 1) {
+              this.teamList = res.data.data;
+            }
+          },
+          err => {}
+        );
+      },
       //含餐类型切换
       DinnerTypeChange(subItem) {
         switch (subItem.ContainDinnerType) {
@@ -1750,6 +1770,7 @@
       this.getSubtotalMoney();
       this.getAllCurrency();
       this.getCompanyList();
+      this.getTeamList();
     },
     created() {},
     watch: {

src/components/TravelManager/TravelNewQuotation/newQuotation.vue

@@ -89,6 +89,17 @@
             </el-select>
           </span>
         </li>
+        <li>
+          <span>
+                      <span>{{$t('visa.v_czuser')}}</span>
+                      <el-select class="w150" v-model="queryData.CreateBy" filterable :placeholder="$t('pub.pleaseSel')">
+                        <el-option :label="$t('pub.unlimitedSel')" :value="0">
+                        </el-option>
+                        <el-option v-for="(item,index) in EmployeeList" :label="item.EmName"
+                          :value="item.EmployeeId" :key="index"></el-option>
+                      </el-select>
+          </span>
+        </li>
         <li>
           <button class="hollowFixedBtn" @click="getList(),resetPageIndex()">查询</button>
           <button class="hollowFixedBtn" @click="goMakeQuo('QuotationNewPrice',0)">新增</button>
@@ -327,9 +338,11 @@
   export default {
     data() {
       return {
+        EmployeeList: [],
         EditBtn:false,//报价单修改权限
         userInfo: {},
         queryData: {
+          CreateBy: '',
           LineId: 0,
           LineteamId: 0,
           TravelState: 0,
@@ -407,6 +420,28 @@
       commonTeamInfo: commonTeamInfo
     },
     methods: {
+      //根据当前员工所在部门获取该部门及子部门员工信息
+      getEmployeeList() {
+        let userInfo = this.getLocalStorage();
+        // console.log('userInfo', userInfo)
+        this.queryData.CreateBy = userInfo.EmployeeId
+        let msg = {
+          GroupId: userInfo.RB_Group_id,
+          BranchId: "-1",
+          DepartmentId: "-1",
+          PostId: "-1",
+          IsLeave: "0"
+        };
+        this.apipost(
+          "admin_get_EmployeeGetList", {},
+          res => {
+            if (res.data.resultCode == 1) {
+              this.EmployeeList = res.data.data;
+            }
+          },
+          err => {}
+        );
+      },
       goUrl(path, configId, qType) {
         if (configId > 0) {
           this.$router.push({
@@ -649,6 +684,7 @@
       },
     },
     mounted() {
+      this.getEmployeeList();
       this.GetAuth();
       var routeName = this.$route.name;
       if (routeName == 'newQuotation') {

src/plug/index.js

@@ -119,8 +119,8 @@ export default {
         let crmUrl = ""; //crm API
         let locationName = window.location.hostname;
         // domainUrl = "http://192.168.10.128";
-        domainUrl = "http://192.168.10.9:8083" // 刘东电脑
-        //  domainUrl = "http://192.168.10.226:8015";
+        // domainUrl = "http://192.168.10.9:8083" // 刘东电脑
+         domainUrl = "http://192.168.10.226:8015";
         // domainUrl = "http://reborn.oytour.com";
         let crmLocalFileStreamDownLoadUrl = "";
         crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";