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

src/components/FinancialModule/Application.vue

 <template>
   <div class="Application">
       <div class="Application_content">
+          <div>
+              <el-select :disabled="numDisabled" @change="ChangeType" v-model="formdata.Type" placeholder="请选择">
+                <el-option label="现金" :value="1"></el-option>
+                <el-option label="转账" :value="2"></el-option>
+            </el-select>
+          </div>
+          <p style="text-align:right;margin:10px 0;font-size:14px">
+              流水号：<span style="color:#E95252">{{data.ApplyForNumber}}</span>
+          </p>
           <p style="text-align:center">
-              <span style="font-weight:700;font-size:20px;">現金受取依頼書</span>
+              <span style="font-weight:700;font-size:20px;">{{baseData.head}}</span>
               <span class="download" @click="downLoad">下载并保存</span>
           </p>
           <div> 
@@ -16,10 +25,10 @@
                         </el-option>
                     </el-select>
             </div>　　
-            弊社は下記のガイド1名が現金を受け取りします。受取者の本人パスポートを提示して/身分証明書を確認してから現金を渡してください。ご対応お願い致します。
+            {{baseData.info}}
           </div>
             
-            <table style="margin-top:30px" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
+            <table style="margin-top:30px" class="ApplicationTable singeRowTable" border="0" cellspacing="0" cellpadding="0">
                 <tr>
                     <th>受取日</th>
                     <th width="200">受取者</th>	
@@ -27,8 +36,12 @@
                     <th>金 額</th>
                 </tr>
                 <tr>
-                    <td>{{data.GetDate}}</td>
-                    <td>{{data.LeaderName}}</td>	
+                    <td>
+                        <el-input :disabled="numDisabled" v-model="formdata.GetDate" placeholder="请输入内容"></el-input>
+                    </td>
+                    <td>
+                        <el-input :disabled="numDisabled" v-model="formdata.LeaderName" placeholder="请输入内容"></el-input>
+                    </td>	
                     <td>
                         <el-select clearable :disabled="disabled1" v-model="formdata.GetAddress" placeholder="请选择">
                             <el-option v-if="id=='' || id==item.CashId"
@@ -39,17 +52,36 @@
                             </el-option>
                         </el-select>
                     </td>	
-                    <td>{{data.Money}}</td>
+                    <td>
+                        <el-input :disabled="numDisabled" v-model="formdata.Money" placeholder="请输入内容"></el-input>
+                    </td>
                 </tr>
             </table>
-    <div style="text-align:right;margin-top:20px;font-size:14px;">
-        <p style="padding-bottom: 10px;">会社名 成都印象之旅</p>
-        <span>{{data.JapNowTime}}</span>
-    </div>
-    <div style="margin:50px 0">
-        <p>{{data.CityName}}<span style="padding-left:6px;"> </span>{{data.TCNUM}}编号：{{data.FrId}}</p>
-        
-    </div>
+            <div style="text-align:right;margin-top:20px;font-size:14px;">
+                <p style="padding-bottom: 10px;">会社名 成都印象之旅</p>
+                <span>{{data.JapNowTime}}</span>
+            </div>
+            <div class="_addUpload_box clearfix">
+                <div v-if="formdata.ImgAddress!=''">
+                    <div style="width:100%;height:100%;overflow: hidden;">
+                        <img :src="formdata.ImgAddress?formdata.ImgAddress:''">
+                    </div>
+                    <span v-if="!numDisabled" class="iconfont icon-guanbi1" @click="deleteUploadFile"></span>
+                </div>
+                <div v-if="!numDisabled" class="_pic_upload" >
+                    <el-upload style="width:100%;height:100%"
+                    drag
+                    :http-request="uploadFileBtn"
+                    :multiple="true"  :show-file-list="false"  action="">
+                    <i class="el-icon-plus avatar-uploader-icon"></i>
+                    <div class="el-upload__text">{{$t('active.ld_djscwj')}}</div>
+                    </el-upload>
+                </div>
+            </div>
+            <div style="margin:50px 0">
+                <p>{{data.CityName}}<span style="padding-left:6px;"> </span>{{data.TCNUM}}编号：{{data.FrId}}</p>
+                
+            </div>
       </div>
       
   </div>
