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

src/components/FinancialModule/RecPayQuery.vue

@@ -3,7 +3,10 @@
     background-color: #E6E6E6;
   }
 
-
+  /deep/ .financiaUpload2 .el-upload-dragger {
+    width: 100px !important;
+    height: 80px !important;
+  }
 .recpayQueryMore{margin:10px 0px 5px 0px;text-align:center;cursor: pointer;}
 
 .page_RecPayQuery .el-form-item{
@@ -979,18 +982,53 @@
 
         
         <el-form-item label="操作类型" prop="ImportType">          
-          <template>
             <el-select filterable v-model='FixedAssetsMsg.ImportType' class="w135 _border_b_1">
               <el-option label="佣金汇率" :value='1' :key='1'></el-option>
               <el-option label="机票付款日" :value='2' :key='2'></el-option>
               <el-option label="PIC付款日" :value='3' :key='3'></el-option>
             </el-select>
-          </template>
         </el-form-item>
 
         <el-form-item label="汇率" prop="Rate1" v-if="FixedAssetsMsg.ImportType==1">
           <el-input class="w135 _border_b_1" v-model="FixedAssetsMsg.Rate" placeholder="请输入汇率"></el-input>
         </el-form-item>
+        <div class="_addUpload_box clearfix">
+        <el-form-item label="上传附件" prop="Rate1" v-if="FixedAssetsMsg.ImportType==1">
+          <template v-for="(file,fIndex) in FixedAssetsMsg.Image">
+            <div v-if="file.Type==3" style="width:30px; float:left;">
+              <div class="iconfont ">
+                <el-image style="height:16px;" :src="file.Url?file.Url:file.Content"
+                  :preview-src-list="[file.Url?file.Url:file.Content]">
+                </el-image>
+                <!-- <img :src="file.Url?file.Url:file.Content" @click="showUpLoadFile(file,index)" style="height:16px;"> -->
+              </div>
+              <span class="iconfont icon-guanbi1" style="font-size:12px;"
+                @click="deleteCarBackUploadFile(fIndex,index)"></span>
+            </div>
+            <div v-if="file.Type==1" style="width:30px; float:left;">
+              <div class="iconfont "
+                :class="file.Content.substring(file.Content.lastIndexOf('.')+1,file.Content.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'"
+                @click="showUpLoadFile(file)">
+              </div>
+              <span class="iconfont icon-guanbi1" style="font-size:12px;"
+                @click="deleteCarBackUploadFile(fIndex,index)"></span>
+            </div>
+            <div v-if="file.Type==2" style="width:30px; float:left;">
+              <div class="iconfont icon-excel" @click="showUpLoadFile(file,index)">
+              </div>
+              <span class="iconfont icon-guanbi1" style="font-size:12px;"
+                @click="deleteCarBackUploadFile(fIndex,index)"></span>
+            </div>
+          </template>
+          <div class="_pic_upload financiaUpload2">
+            <el-upload drag :http-request="uploadFileCarBackBtn" :multiple="false" :show-file-list="false" action="">
+              <i class="el-icon-plus avatar-uploader-icon"></i>
+              <div class="el-upload__text">{{$t('tips.dianjishanhcuan')}}</div>
+            </el-upload>
+          </div>
+        </el-form-item>
+      </div>
+
         <el-form-item label="预付款日" prop="CreateDate" v-if="FixedAssetsMsg.ImportType==2 || FixedAssetsMsg.ImportType==3">
           <el-date-picker class="w135 _border_b_1"
             v-model="FixedAssetsMsg.CreateDate"
@@ -1193,7 +1231,9 @@
           RelevanceFrId2:0,
           CreateDate:'',
           Rate:0,
-          ImportType:1
+          ImportType:1,
+          Remark:'',//存放图片 单个
+          Image:[]
         }
       }
     },
@@ -1533,6 +1573,8 @@
         this.showAirPayDate=true;
       },
       showBatchUpdateFDialog(){
+        this.FixedAssetsMsg.Image=[];
+        this.FixedAssetsMsg.Remark="";
         this.showBatchUpdateF=true;
       },
       // 确定垫付对象
