Merge remote-tracking branch 'origin/dev_New' into dev_New

张诺

14 小时以前 11e1de7bb345bc937cce53a2ac7672476b5b4db3

 src/views/collaborativeApproval/rulesRegulationsManagement/index.vue

@@ -102,6 +102,8 @@
            </template>
          </el-table-column>
        </el-table>
        <pagination v-show="page.total > 0" :total="page.total" layout="total, sizes, prev, pager, next, jumper"
                    :page="page.current" :limit="page.size" @pagination="paginationChange" />
      </div>
    </el-card>
    <!-- 用印申请对话框（已移除） -->
@@ -271,7 +273,7 @@
                    :delete-method="handleAttachmentDelete"
                    :rules-regulations-management-id="currentFileRuleId"
                    :name-column-label="'附件名称'"
                    @upload="handleAttachmentUpload" />
                    @upload="handleAttachmentUpload"/>
  </div>
</template>

@@ -310,7 +312,7 @@
  const currentFileRuleId = ref(null);
  const filePage = reactive({
    current: 1,
    size: 10,
    size: 1000,
    total: 0,
  });
  // 规章制度相关
@@ -642,14 +644,19 @@
        regulations.value = res.data.records;
        // 过滤掉已废弃的制度
        // regulations.value = res.data.records.filter(item => item.status !== 'repealed')
        page.value.total = res.data.total;
        page.total = res.data.total;
        tableLoading.value = false;
      })
      .catch(err => {
        tableLoading.value = false;
      });
  };

  // 分页变化处理
  const paginationChange = (obj) => {
    page.current = obj.page;
    page.size = obj.limit;
    getRegulationList();
  };
  onMounted(() => {
    // 初始化
    getRegulationList();