@@ -58,6 +90,10 @@
 export default {
   data () {
     return {
+        baseData:{
+            head:"現金受取依頼書",
+            info:"弊社は下記のガイド1名が現金を受け取りします。受取者の本人パスポートを提示して/身分証明書を確認してから現金を渡してください。ご対応お願い致します。",
+        },
         FrId:0,
         CashList:[],
         formdata:{},
@@ -66,6 +102,7 @@ export default {
         id:"",
         disabled:false,
         disabled1:false,
+        numDisabled:false,
     }
   },
   created(){
@@ -76,6 +113,44 @@ export default {
     
   },
   methods: {
+      ChangeType(val){
+          console.log("val",val);
+      },
+      uploadFileBtn(file) { //上传
+        if(this.formdata.ImgAddress!=''){
+            this.Error("只能上传一张图片！");
+            return;
+        }
+        //  1 文档  2 数据 3 图片
+        let typeArr=[
+            {stringArr:'GIF|JPG|JPEG|PNG|BMP',type:3},
+        ]
+        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("请上传图片！");
+        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);
+            let url=this.domainManager().ViittoFileUrl + x.data.FilePath;
+            
+            this.formdata.ImgAddress=url;
+            this.$message.success(this.$t('tips.scchenggong'))
+        }, 1);
+    },
+      deleteUploadFile(i){  // 删除上传文件
+            this.formdata.ImgAddress="";
+        },
       downLoad(){
           if(this.formdata.Name==""){
               this.Error("请选择旅行社")
@@ -92,6 +167,7 @@ export default {
                         link.href = _loadUrl+res.data.data
                         document.body.appendChild(link);
                         link.click();
+                        this.GetData();
                 }else{
                     this.$message.error(res.data.message)
                 }
@@ -110,7 +186,12 @@ export default {
         this.apipost('Financial_get_GetFinanceCashWithDrawals',{FrId:this.FrId}, res => {
         if(res.data.resultCode == 1) {
           this.data = res.data.data;
+          if(this.data.ApplyForNumber!="待生成"){
+              this.numDisabled=true;
+          }
+          console.log("this.data",this.data)
           this.formdata=Object.assign({},res.data.data);
+          this.formdata.Type=1;
           this.CashList= res.data.data.CashList;
           if(this.data.Name!=""){
               this.disabled=true;
@@ -133,6 +214,69 @@ export default {
 </script>
 
 <style>
+.Application .ApplicationTable .el-input.is-disabled .el-input__inner{
+    border:none;
+    background-color:transparent;
+}
+.Application .singeRowTable tr td{
+    padding: 6px;
+}
+.Application .el-upload,.Application .el-upload-dragger{
+    font-size: 28px;
+    color: #8c939d;
+    width: 126px;
+    height: 80px;
+    line-height: 41px;
+    text-align: center;
+}
+.Application ._addUpload_box{
+    display: block;
+    margin-top: 15px
+}
+.Application ._addUpload_box img{
+    width: 100%;
+    height: 100%;
+}
+.Application ._addUpload_box>div{
+    float: left;
+    width:138px;
+    height:92px;
+    border:1px dashed rgba(210,210,210,1);
+    border-radius:2px;
+    cursor: pointer;
+    margin-bottom: 10px;
+    padding: 5px;
+    margin-right: 10px;
+    position: relative;
+}
+.Application ._addUpload_box>div:hover{
+    background-color: #f5f5f5;
+}
+.Application ._addUpload_box .icon-guanbi1 {
+        font-size: 12px;
+        color: white;
+        display: inline-block;
+        margin-left: 15px;
+        position: absolute;
+        right: -6px;
+        top: -9px;
+        background-color: #f56c6c;
+        border-radius: 50%;
+        height: 20px;
+        width: 20px;
+        text-align: center;
+        line-height: 20px;
+    }
+.Application ._addUpload_box .icon-guanbi1:hover {
+        font-size: 12px;
+        color: #c94052;
+    }
+.Application ._addUpload_box .icon-excel,._addUpload_box .icon-pdf{
+        text-align: center;
+        font-size: 38px;
+        color: green;
+        line-height: 75px;
+    }
 .Application .download{
     float:right;
     cursor: pointer;

src/components/PersonalInfoSet.vue

@@ -37,6 +37,7 @@
         margin:39px auto;
         border:1px solid #F4F4F4;
         padding:3px;
+        border-radius: 50%;
     }
     .Person_Header img{
         width:100%;
@@ -588,7 +589,7 @@
     position: relative;
     cursor: pointer;
     color: #888;
-    background: #fafafa;
+    background: #fff;
     overflow: hidden;
     display: inline-block;
     *display: inline;
@@ -604,6 +605,11 @@
     filter: alpha(opacity=0);
     cursor: pointer
 }
+.cancel_Btnn{
+    background-color: #fff!important;
+    border:1px solid #e95252!important;
+    color:#e95252!important;
+}
 </style>
 
 <template>
@@ -838,9 +844,10 @@
         </div>
         <div id="demo">
             <div class="container" v-show="panel">
-                <div style="width:400px;height:400px;margin:5% 0 0 36%;position:relative;">
+                <div style="width:400px;height:400px;margin:5% 0 0 36%;position:relative;background-color:#fff;">
                     <img id="image" :src="url" alt="Picture">
-                    <button type="button" id="button" style="bottom:0;" @click="crop">确定</button>
+                    <button type="button" class="cancel_Btnn" id="button" style="bottom:-50px;right:105px;" @click="CancelUpImg">取消</button>
+                    <button type="button" id="button" style="bottom:-50px;" @click="crop">确定</button>
                 </div>	
             </div>
             <div style="padding:20px;">
@@ -1061,11 +1068,9 @@
                     this.Success(res.data.message);
                     this.passWordMsg.OldPwd='';
                     this.passWordMsg.Pwd='';
-                    this.passWordMsg.surePassword='';
-                    
+                    this.passWordMsg.surePassword='';                  
                     // //修改成功后退出登录
                     setTimeout(()=>{
-                        console.log('执行了');
                         this.$store.dispatch("logout")
                         localStorage.removeItem("userInfo");
                         localStorage.removeItem("previousPathInfo");
@@ -1171,7 +1176,6 @@
                 Id:userInfo.EmployeeId
             }
             this.apipost('admin_get_EmployeeGet',msg,res=>{
-                console.log(res,'resss');
                 if(res.data.resultCode==1){   
                     this.dataList=res.data.data;
                     this.getAccount();
@@ -1303,12 +1307,10 @@
             }
             // Crop
             croppedCanvas = this.cropper.getCroppedCanvas();
-            console.log(this.cropper)
             // Round
             roundedCanvas = this.getRoundedCanvas(croppedCanvas);
     
             this.headerImage = roundedCanvas.toDataURL();
-            console.log(this.headerImage,'headerImage');
             let that = this;
             let blob = that.base64ToBlob(this.headerImage);
             let newArr = [];
@@ -1316,7 +1318,6 @@
             var fileName = `${that.uuid(10,10)}.png`;
             var path = `/Upload/Temporary`;
             that.uploadSelfBlob(path, newArr, x => {
-                console.log(x);
                 let allPath = that.domainManager().ViittoFileUrl + x.data.FilePath;
                 this.postImg(allPath)
             })
@@ -1387,9 +1388,12 @@
                 }
             },err=>{})
 
+        },
+        //取消上传
+        CancelUpImg(){
+            this.panel=false;
         }
 
-
     },
     mounted() {
       this.getList();

src/components/SalesModule/groupTourOrder.vue

@@ -1324,7 +1324,7 @@
         <li>
           <span>
             <em>订单号</em>
-            <el-input v-model='msg.tempOrderId' class='w150'></el-input>
+            <el-input v-model='msg.tempOrderId' class='w150' @keyup.native="checkInteger(msg,'tempOrderId')" maxlength="8"></el-input>
           </span>
         </li>
         <li><span><em>发团日期</em>

src/components/SalesModule/planeTourOrder.vue

@@ -948,7 +948,7 @@
 				</li>	
 				<li>
 					<span>
-						<em>订单号</em><el-input v-model='msg.tempOrderId'  class='w150'></el-input>
+						<em>订单号</em><el-input v-model='msg.tempOrderId'  class='w150' @keyup.native="checkInteger(msg,'tempOrderId')" maxlength="8"></el-input>
 					</span>
 				</li>	
 				<li><span><em>发团日期</em>

src/components/sale/sale.vue

@@ -11,6 +11,14 @@
     font-size:12px;
     margin-left:10px;
   }
+  .ShareDisClick{
+    color:gray;
+  }
+  .Sale_UnlessWords{
+    display:inline-block;
+    margin:25px 0 0 80px;
+    color:#E95252;
+  }
 </style>
 
 <template>
@@ -48,7 +56,7 @@
                         <span>本月提成</span>
                         <template v-if="data.comissionGeneralId>0">
                           <span v-if="data.share==1" class="Sale_Share" style="color:#333;cursor:default;">已确认</span>
-                          <span v-if="data.share==0" @click="tichengDialog=true" class="Sale_Share">分享并确认</span>
+                          <span v-if="data.share==0" @click="tichengDialog=true" class="Sale_Share" :class="{'ShareDisClick':!isSubmit}">分享并确认</span>
                         </template>
                       </div>
                     </div>
@@ -502,10 +510,13 @@
      <!-- 分享业绩 -->
     <el-dialog custom-class='w500' title="分享提成" :visible.sync="tichengDialog" center :before-close="resetCommission">
             <el-form :model="shareMsg" :rules="rules" ref="shareMsg" label-width="80px">
-                <el-form-item  label="个人宣言" style="margin-bottom:0;">
+                <el-form-item  label="个人宣言" style="margin-bottom:0;" prop="ShareContent">
                     <el-input type="textarea" rows="6" resize="none" maxlength="100" v-model="shareMsg.ShareContent" placeholder=""></el-input>
                 </el-form-item>
 			    	</el-form>	
+            <span class="Sale_UnlessWords">
+                不能少于4个字
+            </span>
 			    	<div slot="footer" class="dialog-footer">
 			    		<button class="hollowFixedBtn" @click="tichengDialog=false">取消</button>
 			    		<button class="normalBtn" @click="shareCommission">确定</button>
@@ -546,6 +557,8 @@
             trigger: 'blur'
           }]
         },
+        //验证重复提交
+        isSubmit: true,
       }
     },
     components:{
@@ -775,25 +788,45 @@
           path: path
         })
       },
