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

src/components/FinancialModule/FinancialDocuments.vue

@@ -865,6 +865,13 @@
               <el-input class="w200" v-model="msg.Remark"></el-input>
             </span>
           </li>
+          <li v-if="msg.Conditon==1">
+            <span>
+              <em>只看待上传发票的</em>
+              <el-switch v-model="msg.InvoiceState" active-value="true" inactive-value="false">
+                      </el-switch>
+            </span>
+          </li>
         </template>
       </ul>
     </div>
@@ -1436,7 +1443,8 @@
           UpdateBy: "",
           Sort: "2",
           IsSpecial: 0,
-          Remark: ""
+          Remark: "",
+          InvoiceState:false,
         },
         getCompanyMsg: {
           // 公司
@@ -2281,6 +2289,7 @@
         if (!this.msg.Conditon) this.msg.Conditon = 1;
         if (!this.msg.TradeWay) this.msg.TradeWay = 0;
         if (!this.msg.AccountType) this.msg.AccountType = 0;
+      
         this.apipost(
           "Financial_post_GetPageList",
           this.msg,

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -1121,7 +1121,9 @@
           <div style="border-top: 1px solid #dedede;margin-top: 10px;
           padding: 0 0 10px 0;"
           v-if="GetDetail.KingdeeInvoice&&(GetDetail.KingdeeInvoice==1||GetDetail.KingdeeInvoice==3)
-          &&(GetDetail.CreateBy==userInfo.EmployeeId||GetDetail.InvoiceExamineBy==userInfo.EmployeeId)">
+          &&(GetDetail.CreateBy==userInfo.EmployeeId
+          ||GetDetail.InvoiceExamineBy==userInfo.EmployeeId
+          ||ActionMenuCode.indexOf('F_Query_AllIncomPay')!= -1)">
             <p
             style="margin-top: 10px;">
               <span style="color: red;">发票凭证</span>
@@ -1162,7 +1164,6 @@
                     <!-- <img :src="file.Url?file.Url:file.Content" @click="showImg(file.Url?file.Url:file.Content)"> -->
                   </div>
                   <span class="iconfont icon-guanbi1"
-                  v-if="(GetDetail.CreateBy==userInfo.EmployeeId||GetDetail.InvoiceExamineBy==userInfo.EmployeeId)&&GetDetail.InvoiceState!=2"
                   @click="deleteUploadFile(fIndex,1)"></span>
                 </div>
                 <div v-if="file.Type==1">
@@ -1172,13 +1173,14 @@
                     @click="showUpLoadFile(file)">
                   </div>
                   <span class="iconfont icon-guanbi1"
-                  v-if="(GetDetail.CreateBy==userInfo.EmployeeId||GetDetail.InvoiceExamineBy==userInfo.EmployeeId)&&GetDetail.InvoiceState!=2"
                   @click="deleteUploadFile(fIndex,1)"></span>
                 </div>
               </template>
             </div>
             <div style="margin-top: 10px;"
-            v-if="(GetDetail.CreateBy==userInfo.EmployeeId||GetDetail.InvoiceExamineBy==userInfo.EmployeeId)&&GetDetail.InvoiceState!=2">
+            v-if="(GetDetail.CreateBy==userInfo.EmployeeId
+            ||GetDetail.InvoiceExamineBy==userInfo.EmployeeId
+            ||ActionMenuCode.indexOf('F_Query_AllIncomPay')!= -1)&&GetDetail.InvoiceState!=2">
               <div class="_pic_upload">
                 <!--<div class="_pic_upload" v-if="saveMsg.length!==5 && ((saveMsg.length + GetDetail.VorcherInos.length) < 5)">-->
                 <el-upload drag :http-request="uploadFileBtnFP" :multiple="true" :show-file-list="false" action="">
@@ -1666,6 +1668,7 @@
         huijiShow: false,
         clientData: {},
         isReceivablesAccount: false,
+        ActionMenuCode: ''
       }
     },
     components: {
@@ -1706,7 +1709,7 @@
       this.pageIndex = this.$route.query.pageIndex;
       let userinfo = this.getLocalStorage();
       this.bossID = userinfo.EmployeeId;
-      let ActionMenuCode = userinfo.ActionMenuCode;
+      let ActionMenuCode = this.ActionMenuCode = userinfo.ActionMenuCode;
       if (ActionMenuCode.indexOf('F_Update_KJCostType') != -1) {
         this.huijiShow = true;
       }

src/components/SalesModule/MyCustomer.vue

@@ -542,7 +542,12 @@
             </el-popover>
           </td>
           <td>{{item.contactNumber}}</td>
-          <td>{{item.customerName}}</td>
+          <td>
+            {{item.customerName}}
+            <span v-if="item.departmentManagerStr&&msg.CustomerStatus==1" style="color: red;margin-left: 10px;">
+              待{{item.departmentManagerStr}}审核
+            </span>
+          </td>
           <td>
             <p v-if="item.customerVisitList.length>0">
               {{item.customerVisitList[0].visitDateTime}}

src/components/Ticketing/TicketManager.vue

@@ -1393,6 +1393,16 @@
             </el-select>
           </span>
         </li>
+        <li>
+          <span>
+            <em>团期状态</em>
+            <el-select v-model="msg.IsNoTCID" :placeholder="$t('pub.pleaseSel')" class="w120">
+              <el-option label="不限" :value="0"></el-option>
+              <el-option label="未绑定团期" :value="1"></el-option>
+              <el-option label="有机损的取消团期" :value="2"></el-option>
+            </el-select>
+          </span>
+        </li>
         <li style="margin-right:50px;">
           <button class="normalBtn" type="button" @click="resetPageIndex(),getList()">{{$t('pub.searchBtn')}}</button>
           <button class="normalBtn" type="button" @click="addShow=true,command=false,sanmai=false,initAddMsg()">
@@ -2785,6 +2795,7 @@
           Departure_city: 0, //出发地
           SellType: -1, //售卖机票类型：0-团队机票，1-单卖机票
           IsSelectInvoicing: '0', //是否未维护开票金额1-未维护，2-已维护
+          IsNoTCID: 0,//1未绑定团期  2有机损的取消团期
         },
         maintenanceList: [{
             Name: '不限',

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -669,7 +669,7 @@
                     </el-popover>
                   </p>
                   <p class="travelnowrap"
-                    v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168)  && item.IsOpenHotel==1">
+                    v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168 ||item.LineID==118)  && item.IsOpenHotel==1">
                     <span style="color:red;font-weight:bold;">※ {{$t('op.DJyiguanbi')}}.</span>
                   </p>
                 </div>

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -491,7 +491,7 @@
                     {{item.OutBranchName}}
                   </p>
                   <p
