From f6af6a2672b20c133bc8cf9566a87289a20c98e3 Mon Sep 17 00:00:00 2001 From: xzt <1113240624@qq.com> Date: Wed, 10 Apr 2024 15:33:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectProcess/contract/index.vue | 10 ++-- .../options/clockingIn.vue | 29 ++++++++-- .../options/marginAccount.vue | 54 +++++++++++++++---- .../peasantWorkerSystem/options/payroll.vue | 29 ++++++++-- .../options/realNameSystem.vue | 29 ++++++++-- .../projectLegalPersonEvaluation.vue | 4 +- .../warning/options/contract/index.vue | 10 ++-- .../options/clockingIn.vue | 29 ++++++++-- .../options/marginAccount.vue | 54 +++++++++++++++---- .../peasantWorkerSystem/options/payroll.vue | 29 ++++++++-- .../options/realNameSystem.vue | 29 ++++++++-- .../options/projectLegalPersonEvaluation.vue | 4 +- .../projectProcess/contract/index.vue | 10 ++-- .../projectProcess/index.vue | 10 +++- .../options/clockingIn.vue | 29 ++++++++-- .../options/marginAccount.vue | 54 +++++++++++++++---- .../peasantWorkerSystem/options/payroll.vue | 25 +++++++-- .../options/realNameSystem.vue | 29 ++++++++-- .../projectLegalPersonEvaluation.vue | 4 +- .../projectStatisticsMsg/index.vue | 4 +- .../projectStatisticsSort/components/list.vue | 1 + 21 files changed, 385 insertions(+), 91 deletions(-) diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/contract/index.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/contract/index.vue index e0b534ae..0223bc6b 100644 --- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/contract/index.vue +++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/contract/index.vue @@ -25,7 +25,7 @@ --> + > + + - 搜索 + > --> 重置 @@ -295,8 +305,9 @@ export default { // 按哪个字段排序 orderBy: "create_time", // desc降序，升序asc - sort: "desc", + sortBy: "desc", }, + cv: { name: "name", value: "", type: "like" }, }, // 表单参数 form: {}, @@ -414,6 +425,14 @@ export default { remark: null, attendanceDay: null, }, + // 排序方式 + params: { + // 按哪个字段排序 + orderBy: "create_time", + // desc降序，升序asc + sortBy: "desc", + }, + cv: { name: "name", value: "", type: "like" }, }; this.resetForm("form"); }, diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/marginAccount.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/marginAccount.vue index bef6e1cc..fd2b39ff 100644 --- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/marginAccount.vue +++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/marginAccount.vue @@ -8,7 +8,7 @@ > + > + + - 搜索 + > --> 重置 @@ -701,7 +711,20 @@ export default { proNo: null, owerDept: null, }, - cv: {}, + conditionViews: [ + { + name: "incomeExpenditureMethods", + value: "", + type: "like", + isAnd: "1", + }, + { + name: "depositBankSalaryDeposit", + value: "", + type: "like", + isAnd: "1", + }, + ], // 排序方式 params: { // 按哪个字段排序 @@ -949,7 +972,20 @@ export default { owerDept: null, remark: null, }, - cv: {}, + conditionViews: [ + { + name: "incomeExpenditureMethods", + value: "", + type: "like", + isAnd: "1", + }, + { + name: "depositBankSalaryDeposit", + value: "", + type: "like", + isAnd: "1", + }, + ], // 排序方式 params: { // 按哪个字段排序 @@ -962,8 +998,8 @@ export default { }, /** 搜索按钮操作 */ handleQuery() { - this.queryParams.cv.name = "incomeExpenditureMethods"; - this.queryParams.cv.type = "like"; + // this.queryParams.cv.name = "incomeExpenditureMethods"; + // this.queryParams.cv.type = "like"; this.queryParams.pageNum = 1; this.getList(); }, diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/payroll.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/payroll.vue index d65749f7..893f44b6 100644 --- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/payroll.vue +++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/payroll.vue @@ -35,12 +35,22 @@ --> + > + + - 搜索 + > --> 重置 @@ -451,8 +461,9 @@ export default { // 按哪个字段排序 orderBy: "create_time", // desc降序，升序asc - sort: "desc", + sortBy: "desc", }, + cv: { name: "name", value: "", type: "like" }, }, // 表单参数 form: {}, @@ -610,6 +621,14 @@ export default { proNo: null, remark: null, }, + // 排序方式 + params: { + // 按哪个字段排序 + orderBy: "create_time", + // desc降序，升序asc + sortBy: "desc", + }, + cv: { name: "name", value: "", type: "like" }, }; this.resetForm("form"); }, diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/realNameSystem.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/realNameSystem.vue index 38118458..41cc628a 100644 --- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/realNameSystem.vue +++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/realNameSystem.vue @@ -30,12 +30,22 @@ --> + > + + - 搜索 + > --> 重置 @@ -364,8 +374,9 @@ export default { // 按哪个字段排序 orderBy: "create_time", // desc降序，升序asc - sort: "desc", + sortBy: "desc", }, + cv: { name: "name", value: "", type: "like" }, }, // 表单参数 form: {}, @@ -475,6 +486,14 @@ export default { owerDept: null, remark: null, }, + // 排序方式 + params: { + // 按哪个字段排序 + orderBy: "create_time", + // desc降序，升序asc + sortBy: "desc", + }, + cv: { name: "name", value: "", type: "like" }, }; this.resetForm("form"); }, diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/projectLegalPersonEvaluation.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/projectLegalPersonEvaluation.vue index e019a0c0..241ec954 100644 --- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/projectLegalPersonEvaluation.vue +++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/projectLegalPersonEvaluation.vue @@ -23,13 +23,13 @@ - 搜索 + > --> 重置 diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/contract/index.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/contract/index.vue index 7a1d5c58..473d9fc5 100644 --- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/contract/index.vue +++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/contract/index.vue @@ -25,7 +25,7 @@ --> + > + + - 搜索 + > --> 重置 @@ -289,8 +299,9 @@ export default { // 按哪个字段排序 orderBy: "create_time", // desc降序，升序asc - sort: "desc", + sortBy: "desc", }, + cv: { name: "name", value: "", type: "like" }, }, // 表单参数 form: {}, @@ -386,6 +397,14 @@ export default { remark: null, attendanceDay: null, }, + // 排序方式 + params: { + // 按哪个字段排序 + orderBy: "create_time", + // desc降序，升序asc + sortBy: "desc", + }, + cv: { name: "name", value: "", type: "like" }, }; this.resetForm("form"); }, diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/peasantWorkerSystem/options/marginAccount.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/peasantWorkerSystem/options/marginAccount.vue index 7301247d..26c9ab4e 100644 --- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/peasantWorkerSystem/options/marginAccount.vue +++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/peasantWorkerSystem/options/marginAccount.vue @@ -8,7 +8,7 @@ > + > + + - 搜索 + > --> 重置 @@ -696,7 +706,20 @@ export default { proNo: null, owerDept: null, }, - cv: {}, + conditionViews: [ + { + name: "incomeExpenditureMethods", + value: "", + type: "like", + isAnd: "1", + }, + { + name: "depositBankSalaryDeposit", + value: "", + type: "like", + isAnd: "1", + }, + ], // 排序方式 params: { // 按哪个字段排序 @@ -944,7 +967,20 @@ export default { owerDept: null, remark: null, }, - cv: {}, + conditionViews: [ + { + name: "incomeExpenditureMethods", + value: "", + type: "like", + isAnd: "1", + }, + { + name: "depositBankSalaryDeposit", + value: "", + type: "like", + isAnd: "1", + }, + ], // 排序方式 params: { // 按哪个字段排序 @@ -957,8 +993,8 @@ export default { }, /** 搜索按钮操作 */ handleQuery() { - this.queryParams.cv.name = "incomeExpenditureMethods"; - this.queryParams.cv.type = "like"; + // this.queryParams.cv.name = "incomeExpenditureMethods"; + // this.queryParams.cv.type = "like"; this.queryParams.pageNum = 1; this.getList(); }, diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/peasantWorkerSystem/options/payroll.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/peasantWorkerSystem/options/payroll.vue index 06c7faeb..a27471ca 100644 --- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/peasantWorkerSystem/options/payroll.vue +++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/peasantWorkerSystem/options/payroll.vue @@ -35,12 +35,22 @@ --> + > + + - 搜索 + > --> 重置 @@ -445,8 +455,9 @@ export default { // 按哪个字段排序 orderBy: "create_time", // desc降序，升序asc - sort: "desc", + sortBy: "desc", }, + cv: { name: "name", value: "", type: "like" }, }, // 表单参数 form: {}, @@ -584,6 +595,14 @@ export default { proNo: null, remark: null, }, + // 排序方式 + params: { + // 按哪个字段排序 + orderBy: "create_time", + // desc降序，升序asc + sortBy: "desc", + }, + cv: { name: "name", value: "", type: "like" }, }; this.resetForm("form"); }, diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/peasantWorkerSystem/options/realNameSystem.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/peasantWorkerSystem/options/realNameSystem.vue index e4292a87..7203427f 100644 --- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/peasantWorkerSystem/options/realNameSystem.vue +++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/peasantWorkerSystem/options/realNameSystem.vue @@ -30,12 +30,22 @@ --> + > + + - 搜索 + > --> 重置 @@ -360,8 +370,9 @@ export default { // 按哪个字段排序 orderBy: "create_time", // desc降序，升序asc - sort: "desc", + sortBy: "desc", }, + cv: { name: "name", value: "", type: "like" }, }, // 表单参数 form: {}, @@ -459,6 +470,14 @@ export default { owerDept: null, remark: null, }, + // 排序方式 + params: { + // 按哪个字段排序 + orderBy: "create_time", + // desc降序，升序asc + sortBy: "desc", + }, + cv: { name: "name", value: "", type: "like" }, }; this.resetForm("form"); }, diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/projectLegalPersonEvaluation.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/projectLegalPersonEvaluation.vue index 0b4e5157..f13ee2a4 100644 --- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/projectLegalPersonEvaluation.vue +++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/projectLegalPersonEvaluation.vue @@ -23,13 +23,13 @@ - 搜索 + > --> 重置 diff --git a/jwtech-admin-page/src/views/projectStatistics/projectProcess/contract/index.vue b/jwtech-admin-page/src/views/projectStatistics/projectProcess/contract/index.vue index 7a1d5c58..473d9fc5 100644 --- a/jwtech-admin-page/src/views/projectStatistics/projectProcess/contract/index.vue +++ b/jwtech-admin-page/src/views/projectStatistics/projectProcess/contract/index.vue @@ -25,7 +25,7 @@ --> @@ -127,7 +128,11 @@ :disabled="!routeList[1].isEdit" :lazy="true" > - + { this.formData = response.data; - // console.log(this.formData); + // console.log("this.formData", this.formData); // listBidInfo(this.queryParams).then((response) => { // console.log(response); // // this.formData = response.records[0]; diff --git a/jwtech-admin-page/src/views/projectStatistics/projectProcess/peasantWorkerSystem/options/clockingIn.vue b/jwtech-admin-page/src/views/projectStatistics/projectProcess/peasantWorkerSystem/options/clockingIn.vue index b02e8202..f2fed873 100644 --- a/jwtech-admin-page/src/views/projectStatistics/projectProcess/peasantWorkerSystem/options/clockingIn.vue +++ b/jwtech-admin-page/src/views/projectStatistics/projectProcess/peasantWorkerSystem/options/clockingIn.vue @@ -8,21 +8,31 @@ > + > + + - 搜索 + > --> 重置 @@ -289,8 +299,9 @@ export default { // 按哪个字段排序 orderBy: "create_time", // desc降序，升序asc - sort: "desc", + sortBy: "desc", }, + cv: { name: "name", value: "", type: "like" }, }, // 表单参数 form: {}, @@ -386,6 +397,14 @@ export default { remark: null, attendanceDay: null, }, + // 排序方式 + params: { + // 按哪个字段排序 + orderBy: "create_time", + // desc降序，升序asc + sortBy: "desc", + }, + cv: { name: "name", value: "", type: "like" }, }; this.resetForm("form"); }, diff --git a/jwtech-admin-page/src/views/projectStatistics/projectProcess/peasantWorkerSystem/options/marginAccount.vue b/jwtech-admin-page/src/views/projectStatistics/projectProcess/peasantWorkerSystem/options/marginAccount.vue index 7301247d..26c9ab4e 100644 --- a/jwtech-admin-page/src/views/projectStatistics/projectProcess/peasantWorkerSystem/options/marginAccount.vue +++ b/jwtech-admin-page/src/views/projectStatistics/projectProcess/peasantWorkerSystem/options/marginAccount.vue @@ -8,7 +8,7 @@ > + > + + - 搜索 + > --> 重置 @@ -696,7 +706,20 @@ export default { proNo: null, owerDept: null, }, - cv: {}, + conditionViews: [ + { + name: "incomeExpenditureMethods", + value: "", + type: "like", + isAnd: "1", + }, + { + name: "depositBankSalaryDeposit", + value: "", + type: "like", + isAnd: "1", + }, + ], // 排序方式 params: { // 按哪个字段排序 @@ -944,7 +967,20 @@ export default { owerDept: null, remark: null, }, - cv: {}, + conditionViews: [ + { + name: "incomeExpenditureMethods", + value: "", + type: "like", + isAnd: "1", + }, + { + name: "depositBankSalaryDeposit", + value: "", + type: "like", + isAnd: "1", + }, + ], // 排序方式 params: { // 按哪个字段排序 @@ -957,8 +993,8 @@ export default { }, /** 搜索按钮操作 */ handleQuery() { - this.queryParams.cv.name = "incomeExpenditureMethods"; - this.queryParams.cv.type = "like"; + // this.queryParams.cv.name = "incomeExpenditureMethods"; + // this.queryParams.cv.type = "like"; this.queryParams.pageNum = 1; this.getList(); }, diff --git a/jwtech-admin-page/src/views/projectStatistics/projectProcess/peasantWorkerSystem/options/payroll.vue b/jwtech-admin-page/src/views/projectStatistics/projectProcess/peasantWorkerSystem/options/payroll.vue index 06c7faeb..5f7c025e 100644 --- a/jwtech-admin-page/src/views/projectStatistics/projectProcess/peasantWorkerSystem/options/payroll.vue +++ b/jwtech-admin-page/src/views/projectStatistics/projectProcess/peasantWorkerSystem/options/payroll.vue @@ -35,12 +35,22 @@ --> + > + + + > + + - 搜索 + > --> 重置 @@ -360,8 +370,9 @@ export default { // 按哪个字段排序 orderBy: "create_time", // desc降序，升序asc - sort: "desc", + sortBy: "desc", }, + cv: { name: "name", value: "", type: "like" }, }, // 表单参数 form: {}, @@ -459,6 +470,14 @@ export default { owerDept: null, remark: null, }, + // 排序方式 + params: { + // 按哪个字段排序 + orderBy: "create_time", + // desc降序，升序asc + sortBy: "desc", + }, + cv: { name: "name", value: "", type: "like" }, }; this.resetForm("form"); }, diff --git a/jwtech-admin-page/src/views/projectStatistics/projectProcess/projectLegalPersonEvaluation.vue b/jwtech-admin-page/src/views/projectStatistics/projectProcess/projectLegalPersonEvaluation.vue index 0b4e5157..f13ee2a4 100644 --- a/jwtech-admin-page/src/views/projectStatistics/projectProcess/projectLegalPersonEvaluation.vue +++ b/jwtech-admin-page/src/views/projectStatistics/projectProcess/projectLegalPersonEvaluation.vue @@ -23,13 +23,13 @@ - 搜索 + > --> 重置 diff --git a/jwtech-admin-page/src/views/projectStatistics/projectStatisticsMsg/index.vue b/jwtech-admin-page/src/views/projectStatistics/projectStatisticsMsg/index.vue index 972e6018..0ec96bb9 100644 --- a/jwtech-admin-page/src/views/projectStatistics/projectStatisticsMsg/index.vue +++ b/jwtech-admin-page/src/views/projectStatistics/projectStatisticsMsg/index.vue @@ -294,7 +294,9 @@ export default { this.queryParams = { pageNum: 1, pageSize: 10, - data: {}, + data: { + projectType: "ms,1", + }, // 排序方式 params: { // 按哪个字段排序 diff --git a/jwtech-admin-page/src/views/projectStatistics/projectStatisticsSort/components/list.vue b/jwtech-admin-page/src/views/projectStatistics/projectStatisticsSort/components/list.vue index 0c0b19fc..9283f8ad 100644 --- a/jwtech-admin-page/src/views/projectStatistics/projectStatisticsSort/components/list.vue +++ b/jwtech-admin-page/src/views/projectStatistics/projectStatisticsSort/components/list.vue @@ -252,6 +252,7 @@ export default { // desc降序，升序asc sortBy: "desc", }, + // cv: { name: "projectName", value: "", type: "like" }, }, // 表单参数 form: {},