+      //锅炉除开标点符号的字数
+      getFilteredNum(val){
+        //var pattern=new RegExp("[`~%!@#$^=''?~！@#￥……&——‘”“'？*()（），,。.、<>《》\\[\\]【】\\“\\”{}=+-|\/:;；：]"); 
+        var pattern=new RegExp("[`~%!@#$^=''?~！@#￥……&——‘”“'？*()（），,。.、<>《》:;； +-=]"); 
+        //[]内输入你要过滤的字符，这里基本包含全部的标点符号，\\是转义字符
+        var rs="";
+        for(var i=0;i<val.length;i++){
+          rs+=val.substr(i,1).replace(pattern,'');
+        }
+        return rs
+      },
       //确定分享业绩
       shareCommission(){
         if(this.shareMsg.ShareContent==''){
           this.Error('请填写个人宣言');
           return;
         }
-        this.shareMsg.PeriodsId=this.data.comissionGeneralId;
-        this.shareMsg.totalCommission=this.data.totalCommission;
-        this.apipost('customerIndex_post_SetSellComissionGeneralSure', this.shareMsg ,res=>{
-          if(res.data.resultCode==1){
-            this.Success(res.data.message);
-            this.iWorkbench();
-            this.resetCommission();
-            this.MsgBus.$emit('reSetMSG');
-
-          }else{
-            this.Error(res.data.message);
+        let FilterNum=this.getFilteredNum(this.shareMsg.ShareContent); 
+        if(FilterNum.length<4){
+          this.Error('字数太少了，再多说点吧！');
+          return;
+        }else{
+          this.shareMsg.PeriodsId=this.data.comissionGeneralId;
+          this.shareMsg.totalCommission=this.data.totalCommission;
+          if (this.isSubmit) {
+            this.isSubmit = false;
+            this.apipost('customerIndex_post_SetSellComissionGeneralSure', this.shareMsg ,res=>{
+              this.isSubmit=true;
+              if(res.data.resultCode==1){
+                this.Success(res.data.message);
+                this.iWorkbench();
+                this.resetCommission();
+                this.MsgBus.$emit('reSetMSG');
+              }else{
+                this.Error(res.data.message);
+              }
+            },err=>{})
           }
-        },err=>{})
+        }
       },
       //关闭重置输入框
       resetCommission(){