-                    v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168) && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
+                    v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168||item.LineID==118) && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
                     <el-popover width="980" trigger="click" popper-class="TC_HotelPop">
                       <commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj"
                         :TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUM"
@@ -505,7 +505,7 @@
                     </el-popover>
                   </p>
                   <p class="travelnowrap"
-                    v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168) && item.IsOpenHotel==1">
+                    v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168||item.LineID==118) && item.IsOpenHotel==1">
                     <span style="color:red;font-weight:bold;">※ {{$t('op.DJyiguanbi')}}.</span>
                   </p>
                 </div>

src/components/confirmationOrderDownLoadNew.vue

@@ -539,8 +539,14 @@
         var title = this.orderMsg.startDate + this.orderMsg.lineteamName + this.orderMsg.dayNum + '日游';
         //欧洲
         if (this.dataAll.lineId == 168 || this.dataAll.lineId == 119) {
-          title = this.orderMsg.startDate + this.dataAll.title;
+          title = this.orderMsg.startDate;
+          if (this.dataAll.title.length > 80) {
+            title += this.dataAll.title.substring(0, 80);
+          } else {
+            title += this.dataAll.title;
+          }
         }
+        console.log("title", title);
         var fileName = title + ".pdf";
         if (this.orderId && this.orderId > 0) {
           //出团通知书下载

src/plug/index.js

@@ -123,7 +123,7 @@ export default {
         let ocrUrl = "http://192.168.10.68:8888";
         // domainUrl = "http://192.168.10.238:8083"; // 刘东电脑
         //  domainUrl = "http://192.168.10.226"; //春姐
-        domainUrl = "http://192.168.10.68"; //奎哥
+        domainUrl = "http://192.168.10.160"; //奎哥
 
         let crmLocalFileStreamDownLoadUrl = "";
         crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";
@@ -1138,7 +1138,6 @@ export default {
         };
         try {
           let url = oss.signatureUrl(objectKey);
-          console.log("url", url);
           let getBlob = new Promise(resolve => {
             const xhr = new XMLHttpRequest();
             xhr.open('GET', url, true);
@@ -1158,7 +1157,15 @@ export default {
           getBlob.then(blob => {
             if (window.navigator.msSaveOrOpenBlob) {      
               navigator.msSaveBlob(blob, filename);
+              resultJson.resultCode = 1;
+              if (callBack) {
+                callBack(resultJson)
+              }
             } else {     
+              resultJson.resultCode = 1;
+              if (callBack) {
+                callBack(resultJson)
+              }
               const link = document.createElement('a');
               const body = document.querySelector('body');
               link.href = window.URL.createObjectURL(blob);
@@ -1168,10 +1175,6 @@ export default {
               link.click();
               body.removeChild(link);
               window.URL.revokeObjectURL(link.href);
-              resultJson.resultCode = 1;
-              if (callBack) {
-                callBack(resultJson)
-              }
             }
           });
         } catch (err) {