所有列表页，查询条件和分页冲突问题解决

src/views/advance-packingList/adPaList-clothes.vue

@@ -396,7 +396,7 @@ export default {
             console.log('预装箱单-成衣列表', this.adPaListClothesData)
             this.pagination = {
               total: res.result.total,
-              current: res.result.current,
+              current: 1,
               pageSize: res.result.size
             }
           }

src/views/order/orderDetailDrawer.vue

@@ -247,7 +247,7 @@ export default {
             this.childData = res.result.records
             this.pagination = {
               total: res.result.total,
-              current: res.result.current,
+              current: 1,
               pageSize: res.result.size
             }
           }

src/views/order/orderList.vue

@@ -216,7 +216,7 @@ export default {
             // console.log('订单数据列表', this.orderListData)
             this.pagination = {
               total: res.result.total,
-              current: res.result.current,
+              current: 1,
               pageSize: res.result.size
             }
           }

src/views/reportForms/cost-allocation-table.vue

@@ -27,7 +27,7 @@
 
             <a-col :md="6" :sm="8">
               <a-form-model-item label="外销员" prop="exportSales">
-                <a-input v-model="costAllocationTable.exportSales" ></a-input>
+                <a-input v-model="costAllocationTable.exportSales"></a-input>
               </a-form-model-item>
             </a-col>
 
@@ -303,6 +303,8 @@ import mainTableExpenseCNYModal from '@views/reportForms/cost-allocation-table/m
 import mainTableExpenseUSDModal from '@views/reportForms/cost-allocation-table/mainTableExpenseUSDModal.vue'
 import accidentListModal from '@views/reportForms/fabric-loss-table/accidentListModal.vue' // 事故单
 
