Prechádzať zdrojové kódy

Merge branch 'develop_cuxiao' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_cuxiao

chenrui 1 rok pred
rodič
commit
3fd05bff67

+ 17 - 17
package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "chelingzhu",
+  "name": "jg-ocs",
   "version": "2.0.0",
   "lockfileVersion": 1,
   "requires": true,
@@ -1989,16 +1989,16 @@
       },
       "dependencies": {
         "@babel/parser": {
-          "version": "7.21.3",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.3.tgz",
-          "integrity": "sha512-lobG0d7aOfQRXh8AyklEAgZGvA4FShxo6xQbUrrT/cNBPUdIDojlokwJsQyCC/eKia7ifqM0yP+2DRZ4WKw2RQ=="
+          "version": "7.23.0",
+          "resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.23.0.tgz",
+          "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw=="
         },
         "postcss": {
-          "version": "8.4.21",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz",
-          "integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==",
+          "version": "8.4.31",
+          "resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.4.31.tgz",
+          "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
           "requires": {
-            "nanoid": "^3.3.4",
+            "nanoid": "^3.3.6",
             "picocolors": "^1.0.0",
             "source-map-js": "^1.0.2"
           }
@@ -5085,9 +5085,9 @@
       }
     },
     "csstype": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz",
-      "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw=="
+      "version": "3.1.2",
+      "resolved": "https://registry.npmmirror.com/csstype/-/csstype-3.1.2.tgz",
+      "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
     },
     "cuint": {
       "version": "0.2.2",
@@ -11580,9 +11580,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.15",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
+      "version": "4.17.21",
+      "resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
     "lodash.defaultsdeep": {
       "version": "4.6.1",
@@ -17219,9 +17219,9 @@
       "integrity": "sha512-Uf1i/sCh+ZqSM9hb2YTGRENzJFH+mvDuv8N2brGLjK7UBuF7XDP7zbis8g/dcqZiMojAcBDtObFCn4ERFbRMxQ=="
     },
     "vue-easytable": {
-      "version": "2.24.0",
-      "resolved": "https://registry.npmjs.org/vue-easytable/-/vue-easytable-2.24.0.tgz",
-      "integrity": "sha512-5OcCw3EMLEb/cBLV/pMqRIhAmwt3FadXpoZvWhdE+SynthdNtTrQhxFKyjgpAmX6OPEMb9/XFNX86gDuIVnlxg==",
+      "version": "2.27.1",
+      "resolved": "https://registry.npmmirror.com/vue-easytable/-/vue-easytable-2.27.1.tgz",
+      "integrity": "sha512-Rs2cqaPYamH8zXQo/f90AyM/ROGMsB5Njb74GpooWacAKEXbHU0wXYvEjSBZ7CcS6TVqliA/ZbgVqOoA/o9bHQ==",
       "requires": {
         "lodash": "^4.17.20",
         "resize-observer-polyfill": "^1.5.1",

+ 3 - 2
package.json

@@ -1,5 +1,5 @@
 {
-  "name": "chelingzhu",
+  "name": "jg-ocs",
   "version": "2.0.0",
   "private": true,
   "scripts": {
@@ -21,6 +21,7 @@
     "core-js": "2.6.9",
     "echarts": "^5.4.0",
     "enquire.js": "^2.1.6",
+    "lodash": "^4.17.20",
     "lodash.get": "^4.4.2",
     "lodash.pick": "^4.4.0",
     "md5": "^2.2.1",
@@ -35,7 +36,7 @@
     "vue-clipboard2": "^0.2.1",
     "vue-cookies": "^1.6.1",
     "vue-cropper": "0.4.9",
-    "vue-easytable": "^2.24.0",
+    "vue-easytable": "^2.27.1",
     "vue-ls": "^3.2.1",
     "pdfjs-dist": "2.5.207",
     "vue-pdf-signature": "^4.2.6",

+ 1 - 0
src/views/promotionRulesManagement/dealerPromotions/chooseProductsModal.vue

@@ -63,6 +63,7 @@
           :row-selection="{ columnWidth: 40, getCheckboxProps:record =>({props: { disabled: this.chooseDataList && this.chooseDataList.indexOf(record.productSn) > -1 } })}"
           @rowSelection="rowSelectionFun"
           :columns="columns"
+          :pagination="{pageSizeOptions: ['20','50','100','200','500']}"
           :data="loadData"
           :defaultLoadData="false"
           style="max-height:460px;"

+ 2 - 1
src/views/promotionRulesManagement/promotionManagement/chooseDealer.vue

@@ -113,7 +113,8 @@ export default {
       },
       pagination: {
         pageSize: 20,
-        showSizeChanger: true
+        showSizeChanger: true,
+        pageSizeOptions: ['20','50','100','200','500']
       },
       pageFlag: false,
       chooseInfo: [],