浏览代码

work 财务结算 提交代码

jiayufei 3 年之前
父节点
当前提交
3d09c7742c

+ 1 - 1
src/views/modules/Statistics/newPlanStatic/newPlanStatic.vue

@@ -971,7 +971,7 @@ export default {
 		// 快手头条的切换
 		tabChange(key) {
 			this.treeValue = [];
-			this.operate = undefined;
+			// this.operate = undefined;
 			this.type = 1;
 			this.dateValue = [moment(), moment()];
 			if (key === 1) {

+ 2 - 2
src/views/modules/settlement-account/settlement-account-server.js

@@ -5,7 +5,7 @@
 
 //  export const urlAcount = 'http://118.24.244.213:8808'; // 线上
 //  export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
-// export const urlAcount = 'http://192.168.1.43:9999'; // 子安
- export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
+export const urlAcount = 'http://192.168.1.43:9999'; // 子安
+//  export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
 // export const urlAcount = 'http://192.168.1.8:9999'; // 学超
  

+ 2 - 2
src/views/modules/settlement-information/settlement-information-server.js

@@ -5,7 +5,7 @@
 
 //  export const urlAcount = 'http://118.24.244.213:8808'; // 线上
 //  export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
-//  export const urlAcount = 'http://192.168.1.43:9999'; // 子安
- export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
+ export const urlAcount = 'http://192.168.1.43:9999'; // 子安
+//  export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
 // export const urlAcount = 'http://192.168.1.8:9999'; // 学超
  

+ 7 - 5
src/views/modules/settlement-information/settlement-information.vue

@@ -231,6 +231,7 @@
                             :file-list="policyOperationForm.settlementList"
                             :before-upload="beforeUpload"
                             :remove="handleFileRemove"
+                            :multiple="true"
                         >
                             <a-button><a-icon type="upload"/>文件上传</a-button>
                         </a-upload>
@@ -676,10 +677,10 @@ export default {
                             this.$message.error(result.message);
                         }
                         else {
-                            this.$message.success('正在下载利润单,请稍后...', 4);
-
+                            this.profitModalStatus = false;
+                            this.handleProfitModalnCancel();
+                            this.$message.success('正在下载利润表,请稍后...', 4);
                             window.location.href = `${urlAcount}${urlData}?startTime=${paramsData.startTime}&endTime=${paramsData.endTime}`;
-                            this.handleSettlementModalnCancel();
 
                             // this.handleDownUpdate(url);
                         }
@@ -742,9 +743,9 @@ export default {
                             this.$message.error(result.message);
                         }
                         else {
+                            this.handleSettlementModalnCancel();
                             this.$message.success('正在下载结算单,请稍后...', 4);
                             window.location.href = `${urlAcount}${urlData}?advertiserId=${advertiserId}&productId=${productId}&mediaId=${mediaId}&uploadYears=${paramsData.uploadYears}`;
-                            this.handleSettlementModalnCancel();
                         }
                     }).catch(error => {
                         console.log(error, 'eeee');
@@ -804,7 +805,8 @@ export default {
         },
         beforeUpload(file) {
             let reg = /[\u4E00-\u9FA5]|[A-Za-z]/g;
-            const name = file.name.split('.')[0];
+            const lastPosition = file.name.lastIndexOf('.');
+            const name = file.name.slice(0, lastPosition);
             let finallyResult = name.match(reg);
             const isZip = file.type.includes('png') || file.type.includes('jpeg');
             if (!isZip) {

+ 2 - 2
vue.config.js

@@ -86,9 +86,9 @@ module.exports = {
 				//  target: 'http://adsp.tjyourong.com.cn/', //请求本地 需要jeecg-boot后台项目
 				// target: 'http://192.168.1.251/', //请求本地 需要jeecg-boot后台项目
 				// target:'http://118.24.244.213:8804',
-				// target: 'http://192.168.1.43:9999', // 子安
+				target: 'http://192.168.1.43:9999', // 子安
 				// target: 'http://192.168.1.8:9999', // 学超
-				target:'http://gateway.tjyourong.com.cn', //测试
+				// target:'http://gateway.tjyourong.com.cn', //测试
         // target: 'http://192.168.1.134:7001', //请求本地 需要jeecg-boot后台项目  周泽宇
 				// target:'http://apipre.tjyourong.com.cn', //预生产