Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs into settle-test-20230110

src/business/gitopn/event/index.js

@@ -226,10 +226,12 @@ export default {
           this.calcPayDetail(reqParams)
           break
         case 'changeDsp':
+          let index = emitParams.index;
           let setglgRequest = buildFn.buildSetglg(this.model, this.trnName);
           setglgRequest.setglg = {setgll:  emitParams.list};
-          this.setgllAccts(setglgRequest, emitParams.index)
-          emitParams.list = this.model.setmod.setglg.setgll;
+          this.setgllAccts(setglgRequest, index);
+          emitParams.list = this.model.setmod.setglg.setgll || [{value: '', lable:''}];
+          emitParams.list[index-1].act =  emitParams.list[index-1].acts[0].value;
           break
         default:
           return

src/business/gitopn/model/index.js

@@ -182,6 +182,10 @@ export default class Gitopn {
 						cur: '', // Guarantee Amount		.gidgrp.cbs.max.cur
 						amt: '0.00', // Guarantee Amount		.gidgrp.cbs.max.amt
 					},
+					max2: {
+						cur: '', // Guarantee Amount		.gidgrp.cbs.max.cur
+						amt: '0.00', // Guarantee Amount		.gidgrp.cbs.max.amt
+					},
 					opc2: {
 						cur: '',
 						amt: '0.00',

src/components/business/docpan/views/index.vue

@@ -589,12 +589,12 @@ export default {
       //     // this.model.docpan.cortyp = cortyp
 
       // }
-      const params = {
-        index: row.idx,
+      let params = {
+        docVo: row,
       };
       rtnmsg = await Api.post(
         `${this.requestPrefix}/executeDocpan`,
-        this.wrapper(params)
+        params
       );
       if (rtnmsg.respCode == SUCCESS) {
         if (cortyp == 'SWT' || cortyp == 'FMT' || cortyp == 'CMT') {
@@ -628,6 +628,19 @@ export default {
         } else {
           this.title = '面函';
           let viewurl = '/#/docpan/show';
+          let base64Str = rtnmsg.data.executeDocpan;
+          let bstr = window.atob(base64Str); // 解码 base-64 编码的字符串，base-64 编码使用方法是 btoa()
+          let length = bstr.length;
+          let u8arr = new Uint8Array(length); // 创建初始化为0的，包含length个元素的无符号整型数组
+          while (length--) {
+            u8arr[length] = bstr.charCodeAt(length); // 返回在指定的位置的字符的 Unicode 编码
+          }
+          let blob = new Blob([u8arr]);
+          let param={
+            blob:blob,
+            docnam:row.docnam
+          }
+          window["params"] = param;
           window.open(
             viewurl,
             'newwindow',

src/views/Docpan/Show.vue

@@ -25,46 +25,21 @@ export default {
   },
   methods: {
     async goPreview () {
-      let routeQuery = this.$route.query
-      const params = {
-        index: routeQuery.idx,
-      };
-      let res = await Api.post('/service/gitopn/executeDocpan', this.wrapper(params));
-      if (res.respCode == SUCCESS) {
-        let base64Str = res.data.executeDocpan;
-        let bstr = window.atob(base64Str); // 解码 base-64 编码的字符串，base-64 编码使用方法是 btoa()
-        let length = bstr.length;
-        let u8arr = new Uint8Array(length); // 创建初始化为0的，包含length个元素的无符号整型数组
-        while (length--) {
-          u8arr[length] = bstr.charCodeAt(length); // 返回在指定的位置的字符的 Unicode 编码
-        }
-        let blob = new Blob([u8arr]);
-        renderAsync(blob, this.$refs.file)
-      }
+      let params = window.opener["params"];
+      let blob = params.blob
+      renderAsync(blob, this.$refs.file)
     },
     async downLoad () {
-      let routeQuery = this.$route.query
-      const params = {
-        index: routeQuery.idx,
-      };
-      let res = await Api.post('/service/gitopn/executeDocpan', this.wrapper(params));
-      if (res.respCode == SUCCESS) {
-        let base64Str = res.data.executeDocpan;
-        let bstr = window.atob(base64Str); // 解码 base-64 编码的字符串，base-64 编码使用方法是 btoa()
-        let length = bstr.length;
-        let u8arr = new Uint8Array(length); // 创建初始化为0的，包含length个元素的无符号整型数组
-        while (length--) {
-          u8arr[length] = bstr.charCodeAt(length); // 返回在指定的位置的字符的 Unicode 编码
-        }
-        let blob = new Blob([u8arr]);
-        var a = document.createElement("a"); //创建一个<a></a>标签
-        a.href = URL.createObjectURL(blob); // 将流文件写入a标签的href属性值
-        a.download = "gitopn.docx"; //设置文件名
-        a.style.display = "none"; // 障眼法藏起来a标签
-        document.body.appendChild(a); // 将a标签追加到文档对象中
-        a.click(); // 模拟点击了a标签，会触发a标签的href的读取，浏览器就会自动下载了
-        a.remove(); // 一次性的，用完就删除a标签
-      }
+      let params = window.opener["params"];
+      let blob = params.blob
+      let docnam = params.docnam
+      var a = document.createElement("a"); //创建一个<a></a>标签
+      a.href = URL.createObjectURL(blob); // 将流文件写入a标签的href属性值
+      a.download = docnam; //设置文件名
+      a.style.display = "none"; // 障眼法藏起来a标签
+      document.body.appendChild(a); // 将a标签追加到文档对象中
+      a.click(); // 模拟点击了a标签，会触发a标签的href的读取，浏览器就会自动下载了
+      a.remove(); // 一次性的，用完就删除a标签
     }
   }
 };