@@ -1633,7 +1675,7 @@
         if (this.multipleSelection.length>0) {
           var frids = this.multipleSelection.map(item => item.id).join(',');
           this.apipost(
-            "Financial_post_BatchUpdateFinanceInfo", {FrIDs:frids,Rate:this.FixedAssetsMsg.Rate,ImportType:this.FixedAssetsMsg.ImportType,CreateDate:this.FixedAssetsMsg.CreateDate},res => {
+            "Financial_post_BatchUpdateFinanceInfo", {FrIDs:frids,Rate:this.FixedAssetsMsg.Rate,ImportType:this.FixedAssetsMsg.ImportType,CreateDate:this.FixedAssetsMsg.CreateDate,Remark:this.FixedAssetsMsg.Remark},res => {
               if (res.data.resultCode == 1) {
                 this.Success(this.$t('objFill.v101.FinancialModule.gengxincg')) ;
                 this.showBatchUpdateF = false;
@@ -2410,8 +2452,52 @@
             this.Error(res.data.message);
           }
         }, err => {})
+      },
+      uploadFileCarBackBtn(file) { //上传
+        if (file.file.size > 1024 * 1024 * 10) {
+          this.$message.warning(this.$t('tips.wjdxbncgsz'))
+          return
         }
-
+        //  1 文档  2 数据 3 图片
+        let typeArr = [{
+            stringArr: 'GIF|JPG|JPEG|PNG|BMP',
+            type: 3
+          },
+          {
+            stringArr: 'DOCX|DOC|XLSX|XLS|PPT|PPTX|PDF',
+            type: 1
+          },
+        ]
+        let ft = file.file.name.substring(file.file.name.lastIndexOf('.') + 1, file.file.name.length).toUpperCase();
+        let fileTypeNumber = 2;
+        let typeOk = false;
+        typeArr.forEach(x => {
+          if (x.stringArr.indexOf(ft) != '-1') {
+            fileTypeNumber = x.type;
+            typeOk = true;
+          }
+        })
+        if (!typeOk) return this.$message.error(this.$t('tips.qscWEfile'));
+        let newArr = [];
+        newArr.push(file.file)
+        let path = "/Upload/Temporary/"
+        this.$message.info(this.$t('tips.shangchuanzhong'))
+        this.UploadSelfFileT(path, newArr, x => {
+          let fileSize = file.file.size < 1024 ? file.file.size : (file.file.size / 1024).toFixed(0);
+          this.FixedAssetsMsg.Image = [];
+          this.FixedAssetsMsg.Image.push({
+            Content: x.data.FilePath,
+            ID: 0,
+            Type: fileTypeNumber,
+            Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
+          })
+          this.FixedAssetsMsg.Remark = x.data.FilePath;
+          this.$message.success(this.$t('tips.scchenggong'))
+        }, 1);
+      },
+      deleteCarBackUploadFile(i) { // 删除上传文件
+        this.FixedAssetsMsg.Image.splice(i, 1);
+      },
     }
   }
 

src/components/TravelManager/Lxy/directorOrderList.vue

@@ -213,7 +213,7 @@
                         v-if="TenantId==1">
                         <el-dropdown trigger="click" style="margin-left: 50px">
                           <span class="el-dropdown-link">{{$t('objFill.preparedocument')}}</span>
-                          <el-dropdown-menu slot="dropdown" class="TC-dropdown">
+                          <el-dropdown-menu slot="dropdown" class="TC-dropdown" style="max-height: 410px;overflow: auto;">
                             <el-dropdown-item @click.native="goCollection(item,list)">
                               {{$t('objFill.v101.shouruzhid')}}
                             </el-dropdown-item>

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -1436,7 +1436,7 @@
                       <span class="el-dropdown-link">{{ $t("pub.updateMsg") }}
                         <i class="el-icon-arrow-down el-icon--right"></i>
                       </span>
-                      <el-dropdown-menu slot="dropdown" class="TC-dropdown">
+                      <el-dropdown-menu slot="dropdown" class="TC-dropdown" style="max-height: 410px;overflow: auto;">
                         <template v-if="
                             item.RelationPriceList && item.RelationPriceList.length > 0
                           ">
@@ -1516,7 +1516,7 @@
                     <span class="el-dropdown-link">{{ $t("Operation.Op_moreOperation") }}
                       <i class="el-icon-arrow-down el-icon--right"></i>
                     </span>
-                    <el-dropdown-menu slot="dropdown" class="TC-dropdown">
+                    <el-dropdown-menu slot="dropdown" class="TC-dropdown" style="max-height: 410px;overflow: auto;">
                       <el-dropdown-item @click.native="SetGroupRecommendType(item, 1)" v-if="
                           item.b2b &&
                           item.GroupRecommendType == 0 &&

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -1042,7 +1042,7 @@
                     <span class="el-dropdown-link">{{$t('pub.updateMsg')}}
                       <i class="el-icon-arrow-down el-icon--right"></i>
                     </span>
