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

src/components/Complaints/ComplaintsManage.vue

@@ -129,9 +129,17 @@
             </el-select>
           </span>
         </li>
+        <li>
+          <span>
+            <em>日期</em>
+            <el-date-picker value-format="yyyy-MM-dd" v-model="queryMsg.startDate" type="date"></el-date-picker>
+            <el-date-picker value-format="yyyy-MM-dd" v-model="queryMsg.endDate" type="date"></el-date-picker>
+          </span>
+        </li>
         <li>
           <input type="button" class="hollowFixedBtn" value="查询" @click="getList(),resetPageIndex()"/>&nbsp;
           <input type="button" class="normalBtn" value="新增" @click="goUrl('AddComplaints',0)"/>
+          <input type="button" class="normalBtn" value="导出"/>
         </li>
       </ul>
     </div>
@@ -168,6 +176,7 @@
           <th>状态</th>
           <th>应赔金额</th>
           <th>实赔金额</th>
+          <th>创建日期</th>
           <th>当前处理人</th>
           <th>处理人耗时</th>
           <th>总耗时</th>
@@ -188,6 +197,7 @@
           <td>{{item.DisposeStatusStr}}</td>
           <td>{{item.DisposeStatus===4?item.ShouldPayMoney:''}}</td>
           <td>{{item.DisposeStatus===4?item.BackMoney:''}}</td>
+          <td>{{item.CreateTime}}</td>
           <td>{{item.CurrentDealEmpName}}</td>
           <td>{{getTimeConsuming(item,1)}}</td>
           <td>{{getTimeConsuming(item,2)}}</td>
@@ -248,7 +258,9 @@
           OrderID: '',
           TCID: '',
           pageIndex: 1,
-          pageSize: 10
+          pageSize: 10,
+          startDate:'',
+          endDate:'',
         },
         complainStatistic: {}
       }
@@ -285,6 +297,7 @@
             this.queryCommonData.total = res.data.data.count
             this.queryCommonData.noData = !this.queryCommonData.total > 0
             this.queryCommonData.dataList = res.data.data.pageData
+            console.log(this.queryCommonData.dataList,'datalist');
           } else {
             this.Error(res.data.message)
           }

src/components/Details.vue

