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

src/components/SalesModule/signedFinance.vue

@@ -400,11 +400,12 @@
                     </el-tooltip>
                     </td>
                 <td>
-                  <el-tooltip class="item" effect="dark" content="预付款退款" placement="top-start">
+                  <!-- <el-tooltip class="item" effect="dark" content="预付款退款" placement="top-start">
                     <button class="normalBtn" @click="goUrlZD(item)">
                       <i class="el-icon-right"></i>
                     </button>
-                    </el-tooltip>
+                    </el-tooltip> -->
+                    <el-button @click="checkFinance(item)">审核</el-button>
                 </td>
                 </tr>
                 <tr v-if="czList.length==0">
@@ -414,6 +415,33 @@
       <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
         layout="total,prev, pager, next, jumper" :page-size="this.msg.pageSize" :total="total">
       </el-pagination>
+        <el-dialog custom-class='addCompany' :title="$t('fnc.xzzjiaoren')" width="400px" :visible.sync="showCheck" center>
+                <el-form label-width="100px">
+            <el-form-item label="签约资料" prop="SigningFile">
+              <el-upload v-if="!saveMsg || !saveMsg.length" class="upload-demo"
+                style="display:inline-block;position:relative;top:-1px;left:3px;" :http-request="uploadFileBtn"
+                :show-file-list="false" action="">
+                <el-button size="small" type="primary">签约材料</el-button>
+              </el-upload>
+              <template v-if="saveMsg&& saveMsg.length>0">
+                <template v-for="(subItem,subIndex) in saveMsg">
+                  <a style="margin-left:20px;color:blue;cursor:pointer;" target="_blank" :key="subIndex"
+                    @click="downloadFile(subItem.Path,subItem.FileName)">{{subItem.FileName}}</a>
+
+                  <a :key="subIndex+1000" style="margin-left:20px;color:blue;cursor:pointer;"
+                    @click="DeleteFile(subIndex)">删除</a>
+                </template>
+              </template>
+            </el-form-item>
+                    <el-form-item :label="$t('hotel.hotel_remark')">
+                        <el-input type="textarea" v-model="addMsg.Notes" class="w216"></el-input>
+                    </el-form-item>
+                </el-form>
+                <div slot="footer" class="dialog-footer">
+                    <button class="normalBtn" type="primary" @click="checkSubmit">{{$t('pub.saveBtn')}}</button>
+                    <button class="hollowFixedBtn" @click="showCheck=false">{{$t('pub.cancelBtn')}}</button>
+                </div>
+        </el-dialog>
     </div>
 
   </div>
@@ -422,6 +450,12 @@
   export default {
     data() {
       return {
+        addMsg: {},
+        showCheck: false,
+        saveMsg: [],
+        headers: {
+          'Content-Type': 'application/octet-stream'
+        },
       yfcheckList: [],
         czList: [],
         saveMsg: [],
@@ -467,6 +501,62 @@
       }
     },
     methods: {
+      checkSubmit() {
+        if(!this.saveMsg || !this.saveMsg.length) {
+          this.$message.error('请上传凭证')
+          return
+        }
+        this.addMsg.Voucher = this.saveMsg[0].Path;
+        this.apipost('customer_post_GetSigningFinance', this.addMsg, res => {
+          if (res.data.resultCode == 0) {
+            this.loading = false;
+            this.czList = []
+          } else {
+            this.czList = res.data.data.pageData;
+            this.total = res.data.data.count;
+            this.loading = false;
+          }
+        }, err => {})
+      },
+      uploadFileBtn(file) { //上传
+        if (file.file.size > 1024 * 1024 * 100) {
+          this.$message.warning('文件大小不能超过100M！')
+          return
+        }
+        let that = this
+        let newArr = [];
+        newArr.push(file.file)
+        let path = "/Upload/Temporary/"
+        this.$message.info('上传中...')
+        this.UploadSelfFileT(path, newArr, x => {
+          let fileSize = file.file.size < 1024 ? file.file.size : (file.file.size / 1024).toFixed(0);
+          this.saveMsg = []
+          console.log('file', file, x)
+          this.saveMsg.push({
+            Path: x.data.FilePath,
+            FileName: file.file.name,
+            MD5Sign: file.file.uid,
+            FileSize: fileSize,
+            FolderId: this.msg.ParentId
+          })
+        });
+      },
+      //删除文件
+      DeleteFile(subIndex) {
+        this.saveMsg.splice(subIndex, 1);
+      },
+      //下载文件
+      downloadFile(fileUrl, fileName) {
+        const link = document.createElement('a');
+        link.href = fileUrl;
+        link.download = fileName;
+        document.body.appendChild(link);
+        link.click();
+      },
+      checkFinance(item) {
+        this.showCheck = true;
+        this.checkObj = item;
+      },
     ZhiDanChongDi() {
       this.yfcdState = true;
       this.yfcheckList = [];

src/plug/index.js

@@ -119,16 +119,16 @@ export default {
         let lxymallUrl = ''; //国内游api
         let crmUrl = ""; //crm API
         let locationName = window.location.hostname;
-         domainUrl = "http://192.168.10.128";
+        //  domainUrl = "http://192.168.10.128";
         // domainUrl = "http://192.168.10.9:8083" // 刘东电脑
-         //domainUrl = "http://192.168.10.226:8015";
+         domainUrl = "http://192.168.10.226";
         //domainUrl = "http://reborn.oytour.com";
         let crmLocalFileStreamDownLoadUrl = "";
         crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";
         let javaUrldo = "";
         javaUrldo = locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://127.0.0.1:9000";
         //商城API
-        // mallUrl = "http://192.168.1.48:8019";
+        // mallUrl = "http://192.168.1.48:8019";                                                                                                          
         mallUrl = "http://192.168.20.13:8088";
         lxymallUrl = "http://192.168.20.13:8088";
         // crmUrl = "http://192.168.10.36:8098"