修改bug

src/components/bill/selectOrderDetailList.vue

@@ -2,7 +2,7 @@
   <div>
     <avue-crud :option="option" :table-loading="loading" :data="data" :search.sync="search" ref="crud"
       @refresh-change="refreshChange" @selection-change="selectionChange" @search-change="searchChange" @search-reset="searchReset"
-      @saveColumn="saveColumn" :page.sync="page" @on-load="onLoad">
+      @saveColumn="saveColumn" @current-change="currentChange" @size-change="sizeChange" :page.sync="page" @on-load="onLoad">
       <template slot="costTypeSearch">
         <breakdown-select v-model="search.costType" :configuration="breakConfiguration"></breakdown-select>
       </template>
@@ -64,7 +64,7 @@ export default {
       selectList: [],
       page: {
         pageSize: 20,
-        pagerCount: 1,
+        currentPage: 1,
         total: 0,
         pageSizes: [20, 200, 300, 500, 700, 1000]
       },
@@ -139,7 +139,17 @@ export default {
       // this.selectList = row
       this.goodsListSave = row
     },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
     onLoad(page, params) {
+      params= {
+          ...this.params,
+          ...params,
+      }
       if(params && params.rentStartDate ){
         params.createStartDate = params.rentStartDate[0] + " " + "00:00:00"?params.rentStartDate[0] + " " + "00:00:00":'';
         params.createEndDate = params.rentStartDate[1] + " " + "23:59:59"?params.rentStartDate[1] + " " + "23:59:59":'';

src/components/bill/selectOrderDetailListCG.vue

@@ -1,8 +1,9 @@
 <template>
   <div>
     <avue-crud :option="option" :table-loading="loading" :data="data" :search.sync="search" ref="crud"
-      @refresh-change="refreshChange" @selection-change="selectionChange" @search-change="searchChange" @search-reset="searchReset"
-      @saveColumn="saveColumn" :page.sync="page" @on-load="onLoad">
+      @refresh-change="refreshChange" @selection-change="selectionChange" @search-change="searchChange"
+      @search-reset="searchReset" @saveColumn="saveColumn" @current-change="currentChange" @size-change="sizeChange"
+      :page.sync="page" @on-load="onLoad">
       <template slot="costTypeSearch">
         <breakdown-select v-model="search.costType" :configuration="breakConfiguration"></breakdown-select>
       </template>
@@ -14,8 +15,7 @@
       </template>
       <template slot-scope="scope" slot="menu">
         <el-button type="text" icon="el-icon-edit" size="small" @click.stop="importStagList(scope.row, scope.index)"
-          v-if="activeName == 'searchList'"
-          :disabled="goodsListSave.findIndex(item => item.id == scope.row.id) !== -1">选择
+          v-if="activeName == 'searchList'" :disabled="goodsListSave.findIndex(item => item.id == scope.row.id) !== -1">选择
         </el-button>
         <el-button type="text" icon="el-icon-delete" size="small" @click.stop="removeStagList(scope.row, scope.index)"
           v-else>移除
@@ -33,7 +33,7 @@
 
 <script>
 import optionCG from './config/mainListsCG.json'
-import {getListOrder, orderListBySettlement} from "@/api/financialManagement/paymentRequest";
+import { getListOrder, orderListBySettlement } from "@/api/financialManagement/paymentRequest";
 
 export default {
   name: "index",
@@ -64,7 +64,7 @@ export default {
       selectList: [],
       page: {
         pageSize: 20,
-        pagerCount: 1,
+        currentPage: 1,
         total: 0,
         pageSizes: [20, 200, 300, 500, 700, 1000]
       },
@@ -84,7 +84,7 @@ export default {
   },
   watch: {
     'params.corpId'(newVal, oldVal) {
-        console.log(newVal,87)
+      console.log(newVal, 87)
       if (newVal != oldVal) {
         this.onLoad(this.page, this.search)
       }
@@ -93,10 +93,10 @@ export default {
   async created() {
     // this.option = await this.getColumnData(this.getColumnName(281), option);
   },
-    mounted() {
-        this.onLoad(this.page,this.params)
-    },
-    methods: {
+  mounted() {
+    this.onLoad(this.page, this.params)
+  },
+  methods: {
     importStagList(row, index) {
       // this.goodsListSave.push(row);
       this.$refs.crud.toggleSelection([row]);
@@ -121,18 +121,18 @@ export default {
       this.onLoad(this.page);
     },
     // 清空
-    searchReset(){
-        this.onLoad(this.page,this.params);
+    searchReset() {
+      this.onLoad(this.page, this.params);
     },
     searchChange(params, done) {
       if (params.createStart) {
         params.createStartDate = params.createStart[0]
         params.createEndDate = params.createStart[1]
       }
-        params = {
-          ...this.params,
-          ...params,
-        }
+      params = {
+        ...this.params,
+        ...params,
+      }
       this.onLoad(this.page, params);
       done()
     },
@@ -140,17 +140,26 @@ export default {
       // this.selectList = row
       this.goodsListSave = row
     },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
     onLoad(page, params) {
-        console.log(page,params,140)
-      if(params && params.rentStartDate ){
-        params.createStartDate = params.rentStartDate[0] + " " + "00:00:00"?params.rentStartDate[0] + " " + "00:00:00":'';
-        params.createEndDate = params.rentStartDate[1] + " " + "23:59:59"?params.rentStartDate[1] + " " + "23:59:59":'';
+      params= {
+          ...this.params,
+          ...params,
+      }
+      if (params && params.rentStartDate) {
+        params.createStartDate = params.rentStartDate[0] + " " + "00:00:00" ? params.rentStartDate[0] + " " + "00:00:00" : '';
+        params.createEndDate = params.rentStartDate[1] + " " + "23:59:59" ? params.rentStartDate[1] + " " + "23:59:59" : '';
         this.$delete(params, 'rentStartDate')
       }
       this.loading = true;
-        // 把老数据进行更新  从父组件调用的子组件方法
-        if (params.customerId != this.params.customerId) {
-            this.params = params
+      // 把老数据进行更新  从父组件调用的子组件方法
+       if (params.customerId != this.params.customerId) {
+          this.params = params
         }
       // params = {
       //   // ...params,
@@ -158,30 +167,30 @@ export default {
       //     ...this.params
       // }
 
-    // ...this.params 使用之前的老数据 回请求之前的ID造成数据不对
+      // ...this.params 使用之前的老数据 回请求之前的ID造成数据不对
       params.billType = this.billType
       if (this.$store.getters.userInfo.tenant_id === "673511") {
         params.type = "CMY"
       }
       params.flag = this.flag
-        if (this.params.bsType == 'XS') {
-            params.settlementType = 'd'
-        }else {
-            params.settlementType = 'c'
-        }
+      if (this.params.bsType == 'XS') {
+        params.settlementType = 'd'
+      } else {
+        params.settlementType = 'c'
+      }
       orderListBySettlement(page.currentPage, page.pageSize, params).then(res => {
         this.data = res.data.data.records
         this.page.total = res.data.data.total
       }).finally(() => {
         this.loading = false;
       })
-        // getListOrder(page.currentPage, page.pageSize, params).then(res => {
-        //     console.log(res,155)
-        //     this.data = res.data.data.records
-        //     this.page.total = res.data.data.total
-        // }).finally(() => {
-        //     this.loading = false;
-        // })
+      // getListOrder(page.currentPage, page.pageSize, params).then(res => {
+      //     console.log(res,155)
+      //     this.data = res.data.data.records
+      //     this.page.total = res.data.data.total
+      // }).finally(() => {
+      //     this.loading = false;
+      // })
     },
     importProMent() {
       this.$emit('importProMent', this.goodsListSave);

src/views/iosBasicData/accounts/index.vue

@@ -80,6 +80,7 @@
           :visible.sync="accountsVisible"
           class="el-dialogDeep"
           width="60%"
+          :close-on-click-modal="false"	
           :before-close="handleClose">
           <accounts-dialog ref="accountsDialog" :form="form"></accounts-dialog>
           <span slot="footer" class="dialog-footer">
@@ -95,6 +96,7 @@
           :visible.sync="sopenblcVisible"
           class="el-dialogDeep"
           width="70%"
+          :close-on-click-modal="false"	
           :before-close="handleClose">
           <accitemsopenblc :form="form" ></accitemsopenblc>
           <span slot="footer" class="dialog-footer">

src/views/tirePartsMall/salesManagement/saleOrder/detailsPage.vue

@@ -86,7 +86,7 @@
                                     @click="rowAdd(row)">添加商品</el-button>
                                 <el-button type="primary" icon="el-icon-printer" size="small"
                                     @click="handlePrint">打印</el-button>
-                                <el-button type="danger" plain size="small" @click="batchDelete">一键删除</el-button>
+                                <el-button type="danger" plain size="small" @click="batchDelete" :disabled="form.generateTask == '已生成'">一键删除</el-button>
                                 <el-button type="primary" plain size="small" @click="quickCopy">快捷复制</el-button>
                             </template>