Merge remote-tracking branch 'origin/dev_银川_中盛建材' into dev_银川_中盛建材

zss

3 天以前 992a9d091338cae0d8c0bd17904d38d7100d3136

 src/views/basicData/parameterMaintenance/index.vue

@@ -31,10 +31,10 @@
                :column="tableColumn"
                :tableData="tableData"
                :page="page"
                height="calc(100vh - 280px)"
                height="calc(100vh - 320px)"
                :tableLoading="tableLoading"
                :isSelection="false"
                :isShowPagination="false"
                :isShowPagination="true"
                @pagination="pagination">
      </PIMTable>
    </div>
@@ -442,12 +442,16 @@
  const getList = () => {
    tableLoading.value = true;
    // 调用新接口 /baseParam/list
    getBaseParamList({ paramName: searchForm.paramName })
    getBaseParamList({
      paramName: searchForm.paramName,
      current: page.current,
      size: page.size,
    })
      .then(res => {
        tableLoading.value = false;
        if (res.code === 200) {
          tableData.value = res.data || [];
          page.total = res.data?.length || 0;
          tableData.value = res.data?.records || [];
          page.total = res.data?.total || 0;
        } else {
          ElMessage.error(res.msg || "查询失败");
        }