模糊查询修改

jwtech-admin-page/src/views/building/projectInfo/projectProcess/contract/index.vue

@@ -25,7 +25,7 @@
       </el-form-item> -->
       <el-form-item label="合同名称" prop="contractName">
         <el-input
-          v-model="queryParams.data.contractName"
+          v-model="queryParams.cv.value"
           placeholder="请输入合同名称"
           clearable
           size="small"
@@ -776,8 +776,9 @@ export default {
           // 按哪个字段排序
           orderBy: "create_time",
           // desc降序，升序asc
-          sort: "desc",
+          sortBy: "desc",
         },
+        cv: { name: "contractName", value: "", type: "like" },
       },
       // 表单参数
       form: {},
@@ -944,7 +945,7 @@ export default {
           contractNumber: null,
           contractName: null,
           constructionUnit: null,
-          contractStatus: "0",
+          contractStatus: null,
           sectionName: null,
           contractAmount: null,
           contractDuration: null,
@@ -971,8 +972,9 @@ export default {
           // 按哪个字段排序
           orderBy: "create_time",
           // desc降序，升序asc
-          sort: "desc",
+          sortBy: "desc",
         },
+        cv: { name: "contractName", value: "", type: "like" },
       };
       this.resetForm("form");
     },

jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/clockingIn.vue

@@ -8,21 +8,31 @@
     >
       <el-form-item label="姓名" prop="name">
         <el-input
-          v-model="queryParams.data.name"
+          v-model="queryParams.cv.value"
           placeholder="请输入姓名"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
-        />
+        >
+          <template slot="append">
+            <el-button
+              type="primary"
+              slot="append"
+              icon="el-icon-search"
+              size="small"
+              @click="handleQuery"
+            ></el-button>
+          </template>
+        </el-input>
       </el-form-item>
       <el-form-item>
-        <el-button
+        <!-- <el-button
           type="cyan"
           icon="el-icon-search"
           size="mini"
           @click="handleQuery"
           >搜索</el-button
-        >
+        > -->
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
           >重置</el-button
         >
@@ -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");
     },

jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/marginAccount.vue

@@ -8,7 +8,7 @@
     >
       <el-form-item label="收取方式" prop="incomeExpenditureMethods">
         <el-select
-          v-model="queryParams.cv.value"
+          v-model="queryParams.conditionViews[0].value"
           placeholder="请选择收取方式"
           clearable
           size="small"
@@ -28,22 +28,32 @@
         label-width="152px"
       >
         <el-input
-          v-model="queryParams.data.depositBankSalaryDeposit"
+          v-model="queryParams.conditionViews[1].value"
           placeholder="请输入工资保证金开户银行"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
-        />
+        >
+          <template slot="append">
+            <el-button
+              type="primary"
+              slot="append"
+              icon="el-icon-search"
+              size="small"
+              @click="handleQuery"
+            ></el-button>
+          </template>
+        </el-input>
       </el-form-item>
 
       <el-form-item>
-        <el-button
+        <!-- <el-button
           type="cyan"
           icon="el-icon-search"
           size="mini"
           @click="handleQuery"
           >搜索</el-button
-        >
+        > -->
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
           >重置</el-button
         >
@@ -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();
     },

jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/payroll.vue

@@ -35,12 +35,22 @@
       </el-form-item> -->
       <el-form-item label="务工人员姓名" prop="name">
         <el-input
-          v-model="queryParams.data.name"
+          v-model="queryParams.cv.value"
           placeholder="请输入务工人员姓名"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
-        />
+        >
+          <template slot="append">
+            <el-button
+              type="primary"
+              slot="append"
+              icon="el-icon-search"
+              size="small"
+              @click="handleQuery"
+            ></el-button>
+          </template>
+        </el-input>
       </el-form-item>
       <!-- <el-form-item label="工资年月" prop="salaryTime">
         <el-date-picker
@@ -91,13 +101,13 @@
         />
       </el-form-item> -->
       <el-form-item>
-        <el-button
+        <!-- <el-button
           type="cyan"
           icon="el-icon-search"
           size="mini"
           @click="handleQuery"
           >搜索</el-button
-        >
+        > -->
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
           >重置</el-button
         >
@@ -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");
     },

jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/realNameSystem.vue

@@ -30,12 +30,22 @@
       </el-form-item> -->
       <el-form-item label="姓名" prop="name">
         <el-input
-          v-model="queryParams.data.name"
+          v-model="queryParams.cv.value"
           placeholder="请输入姓名"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