-                    <el-dropdown-menu slot="dropdown" class="TC-dropdown">
+                    <el-dropdown-menu slot="dropdown" class="TC-dropdown" style="max-height: 410px;overflow: auto;">
                       <template v-if="item.RelationPriceList&&item.RelationPriceList.length>0">
                         <el-dropdown-item @click.native="goToOpenTravel('TravelManager',item.ID,0,item)">
                           {{$t('Operation.Op_xilieModyfi')}}</el-dropdown-item>
@@ -1112,7 +1112,7 @@
                     <span class="el-dropdown-link">{{$t('Operation.Op_moreOperation')}}
                       <i class="el-icon-arrow-down el-icon--right"></i>
                     </span>
-                    <el-dropdown-menu slot="dropdown" class="TC-dropdown">
+                    <el-dropdown-menu slot="dropdown" class="TC-dropdown" style="max-height: 410px;overflow: auto;">
                       <el-dropdown-item @click.native="goTeamBalance(item.TCID,item.OutBranchId)">
                         {{$t('Operation.Op_shouzhiDetail')}}</el-dropdown-item>
                       <el-dropdown-item @click.native="goUrlR(item)">

src/components/TravelManager/TravelList/oneDayTrip.vue

@@ -739,7 +739,7 @@
                     <span class="el-dropdown-link">{{$t('pub.updateMsg')}}
                       <i class="el-icon-arrow-down el-icon--right"></i>
                     </span>
-                    <el-dropdown-menu slot="dropdown" class="TC-dropdown">
+                    <el-dropdown-menu slot="dropdown" class="TC-dropdown" style="max-height: 410px;overflow: auto;">
                       <template v-if="item.RelationPriceList&&item.RelationPriceList.length>0">
                         <el-dropdown-item @click.native="goToOpenTravel('TravelManager',item.ID,0,item)">
                           {{$t('Operation.Op_xilieModyfi')}}
@@ -812,7 +812,7 @@
                     <span class="el-dropdown-link">{{$t('Operation.Op_moreOperation')}}
                       <i class="el-icon-arrow-down el-icon--right"></i>
                     </span>
-                    <el-dropdown-menu slot="dropdown" class="TC-dropdown">
+                    <el-dropdown-menu slot="dropdown" class="TC-dropdown" style="max-height: 410px;overflow: auto;">
                       <el-dropdown-item @click.native="goTeamBalance(item.TCID,item.OutBranchId)">
                         {{$t('Operation.Op_shouzhiDetail')}}
                       </el-dropdown-item>

src/components/TravelManager/TravelNewQuotation/CostNewPriceForm.vue

@@ -181,6 +181,10 @@
                 <el-input type="textarea" resize="none" style="width:180px;" v-model="subItem.Title"></el-input>
               </td>
               <td>
+                <template v-if="postConfig.LineId==90">
+                  <el-input v-model="subItem.HotelName"></el-input>
+                </template>
+                <template v-else>
                   <el-select filterable remote :remote-method="(query) => remoteSearchAdGroup(query, subItem)"
                     v-model='subItem.HotelId' :placeholder="$t('objFill.qingshurujdmc')" :loading="loading"
                     @change="getHotel(subItem,subItem.HotelId)" style="width:135px;">
@@ -195,6 +199,7 @@
                       </template>
                     </el-option>
                   </el-select>
+                </template>
                 <el-form-item :label="$t('objFill.v101.hancan')">
                   <el-select v-model='subItem.ContainDinnerType' style="width:100px;"
                     :placeholder="$t('objFill.v101.hancanlxin')" @change="DinnerTypeChange(subItem)">
@@ -305,6 +310,17 @@
                 </template>
               </td>
               <td>
+                <template v-if="postConfig.LineId==90">
+                  <template v-for="(scenicItem,scenicIndex) in subItem.ScenicList">
+                    <template v-if="scenicIndex==0">
+                      <el-input v-model="scenicItem.TicketName"></el-input>
+                    </template>
+                    <template v-else-if="scenicIndex!=0 && subItem.ScenicList[scenicIndex-1].TicketName!=''">
+                      <el-input v-model="scenicItem.TicketName"></el-input>
+                    </template>
+                  </template>
+                </template>
+                <template v-else>
                   <template v-for="(scenicItem,scenicIndex) in subItem.ScenicList">
                     <template v-if="scenicIndex==0">
                       <el-select :key="`d_`+subIndex+`_sn_`+scenicIndex" filterable remote
