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

src/components/SalesVisa/VisaProduct.vue

@@ -309,6 +309,7 @@
         <th width="6%">订单数</th>
         <!-- <th width="12%">总人数（剩余人数）</th> -->
         <th width="10%">创建者</th>
+        <th width="10%">申请表</th>
         <th width="10%">广告图</th>
         <th width="14%">操作</th>
       </tr>
@@ -346,6 +347,29 @@
           <img v-if="item.CreatePhoto" :onerror="defaultImg" :src="item.CreatePhoto">
           <span class="createName">{{item.CreateName}}</span>
         </td>
+        <td>
+          <p v-for="(item2, index2) in item.AdvertisingFileList" :key="index2">
+            <span
+              style="cursor:pointer;text-decoration: underline;"
+              @click="downloadFile(item2)"
+            >{{item2.Name}}</span>
+            <i
+              class="iconfont icon-Close"
+              style="font-size:12px;cursor:pointer;"
+              @click="delUnpload(item.Id,item2)"
+            ></i>
+          </p>
+          <el-upload
+            :http-request="uploadImg"
+            :data="item"
+            ref="upload"
+            :multiple="false"
+            :show-file-list="false"
+            action
+          >
+            <span style="color:#00C6FF;cursor:pointer;" @click="saveitem(item.Id)">上传申请表</span>
+          </el-upload>
+        </td>
         <td>
           <p v-for="(item2, index2) in item.AdvertisingFileList" :key="index2">
             <span

src/components/activity/ItineraryCustomizer.vue

@@ -60,7 +60,7 @@
 		<el-dialog custom-class='w400' title="行程定制师"  :visible.sync="Visible">
 			    	<el-form :model="pwdMsg" label-width="80px" :rules="rulesPwd" ref="pwdMsg">
 			             <el-form-item  label="员工ID" prop="employeeId">
-							 <el-select class='w217' v-model="pwdMsg.employeeId" placeholder="请选择">
+							 <el-select class='w217' v-model="pwdMsg.employeeId" filterable placeholder="请选择">
                                     <el-option v-for="item in employee" :key="item.employeeId" :label="`${item.bName} ${item.departmentName}(${item.name})`" :value="item.employeeId"></el-option>
                                 </el-select>
 			             </el-form-item>

src/plug/index.js

@@ -118,7 +118,8 @@ export default {
       Vue.prototype.domainManager = function () {
         let domainUrl = '';
         let locationName = window.location.hostname;
-        domainUrl = "http://192.168.2.214:8082";
+        // domainUrl = "http://192.168.2.214:8082";
+        domainUrl = "http://192.168.2.16:8083";
         if (locationName.indexOf('oytour') !== -1) {
           domainUrl = "http://reborn.oytour.com";
         } else if (locationName.indexOf('viitto') !== -1) {
@@ -149,7 +150,7 @@ export default {
           UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://upload.oytour.com" : "http://192.168.2.214:8120",
           //文件站点
           ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://imgfile.oytour.com" : 'http://192.168.2.214:8130',
-          javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.106:9000",
+          javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.215:9000",
         };
         return obj;
       },