报告、报告作废、报告作废归档的筛选条件调整

src/views/modules/cw/reportCancellApply/ReportCancellApplyList.vue

@@ -8,35 +8,11 @@
       <el-form-item label="项目名称" prop="projectName">
         <el-input size="small" v-model="searchForm.projectName" placeholder="请输入项目名称" clearable></el-input>
       </el-form-item>
-      <el-form-item label="项目经理1" prop="projectMasterId">
-        <SelectUserTree
-          ref="companyTree"
-          :props="{
-                  value: 'id',             // ID字段名
-                  label: 'name',         // 显示名称
-                  children: 'children'    // 子级字段名
-                }"
-          :url="`/sys/user/treeUserDataAllOffice?type=2`"
-          :value="searchForm.projectMasterId"
-          :clearable="true"
-          :accordion="true"
-          @getValue="(value) => {searchForm.projectMasterId=value}"/>
-<!--        <el-input size="small" v-model="searchForm.projectMaster" placeholder="请输入项目经理" clearable></el-input>-->
+      <el-form-item label="项目经理1" prop="projectMasterName">
+        <UserSelect :limit='1' :userName="searchForm.projectMasterName" @getValue='(value, label) => {searchForm.projectMasterName = label}'></UserSelect>
       </el-form-item>
-      <el-form-item label="项目经理2" prop="projectMaster2Id">
-        <SelectUserTree
-          ref="companyTree"
-          :props="{
-                  value: 'id',             // ID字段名
-                  label: 'name',         // 显示名称
-                  children: 'children'    // 子级字段名
-                }"
-          :url="`/sys/user/treeUserDataAllOffice?type=2`"
-          :value="searchForm.projectMaster2Id"
-          :clearable="true"
-          :accordion="true"
-          @getValue="(value) => {searchForm.projectMaster2Id=value}"/>
-        <!--        <el-input size="small" v-model="searchForm.projectMaster" placeholder="请输入项目经理" clearable></el-input>-->
+      <el-form-item label="项目经理2" prop="projectMaster2Name">
+        <UserSelect :limit='1' :userName="searchForm.projectMaster2Name" @getValue='(value, label) => {searchForm.projectMaster2Name = label}'></UserSelect>
       </el-form-item>
 <!--      <el-form-item label="创建人" prop="createBy">-->
 <!--        <el-input size="small" v-model="searchForm.createBy" placeholder="请输入创建人" clearable></el-input>-->
@@ -164,6 +140,7 @@
   import pick from 'lodash.pick'
   import UserService from '@/api/sys/UserService'
   import SelectUserTree from '@/views/modules/utils/treeUserSelect'