@@ -820,7 +820,7 @@ export default {
     filterRouter(){
       let that=this
       this.$router.beforeEach((to, from, next) => {
-        console.log("to.query.blank && to.query.blank=='y'",to.query)
+        // console.log("to.query.blank && to.query.blank=='y'",to.query,"666")
         if(to.path=="/ModifyVisaProduct"){
           this.reloadpage();
         }

src/components/FinancialModule/addFinancialDocuments.vue

@@ -830,7 +830,7 @@ export default {
                     Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
                 })
                 this.$message.success(this.$t('tips.scchenggong'))
-            });
+            }, 1);
         },
         AuditOrRefund(){
           this.MsgBus.$emit('msg');

src/components/Hotel/roomReservations.vue

@@ -39,7 +39,7 @@
           <th width="120">占床/不占床</th>
           <th width="80">实际用房数</th>
           <th></th>
-          <th v-for='item in thLengthTitle'>{{item}}</th>
+          <!-- <th v-for='item in thLengthTitle'>{{item}}</th> -->
           <th></th>
           <th>备注</th>
           <th>操作</th>

src/components/SalesModule/VisaFinancialDocuments.vue

@@ -531,7 +531,6 @@ export default {
         this.Error("至少选择一人！");
         return;
       }
-      
       sessionStorage.setItem("saveGuestInfo",JSON.stringify(userInfo))
       // this.$store.commit('saveGuestInfo',userInfo)
       // console.log("getGuestInfo",this.$store.getters.getGuestInfo)

src/components/SalesVisa/ModifyVisaProduct.vue

@@ -404,19 +404,19 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="成本价" prop="CostPrice">
-                    <el-input v-model.number="addMsg.CostPrice" @keyup.native="checkInteger(addMsg,'CostPrice')" placeholder="请输入" maxlength="20"></el-input>
+                    <el-input v-model="addMsg.CostPrice"  @keyup.native="checkPrice(addMsg,'CostPrice')" placeholder="请输入" maxlength="20"></el-input>
                     </el-form-item>
                     
                    
                     <el-form-item label="同业价" prop="VisaPrice">
-                    <el-input v-model.number="addMsg.VisaPrice" @keyup.native="checkInteger(addMsg,'VisaPrice')" placeholder="请输入" maxlength="20"></el-input>
+                    <el-input v-model.number="addMsg.VisaPrice" @keyup.native="checkPrice(addMsg,'VisaPrice')" placeholder="请输入" maxlength="20"></el-input>
                     </el-form-item>
                     <el-form-item label="直客价" prop="VisaB2CPrice">
-                    <el-input v-model.number="addMsg.VisaB2CPrice" @keyup.native="checkInteger(addMsg,'VisaB2CPrice')" placeholder="请输入" maxlength="20"></el-input>
+                    <el-input v-model.number="addMsg.VisaB2CPrice" @keyup.native="checkPrice(addMsg,'VisaB2CPrice')" placeholder="请输入" maxlength="20"></el-input>
                     </el-form-item>
                     
                     <el-form-item label="提成金额" prop="CommissionPrice">
-                    <el-input v-model="addMsg.CommissionPrice" placeholder="请输入"  @keyup.native="checkInteger(addMsg,'CommissionPrice')"></el-input>
+                    <el-input v-model="addMsg.CommissionPrice" placeholder="请输入"  @keyup.native="checkPrice(addMsg,'CommissionPrice')"></el-input>
                     </el-form-item>
                     
                     <el-form-item label="提前预定天数" prop="BookAdvance">
@@ -764,7 +764,7 @@ export default {
         VisaType: 1,
         SendVisaDate: "",
         VisaPrice: "",
-        PeopleNum: 0,
+        PeopleNum: "0",
         CostPrice: "",
         EntryType:0,
         CommissionPrice: "",
@@ -779,8 +779,6 @@ export default {
     
       rules: {
         Name: [{ required: true, message: "请输入产品名称", trigger: "blur" }],
-        // ManageDuration:[{ type: 'number', message: '必须为数字值'}],
-        
         customerName: [
           { required: true, message: "请输入客户名", trigger: "blur" }
         ],
@@ -795,14 +793,14 @@ export default {
           { required: true, message: "请输入直客价", trigger: "blur" },
           {
             pattern: this.$commonUtils.Regex.el_Isdecimal,
-            message: "请输入数字"
+            message: "请输入直客价"
           }
         ],
         CostPrice: [
           { required: true, message: "请输入成本价", trigger: "blur" },
           {
             pattern: this.$commonUtils.Regex.el_Isdecimal,
-            message: "请输入数字"
+            message: "请输入成本价"
           }
         ],
         VisaType: [
@@ -895,7 +893,7 @@ export default {
             "dmc_get_visa_GetVisaProductInfo_V1",
             {Pid:Pid},
             res => {
-              // console.log(res);
+              console.log(res);
               if (res.data.resultCode == 1) {
                   let data=res.data.data;
                   this.addMsg=res.data.data;
@@ -975,7 +973,6 @@ export default {
             "YYYY-MM-DD"
           );
         //   console.log("this.addMsg", this.addMsg);
-        this.loading=true;
           this.apipost(
             "dmc_post_visa_SetVisaProduct_V1",
             this.addMsg,

src/components/TravelManager/TravelList/TeamBalancePayment.vue

@@ -233,7 +233,7 @@
           <div class="TB_comtitle TB-Title">团费收入：
             <span v-if="moneyAll.Moneyall>0 || moneyAll.PayMoneyall>0">
               <span class="span_all">应收：¥{{moneyFormat(moneyAll.Moneyall)}}</span>
-              <span class="span_all">实收：¥{{moneyFormat(moneyAll.PayMoneyall)}}</span>
+              <span class="span_all">实收：¥{{moneyFormat(moneyAll.PayMoneyall)}}</span> 
             </span>
             
             
@@ -1573,8 +1573,8 @@
               // 车资
               if(that.isExists(item.CostTypeList,'车资')){
            
-                this.moneyAll.zheziyf+=item.Money;
-                this.moneyAll.zhezisf+=item.PayMoney;
+                this.moneyAll.cheziyf+=item.Money;
+                this.moneyAll.chezisf+=item.PayMoney;
               }
               // 机票款
               if(that.isExists(item.CostTypeList,'国际段机票') || item.OrderSource===4 || that.isExists(item.CostTypeList,'机票退税') || that.isExists(item.CostTypeList,'机票罚金') || that.isExists(item.CostTypeList,'机票税金') || that.isExists(item.CostTypeList,'国内联运段机票')){

src/plug/index.js

@@ -117,10 +117,10 @@ export default {
       Vue.prototype.domainManager = function () {
         let domainUrl = '';
         let locationName = window.location.hostname;
-        // domainUrl = "http://192.168.2.65:8025"; //214主域名
-        domainUrl = "http://192.168.2.214:8082"; //214主域名
+        domainUrl = "http://192.168.2.65:8025"; //214主域名
+        // domainUrl = "http://192.168.2.214:8082"; //214主域名
         // domainUrl = "http://192.168.0.119:8082";
-        // domainUrl = "http://192.168.2.16:8083";
+        // domainUrl = "http://192.168.2.106:8082";
         if (locationName.indexOf('oytour') !== -1) {
           domainUrl = "http://reborn.oytour.com";
         } else if (locationName.indexOf('viitto') !== -1) {
@@ -148,7 +148,7 @@ export default {
           //google地图图片地址
           GoogleMapImageUrl: "http://super.oytour.com",
           //上传站点
-          UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://upload.oytour.com" : "http://192.168.2.214:8120",
+          UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://upload.oytour.com" : "http://192.168.2.106: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.215:9000",
@@ -597,7 +597,7 @@ export default {
         }
       },
       //上传文件到本地服务器
-      Vue.prototype.UploadSelfFileT = function (path, files, successCall) {
+      Vue.prototype.UploadSelfFileT = function (path, files, successCall, ocr) {
         if (files && files.length > 0) {
           let nameList = new Array()
           for (let index = 0; index < files.length; index++) {
@@ -609,7 +609,7 @@ export default {
               let fileName = nameList[index]
               fileName = path + fileName + "." + files[index].name.split('.').pop()
               var formData = new FormData();
-              var uploadUrl = that.domainManager().UploadUrl + "/Upload?filePath=" + path;
+              var uploadUrl = that.domainManager().UploadUrl + "/Upload?filePath=" + path +'&ocr='+ ocr;
               formData.append("myfile", files[index]);
               that.$http.post(uploadUrl, formData, {})
                 .then(res => {