fix: 人等排序; fix: 海纳是甲方

src/views/products/Detail/Header.jsx

@@ -19,7 +19,7 @@ import VendorSelector from "@/components/VendorSelector";
 import AuditStateSelector from "@/components/AuditStateSelector";
 import { usingStorage } from "@/hooks/usingStorage";
 
-import AgencyContract from "../Print/AgencyContract_v1120";
+import AgencyContract from "../Print/AgencyContract";
 // import AgencyContract from "../Print/AgencyContract_v0903";
 import { saveAs } from "file-saver";
 import { Packer } from "docx";

src/views/products/Print/AgencyContract.jsx

@@ -109,6 +109,7 @@ const chunkBy = (use_year, dataList = [], by = []) => {
     aq[cq.WPI_SN] = aq[cq.WPI_SN] || []
     aq[cq.WPI_SN].push(cq.group_size_min)
     aq[cq.WPI_SN] = unique(aq[cq.WPI_SN])
+    aq[cq.WPI_SN] = aq[cq.WPI_SN].slice().sort((a,b) => a-b)
     return aq
   }, {})
 
@@ -116,9 +117,10 @@ const chunkBy = (use_year, dataList = [], by = []) => {
   const maxSet = maxGroupSize === 1000 ? Infinity : maxGroupSize
 
   const _SSMinSet = uniqWith(Object.values(PGroupSizeSS), (a, b) => a.join(',') === b.join(','))
-
+  // const uSSsizeSetArr = (_SSMinSet)
   const uSSsizeSetArr = uniqueBySub(_SSMinSet)
 
+  // * 若不重叠分组, 则上面不要 uniqueBySub
   for (const key in PGroupSizeSS) {
     if (Object.prototype.hasOwnProperty.call(PGroupSizeSS, key)) {
       const element = PGroupSizeSS[key]
@@ -225,7 +227,9 @@ const tableBorderOne = {
   left: { style: BorderStyle.SINGLE, space: 0, size: 6, color: 'auto' },
   right: { style: BorderStyle.SINGLE, space: 0, size: 6, color: 'auto' },
 }
-
+/**
+ * v1120
+ */
 export default class AgencyContract {
   #remarkList = []
   create([headerParams, activeAgency, agencyProducts, agencyExtras, remarks]) {
@@ -1690,7 +1694,7 @@ export default class AgencyContract {
         children: [
           new TextRun({
             break: 2,
-            children: ['甲方：', new Tab(), '乙方：桂林海纳国际旅行社有限公司'],
+            children: ['甲方：桂林海纳国际旅行社有限公司', new Tab(), '乙方：'],
           }),
           new TextRun({
             break: 1,
@@ -1698,15 +1702,15 @@ export default class AgencyContract {
           }),
           new TextRun({
             break: 3,
-            children: ['联系人: ', new Tab(), '联系人：游佳佳'],
+            children: ['联系人: 游佳佳', new Tab(), '联系人：'],
           }),
           new TextRun({
             break: 1,
-            children: ['电话: ', new Tab(), '电话：13507831547'],
+            children: ['电话: 13507831547', new Tab(), '电话：'],
           }),
           new TextRun({
             break: 1,
-            children: ['电子邮箱: ', new Tab(), '电子邮箱：xeniayou@hainatravel.com'],
+            children: ['电子邮箱: xeniayou@hainatravel.com', new Tab(), '电子邮箱：'],
           }),
           new TextRun({
             break: 1,