Merge branch 'new-bug' into fix-bug

package.json

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

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

@@ -21,6 +21,7 @@
       :onClosePlain="onClosePlain"
       :defaultSearchData="defaultSearchData"
       :replaceOrNotMap="replaceOrNotMap"
+      :moreParameters="moreParameters"
       @columnWidthChange="columnWidthChange"
       @columnListChange="columnListChange"
     >
@@ -62,6 +63,10 @@ export default {
     SelExportColumnList
   },
   props: {
+    moreParameters: {
+      type: Array,
+      default: () => []
+    },
     loading: {
       type: Boolean,
       default: false
@@ -405,11 +410,12 @@ export default {
         return
       }
       try {
+        var { querylist, page, size, ...data_ } = data
         this.parameter = {
-          pageNum: data.page,
-          pageSize: data.size,
-          orderBy: data.orderBy,
-          params: data.querylist,
+          ...data_,
+          pageNum: page,
+          pageSize: size,
+          params: querylist,
           moduleId: this.moduleId
         }
         var res = await this.getList(this.parameter)
@@ -582,12 +588,7 @@ export default {
         })
     },
     refreshList(bool) {
-      if (bool === true) {
-        this.showTable = false
-        this.$refs.zjpage.refresh()
-      } else {
-        this.$refs.zjpage.refresh()
-      }
+      this.$refs.zjpage.refresh()
     }
   }
 }

src/views/sales_policy/components/Examine.vue

@@ -458,7 +458,6 @@
           </div>
           <div class="table">
             <el-table
-              v-if="detail.type == 'PROVISION'"
               v-loading="clistLoading"
               :data="list"
               element-loading-text="Loading"
@@ -838,7 +837,7 @@ export default {
     },
     // 更改每页数量
     handleSizeChanges4(val) {
-      this.policyList.pageSizes = val
+      this.policyList.pageSize = val
       this.policyList.currentPages = 1
       this.getPolicyList()
     },

src/views/supply/engin/home_list.vue

@@ -334,7 +334,7 @@ export default {
         }
       }
       try {
-        let res = await v2EnginOrderHomeCountList(params)
+        const res = await v2EnginOrderHomeCountList(params)
         this.numSum.totalC = res.data.totalC
         this.numSum.amountC = res.data.amountC
         this.numSum.totalEC = res.data.totalEC
@@ -345,7 +345,15 @@ export default {
       return v2EnginOrderHomeList(params)
     },
     // 列表导出函数
-    exportList: v2EnginOrderHomeListExport,
+    exportList(...p) {
+      if (this.orderStatusParam !== '') {
+        p[0] = {
+          ...p[0],
+          params: [{ param: 'a.examine_status', compare: '=', value: this.orderStatusParam }, ...p[0].params]
+        }
+      }
+      return v2EnginOrderHomeListExport(...p)
+    },
     // 表格列解析渲染数据更改
     columnParsing(item, defaultData) {
       // console.log(item)