-        />
+        >
+          <template slot="append">
+            <el-button
+              type="primary"
+              slot="append"
+              icon="el-icon-search"
+              size="small"
+              @click="handleQuery"
+            ></el-button>
+          </template>
+        </el-input>
       </el-form-item>
       <!-- <el-form-item label="出生日期" prop="birthday">
         <el-date-picker
@@ -69,13 +79,13 @@
       </el-form-item> -->
 
       <el-form-item>
-        <el-button
+        <!-- <el-button
           type="cyan"
           icon="el-icon-search"
           size="mini"
           @click="handleQuery"
           >搜索</el-button
-        >
+        > -->
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
           >重置</el-button
         >
@@ -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");
     },

jwtech-admin-page/src/views/building/projectInfo/projectProcess/projectLegalPersonEvaluation.vue

@@ -23,13 +23,13 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button
+        <!-- <el-button
           type="cyan"
           icon="el-icon-search"
           size="mini"
           @click="handleQuery"
           >搜索</el-button
-        >
+        > -->
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
           >重置</el-button
         >

jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/contract/index.vue

@@ -25,7 +25,7 @@
       </el-form-item> -->
       <el-form-item label="合同名称" prop="contractName">
         <el-input
-          v-model="queryParams.data.contractName"
+          v-model="queryParams.cv.value"
           placeholder="请输入合同名称"
           clearable
           size="small"
@@ -779,8 +779,9 @@ export default {
           // 按哪个字段排序
           orderBy: "create_time",
           // desc降序，升序asc
-          sort: "desc",
+          sortBy: "desc",
         },
+        cv: { name: "contractName", value: "", type: "like" },
       },
       // 表单参数
       form: {},
@@ -946,7 +947,7 @@ export default {
           contractNumber: null,
           contractName: null,
           constructionUnit: null,
-          contractStatus: "0",
+          contractStatus: null,
           sectionName: null,
           contractAmount: null,
           contractDuration: null,
@@ -973,8 +974,9 @@ export default {
           // 按哪个字段排序
           orderBy: "create_time",
           // desc降序，升序asc
-          sort: "desc",
+          sortBy: "desc",
         },
+        cv: { name: "contractName", value: "", type: "like" },
       };
       this.resetForm("form");
     },

jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/peasantWorkerSystem/options/clockingIn.vue

@@ -8,21 +8,31 @@
     >
       <el-form-item label="姓名" prop="name">
         <el-input
-          v-model="queryParams.data.name"
+          v-model="queryParams.cv.value"
           placeholder="请输入姓名"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
-        />
+        >
+          <template slot="append">
+            <el-button
+              type="primary"
+              slot="append"
+              icon="el-icon-search"
+              size="small"
+              @click="handleQuery"
+            ></el-button>
+          </template>
+        </el-input>
       </el-form-item>
       <el-form-item>
-        <el-button
+        <!-- <el-button
           type="cyan"
           icon="el-icon-search"
           size="mini"
           @click="handleQuery"
           >搜索</el-button
-        >
+        > -->
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
           >重置</el-button
         >
@@ -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");
     },

jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/peasantWorkerSystem/options/marginAccount.vue

@@ -8,7 +8,7 @@
     >
       <el-form-item label="收取方式" prop="incomeExpenditureMethods">
         <el-select
-          v-model="queryParams.cv.value"
+          v-model="queryParams.conditionViews[0].value"
           placeholder="请选择收取方式"
           clearable
           size="small"
@@ -28,22 +28,32 @@
         label-width="152px"
       >
         <el-input
-          v-model="queryParams.data.depositBankSalaryDeposit"
+          v-model="queryParams.conditionViews[1].value"
           placeholder="请输入工资保证金开户银行"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
-        />
+        >
+          <template slot="append">
+            <el-button
+              type="primary"
+              slot="append"
+              icon="el-icon-search"
+              size="small"
+              @click="handleQuery"
+            ></el-button>
+          </template>
+        </el-input>
       </el-form-item>
 
       <el-form-item>
-        <el-button
+        <!-- <el-button
           type="cyan"
           icon="el-icon-search"
           size="mini"
           @click="handleQuery"
           >搜索</el-button
-        >
+        > -->
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
           >重置</el-button
         >
@@ -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();
     },

jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/peasantWorkerSystem/options/payroll.vue

@@ -35,12 +35,22 @@
       </el-form-item> -->
       <el-form-item label="务工人员姓名" prop="name">
         <el-input
