Merge branch 'master' of http://1.71.9.215:3000/feiyi/cbjsxt-front-master

src/views/costAudit/projectInfo/auditProjectManage/memoManage/memoManageMixin.js

@@ -578,7 +578,13 @@ export const memoManageMixin = {
     handleSave() {
       this.$refs['ruleForm'].validate((valid) => {
         if (valid) {
-          const formData = { ...this.editForm }
+          let task = this.auditTaskList.find(
+            (item) => item.projectId === this.editForm.projectId
+          )
+          const formData = {
+            ...this.editForm,
+            areaCode: task.areaCode,
+          }
           // 合并开始时间和结束时间为timePeriod格式
           formData.timePeriod = `${formData.startTime}-${formData.endTime}`
           // 删除单独的时间字段，避免后端接收多余数据

src/views/home/index.vue

@@ -660,7 +660,11 @@
       // 待办事项搜索
       handleTodoSearch() {
         this.currentPage = 1
-        this.loadAuditProjectList()
+        if (this.curOrg === '企业单位') {
+          this.getEnterpriseTodoList()
+        } else {
+          this.loadAuditProjectList()
+        }
       },
       // 获取企业待办列表
       async getEnterpriseTodoList() {

src/views/personal/notice/index.vue

@@ -88,7 +88,7 @@
       <el-pagination
         class="mt20"
         background
-        :current-page="search.page"
+        :current-page="search.pageNum"
         :page-sizes="[50, 100]"
         :page-size="search.pageSize"
         layout="total, sizes, prev, pager, next, jumper"
@@ -179,7 +179,7 @@
     data() {
       return {
         search: {
-          page: 1,
+          pageNum: 1,
           pageSize: 50,
         },
         list: [],
@@ -239,7 +239,7 @@
       },
       // 分页当前页改变
       handleCurrentChange(val) {
-        this.search.page = val
+        this.search.pageNum = val
         this.getList()
       },
       // 获取用户姓名