修改发票退回处理方法

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/_options.js

@@ -24,6 +24,7 @@ const stateOptions = [
   { value: 12, label: "发票同步中" },
   { value: 13, label: "可结退回不可结同步中" },
   { value: 14, label: "提交QAD退回到已开票中" },
+  { value: 15, label: "已退回" },
 ];
 const state = { title: "状态", type: "number", input: "select", options: stateOptions };
 const state2 = Object.assign(Object.assign({}, state), {
@@ -213,6 +214,7 @@ const invState = {
     { value: 12, label: "发票同步中" },
     { value: 13, label: "可结退回不可结同步中" },
     { value: 14, label: "提交QAD退回到已开票中" },
+    { value: 15, label: "已退回" },
   ],
 };
 

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/commerce.js

@@ -91,7 +91,7 @@ export default function (businessType, type) {
   const updateUrl = "settleaccount/invoice_service/update-invoice";
   const invoiceUrl = `settleaccount/${service}/generate-invoice`;
   const receivedUrl = `settleaccount/${service}/received`;
-  const rejectUrl = `settleaccount/${service}/reject`;
+  const rejectUrl = `settleaccount/invoice_service/return`;
   const reissueUrl = `settleaccount/${service}/reissue-invoice`;
   const approvalUrl = `settleaccount/${service}/approval-passed`;
   const importUrl = `settleaccount/${service}/excel-import`;

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/finance/check.js

@@ -77,11 +77,11 @@ export default {
         const url = config.edit.updateUrl;
         const method = config.edit.updateMethod;
 
-        alert("123");
+        //alert("123");
         if (rows.length > 0) {
 
           let data = rows.map((o) => o.invbillNum);
-          alert(data);
+          //alert(data);
           const postData = {
 
             InvbillNum: rows[0]["invbillNum"],

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/finance/sync.js

@@ -30,7 +30,7 @@ export default {
             url = config.edit.approvalUrl;
           } else if (item.path === "reject") {
             message = `确认退回选中的${rows.length}行数据吗?`;
-            data = rows[0]["invGroupNum"];
+            //data = rows[0]["invGroupNum"];
             url = config.edit.rejectUrl;
           } else if (item.path === "receive") {
             message = `确认选中的${rows.length}行数据客户已收票吗?`;

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/commerce.js

@@ -27,8 +27,9 @@ export default {
               : item.path === "reject"
               ? `确认退回选中的${rows.length}行数据吗?`
               : `确认选中的${rows.length}行数据客户已收票吗?`;
-          const data = item.path === "approval" ? rows.map((o) => o.invbillNum) : item.path === "reject" ? rows[0]["invGroupNum"] : rows.map((o) => o.invbillNum);
+          const data = item.path === "approval" ? rows.map((o) => o.invbillNum) : item.path === "reject" ? rows[0] : rows.map((o) => o.invbillNum);
           const url = item.path === "approval" ? config.edit.invoiceUrl : item.path === "reject" ? config.edit.rejectUrl : config.edit.receivedUrl;
+          
           await appListRef.value.onClick(async () => await request(url, data, { method: "POST" }), message, true);
         }
       }

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/finance.js

@@ -29,8 +29,9 @@ export default {
             url = config.edit.approvalUrl;
           } else if (item.path === "reject") {
             message = `确认退回选中的${rows.length}行数据吗?`;
-            data = rows[0]["invGroupNum"];
-            url = config.edit.rejectUrl;
+            data = rows[0]["invGroupNum"];            
+            url = config.edit.rejectUrl;           
+            
           } else if (item.path === "receive") {
             message = `确认选中的${rows.length}行数据客户已收票吗?`;
             url = config.edit.receivedUrl;