-          v-model="queryParams.data.name"
+          v-model="queryParams.cv.value"
           placeholder="请输入务工人员姓名"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
-        />
+        >
+          <template slot="append">
+            <el-button
+              type="primary"
+              slot="append"
+              icon="el-icon-search"
+              size="small"
+              @click="handleQuery"
+            ></el-button>
+          </template>
+        </el-input>
       </el-form-item>
       <!-- <el-form-item label="工资年月" prop="salaryTime">
         <el-date-picker
@@ -91,13 +101,13 @@
         />
       </el-form-item> -->
       <el-form-item>
-        <el-button
+        <!-- <el-button
           type="cyan"
           icon="el-icon-search"
           size="mini"
           @click="handleQuery"
           >搜索</el-button
-        >
+        > -->
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
           >重置</el-button
         >
@@ -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");
     },

jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/peasantWorkerSystem/options/realNameSystem.vue

@@ -30,12 +30,22 @@
       </el-form-item> -->
       <el-form-item label="姓名" prop="name">
         <el-input
-          v-model="queryParams.data.name"
+          v-model="queryParams.cv.value"
           placeholder="请输入姓名"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
-        />
+        >
+          <template slot="append">
+            <el-button
+              type="primary"
+              slot="append"
+              icon="el-icon-search"
+              size="small"
+              @click="handleQuery"
+            ></el-button>
+          </template>
+        </el-input>
       </el-form-item>
       <!-- <el-form-item label="出生日期" prop="birthday">
         <el-date-picker
@@ -69,13 +79,13 @@
       </el-form-item> -->
 
       <el-form-item>
-        <el-button
+        <!-- <el-button
           type="cyan"
           icon="el-icon-search"
           size="mini"
           @click="handleQuery"
           >搜索</el-button
-        >
+        > -->
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
           >重置</el-button
         >
@@ -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");
     },

jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/projectLegalPersonEvaluation.vue

@@ -23,13 +23,13 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button
+        <!-- <el-button
           type="cyan"
           icon="el-icon-search"
           size="mini"
           @click="handleQuery"
           >搜索</el-button
-        >
+        > -->
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
           >重置</el-button
         >

jwtech-admin-page/src/views/projectStatistics/projectProcess/contract/index.vue

@@ -25,7 +25,7 @@
       </el-form-item> -->
       <el-form-item label="合同名称" prop="contractName">
         <el-input
-          v-model="queryParams.data.contractName"
+          v-model="queryParams.cv.value"
           placeholder="请输入合同名称"
           clearable
           size="small"
@@ -779,8 +779,9 @@ export default {
           // 按哪个字段排序
           orderBy: "create_time",
           // desc降序，升序asc
-          sort: "desc",
+          sortBy: "desc",
         },
+        cv: { name: "contractName", value: "", type: "like" },
       },
       // 表单参数
       form: {},
@@ -946,7 +947,7 @@ export default {
           contractNumber: null,
           contractName: null,
           constructionUnit: null,
-          contractStatus: "0",
+          contractStatus: null,
           sectionName: null,
           contractAmount: null,
           contractDuration: null,
@@ -973,8 +974,9 @@ export default {
           // 按哪个字段排序
           orderBy: "create_time",
           // desc降序，升序asc
-          sort: "desc",
+          sortBy: "desc",
         },
+        cv: { name: "contractName", value: "", type: "like" },
       };
       this.resetForm("form");
     },

jwtech-admin-page/src/views/projectStatistics/projectProcess/index.vue

@@ -94,6 +94,7 @@
         :lazy="true"
       >
         <scheduleManagement
+          v-if="formData.proNo"
           :proNo="formData.proNo"
           :proCode="formData.proCode"
         />
@@ -127,7 +128,11 @@
         :disabled="!routeList[1].isEdit"
         :lazy="true"
       >
-        <investment :proNo="formData.proNo" :proCode="formData.proCode" />
+        <investment
+          v-if="formData.proNo"
+          :proNo="formData.proNo"
+          :proCode="formData.proCode"
+        />
       </el-tab-pane>
       <el-tab-pane
         label="农民工制度管理"
@@ -148,6 +153,7 @@
         :lazy="true"
       >
         <projectAcceptance
+          v-if="formData.proNo"
           :proNo="formData.proNo"
           :proCode="formData.proCode"
           :projectName="formData.projectName"
