lfx преди 3 месеца
родител
ревизия
2c17a76798

+ 2 - 2
src/main/java/com/malk/pro/guyuan/controller/NhIVController.java

@@ -151,7 +151,7 @@ public class NhIVController {
     McR invoice_iv2(@RequestBody Map<String, String> data) throws TencentCloudSDKException {
 
         McException.assertParamException_Null(data, "url");
-        String image = ydClient.convertTemporaryUrl(data.get("url"),6000);
+        String image = ydClient.convertTemporaryUrl(data.get("url"),6000,APP_TYPE,SYSTEM_TOKEN);
         log.info("混票识别, 免登地址, {}", image);
         // 非PDF, 且内存大于3M, 压缩后上传
         if (UtilMap.getFloat(data, "size") > 3.0f && !UtilMap.getBoolean(data, "isPdf")) {
@@ -228,7 +228,7 @@ public class NhIVController {
     McR invoice_iv(@RequestBody Map<String, String> data) throws TencentCloudSDKException {
 
         McException.assertParamException_Null(data, "url");
-        String image = ydClient.convertTemporaryUrl(data.get("url"),6000);
+        String image = ydClient.convertTemporaryUrl(data.get("url"),6000,APP_TYPE,SYSTEM_TOKEN);
         log.info("混票识别, 免登地址, {}", image);
         // 非PDF, 且内存大于3M, 压缩后上传
         if (UtilMap.getFloat(data, "size") > 3.0f && !UtilMap.getBoolean(data, "isPdf")) {

src/main/resources/static/mjs/mjs.js → src/main/resources/static/guyuan/mjs/mjs.js


src/main/resources/static/mjs/mjs.min.js → src/main/resources/static/guyuan/mjs/mjs.min.js


+ 12 - 3
src/main/resources/static/mjs/mjsnh.js

@@ -14812,7 +14812,10 @@ import { SS as storage } from "storage"; // import { SS } from "storage"; */
                                 rsp = _context2.sent;
 
                                 // 明细数据匹配表头
-                                headers = mjs.$this.$("tableField_liv5f4d2").props.children.props.children.map(function (_ref2) {
+                                const children = mjs.$this.$("tableField_liv5f4d2").props.children;
+                                // 确保 children 是一个数组
+                                const childrenArray = Array.isArray(children) ? children : [children];
+                                headers = childrenArray[0].props.children.map(function (_ref2) {
                                     var _ref2$props = _ref2.props,
                                         label = _ref2$props.label,
                                         fieldId = _ref2$props.fieldId;
@@ -14846,14 +14849,20 @@ import { SS as storage } from "storage"; // import { SS } from "storage"; */
                                     exTax += item.excludingTax;
                                     // 发票数据标题: 销售方 + 发票类型 + 价税合计
                                     rowData.textField_ljmgqvbz = item.sellerName + "-" + item.kindName + "-" + item.amount;
+                                    rowData.textField_m7ohbyd0 = file.uid;
                                     return rowData;
                                 });
 
                                 mjs.$this.$('numberField_ln05ra1i').setValue(amount);
                                 mjs.$this.$('numberField_ln05ra1n').setValue(exTax);
                                 mjs.$this.$('numberField_ln05ra1o').setValue(tax);
-                                mjs.$this.$('tableField_liv5f4d2').setValue(invoices);
-                                return _context2.abrupt("return", invoices);
+                                var tableData = mjs.$this.$('tableField_liv5f4d2').getValue();
+                                if(tableData.length == 1 && !tableData[0].selectField_liihyrta){
+                                    tableData=[];
+                                }
+                                tableData.push(...invoices)
+                                mjs.$this.$('tableField_liv5f4d2').setValue(tableData);
+                                return _context2.abrupt("return", tableData);
 
                             case 12:
                             case "end":