From b4ca7963a5fc8fafa3ac7e6a641d0af14666541a Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Sat, 19 Aug 2023 09:34:47 +0800
Subject: [PATCH] update

---
 .../wwwroot/components/table/index.js           |  2 +-
 .../wwwroot/models/settle/commerce.js           |  2 +-
 .../wwwroot/router/business.js                  |  2 +-
 .../wwwroot/views/base-data/user.js             |  2 +-
 .../wwwroot/views/settle/_check.js              | 13 +++++++++++++
 .../wwwroot/views/settle/commerce.js            | 17 +++++++++++++++++
 6 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/table/index.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/table/index.js
index fdf9420e..d820c71a 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/table/index.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/table/index.js
@@ -22,7 +22,7 @@ export default {
         </div>
       </template>
     </div>
-    <div v-for="(row,index) in data" class="row">
+    <div v-for="(row,index) in data" class="row data">
       <template v-for="(item,key) in columns.properties">
         <div class="cell el-table__cell selection" v-if="item.input==='selection'">
           <div class="cell" style="text-align:center;" v-if="item.input==='selection'">
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/commerce.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/commerce.js
index 535e3b8c..63b72cca 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/commerce.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/commerce.js
@@ -65,7 +65,7 @@ export default function (businessType, type) {
     service = "invoice_service";
   }
   const queryUrl = `settleaccount/${service}/main-query`;
-  const exportUrl = `settleaccount/${service}/export`;
+  const exportUrl = `settleaccount/invoice_service/export-detail`;
   const invoiceUrl = `settleaccount/${service}/generate-invoice`;
   const receivedUrl = `settleaccount/${service}/received`;
   const rejectUrl = `settleaccount/${service}/reject`;
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js
index 9f6ce240..a32f0b32 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js
@@ -87,7 +87,7 @@ function createCommerceCheckList(path, business, client, title = "商务审批")
       createButton("query", "title=查询&isTop=true"),
       createButton("approval", "title=商务审核通过&isTop=true"),
       createButton("reject", "title=退回"),
-      createButton("export", "title=导出&isTop=true&pattern=paged"),
+      createButton("export-group", "title=导出发票分组&pattern=paged"),
       createButton("receive", "title=客户已收票&isTop=true"),
     ],
   };
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/user.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/user.js
index f7a38935..58525a07 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/user.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/user.js
@@ -15,7 +15,7 @@ export default {
         const url = `base/user/${rows[0].id}/${item.path}`;
         await appListRef.value.action(
           async () => await request(url, null, { method: item.meta.method }),
-          `是否重置用户${rows[0].userName}密码`,
+          `是否重置用户${rows[0].userName}密码?`,
           `${rows[0].userName}密码已经重置为123456`
         );
       }
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js
index 86df3ca5..5e51a00f 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js
@@ -447,6 +447,19 @@ export default {
           nextTick(() => {
             console.log(setup2table1Ref.value);
             console.log(setup2table2Ref.value);
+            const list1 = setup2table1Ref.value.tableRef.querySelectorAll(".row.data");
+            const list2 = setup2table2Ref.value.tableRef.querySelectorAll(".row.data");
+            list1.forEach((o) => {
+              const key = o.querySelector(".lu").innerText;
+              var qty = o.querySelector(".qty");
+              var qtyValue = qty.innerText;
+              var qty2 = Array.from(list2).find((o) => o.querySelector(".lu").innerText === key);
+              var qtyValue2 = qty2?.innerText;
+              if (qtyValue !== qty2) {
+                qty.classList.addClass("diff");
+                qty2?.addClass("diff");
+              }
+            });
           });
         } catch (e) {
           console.log(e);
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/commerce.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/commerce.js
index 941ae5f7..48af9dd5 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/commerce.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/commerce.js
@@ -46,6 +46,23 @@ export default {
             appListRef.value.tableLoading = false;
           }
         }
+      } else if (item.path === "export-group") {
+        const url = config.edit.exportUrl;
+        const method = config.edit.exportMethod;
+        const postData = {
+          filters: [
+            {
+              logic: "and",
+              column: "invGroupNum",
+              action: "equal",
+              value: rows[0]["invGroupNum"],
+            },
+          ],
+        };
+        const response = await request(url, postData, { method });
+        if (!response.errors) {
+          window.open(getUrl(`settleaccount/getblobfile/download/${response.data}`));
+        }
       } else if (item.path === "invbillNum" || item.path === "invGroupNum") {
         data.value = { [item.path]: rows[0][item.path] };
         visable.value = true;