+import { queryByPlanNum } from '@api/reportForms/cost-allocation-table.js'
+
 export default {
   name: 'CostAllocationTable', // 成本分配 (新增)
   mixins: [JeecgListMixin],
@@ -353,7 +355,18 @@ export default {
     // 【计划单号】 搜索
     onSearch(value) {
       console.log('【计划单号】 ', value)
-      // 根据计划单号查询该页面所有信息且回显
+      this.$nextTick(() => {
+        console.log('0')
+        queryByPlanNum().then(res => {
+          console.log('11')
+          if (res.success) {
+            // this.shipmentListData = res.result.records
+            // console.log('发运明细列表', this.shipmentListData)
+          }
+          console.log('22')
+        })
+      })
+
     },
     //  主表：人民币费用支出  弹框
     mainTableExpenseCNY() {

src/views/reportForms/dye-loss-table.vue

@@ -159,12 +159,13 @@ export default {
         planLotNumber: '', //计划单号
         csocode: '', //销售订单号
         pageNo: '' //  点击的页数
+        //  pageSize: '3' //一页多少
       },
       // 分页
       pagination: {
         // total: '', //总条数
         // current: '', //当前页
-        // pageSize: '' //一页多少
+        pageSize: '3' //一页多少
       },
       someoneChartData: {
         cvenNameArr: [], //供应商数组 chart
@@ -193,12 +194,14 @@ export default {
     // 查询染损列表
     getdyeLossList() {
       this.$nextTick(() => {
+        // TODO:判断是否又查询条件  有的话  页面初始化
         dyeLossList(this.queryParam).then(res => {
+          // if(this.queryParam) {}
           if (res.success) {
             this.dyeLossRateData = res.result.records
             this.pagination = {
               total: res.result.total,
-              current: res.result.current,
+              current: 1,
               pageSize: res.result.size
             }
             // console.log('染损列表', this.dyeLossRateData)
@@ -206,7 +209,7 @@ export default {
         })
       })
     },
-
+    // this.queryParam.pageNo = pagination.current
     // 查询按钮
     searchQuery() {
       if (this.queryParam.venName) {
@@ -216,10 +219,11 @@ export default {
         this.$refs.someoneLossChart.venName = this.queryParam.venName
         console.log('[查询的供应商名称]', this.$refs.someoneLossChart.venName)
         this.$refs.someoneLossChart.getSomeoneLossData()
-
-        console.log('父调子方法成功000')
       }
+
+      this.queryParam.pageNo = ''
       this.getdyeLossList() // 渲染染损列表
+      console.log('重置页数')
     },
     searchReset() {
       this.queryParam = {}
@@ -277,7 +281,6 @@ export default {
         this.isorter.order = sorter.order == 'ascend' ? 'asc' : 'desc'
       }
       this.queryParam.pageNo = pagination.current
-      // console.log('this.queryParam.pageNo', this.queryParam.pageNo)
       this.getdyeLossList()
     }
   },

src/views/reportForms/order-statistics/chart/external/customerChart.vue

@@ -169,7 +169,7 @@ export default {
       })
     },
 
-    watch: {
+    // watch: {
       // 3、监听数据变化
       // newData: {
       //   deep: true,
@@ -180,7 +180,7 @@ export default {
       //      console.log('333')
       //   }
       // }
-    }
+    // }
   }
 }
 </script>

src/views/reportForms/order-statistics/external-statistics.vue

@@ -7,24 +7,16 @@
         <a-form layout="inline" @keyup.enter.native="searchQuery">
           <a-row :gutter="24">
             <a-col :md="6" :sm="8">
-              <a-form-item label="开始年月">
-                <!--  :disabled-date="disabledDate" 不可选择的日期 -->
-                <a-month-picker
-                  placeholder="请选择开始年月"
+              <a-form-item label="起始年月">
+                <a-range-picker
+                  style="width: 100%"
+                  v-model="queryParam.timeRange"
+                  placeholder="['开始年月', '结束年月']"
                   format="YYYY-MM"
-                  style="width:100%;"
-                  v-model="queryParam.startYearMonth"
-                />
-              </a-form-item>
-            </a-col>
-
-            <a-col :md="6" :sm="8">
-              <a-form-item label="结束年月">
-                <a-month-picker
-                  placeholder="请选择结束年月"
-                  format="YYYY-MM"
-                  style="width:100%;"
-                  v-model="queryParam.endYearMonth"
+                  :mode="mode2"
+                  :value="value"
+                  @panelChange="handlePanelChange"
+                  @change="handleChange"
                 />
               </a-form-item>
             </a-col>
@@ -36,25 +28,23 @@
                   <a-select-option :value="''">请选择</a-select-option>
                   <a-select-option :value="0">业务一部</a-select-option>
                   <a-select-option :value="1">业务二部</a-select-option>
-                  <a-select-option :value="2">业务三部</a-select-option>
-                  <a-select-option :value="2">业务四部</a-select-option>
                 </a-select> -->
               </a-form-item>
             </a-col>
 
-            <template v-if="toggleSearchStatus">
-              <a-col :md="6" :sm="8">
-                <a-form-item label="客户">
-                  <a-select placeholder="请选择客户" v-model="queryParam.customer">
-                    <a-select-option :value="''">请选择</a-select-option>
-                    <a-select-option :value="0">FD</a-select-option>
-                    <a-select-option :value="1">PMK</a-select-option>
-                    <a-select-option :value="2">AUCHAN</a-select-option>
-                    <a-select-option :value="2">BIOWORLD</a-select-option>
-                  </a-select>
-                </a-form-item>
-              </a-col>
-            </template>
+            <a-col :md="6" :sm="8">
+              <a-form-item label="客户">
+                <a-input placeholder="请输入客户" v-model="queryParam.customer"></a-input>
+
+                <!-- <a-select placeholder="请选择客户" v-model="queryParam.customer">
+                  <a-select-option :value="''">请选择</a-select-option>
+                  <a-select-option :value="0">FD</a-select-option>
+                  <a-select-option :value="1">PMK</a-select-option>
+                </a-select> -->
+              </a-form-item>
+            </a-col>
+
+            <template v-if="toggleSearchStatus"></template>
 
             <a-col :md="6" :sm="8">
               <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
@@ -105,11 +95,10 @@
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import JEllipsis from '@/components/jeecg/JEllipsis'
 import moment from 'moment'
-
 import departmentChart from '@views/reportForms/order-statistics/chart/external/departmentChart'
 import customerChart from '@views/reportForms/order-statistics/chart/external/customerChart.vue'
 
-// import { external } from '@api/reportForms/order-statistics.js'
+import { external } from '@api/reportForms/order-statistics.js'
 
 export default {
   name: 'ExternalStatistics', // 订单外部统计表
@@ -179,6 +168,7 @@ export default {
         vendorType: '外部',
         startYearMonth: '',
         endYearMonth: '',
+        // timeRange: [],
         department: '',
         customer: ''
       },
@@ -187,7 +177,9 @@ export default {
         // total: '', //总条数
         // current: '', //当前页
         // pageSize: '' //一页多少
-      }
+      },
+      mode2: ['month', 'month'],
+      value: []
       // dateFormat: 'YYYY-MM-DD'
     }
   },
@@ -197,21 +189,41 @@ export default {
   methods: {
     getExternalData() {
       this.$nextTick(() => {
-        // external(this.queryParam).then(res => {
-        //   if (res.success) {
-        //     this.ExternalData = res.result.records
-        //     console.log('订单外部列表', this.ExternalData)
-        //     this.pagination = {
-        //       total: res.result.total,
-        //       current: res.result.current,
-        //       pageSize: res.result.size
-        //     }
-        //     // console.log('分页器赋值:', this.pagination.total, this.pagination.current, this.pagination.pageSize)
-        //   }
-        // })
+        external(this.queryParam).then(res => {
+          if (res.success) {
+            this.ExternalData = res.result.records
+            console.log('订单外部列表', this.ExternalData)
+            this.pagination = {
+              total: res.result.total,
+              current: 1,
+              pageSize: res.result.size
+            }
+          }
+        })
       })
     },
+    // 日期面板变化时的回调
+    handlePanelChange(value, mode) {
+      this.value = value
+      this.mode2 = [mode[0] === 'date' ? 'month' : mode[0], mode[1] === 'date' ? 'month' : mode[1]]
+      console.log('this.mode2', this.mode2)
 
+      console.log('value.dateString[0]', moment(value[0]))
+      console.log('value.dateString[1]', moment(value[0]))
+      // this.queryParam.startYearMonth = dateString[0]
+      // this.queryParam.endYearMonth = dateString[1]
+    },
+    // onDateChange(value, dateString) {
+    //   console.log('起年月', dateString[0], '始年月', dateString[1])
+    //   this.queryParam.startYearMonth = dateString[0]
+    //   this.queryParam.endYearMonth = dateString[1]
+    // }
+    // 时间发生变化的回调，发生在用户选择时间时
+    handleChange(value) {
+      console.log('?', value)
+      this.value = value
+      console.log('this.value', this.value)
+    },
     searchQuery() {
       this.getExternalData()
     },

src/views/reportForms/order-statistics/interior-statistics.vue

@@ -214,7 +214,7 @@ export default {
         //     console.log('订单外部列表', this.interiorData)
         //     this.pagination = {
         //       total: res.result.total,
-        //       current: res.result.current,
+        //       current: 1,
         //       pageSize: res.result.size
         //     }
         //     // console.log('分页器赋值:', this.pagination.total, this.pagination.current, this.pagination.pageSize)

src/views/reportForms/pro-progress-report.vue

@@ -249,7 +249,7 @@ export default {
             console.log('生产进度列表页', this.proProgressData)
             this.pagination = {
               total: res.result.total,
-              current: res.result.current,
+              current: 1,
               pageSize: res.result.size
             }
           }

src/views/reportForms/pro-progress-report/detailsFabricDrawer.vue

@@ -377,7 +377,7 @@ export default {
         //     this.data = res.result.records
         //     this.pagination = {
         //       total: res.result.total,
-        //       current: res.result.current,
+        //       current: 1,
         //       pageSize: res.result.size
         //     }
         //   }

src/views/reportForms/pro-progress-report/packinglistFabricsDrawer.vue

@@ -149,7 +149,7 @@ export default {
         //     console.log('装箱单列表', this.packinglistFabricsData)
         //     this.pagination = {
         //       total: res.result.total,
-        //       current: res.result.current,
+        //       current: 1,
         //       pageSize: res.result.size
         //     }
         //   }

src/views/reportForms/supply-capacity-table.vue

@@ -14,7 +14,7 @@
 
             <!-- test -->
             <a-col :md="6" :sm="8">
-              <a-form-item label="起始时间">
+              <a-form-item label="起始日期">
                 <a-range-picker
                   style="width: 100%"
                   v-model="queryParam.timeRange"
@@ -25,18 +25,6 @@
                 />
               </a-form-item>
             </a-col>
-            <!-- <a-col :md="6" :sm="8">
-              <a-form-item label="起始月份">
-                <a-range-picker
-                  style="width: 100%"
-                  v-model="queryParam.timeRange"
-                  format="YYYY-MM"
-                  :placeholder="['开始月份', '结束月份']"
-                  @change="onDateChange"
-                  @ok="onDateOk"
-                />
-              </a-form-item>
-            </a-col> -->
 
             <a-col :md="6" :sm="8">
               <a-form-item label="订单类型">
@@ -202,7 +190,7 @@ export default {
             console.log('【供应商产能报表数据】:', this.supplyCapacityData)
             this.pagination = {
               total: res.result.total,
-              current: res.result.current,
+              current: 1,
               pageSize: res.result.size
             }
           }
@@ -293,14 +281,13 @@ export default {
     },
     searchReset() {
       this.queryParam = {}
-      this.queryParam.timeRange = []
       this.getSupplyCapList()
     },
     // 查询条件 月范围份转换成字符串并赋值
     onDateChange(value, dateString) {
-      console.log('查询开始月份', dateString[0], '查询结束月份', dateString[1])
       this.queryParam.startDate = dateString[0]
       this.queryParam.endDate = dateString[1]
+      console.log('起始日期', this.queryParam.startDate, this.queryParam.endDate)
     },
     onDateOk(value) {
       console.log('value', value)

src/views/shipment-details/referOrderDataModal.vue

@@ -378,7 +378,7 @@ export default {
             // console.log('新增参照订单数据', this.orderListData)
             this.pagination = {
               total: res.result.total,
-              current: res.result.current,
+              current: 1,
               pageSize: res.result.size
             }
           }

src/views/shipment-details/shipmentList.vue

@@ -482,7 +482,7 @@ export default {
             console.log('发运明细列表', this.shipmentListData)
             this.pagination = {
               total: res.result.total,
-              current: res.result.current,
+              current: 1,
               pageSize: res.result.size
             }
             // console.log('分页器赋值:', this.pagination.total, this.pagination.current, this.pagination.pageSize)

yarn.lock

@@ -1548,6 +1548,11 @@ adjust-sourcemap-loader@^1.1.0:
     object-path "^0.9.2"
     regex-parser "^2.2.9"
 
+adler-32@~1.3.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/adler-32/-/adler-32-1.3.1.tgz#1dbf0b36dda0012189a32b3679061932df1821e2"
+  integrity sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==
+
 aggregate-error@^3.0.0:
   version "3.0.1"
   resolved "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz#db2fe7246e536f40d9b5442a39e117d7dd6a24e0"
@@ -3043,6 +3048,14 @@ center-align@^0.1.1:
     align-text "^0.1.3"
     lazy-cache "^1.0.3"
 
+cfb@~1.2.1:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/cfb/-/cfb-1.2.2.tgz#94e687628c700e5155436dac05f74e08df23bc44"
+  integrity sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==
+  dependencies:
+    adler-32 "~1.3.0"
+    crc-32 "~1.2.0"
+
 chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
@@ -3318,6 +3331,11 @@ codemirror@^5.46.0, codemirror@^5.48.4:
   resolved "https://registry.npmjs.org/codemirror/-/codemirror-5.55.0.tgz#23731f641288f202a6858fdc878f3149e0e04363"
   integrity sha512-TumikSANlwiGkdF/Blnu/rqovZ0Y3Jh8yy9TqrPbSM0xxSucq3RgnpVDQ+mD9q6JERJEIT2FMuF/fBGfkhIR/g==
 
+codepage@~1.15.0:
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/codepage/-/codepage-1.15.0.tgz#2e00519024b39424ec66eeb3ec07227e692618ab"
+  integrity sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA==
+
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
@@ -3644,6 +3662,11 @@ cosmiconfig@^5.0.0:
     js-yaml "^3.13.1"
     parse-json "^4.0.0"
 
+crc-32@~1.2.0, crc-32@~1.2.1:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.2.tgz#3cad35a934b8bf71f25ca524b6da51fb7eace2ff"
+  integrity sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==
+
 create-ecdh@^4.0.0:
   version "4.0.3"
   resolved "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
@@ -5415,6 +5438,11 @@ file-loader@^3.0.1:
     loader-utils "^1.0.2"
     schema-utils "^1.0.0"
 
+file-saver@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-2.0.5.tgz#d61cfe2ce059f414d899e9dd6d4107ee25670c38"
+  integrity sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==
+
 file-uri-to-path@1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
@@ -5620,6 +5648,11 @@ forwarded@~0.1.2:
   resolved "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
   integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
 
+frac@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/frac/-/frac-1.1.2.tgz#3d74f7f6478c88a1b5020306d747dc6313c74d0b"
+  integrity sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==
+
 fragment-cache@^0.2.1:
   version "0.2.1"
   resolved "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
@@ -10400,6 +10433,13 @@ sprintf-js@~1.0.2:
   resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
+ssf@~0.11.2:
+  version "0.11.2"
+  resolved "https://registry.yarnpkg.com/ssf/-/ssf-0.11.2.tgz#0b99698b237548d088fc43cdf2b70c1a7512c06c"
+  integrity sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==
+  dependencies:
+    frac "~1.1.2"
+
 sshpk@^1.7.0:
   version "1.16.1"
   resolved "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
@@ -11835,6 +11875,11 @@ window-size@0.1.0:
   resolved "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
   integrity sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=
 
+wmf@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wmf/-/wmf-1.0.2.tgz#7d19d621071a08c2bdc6b7e688a9c435298cc2da"
+  integrity sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==
+
 wolfy87-eventemitter@^5.1.0:
   version "5.2.9"
   resolved "https://registry.npmjs.org/wolfy87-eventemitter/-/wolfy87-eventemitter-5.2.9.tgz#e879f770b30fbb6512a8afbb330c388591099c2a"
@@ -11850,6 +11895,11 @@ word-wrap@~1.2.3:
   resolved "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
 
+word@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/word/-/word-0.3.0.tgz#8542157e4f8e849f4a363a288992d47612db9961"
+  integrity sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==
+
 wordwrap@0.0.2:
   version "0.0.2"
   resolved "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
@@ -11919,6 +11969,19 @@ xe-utils@2.4.8:
   resolved "https://registry.yarnpkg.com/xe-utils/-/xe-utils-2.4.8.tgz#0efda3ca81f6b55f68a8a31e276fb17da59c98b3"
   integrity sha512-/95ZaQK9GJE/EYrpMv9lgKdkEMQwWv4a4TF4dddi4gSzZ33vp/rZvzJNNV9XknaOkMizK9IBSX8CB/nL+SAk0Q==
 
+xlsx@^0.18.5:
+  version "0.18.5"
+  resolved "https://registry.yarnpkg.com/xlsx/-/xlsx-0.18.5.tgz#16711b9113c848076b8a177022799ad356eba7d0"
+  integrity sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==
+  dependencies:
+    adler-32 "~1.3.0"
+    cfb "~1.2.1"
+    codepage "~1.15.0"
+    crc-32 "~1.2.1"
+    ssf "~0.11.2"
+    wmf "~1.0.1"
+    word "~0.3.0"
+
 xregexp@^4.2.4:
   version "4.3.0"
   resolved "https://registry.npmjs.org/xregexp/-/xregexp-4.3.0.tgz#7e92e73d9174a99a59743f67a4ce879a04b5ae50"