zhouhao пре 2 година
родитељ
комит
7f43863c9e

+ 7 - 7
package-lock.json

@@ -9,7 +9,7 @@
       "version": "4.4.0",
       "license": "MIT",
       "dependencies": {
-        "@zjlib/element-plugins": "^1.1.0",
+        "@zjlib/element-plugins": "^1.1.1",
         "axios": "0.18.1",
         "clipboard": "^2.0.8",
         "concurrent-tasks": "^1.0.7",
@@ -3928,9 +3928,9 @@
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
     },
     "node_modules/@zjlib/element-plugins": {
-      "version": "1.1.0",
-      "resolved": "http://121.41.110.30:4873/@zjlib%2felement-plugins/-/element-plugins-1.1.0.tgz",
-      "integrity": "sha512-dkmJDNTyb6D2SDeJzd0vGr/h+miGSuLdy5gt+UxnqG3IRI7zV1eng6Bgrb8ZdFO5Hvz+ugEPhEfi9EXYSBHRHw==",
+      "version": "1.1.1",
+      "resolved": "http://121.41.110.30:4873/@zjlib%2felement-plugins/-/element-plugins-1.1.1.tgz",
+      "integrity": "sha512-hobIdUjiYEaghdmlF7i2DPFCnpcperDasmmRZr6FZ99jJGRJEmigPKMOhUBnYKUBbi9b3e6h9IOzdPRmgSzXNg==",
       "dependencies": {
         "clipboard": "^2.0.11",
         "core-js": "^3.6.5",
@@ -25054,9 +25054,9 @@
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
     },
     "@zjlib/element-plugins": {
-      "version": "1.1.0",
-      "resolved": "http://121.41.110.30:4873/@zjlib%2felement-plugins/-/element-plugins-1.1.0.tgz",
-      "integrity": "sha512-dkmJDNTyb6D2SDeJzd0vGr/h+miGSuLdy5gt+UxnqG3IRI7zV1eng6Bgrb8ZdFO5Hvz+ugEPhEfi9EXYSBHRHw==",
+      "version": "1.1.1",
+      "resolved": "http://121.41.110.30:4873/@zjlib%2felement-plugins/-/element-plugins-1.1.1.tgz",
+      "integrity": "sha512-hobIdUjiYEaghdmlF7i2DPFCnpcperDasmmRZr6FZ99jJGRJEmigPKMOhUBnYKUBbi9b3e6h9IOzdPRmgSzXNg==",
       "requires": {
         "clipboard": "^2.0.11",
         "core-js": "^3.6.5",

+ 1 - 1
package.json

@@ -15,7 +15,7 @@
     "test:ci": "npm run lint && npm run test:unit"
   },
   "dependencies": {
-    "@zjlib/element-plugins": "^1.1.0",
+    "@zjlib/element-plugins": "^1.1.1",
     "axios": "0.18.1",
     "clipboard": "^2.0.8",
     "concurrent-tasks": "^1.0.7",

+ 1 - 0
src/components/template/template-page-1.vue

@@ -5,6 +5,7 @@
     :table-events="{ ...defaultTableEvents, ...tableEvents }" :column-parsing="columnParsing" :reduction="reduction"
     :plan="[...plan, ...morePlan]" :operation="operation" :operation-column-width="operationColumnWidth"
     :show-table="showTable" :code-gather="codeGather" @columnWidthChange="columnWidthChange"
+    :lowerLine="true"
     @columnListChange="columnListChange">
     <sel-export-column-list :column-list="columnList" @determine="exportDetermine" @cancel="columnList = []" />
     <slot />

+ 2 - 2
src/views/deposit_commerce/refund_list.vue

@@ -839,7 +839,7 @@ export default {
       this.examine = v
       this.getDataList({
         pageSize: this.pageSize,
-        pageNum: this.currentPage,
+        pageNum: 1,
         enginOrderType: this.enginOrderType,
         ...this.screenForm,
         examineStatus: this.examine
@@ -872,7 +872,7 @@ export default {
     searchFn() {
       this.getDataList({
         pageSize: this.pageSize,
-        pageNum: this.currentPage,
+        pageNum: 1,
         confirmName: '',
         createName: '',
         enginOrderNo: '',

+ 2 - 2
src/views/deposit_home/refund_list.vue

@@ -827,7 +827,7 @@ export default {
       this.examine = v
       this.getDataList({
         pageSize: this.pageSize,
-        pageNum: this.currentPage,
+        pageNum: 1,
         enginOrderType: this.enginOrderType,
         ...this.screenForm,
         examineStatus: this.examine
@@ -860,7 +860,7 @@ export default {
     searchFn() {
       this.getDataList({
         pageSize: this.pageSize,
-        pageNum: this.currentPage,
+        pageNum: 1,
         confirmName: '',
         createName: '',
         enginOrderNo: '',

+ 1 - 1
src/views/supply/engin/home_list.vue

@@ -9,7 +9,7 @@
             <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>
           </template>
           <template #left_btn>
-            <el-checkbox-group v-model="screenForm.status" @change="getList()" size="mini">
+            <el-checkbox-group v-model="screenForm.status" @change="currentPage = 1;getList()" size="mini">
               <el-checkbox-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{
                 item.label
               }}</el-checkbox-button>