Merge remote-tracking branch 'origin/master'

cy

2023-11-30 870a9499eb65de0031ef8e8f70607e5dfb64b806

 admin-web/src/views/stock/inventorycount/inventorytask/index.vue

@@ -21,7 +21,8 @@
            @close="inventorySetting.show = false"
            @search="search"
          />
          <detail v-if="inventoryDetail.show" :setting="inventoryDetail" @close="inventoryDetail.show = false" @search="search" />
          <detail v-if="inventoryDetail.show" :setting="inventoryDetail" @close="inventoryDetail.show = false"
                  @search="search"/>
        </el-card>
      </el-container>
    </el-container>
@@ -46,9 +47,11 @@
import {inventoryDel, inventoryListApi} from '@/api/stock/inventory';
import * as DateFormatter from '@/utils/DateFormatter';
import {mapGetters} from 'vuex';
import listPage from '@/views/mixins/listPage';

export default {
  name: 'index',
  mixins: [listPage],
  components: { MyButton, MyTableV2, edit, myImport, inventory,detail },
  data() {
    return {
@@ -271,7 +274,7 @@
                }
              },
              events: (row) => {
                this.showInventoryDetail(row);
                this.handleExport('inventoryExport', `盘点表-${row.businessFormCode}`, {id: row.id});
              },
            },
          ],
@@ -328,7 +331,8 @@
            this.search();
          });
        })
        .catch(() => {});
          .catch(() => {
          });
    },
    showAdd() {
      this.editSetting.id = null;
@@ -362,17 +366,6 @@
      } else {
        this.$refs.myTable.search();
      }
    },
    fifterForm(params) {
      this.filterFrom = Object.assign(this.filterFrom, params);

      if (this.filterFrom.startTime) {
        this.filterFrom.startTime = this.filterFrom.startTime.replace(/\-/g, '');
      }
      if (this.filterFrom.endTime) {
        this.filterFrom.endTime = this.filterFrom.endTime.replace(/\-/g, '');
      }
      this.search(1);
    },
  },
};