@@ -327,8 +343,26 @@
                       </el-select>
                     </template>
                   </template>
+                </template>
               </td>
               <td>
+                <template v-if="postConfig.LineId==90">
+                  <template v-for="(scenicItem,scenicIndex) in subItem.ScenicList">
+                    <template v-if="scenicIndex==0">
+                      <el-input :key="`d_`+subIndex+`_sc_`+scenicIndex" type='text' v-model="scenicItem.TicketCostPrice"
+                        class="w70" @keyup.native="checkPrice(scenicItem,'TicketCostPrice'),getchange(1)"
+                        :placeholder="$t('objFill.v101.jindianjiag')">
+                      </el-input>
+                    </template>
+                    <template v-else-if="scenicIndex!=0 && subItem.ScenicList[scenicIndex-1].TicketName!=''">
+                      <el-input :key="`d_`+subIndex+`_sc_`+scenicIndex" type='text' v-model="scenicItem.TicketCostPrice"
+                        class="w70" @keyup.native="checkPrice(scenicItem,'TicketCostPrice'),getchange(1)"
+                        :placeholder="$t('objFill.v101.jindianjiag')">
+                      </el-input>
+                    </template>
+                  </template>
+                </template>
+                <template v-else>
                   <template v-for="(scenicItem,scenicIndex) in subItem.ScenicList">
                     <template v-if="scenicIndex==0">
                       <el-input :key="`d_`+subIndex+`_sc_`+scenicIndex" type='text' v-model="scenicItem.TicketCostPrice"
@@ -343,6 +377,8 @@
                       </el-input>
                     </template>
                   </template>
+                </template>
+
               </td>
               <td>
                 <el-input type="text" v-model='subItem.OtherName' class="w70"

src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue

@@ -168,6 +168,29 @@
                 </el-input>
               </td>
             </tr>
+            <tr v-if="postData.LineId==90">
+              <td colspan="6" style="height:20px;">
+              </td>
+            </tr>
+            <tr v-if="postData.LineId==90">
+              <td width="80" class="txtRightCost">客户电话</td>
+              <td>
+                <el-input v-model="postData.CustomerTel" type="text" placeholder="客户电话"
+                  maxlength="200">
+                </el-input>
+              </td>
+              <td width="80" class="txtRightCost">领队人数</td>
+              <td>
+                <el-input v-model="postData.LeaderNum" type="text" :placeholder="$t('fnc.khmingcheng')" maxlength="200">
+                </el-input>
+              </td>
+              <td width="80" class="txtRightCost">自动下单</td>
+              <td>
+                <el-switch v-model="postData.IsCreateOrder" active-color="#13ce66" inactive-color="#ff4949"
+                  :active-value="1" :inactive-value="0">
+                </el-switch>
+              </td>
+            </tr>
             <tr>
               <td colspan="6" style="height:20px;">
               </td>
@@ -272,7 +295,10 @@
           OPId: "",
           AssistantList: [],
           dayCostPriceList: [], //行程报价
-          OfferArray: []
+          OfferArray: [],
+          CustomerTel: "", //客户电话
+          LeaderNum: 0, //领队数量
+          IsCreateOrder: 0, //是否自动生成订单
         },
         isSubmit: true,
         LineList: [], //线路列表
@@ -675,6 +701,15 @@
               if (tempData.OutBranchName && tempData.OutBranchName != '') {
                 this.postData.OutBranchId = Number(tempData.OutBranchId);
               }
+              if (tempData.OutBranchName && tempData.OutBranchName != '') {
+                this.postData.CustomerTel = tempData.CustomerTel;
+              }
+              if (tempData.LeaderNum && tempData.LeaderNum != 0) {
+                this.postData.LeaderNum = Number(tempData.LeaderNum);
+              }
+              if (tempData.IsCreateOrder && tempData.IsCreateOrder != 0) {
+                this.postData.IsCreateOrder = Number(tempData.IsCreateOrder);
+              }
               if (tempData.IsRoll) {
                 this.postData.IsRoll = tempData.IsRoll;
               }

src/plug/index.js

@@ -124,6 +124,7 @@ export default {
         let ocrUrl = "http://192.168.5.46:8888";
         // domainUrl = "http://192.168.5.214";
         domainUrl = "http://192.168.5.39:8083"
+        // domainUrl = "http://192.168.5.204:8030"
         // domainUrl = "http://reborn.oytour.com";
         let crmLocalFileStreamDownLoadUrl = "";
         crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";