Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/views/houseSelfCollect/paymentManagement.vue

@@ -391,35 +391,46 @@ import {
         invoicing(data)
           .toPromise()
           .then(response => {
+            debugger
             console.log(response)
-            //未完成，接口调通后替换假数据
-            response = {
-
-            }
-            response.data.imgList = [{
-                name: 'xml1',
-                src: 'https://taohaoliang.oss-cn-beijing.aliyuncs.com/admin/75215bed1ad7408aa73d6474bfe82854.png'
-              },
-              {
-                name: 'xml2',
-                src: 'https://taohaoliang.oss-cn-beijing.aliyuncs.com/admin/75215bed1ad7408aa73d6474bfe82854.png'
-              }, {
-                name: 'xml3',
-                src: 'https://taohaoliang.oss-cn-beijing.aliyuncs.com/admin/75215bed1ad7408aa73d6474bfe82854.png'
-              }
-            ]
-            this.invoicingImgList = response.data.imgList
-            if (response.data.imgList.length > 0) {
-              for (let i = 0; i < response.data.imgList.length; i++) {
+            if (response.length > 0) {
+              for (let i = 0; i < response.length; i++) {
                 //创建标签下载文件
                 let a = document.createElement('a');
-                a.href = response.data.imgList[i].src;
-                let urlArr = a.href.split('.');
-                a.setAttribute('download', response.data.imgList[i].name + '.xml');
+                a.href = response[i];
+                a.setAttribute('download', response[i]);
                 a.click();
                 a.remove();
               }
             }
+            //未完成，接口调通后替换假数据
+            // response = {
+
+            // }
+            // response.data.imgList = [{
+            //     name: 'xml1',
+            //     src: 'https://taohaoliang.oss-cn-beijing.aliyuncs.com/admin/75215bed1ad7408aa73d6474bfe82854.png'
+            //   },
+            //   {
+            //     name: 'xml2',
+            //     src: 'https://taohaoliang.oss-cn-beijing.aliyuncs.com/admin/75215bed1ad7408aa73d6474bfe82854.png'
+            //   }, {
+            //     name: 'xml3',
+            //     src: 'https://taohaoliang.oss-cn-beijing.aliyuncs.com/admin/75215bed1ad7408aa73d6474bfe82854.png'
+            //   }
+            // ]
+            // this.invoicingImgList = response.data.imgList
+            // if (response.data.imgList.length > 0) {
+            //   for (let i = 0; i < response.data.imgList.length; i++) {
+            //     //创建标签下载文件
+            //     let a = document.createElement('a');
+            //     a.href = response.data.imgList[i].src;
+            //     let urlArr = a.href.split('.');
+            //     a.setAttribute('download', response.data.imgList[i].name + '.xml');
+            //     a.click();
+            //     a.remove();
+            //   }
+            // }
           })
           .catch(() => {})
       },
@@ -931,19 +942,20 @@ import {
       },
       selectInit(row) {
         //在这里一定要记得类型匹配的上。
-        if (row.status != '已驳回') {
-          if (
-            row.taskId == null &&
-            row.status != '已通过' &&
-            row.status != '部分付款'
-          ) {
-            return false
-          } else {
-            return true
-          }
-        } else {
-          return true
-        }
+        // if (row.status != '已驳回') {
+        //   if (
+        //     row.taskId == null &&
+        //     row.status != '已通过' &&
+        //     row.status != '部分付款'
+        //   ) {
+        //     return false
+        //   } else {
+        //     return true
+        //   }
+        // } else {
+        //   return true
+        // }
+        return true
       },
       handleSelectionChange(val) {
         this.modification = val

vue.config.js

@@ -141,8 +141,7 @@ module.exports = {
         // target: 'https://product-server.winsea.com/', //目标地址
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
-        // target: 'http://192.168.1.122:9100/',
-        target: 'http://192.168.1.108:8090/',
+        target: 'http://192.168.1.122:9100/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',
         // target: 'http://192.168.24.5:8098',//目标地址