+  import UserSelect from '@/views/modules/cw/workClientInfo/clientUserSelect'
   export default {
     data () {
       return {
@@ -173,7 +150,9 @@
           projectMasterId: '',
           projectMaster2Id: '',
           createBy: '',
-          contractDates: []
+          contractDates: [],
+          projectMasterName: '', // 项目经理1
+          projectMaster2Name: '' // 项目经理2
         },
         dataList: [],
         tablePage: {
@@ -207,7 +186,8 @@
     components: {
       // ReportManagementForm
       ReportCancellApplyForm,
-      SelectUserTree
+      SelectUserTree,
+      UserSelect
     },
     computed: {
       userName () {

src/views/modules/cw/reportCancellApplyArchived/ReportCancellApplyArchivedList.vue

@@ -8,35 +8,11 @@
       <el-form-item label="项目名称" prop="projectName">
         <el-input size="small" v-model="searchForm.projectName" placeholder="请输入项目名称" clearable></el-input>
       </el-form-item>
-      <el-form-item label="项目经理1" prop="projectMasterId">
-        <SelectUserTree
-          ref="companyTree"
-          :props="{
-                  value: 'id',             // ID字段名
-                  label: 'name',         // 显示名称
-                  children: 'children'    // 子级字段名
-                }"
-          :url="`/sys/user/treeUserDataAllOffice?type=2`"
-          :value="searchForm.projectMasterId"
-          :clearable="true"
-          :accordion="true"
-          @getValue="(value) => {searchForm.projectMasterId=value}"/>
-<!--        <el-input size="small" v-model="searchForm.projectMaster" placeholder="请输入项目经理" clearable></el-input>-->
+      <el-form-item label="项目经理1" prop="projectMasterName">
+        <UserSelect :limit='1' :userName="searchForm.projectMasterName" @getValue='(value, label) => {searchForm.projectMasterName = label}'></UserSelect>
       </el-form-item>
-      <el-form-item label="项目经理2" prop="projectMaster2Id">
-        <SelectUserTree
-          ref="companyTree"
-          :props="{
-                  value: 'id',             // ID字段名
-                  label: 'name',         // 显示名称
-                  children: 'children'    // 子级字段名
-                }"
-          :url="`/sys/user/treeUserDataAllOffice?type=2`"
-          :value="searchForm.projectMaster2Id"
-          :clearable="true"
-          :accordion="true"
-          @getValue="(value) => {searchForm.projectMaster2Id=value}"/>
-        <!--        <el-input size="small" v-model="searchForm.projectMaster" placeholder="请输入项目经理" clearable></el-input>-->
+      <el-form-item label="项目经理2" prop="projectMaster2Name">
+        <UserSelect :limit='1' :userName="searchForm.projectMaster2Name" @getValue='(value, label) => {searchForm.projectMaster2Name = label}'></UserSelect>
       </el-form-item>
 <!--      <el-form-item label="创建人" prop="createBy">-->
 <!--        <el-input size="small" v-model="searchForm.createBy" placeholder="请输入创建人" clearable></el-input>-->
@@ -181,6 +157,8 @@
   import pick from 'lodash.pick'
   import UserService from '@/api/sys/UserService'
   import SelectUserTree from '@/views/modules/utils/treeUserSelect'
+  import UserSelect from '@/views/modules/cw/workClientInfo/clientUserSelect'
+
   export default {
     data () {
       return {
@@ -190,7 +168,9 @@
           projectMasterId: '',
           projectMaster2Id: '',
           createBy: '',
-          contractDates: []
+          contractDates: [],
+          projectMasterName: '', // 项目经理1
+          projectMaster2Name: '' // 项目经理2
         },
         dataList: [],
         tablePage: {
@@ -226,7 +206,8 @@
     components: {
       // ReportManagementForm
       ReportCancellApplyForm,
-      SelectUserTree
+      SelectUserTree,
+      UserSelect
     },
     computed: {
       userName () {

src/views/modules/cw/reportManagement/ReportManagementList.vue

@@ -8,35 +8,11 @@
       <el-form-item label="项目名称" prop="projectName">
         <el-input size="small" v-model="searchForm.projectName" placeholder="请输入项目名称" clearable></el-input>
       </el-form-item>
-      <el-form-item label="项目经理1" prop="projectMasterId">
-        <SelectUserTree
-          ref="companyTree"
-          :props="{
-                  value: 'id',             // ID字段名
-                  label: 'name',         // 显示名称
-                  children: 'children'    // 子级字段名
-                }"
-          :url="`/sys/user/treeUserDataAllOffice?type=2`"
-          :value="searchForm.projectMasterId"
-          :clearable="true"
-          :accordion="true"
-          @getValue="(value) => {searchForm.projectMasterId=value}"/>
-<!--        <el-input size="small" v-model="searchForm.projectMasterName" placeholder="请输入项目经理" clearable></el-input>-->
+      <el-form-item label="项目经理1" prop="projectMasterName">
+        <UserSelect :limit='1' :userName="searchForm.projectMasterName" @getValue='(value, label) => {searchForm.projectMasterName = label}'></UserSelect>
       </el-form-item>
-      <el-form-item label="项目经理2" prop="projectMaster2Id">
-        <SelectUserTree
-          ref="companyTree"
-          :props="{
-                  value: 'id',             // ID字段名
-                  label: 'name',         // 显示名称
-                  children: 'children'    // 子级字段名
-                }"
-          :url="`/sys/user/treeUserDataAllOffice?type=2`"
-          :value="searchForm.projectMaster2Id"
-          :clearable="true"
-          :accordion="true"
-          @getValue="(value) => {searchForm.projectMaster2Id=value}"/>
-        <!--        <el-input size="small" v-model="searchForm.projectMasterName" placeholder="请输入项目经理" clearable></el-input>-->
+      <el-form-item label="项目经理2" prop="realHeaderName">
+        <UserSelect :limit='1' :userName="searchForm.realHeaderName" @getValue='(value, label) => {searchForm.realHeaderName = label}'></UserSelect>
       </el-form-item>
       <el-form-item label="创建人" prop="createBy">
         <SelectUserTree
@@ -262,6 +238,7 @@
   import UserService from '@/api/sys/UserService'
   import SelectUserTree from '@/views/modules/utils/treeUserSelect'
   import ProjectRecordsService from '@/api/cw/projectRecords/ProjectRecordsService'
+  import UserSelect from '@/views/modules/cw/workClientInfo/clientUserSelect'
   export default {
     data () {
       return {
@@ -276,7 +253,9 @@
           projectMasterId: '',
           projectMaster2Id: '',
           createBy: '',
-          contractDates: []
+          contractDates: [],
+          projectMasterName: '', // 项目经理1
+          realHeaderName: '' // 项目经理2
         },
         dataList: [],
         tablePage: {
@@ -320,7 +299,8 @@
       ReportManagementForm,
       ReportManagementAddForm,
       SelectUserTree,
-      InputNumber
+      InputNumber,
+      UserSelect
     },
     computed: {
       userName () {