@@ -234,7 +240,7 @@ export default {
     getList() {
       getInfo(this.$route.query.baseDataId).then((response) => {
         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];

jwtech-admin-page/src/views/projectStatistics/projectProcess/peasantWorkerSystem/options/clockingIn.vue

@@ -8,21 +8,31 @@
     >
       <el-form-item label="姓名" prop="name">
         <el-input
-          v-model="queryParams.data.name"
+          v-model="queryParams.cv.value"
           placeholder="请输入姓名"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
-        />
+        >
+          <template slot="append">
+            <el-button
+              type="primary"
+              slot="append"
+              icon="el-icon-search"
+              size="small"
+              @click="handleQuery"
+            ></el-button>
+          </template>
+        </el-input>
       </el-form-item>
       <el-form-item>
-        <el-button
+        <!-- <el-button
           type="cyan"
           icon="el-icon-search"
           size="mini"
           @click="handleQuery"
           >搜索</el-button
-        >
+        > -->
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
           >重置</el-button
         >
@@ -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");
     },

jwtech-admin-page/src/views/projectStatistics/projectProcess/peasantWorkerSystem/options/marginAccount.vue

@@ -8,7 +8,7 @@
     >
       <el-form-item label="收取方式" prop="incomeExpenditureMethods">
         <el-select
-          v-model="queryParams.cv.value"
+          v-model="queryParams.conditionViews[0].value"
           placeholder="请选择收取方式"
           clearable
           size="small"
@@ -28,22 +28,32 @@
         label-width="152px"
       >
         <el-input
-          v-model="queryParams.data.depositBankSalaryDeposit"
+          v-model="queryParams.conditionViews[1].value"
           placeholder="请输入工资保证金开户银行"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
-        />
+        >
+          <template slot="append">
+            <el-button
+              type="primary"
+              slot="append"
+              icon="el-icon-search"
+              size="small"
+              @click="handleQuery"
+            ></el-button>
+          </template>
+        </el-input>
       </el-form-item>
 
       <el-form-item>
-        <el-button
+        <!-- <el-button
           type="cyan"
           icon="el-icon-search"
           size="mini"
           @click="handleQuery"
           >搜索</el-button
-        >
+        > -->
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
           >重置</el-button
         >
@@ -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();
     },

jwtech-admin-page/src/views/projectStatistics/projectProcess/peasantWorkerSystem/options/payroll.vue

@@ -35,12 +35,22 @@
       </el-form-item> -->
       <el-form-item label="务工人员姓名" prop="name">
         <el-input
-          v-model="queryParams.data.name"
+          v-model="queryParams.cv.value"
           placeholder="请输入务工人员姓名"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
-        />
+        >
+          <template slot="append">
+            <el-button
+              type="primary"
+              slot="append"
+              icon="el-icon-search"
+              size="small"
+              @click="handleQuery"
+            ></el-button>
+          </template>
+        </el-input>
       </el-form-item>
       <!-- <el-form-item label="工资年月" prop="salaryTime">
         <el-date-picker
@@ -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");
     },

jwtech-admin-page/src/views/projectStatistics/projectProcess/peasantWorkerSystem/options/realNameSystem.vue

@@ -30,12 +30,22 @@
       </el-form-item> -->
       <el-form-item label="姓名" prop="name">
         <el-input
-          v-model="queryParams.data.name"
+          v-model="queryParams.cv.value"
           placeholder="请输入姓名"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
-        />
+        >
+          <template slot="append">
+            <el-button
+              type="primary"
+              slot="append"
+              icon="el-icon-search"
+              size="small"
+              @click="handleQuery"
+            ></el-button>
+          </template>
+        </el-input>
       </el-form-item>
       <!-- <el-form-item label="出生日期" prop="birthday">
         <el-date-picker
@@ -69,13 +79,13 @@
       </el-form-item> -->
 
       <el-form-item>
-        <el-button
+        <!-- <el-button
           type="cyan"
           icon="el-icon-search"
           size="mini"
           @click="handleQuery"
           >搜索</el-button
-        >
+        > -->
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
           >重置</el-button
         >
@@ -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");
     },

jwtech-admin-page/src/views/projectStatistics/projectProcess/projectLegalPersonEvaluation.vue

@@ -23,13 +23,13 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button
+        <!-- <el-button
           type="cyan"
           icon="el-icon-search"
           size="mini"
           @click="handleQuery"
           >搜索</el-button
-        >
+        > -->
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
           >重置</el-button
         >

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: {
           // 按哪个字段排序

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: {},