sangwenwei 1 éve
szülő
commit
fc655bc2e2
41 módosított fájl, 2225 hozzáadás és 599 törlés
  1. 36 4
      src/views/ccpm/reimbursement/info/InfoList.vue
  2. 36 4
      src/views/consultancy/reimbursement/info/InfoList.vue
  3. 69 31
      src/views/cw/invoice/InvoiceForm.vue
  4. 108 58
      src/views/cw/invoice/InvoiceFormTask.vue
  5. 66 28
      src/views/cw/invoice/InvoiceFormTaskInvalid.vue
  6. 36 4
      src/views/cw/invoice/InvoiceList.vue
  7. 66 29
      src/views/cw/invoice/InvoiceUpdateForm.vue
  8. 86 22
      src/views/cw/projectRecords/ProjectRecordsAddForm.vue
  9. 68 11
      src/views/cw/projectRecords/ProjectRecordsForm.vue
  10. 54 8
      src/views/cw/projectRecords/ProjectRecordsList.vue
  11. 33 16
      src/views/cw/projectReportArchive/ProjectReportArchiveDetailList.vue
  12. 56 9
      src/views/cw/projectReportArchive/ProjectReportArchiveList.vue
  13. 36 4
      src/views/cw/reimbursementApproval/info/InfoList.vue
  14. 66 18
      src/views/cw/reportCancellApply/ReportCancellApplyList.vue
  15. 89 17
      src/views/cw/reportCancellApply/ReportCancellApplyTaskForm.vue
  16. 67 20
      src/views/cw/reportCancellApplyArchived/ReportCancellApplyArchivedList.vue
  17. 99 27
      src/views/cw/reportManagement/ReportManagementAddForm.vue
  18. 96 24
      src/views/cw/reportManagement/ReportManagementForm.vue
  19. 69 22
      src/views/cw/reportManagement/ReportManagementList.vue
  20. 76 8
      src/views/cw/reportManagement/ReportReviewTakeNumberForm.vue
  21. 76 8
      src/views/cw/reportManagement/ReportSignatureForm.vue
  22. 84 16
      src/views/cw/reportManagement/reportReviewNew/ReportReviewFormNew.vue
  23. 84 16
      src/views/cw/reportManagement/revocationSignature/RevocationSignature.vue
  24. 20 3
      src/views/cw/signatureDaily/SignatureDailyList.vue
  25. 19 3
      src/views/cw/signatureDaily/SignatureReportList.vue
  26. 31 15
      src/views/cw/workContract/ContractRegistration.vue
  27. 67 29
      src/views/finance/invoice/InvoiceForm.vue
  28. 68 30
      src/views/finance/invoice/InvoiceFormTask.vue
  29. 39 7
      src/views/finance/invoice/InvoiceList.vue
  30. 70 8
      src/views/program/registered/ProjectArchiveForm.vue
  31. 35 15
      src/views/program/registered/ProjectFormUpdate.vue
  32. 19 5
      src/views/program/registered/ProjectList.vue
  33. 80 24
      src/views/program/registered/ProjectThreeAuditForm.vue
  34. 37 16
      src/views/program/registered/ProofreadIssuedForm.vue
  35. 33 15
      src/views/program/registered/RegisItemForm.vue
  36. 20 3
      src/views/program/signatureDaily/SignatureDailyList.vue
  37. 18 4
      src/views/program/signatureDaily/SignatureReportList.vue
  38. 38 6
      src/views/reimbursement/info/InfoList.vue
  39. 20 4
      src/views/workClient/WorkClientList.vue
  40. 19 4
      src/views/workContract/WorkContractList.vue
  41. 36 4
      src/views/zs/reimbursement/info/InfoList.vue

+ 36 - 4
src/views/ccpm/reimbursement/info/InfoList.vue

@@ -25,10 +25,22 @@
 		</el-date-picker>
 	  </el-form-item>
 		<el-form-item  label="经办人" prop="handled">
-			<UserSelect :limit='1' :modelValue="searchForm.handled" @update:modelValue='(value, label) => {searchForm.handled = value}'></UserSelect>
+<!--			<UserSelect :limit='1' :modelValue="searchForm.handled" @update:modelValue='(value, label) => {searchForm.handled = value}'></UserSelect>-->
+			<el-input  v-model="searchForm.handled" placeholder="请选择经办人">
+				<template #suffix>
+					<el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia1">
+					</el-button>
+				</template>
+			</el-input>
 		</el-form-item>
 		<el-form-item v-if="showHideItem"  label="报销人" prop="reimBy">
-			<UserSelect :limit='1' :modelValue="searchForm.reimBy" @update:modelValue='(value, label) => {searchForm.reimBy = value}'></UserSelect>
+<!--			<UserSelect :limit='1' :modelValue="searchForm.reimBy" @update:modelValue='(value, label) => {searchForm.reimBy = value}'></UserSelect>-->
+			<el-input  v-model="searchForm.reimBy" placeholder="请选择报销人">
+				<template #suffix>
+					<el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia2">
+					</el-button>
+				</template>
+			</el-input>
 		</el-form-item>
 		<el-form-item v-if="showHideItem" label="报销项" prop="reimbursementType">
 			<el-select v-model="searchForm.reimbursementType" placeholder="请选择" style="width:100%;" clearable>
@@ -216,6 +228,8 @@
 <!--        <ProjectForm ref="projectForm" @refreshDataList="refreshList"></ProjectForm>-->
         <ProjectRecordsForm ref="projectRecordsForm" @refreshDataList="refreshList"></ProjectRecordsForm>
         <ContractNameForm ref="contractNameForm"></ContractNameForm>
+		  <user-select1 ref="userSelect1" @doSubmit="selectUser1"></user-select1>
+		  <user-select2 ref="userSelect2" @doSubmit="selectUser2"></user-select2>
       </div>
     </div>
   </div>
@@ -235,6 +249,8 @@
   import ProjectRecordsForm from '@/views/cw/projectRecords/ProjectRecordsForm'
   import ContractNameForm from '@/views/cw/workContract/ContractNameForm'
   import userService from '@/api/sys/UserService'
+  import UserSelect1 from '@/views/utils/UserTreeSelect'
+  import UserSelect2 from '@/views/utils/UserTreeSelect'
   export default {
     data () {
       return {
@@ -294,7 +310,9 @@
       // ProjectForm,
       ProjectRecordsForm,
       UserSelect,
-      ContractNameForm
+      ContractNameForm,
+		UserSelect1,
+		UserSelect2,
     },
     mounted () {
 		this.$nextTick(() => {
@@ -937,7 +955,21 @@
           }
         }
         return false
-      }
+      },
+		openUserDia1(){
+			this.$refs.userSelect1.init()
+		},
+		selectUser1(user){
+			console.log(user[0].name)
+			this.searchForm.handled=user[0].name
+		},
+		openUserDia2(){
+			this.$refs.userSelect2.init()
+		},
+		selectUser2(user){
+			console.log(user[0].name)
+			this.searchForm.reimBy=user[0].name
+		},
     }
   }
 </script>

+ 36 - 4
src/views/consultancy/reimbursement/info/InfoList.vue

@@ -25,10 +25,22 @@
 		</el-date-picker>
 	  </el-form-item>
 		<el-form-item  label="经办人" prop="handled">
-			<UserSelect :limit='1' :modelValue="searchForm.handled" @update:modelValue='(value, label) => {searchForm.handled = value}'></UserSelect>
+<!--			<UserSelect :limit='1' :modelValue="searchForm.handled" @update:modelValue='(value, label) => {searchForm.handled = value}'></UserSelect>-->
+			<el-input  v-model="searchForm.handled" placeholder="请选择经办人">
+				<template #suffix>
+					<el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia1">
+					</el-button>
+				</template>
+			</el-input>
 		</el-form-item>
 		<el-form-item v-if="showHideItem"  label="报销人" prop="reimBy">
-			<UserSelect :limit='1' :modelValue="searchForm.reimBy" @update:modelValue='(value, label) => {searchForm.reimBy = value}'></UserSelect>
+<!--			<UserSelect :limit='1' :modelValue="searchForm.reimBy" @update:modelValue='(value, label) => {searchForm.reimBy = value}'></UserSelect>-->
+			<el-input  v-model="searchForm.reimBy" placeholder="请选择报销人">
+				<template #suffix>
+					<el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia2">
+					</el-button>
+				</template>
+			</el-input>
 		</el-form-item>
 		<el-form-item v-if="showHideItem" label="报销项" prop="reimbursementType">
 			<el-select v-model="searchForm.reimbursementType" placeholder="请选择" style="width:100%;" clearable>
@@ -216,6 +228,8 @@
 <!--        <ProjectForm ref="projectForm" @refreshDataList="refreshList"></ProjectForm>-->
         <ProjectRecordsForm ref="projectRecordsForm" @refreshDataList="refreshList"></ProjectRecordsForm>
         <ContractNameForm ref="contractNameForm"></ContractNameForm>
+		  <user-select1 ref="userSelect1" @doSubmit="selectUser1"></user-select1>
+		  <user-select2 ref="userSelect2" @doSubmit="selectUser2"></user-select2>
       </div>
     </div>
   </div>
@@ -236,6 +250,8 @@
   import ContractNameForm from '@/views/cw/workContract/ContractNameForm'
   import userService from '@/api/sys/UserService'
   import InfoUpdateForm from "./InfoUpdateForm";
+  import UserSelect1 from '@/views/utils/UserTreeSelect'
+  import UserSelect2 from '@/views/utils/UserTreeSelect'
   export default {
     data () {
       return {
@@ -293,7 +309,9 @@
       ProjectRecordsForm,
       UserSelect,
       ContractNameForm,
-		InfoUpdateForm
+		InfoUpdateForm,
+		UserSelect1,
+		UserSelect2,
     },
     mounted () {
 		this.$nextTick(() => {
@@ -798,7 +816,21 @@
           }
         }
         return false
-      }
+      },
+		openUserDia1(){
+			this.$refs.userSelect1.init()
+		},
+		selectUser1(user){
+			console.log(user[0].name)
+			this.searchForm.handled=user[0].name
+		},
+		openUserDia2(){
+			this.$refs.userSelect2.init()
+		},
+		selectUser2(user){
+			console.log(user[0].name)
+			this.searchForm.reimBy=user[0].name
+		},
     }
   }
 </script>

+ 69 - 31
src/views/cw/invoice/InvoiceForm.vue

@@ -353,20 +353,26 @@
             <el-form-item label="实际开票人" prop="billingPeopleReal"
                           :rules="[
                  ]">
-              <SelectUserTree
-                ref="companyTree"
-                size="default"
-                :props="{
-                  value: 'id',             // ID字段名
-                  label: 'name',         // 显示名称
-                  children: 'children'    // 子级字段名
-                }"
-                :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"
-                :value="inputForm.billingPeopleReal"
-                :clearable="true"
-                :accordion="true"
+<!--              <SelectUserTree-->
+<!--                ref="companyTree"-->
+<!--                size="default"-->
+<!--                :props="{-->
+<!--                  value: 'id',             // ID字段名-->
+<!--                  label: 'name',         // 显示名称-->
+<!--                  children: 'children'    // 子级字段名-->
+<!--                }"-->
+<!--                :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"-->
+<!--                :value="inputForm.billingPeopleReal"-->
+<!--                :clearable="true"-->
+<!--                :accordion="true"-->
 
-                @getValue="(value) => {inputForm.billingPeopleReal=value}"/>
+<!--                @getValue="(value) => {inputForm.billingPeopleReal=value}"/>-->
+				<el-input  :readonly="true"  @focus="openUserDia1" v-model="inputForm.billingPeopleRealName" placeholder="请选择实际开票人">
+					<template #suffix>
+						<el-button  :readonly="true" style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia1">
+						</el-button>
+					</template>
+				</el-input>
             </el-form-item>
           </el-col>
 			<el-col :span="12">
@@ -383,20 +389,26 @@
             <el-form-item label="对账人" prop="reconciliationPeople"
                           :rules="[
                  ]">
-              <SelectUserTree
-                ref="companyTree"
-                size="default"
-                :props="{
-                  value: 'id',             // ID字段名
-                  label: 'name',         // 显示名称
-                  children: 'children'    // 子级字段名
-                }"
-                :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"
-                :value="inputForm.reconciliationPeople"
-                :clearable="true"
-                :accordion="true"
+<!--              <SelectUserTree-->
+<!--                ref="companyTree"-->
+<!--                size="default"-->
+<!--                :props="{-->
+<!--                  value: 'id',             // ID字段名-->
+<!--                  label: 'name',         // 显示名称-->
+<!--                  children: 'children'    // 子级字段名-->
+<!--                }"-->
+<!--                :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"-->
+<!--                :value="inputForm.reconciliationPeople"-->
+<!--                :clearable="true"-->
+<!--                :accordion="true"-->
 
-                @getValue="(value) => {inputForm.reconciliationPeople=value}"/>
+<!--                @getValue="(value) => {inputForm.reconciliationPeople=value}"/>-->
+				<el-input  :readonly="true"  @focus="openUserDia2" v-model="inputForm.reconciliationPeopleName" placeholder="请选择对账人">
+					<template #suffix>
+						<el-button  :readonly="true" style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia2">
+						</el-button>
+					</template>
+				</el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -644,6 +656,8 @@
     <ProgramPageForm ref="programPageForm" @getProgram="getProgram"></ProgramPageForm>
     <ContractForm  ref="contractForm" @getContract="getContract"></ContractForm>
     <WorkClientForm  ref="workClientForm" @getWorkClientRadioChoose="getWorkClient"></WorkClientForm>
+	  <user-select1 ref="userSelect1" @doSubmit="selectUser1"></user-select1>
+	  <user-select2 ref="userSelect2" @doSubmit="selectUser2"></user-select2>
   </div>
 </template>
 
@@ -657,6 +671,8 @@
   import SelectUserTree from '@/views/utils/treeUserSelect'
   import SelectTree from '@/components/treeSelect/treeSelect.vue'
   import XEUtils from 'xe-utils'
+  import UserSelect1 from '@/views/utils/UserTreeSelect'
+  import UserSelect2 from '@/views/utils/UserTreeSelect'
   export default {
     data () {
       return {
@@ -695,8 +711,10 @@
           billingPeopleId: this.$store.state.user.id,
           billingDate: '',
           collectDate: '',
-          billingPeopleReal: '',
-          reconciliationPeople: '',
+			billingPeopleReal: '',
+			billingPeopleRealName: '',
+			reconciliationPeople: '',
+			reconciliationPeopleName: '',
           reconciliationArea: '',
           remarks: '',
           name: '',
@@ -732,7 +750,9 @@
       WorkClientForm,
       SelectUserTree,
       SelectTree,
-      UpLoadComponent
+      UpLoadComponent,
+		UserSelect1,
+		UserSelect2
     },
     methods: {
       init (receivablesFlag, id, meth) {
@@ -781,8 +801,10 @@
           billingPeopleId: this.$store.state.user.id,
           billingDate: '',
           collectDate: '',
-          billingPeopleReal: '',
-          reconciliationPeople: '',
+			billingPeopleReal: '',
+			billingPeopleRealName: '',
+			reconciliationPeople: '',
+			reconciliationPeopleName: '',
           reconciliationArea: '',
           remarks: '',
           name: '',
@@ -1333,6 +1355,22 @@
 			console.log('accountTotal', this.inputForm.accountTotal)
 			return footerData
 		},
+		openUserDia1(){
+			this.$refs.userSelect1.init()
+		},
+		selectUser1(user){
+			console.log(user[0].name)
+			this.inputForm.billingPeopleRealName=user[0].name
+			this.inputForm.billingPeopleReal=user[0].id
+		},
+		openUserDia2(){
+			this.$refs.userSelect2.init()
+		},
+		selectUser2(user){
+			console.log(user[0].name)
+			this.inputForm.reconciliationPeopleName=user[0].name
+			this.inputForm.reconciliationPeople=user[0].id
+		},
     }
   }
 </script>

+ 108 - 58
src/views/cw/invoice/InvoiceFormTask.vue

@@ -393,45 +393,57 @@
 
         <el-col :span="12">
 			<el-col v-if="status === 'audit'?true:false">
-				<el-form-item label="实际开票人" prop="billingPeopleReal"
+				<el-form-item label="实际开票人" prop="billingPeopleRealName"
 							  :rules="[
                         {required: true, message:'实际开票人不能为空', trigger:'blur'},
                         {required: true, message:'实际开票人不能为空', trigger:'change'}
                ]">
-					<SelectUserTree
-						ref="companyTree"
-						:props="{
-                value: 'id',             // ID字段名
-                label: 'name',         // 显示名称
-                children: 'children'    // 子级字段名
-              }"
-						:url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"
-						:value="inputForm.billingPeopleReal"
-						:clearable="true"
-						:accordion="true"
-						size="default"
-						@getValue="(value) => {inputForm.billingPeopleReal=value}"/>
+<!--					<SelectUserTree-->
+<!--						ref="companyTree"-->
+<!--						:props="{-->
+<!--                value: 'id',             // ID字段名-->
+<!--                label: 'name',         // 显示名称-->
+<!--                children: 'children'    // 子级字段名-->
+<!--              }"-->
+<!--						:url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"-->
+<!--						:value="inputForm.billingPeopleReal"-->
+<!--						:clearable="true"-->
+<!--						:accordion="true"-->
+<!--						size="default"-->
+<!--						@getValue="(value) => {inputForm.billingPeopleReal=value}"/>-->
+					<el-input  :readonly="true"  @focus="openUserDia1" v-model="inputForm.billingPeopleRealName" placeholder="请选择实际开票人">
+						<template #suffix>
+							<el-button  :readonly="true" style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia1">
+							</el-button>
+						</template>
+					</el-input>
 				</el-form-item>
 			</el-col>
 			<el-col v-else>
-				  <el-form-item label="实际开票人" prop="billingPeopleReal"
+				  <el-form-item label="实际开票人" prop="billingPeopleRealName"
 								:rules="[
 								{required: true, message:'实际开票人不能为空', trigger:'blur'},
 								{required: true, message:'实际开票人不能为空', trigger:'change'}
 					   ]">
-					<SelectUserTree
-					  ref="companyTree"
-					  :props="{
-						value: 'id',             // ID字段名
-						label: 'name',         // 显示名称
-						children: 'children'    // 子级字段名
-					  }"
-					  :url="`/system-server/sys/user/treeFinanceOffice?type=2`"
-					  :value="inputForm.billingPeopleReal"
-					  :clearable="true"
-					  :accordion="true"
-					  size="default"
-					  @getValue="(value) => {inputForm.billingPeopleReal=value}"/>
+<!--					<SelectUserTree-->
+<!--					  ref="companyTree"-->
+<!--					  :props="{-->
+<!--						value: 'id',             // ID字段名-->
+<!--						label: 'name',         // 显示名称-->
+<!--						children: 'children'    // 子级字段名-->
+<!--					  }"-->
+<!--					  :url="`/system-server/sys/user/treeFinanceOffice?type=2`"-->
+<!--					  :value="inputForm.billingPeopleReal"-->
+<!--					  :clearable="true"-->
+<!--					  :accordion="true"-->
+<!--					  size="default"-->
+<!--					  @getValue="(value) => {inputForm.billingPeopleReal=value}"/>-->
+					  <el-input  :readonly="true"  @focus="openUserDia1" v-model="inputForm.billingPeopleRealName" placeholder="请选择实际开票人">
+						  <template #suffix>
+							  <el-button  :readonly="true" style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia1">
+							  </el-button>
+						  </template>
+					  </el-input>
 				  </el-form-item>
 			</el-col>
         </el-col>
@@ -447,46 +459,58 @@
 		  </el-col>
         <el-col :span="12">
 			<el-col v-if="status === 'audit'?true:false">
-				<el-form-item label="对账人" prop="reconciliationPeople"
+				<el-form-item label="对账人" prop="reconciliationPeopleName"
 							  :rules="[
                         {required: true, message:'对账人不能为空', trigger:'blur'},
                         {required: true, message:'对账人不能为空', trigger:'change'}
                ]">
-					<SelectUserTree
-						ref="companyTree"
-						:props="{
-                value: 'id',             // ID字段名
-                label: 'name',         // 显示名称
-                children: 'children'    // 子级字段名
-              }"
-						:url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"
-						:value="inputForm.reconciliationPeople"
-						:clearable="true"
-						:accordion="true"
-						size="default"
-						@getValue="(value) => {inputForm.reconciliationPeople=value}"/>
+<!--					<SelectUserTree-->
+<!--						ref="companyTree"-->
+<!--						:props="{-->
+<!--                value: 'id',             // ID字段名-->
+<!--                label: 'name',         // 显示名称-->
+<!--                children: 'children'    // 子级字段名-->
+<!--              }"-->
+<!--						:url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"-->
+<!--						:value="inputForm.reconciliationPeople"-->
+<!--						:clearable="true"-->
+<!--						:accordion="true"-->
+<!--						size="default"-->
+<!--						@getValue="(value) => {inputForm.reconciliationPeople=value}"/>-->
+					<el-input  :readonly="true"  @focus="openUserDia2" v-model="inputForm.reconciliationPeopleName" placeholder="请选择对账人">
+						<template #suffix>
+							<el-button  :readonly="true" style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia2">
+							</el-button>
+						</template>
+					</el-input>
 				</el-form-item>
 			</el-col>
 
 			<el-col v-else>
-				<el-form-item label="对账人" prop="reconciliationPeople"
+				<el-form-item label="对账人" prop="reconciliationPeopleName"
 							  :rules="[
                         {required: true, message:'对账人不能为空', trigger:'blur'},
                         {required: true, message:'对账人不能为空', trigger:'change'}
                ]">
-					<SelectUserTree
-						ref="companyTree"
-						:props="{
-                value: 'id',             // ID字段名
-                label: 'name',         // 显示名称
-                children: 'children'    // 子级字段名
-              }"
-						:url="`/system-server/sys/user/treeFinanceOffice?type=2`"
-						:value="inputForm.reconciliationPeople"
-						:clearable="true"
-						:accordion="true"
-						size="default"
-						@getValue="(value) => {inputForm.reconciliationPeople=value}"/>
+<!--					<SelectUserTree-->
+<!--						ref="companyTree"-->
+<!--						:props="{-->
+<!--                value: 'id',             // ID字段名-->
+<!--                label: 'name',         // 显示名称-->
+<!--                children: 'children'    // 子级字段名-->
+<!--              }"-->
+<!--						:url="`/system-server/sys/user/treeFinanceOffice?type=2`"-->
+<!--						:value="inputForm.reconciliationPeople"-->
+<!--						:clearable="true"-->
+<!--						:accordion="true"-->
+<!--						size="default"-->
+<!--						@getValue="(value) => {inputForm.reconciliationPeople=value}"/>-->
+					<el-input  :readonly="true"  @focus="openUserDia2" v-model="inputForm.reconciliationPeopleName" placeholder="请选择对账人">
+						<template #suffix>
+							<el-button  :readonly="true" style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia2">
+							</el-button>
+						</template>
+					</el-input>
 				</el-form-item>
 			</el-col>
 
@@ -740,6 +764,8 @@
     <ContractForm  ref="contractForm" @getContract="getContract"></ContractForm>
     <WorkClientForm  ref="workClientForm" @getWorkClientRadioChoose="getWorkClient"></WorkClientForm>
     <WorkClientBillingChooseRadio ref="billingChoose" @getBilling="getBilling"></WorkClientBillingChooseRadio>
+	  <user-select1 ref="userSelect1" @doSubmit="selectUser1"></user-select1>
+	  <user-select2 ref="userSelect2" @doSubmit="selectUser2"></user-select2>
 		<!--		邮箱弹窗-->
 	  <el-dialog v-model="dialogFormVisible" style="width: 50%" title="邮箱修改">
 		  <el-form :model="form" label-width="160px">
@@ -791,6 +817,8 @@
   import userService from "../../../api/sys/userService";
   import processService from '@/api/flowable/processService'
   import CommonApi from '@/api/cw/common/CommonApi'
+  import UserSelect1 from '@/views/utils/UserTreeSelect'
+  import UserSelect2 from '@/views/utils/UserTreeSelect'
   export default {
 	  props: {
 		  businessId: {
@@ -849,7 +877,9 @@
 				  billingDate: '',
 				  collectDate: '',
 				  billingPeopleReal: '',
+				  billingPeopleRealName: '',
 				  reconciliationPeople: '',
+				  reconciliationPeopleName: '',
 				  reconciliationArea: '',
 				  remarks: '',
 				  name: '',
@@ -898,7 +928,9 @@
 		  SelectUserTree,
 		  SelectTree,
 		  UpLoadComponent,
-		  WorkClientBillingChooseRadio
+		  WorkClientBillingChooseRadio,
+		  UserSelect1,
+		  UserSelect2
 	  },
 	  computed: {
 		  bus: {
@@ -967,7 +999,9 @@
 				  billingDate: '',
 				  collectDate: '',
 				  billingPeopleReal: '',
+				  billingPeopleRealName: '',
 				  reconciliationPeople: '',
+				  reconciliationPeopleName: '',
 				  reconciliationArea: '',
 				  remarks: '',
 				  name: '',
@@ -1841,7 +1875,23 @@
 					  throw new Error("请输入正确的邮箱地址")
 				  }
 			   }
-		  }
+		  },
+		  openUserDia1(){
+			  this.$refs.userSelect1.init()
+		  },
+		  selectUser1(user){
+			  console.log(user[0].name)
+			  this.inputForm.billingPeopleRealName=user[0].name
+			  this.inputForm.billingPeopleReal=user[0].id
+		  },
+		  openUserDia2(){
+			  this.$refs.userSelect2.init()
+		  },
+		  selectUser2(user){
+			  console.log(user[0].name)
+			  this.inputForm.reconciliationPeopleName=user[0].name
+			  this.inputForm.reconciliationPeople=user[0].id
+		  },
     }
   }
 </script>

+ 66 - 28
src/views/cw/invoice/InvoiceFormTaskInvalid.vue

@@ -320,38 +320,50 @@
           <el-form-item label="实际开票人" prop="billingPeopleReal"
                         :rules="[
                ]">
-            <SelectUserTree
-              ref="companyTree"
-              :props="{
-                value: 'id',             // ID字段名
-                label: 'name',         // 显示名称
-                children: 'children'    // 子级字段名
-              }"
-              :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"
-              :value="inputForm.billingPeopleReal"
-              :clearable="true"
-              :accordion="true"
-			  size="default"
-              @getValue="(value) => {inputForm.billingPeopleReal=value}"/>
+<!--            <SelectUserTree-->
+<!--              ref="companyTree"-->
+<!--              :props="{-->
+<!--                value: 'id',             // ID字段名-->
+<!--                label: 'name',         // 显示名称-->
+<!--                children: 'children'    // 子级字段名-->
+<!--              }"-->
+<!--              :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"-->
+<!--              :value="inputForm.billingPeopleReal"-->
+<!--              :clearable="true"-->
+<!--              :accordion="true"-->
+<!--			  size="default"-->
+<!--              @getValue="(value) => {inputForm.billingPeopleReal=value}"/>-->
+			  <el-input  :readonly="true"  @focus="openUserDia1" v-model="inputForm.billingPeopleRealName" placeholder="请选择实际开票人">
+				  <template #suffix>
+					  <el-button  :readonly="true" style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia1">
+					  </el-button>
+				  </template>
+			  </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="对账人" prop="reconciliationPeople"
                         :rules="[
                ]">
-            <SelectUserTree
-              ref="companyTree"
-              :props="{
-                value: 'id',             // ID字段名
-                label: 'name',         // 显示名称
-                children: 'children'    // 子级字段名
-              }"
-              :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"
-              :value="inputForm.reconciliationPeople"
-              :clearable="true"
-              :accordion="true"
-			  size="default"
-              @getValue="(value) => {inputForm.reconciliationPeople=value}"/>
+<!--            <SelectUserTree-->
+<!--              ref="companyTree"-->
+<!--              :props="{-->
+<!--                value: 'id',             // ID字段名-->
+<!--                label: 'name',         // 显示名称-->
+<!--                children: 'children'    // 子级字段名-->
+<!--              }"-->
+<!--              :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"-->
+<!--              :value="inputForm.reconciliationPeople"-->
+<!--              :clearable="true"-->
+<!--              :accordion="true"-->
+<!--			  size="default"-->
+<!--              @getValue="(value) => {inputForm.reconciliationPeople=value}"/>-->
+			  <el-input  :readonly="true"  @focus="openUserDia2" v-model="inputForm.reconciliationPeopleName" placeholder="请选择对账人">
+				  <template #suffix>
+					  <el-button  :readonly="true" style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia2">
+					  </el-button>
+				  </template>
+			  </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -558,6 +570,8 @@
     <ProgramPageForm ref="programPageForm" @getProgram="getProgram"></ProgramPageForm>
     <ContractForm  ref="contractForm" @getContract="getContract"></ContractForm>
     <WorkClientForm  ref="workClientForm" @getWorkClientRadioChoose="getWorkClient"></WorkClientForm>
+	  <user-select1 ref="userSelect1" @doSubmit="selectUser1"></user-select1>
+	  <user-select2 ref="userSelect2" @doSubmit="selectUser2"></user-select2>
   </div>
 </template>
 
@@ -570,6 +584,8 @@
   import WorkClientForm from '../workClientInfo/WorkClientChooseRadio'
   import SelectUserTree from '@/views/utils/treeUserSelect'
   import SelectTree from '@/components/treeSelect/treeSelect.vue'
+  import UserSelect1 from '@/views/utils/UserTreeSelect'
+  import UserSelect2 from '@/views/utils/UserTreeSelect'
   export default {
     props: {
       businessId: {
@@ -618,7 +634,9 @@
           billingDate: '',
           collectDate: '',
           billingPeopleReal: this.$store.state.user.id,
+			billingPeopleRealName: '',
           reconciliationPeople: '',
+			reconciliationPeopleName: '',
           reconciliationArea: '',
           remarks: '',
           name: '',
@@ -649,7 +667,9 @@
       WorkClientForm,
       SelectUserTree,
       SelectTree,
-      UpLoadComponent
+      UpLoadComponent,
+		UserSelect1,
+		UserSelect2
     },
     computed: {
       bus: {
@@ -714,7 +734,9 @@
           billingDate: '',
           collectDate: '',
           billingPeopleReal: this.$store.state.user.id,
+			billingPeopleRealName: '',
           reconciliationPeople: '',
+			reconciliationPeopleName: '',
           reconciliationArea: '',
           remarks: '',
           name: '',
@@ -1239,7 +1261,23 @@
             })
           }
         }
-      }
+      },
+		openUserDia1(){
+			this.$refs.userSelect1.init()
+		},
+		selectUser1(user){
+			console.log(user[0].name)
+			this.inputForm.billingPeopleRealName=user[0].name
+			this.inputForm.billingPeopleReal=user[0].id
+		},
+		openUserDia2(){
+			this.$refs.userSelect2.init()
+		},
+		selectUser2(user){
+			console.log(user[0].name)
+			this.inputForm.reconciliationPeopleName=user[0].name
+			this.inputForm.reconciliationPeople=user[0].id
+		},
     }
   }
 </script>

+ 36 - 4
src/views/cw/invoice/InvoiceList.vue

@@ -47,11 +47,23 @@
           </el-input-number>
         </el-form-item>
         <el-form-item v-if="showHideItem" prop="reconciliationPeopleName" label="对账人">
-          <UserSelect :limit='1' :modelValue="searchForm.reconciliationPeopleName" @update:modelValue='(value, label) => {searchForm.reconciliationPeopleName = value}'></UserSelect>
-        </el-form-item>
+<!--          <UserSelect :limit='1' :modelValue="searchForm.reconciliationPeopleName" @update:modelValue='(value, label) => {searchForm.reconciliationPeopleName = value}'></UserSelect>-->
+			<el-input  v-model="searchForm.reconciliationPeopleName" placeholder="请选择对账人">
+				<template #suffix>
+					<el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia1">
+					</el-button>
+				</template>
+			</el-input>
+		</el-form-item>
         <el-form-item v-if="showHideItem" label="经办人" prop="operator">
-          <UserSelect :limit='1' :modelValue="searchForm.operator" @update:modelValue='(value, label) => {searchForm.operator = value}'></UserSelect>
-        </el-form-item>
+<!--          <UserSelect :limit='1' :modelValue="searchForm.operator" @update:modelValue='(value, label) => {searchForm.operator = value}'></UserSelect>-->
+			<el-input  v-model="searchForm.operator" placeholder="请选择经办人">
+				<template #suffix>
+					<el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia2">
+					</el-button>
+				</template>
+			</el-input>
+		</el-form-item>
         <el-form-item v-if="showHideItem" prop="operatorOffice" label="经办人部门">
           <SelectTree
             ref="officeTree"
@@ -317,6 +329,8 @@
     <InvoiceUpdateForm ref="invoiceUpdateForm" @refreshDataList="refreshList"></InvoiceUpdateForm>
 	  <ProjectForm ref="projectForm"></ProjectForm>
 	  <ReportManagementForm ref="reportManagementForm"></ReportManagementForm>
+	  <user-select1 ref="userSelect1" @doSubmit="selectUser1"></user-select1>
+	  <user-select2 ref="userSelect2" @doSubmit="selectUser2"></user-select2>
   </div>
 
 	<el-dialog title="详情信息" v-model="dialogFormVisible">
@@ -351,6 +365,8 @@
   import InvoiceUpdateForm from './InvoiceUpdateForm'
   import ProjectForm from '@/views/cw/projectRecords/ProjectRecordsForm'
   import ReportManagementForm from '@/views/cw/reportManagement/ReportManagementForm'
+  import UserSelect1 from '@/views/utils/UserTreeSelect'
+  import UserSelect2 from '@/views/utils/UserTreeSelect'
   export default {
     data () {
       return {
@@ -413,6 +429,8 @@
       InvoiceUpdateForm,
 	  ProjectForm,
 		ReportManagementForm,
+		UserSelect1,
+		UserSelect2,
     },
     mounted () {
 		this.$nextTick(() => {
@@ -1017,6 +1035,20 @@
         }
         return false
       },
+		openUserDia1(){
+			this.$refs.userSelect1.init()
+		},
+		selectUser1(user){
+			console.log(user[0].name)
+			this.searchForm.reconciliationPeopleName=user[0].name
+		},
+		openUserDia2(){
+			this.$refs.userSelect2.init()
+		},
+		selectUser2(user){
+			console.log(user[0].name)
+			this.searchForm.operator=user[0].name
+		},
 
 
 

+ 66 - 29
src/views/cw/invoice/InvoiceUpdateForm.vue

@@ -377,19 +377,25 @@
                         {required: true, message:'实际开票人不能为空', trigger:'blur'},
                         {required: true, message:'实际开票人不能为空', trigger:'change'}
                ]">
-            <SelectUserTree
-              ref="companyTree"
-              size="default"
-              :props="{
-                value: 'id',             // ID字段名
-                label: 'name',         // 显示名称
-                children: 'children'    // 子级字段名
-              }"
-              :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"
-              :value="inputForm.billingPeopleReal"
-              :clearable="true"
-              :accordion="true"
-              @getValue="(value) => {inputForm.billingPeopleReal=value}"/>
+<!--            <SelectUserTree-->
+<!--              ref="companyTree"-->
+<!--              size="default"-->
+<!--              :props="{-->
+<!--                value: 'id',             // ID字段名-->
+<!--                label: 'name',         // 显示名称-->
+<!--                children: 'children'    // 子级字段名-->
+<!--              }"-->
+<!--              :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"-->
+<!--              :value="inputForm.billingPeopleReal"-->
+<!--              :clearable="true"-->
+<!--              :accordion="true"-->
+<!--              @getValue="(value) => {inputForm.billingPeopleReal=value}"/>-->
+			  <el-input  :readonly="true"  @focus="openUserDia1" v-model="inputForm.billingPeopleRealName" placeholder="请选择实际开票人">
+				  <template #suffix>
+					  <el-button  :readonly="true" style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia1">
+					  </el-button>
+				  </template>
+			  </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -398,19 +404,25 @@
                         {required: true, message:'对账人不能为空', trigger:'blur'},
                         {required: true, message:'对账人不能为空', trigger:'change'}
                ]">
-            <SelectUserTree
-              ref="companyTree"
-              size="default"
-              :props="{
-                value: 'id',             // ID字段名
-                label: 'name',         // 显示名称
-                children: 'children'    // 子级字段名
-              }"
-              :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"
-              :value="inputForm.reconciliationPeople"
-              :clearable="true"
-              :accordion="true"
-              @getValue="(value) => {inputForm.reconciliationPeople=value}"/>
+<!--            <SelectUserTree-->
+<!--              ref="companyTree"-->
+<!--              size="default"-->
+<!--              :props="{-->
+<!--                value: 'id',             // ID字段名-->
+<!--                label: 'name',         // 显示名称-->
+<!--                children: 'children'    // 子级字段名-->
+<!--              }"-->
+<!--              :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"-->
+<!--              :value="inputForm.reconciliationPeople"-->
+<!--              :clearable="true"-->
+<!--              :accordion="true"-->
+<!--              @getValue="(value) => {inputForm.reconciliationPeople=value}"/>-->
+			  <el-input  :readonly="true"  @focus="openUserDia2" v-model="inputForm.reconciliationPeopleName" placeholder="请选择对账人">
+				  <template #suffix>
+					  <el-button  :readonly="true" style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia2">
+					  </el-button>
+				  </template>
+			  </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -659,6 +671,8 @@
     <ContractForm  ref="contractForm" @getContract="getContract"></ContractForm>
     <WorkClientForm  ref="workClientForm" @getWorkClientRadioChoose="getWorkClient"></WorkClientForm>
     <WorkClientBillingChooseRadio ref="billingChoose" @getBilling="getBilling"></WorkClientBillingChooseRadio>
+		<user-select1 ref="userSelect1" @doSubmit="selectUser1"></user-select1>
+		<user-select2 ref="userSelect2" @doSubmit="selectUser2"></user-select2>
 
 
 		<template #footer>
@@ -681,7 +695,8 @@
   import SelectUserTree from '@/views/utils/treeUserSelect'
   import SelectTree from '@/components/treeSelect/treeSelect.vue'
   import WorkClientBillingChooseRadio from '@/views/cw/workClientInfo/WorkClientBillingChooseRadio'
-
+  import UserSelect1 from '@/views/utils/UserTreeSelect'
+  import UserSelect2 from '@/views/utils/UserTreeSelect'
   export default {
     props: {
       businessId: {
@@ -730,6 +745,8 @@
           billingDate: '',
           collectDate: '',
           billingPeopleReal: this.$store.state.user.id,
+			billingPeopleRealName: '',
+			reconciliationPeopleName: '',
           reconciliationPeople: '',
           reconciliationArea: '',
           remarks: '',
@@ -767,7 +784,9 @@
       SelectUserTree,
       SelectTree,
       UpLoadComponent,
-      WorkClientBillingChooseRadio
+      WorkClientBillingChooseRadio,
+		UserSelect1,
+		UserSelect2
     },
     computed: {
       bus: {
@@ -836,6 +855,8 @@
           billingDate: '',
           collectDate: '',
           billingPeopleReal: this.$store.state.user.id,
+			billingPeopleRealName: '',
+			reconciliationPeopleName: '',
           reconciliationPeople: '',
           reconciliationArea: '',
           remarks: '',
@@ -1606,7 +1627,23 @@
           var result = this.inputForm.account.replace(reg, regStrs[i][1])
           this.inputForm.account = result
         }
-      }
+      },
+		openUserDia1(){
+			this.$refs.userSelect1.init()
+		},
+		selectUser1(user){
+			console.log(user[0].name)
+			this.inputForm.billingPeopleRealName=user[0].name
+			this.inputForm.billingPeopleReal=user[0].id
+		},
+		openUserDia2(){
+			this.$refs.userSelect2.init()
+		},
+		selectUser2(user){
+			console.log(user[0].name)
+			this.inputForm.reconciliationPeopleName=user[0].name
+			this.inputForm.reconciliationPeople=user[0].id
+		},
     }
   }
 </script>

+ 86 - 22
src/views/cw/projectRecords/ProjectRecordsAddForm.vue

@@ -236,30 +236,47 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="现场负责人" prop="projectLeaderId"
+                  <el-form-item label="现场负责人" prop="projectLeaderName"
                                 :rules="[
                    ]">
-                    <UserSelect :readonly="true" :disabled="status === 'audit' || status === 'taskFormDetail'" :limit='1' :modelValue="inputForm.projectLeaderId" @update:modelValue='(value) => {inputForm.projectLeaderId = value}'></UserSelect>
-                  </el-form-item>
+<!--                    <UserSelect :readonly="true" :disabled="status === 'audit' || status === 'taskFormDetail'" :limit='1' :modelValue="inputForm.projectLeaderId" @update:modelValue='(value) => {inputForm.projectLeaderId = value}'></UserSelect>-->
+					  <el-input @click="openUserDia1" v-model="inputForm.projectLeaderName" placeholder="请选择现场负责人">
+						  <template #suffix>
+							  <el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia1">
+							  </el-button>
+						  </template>
+					  </el-input>
+				  </el-form-item>
                 </el-col>
 				  <el-col :span="12">
-					  <el-form-item label="项目经理1" prop="projectMasterId"
+					  <el-form-item label="项目经理1" prop="projectMasterName"
 									:rules="[
                    ]">
-                    <UserSelectSignatory style="width: 100%" ref="userSelect1" :disabled="status === 'audit' || status === 'taskFormDetail'"
-										 :readonly="true" :limit='1' :modelValue="inputForm.projectMasterId"
-										 @update:modelValue='(value) => {changeSignatory1(value)}'></UserSelectSignatory>
-
+<!--                    <UserSelectSignatory style="width: 100%" ref="userSelect1" :disabled="status === 'audit' || status === 'taskFormDetail'"-->
+<!--										 :readonly="true" :limit='1' :modelValue="inputForm.projectMasterId"-->
+<!--										 @update:modelValue='(value) => {changeSignatory1(value)}'></UserSelectSignatory>-->
+						  <el-input @blur="changeSignatory1(inputForm.projectMasterName)" @focus="openUserDia2" v-model="inputForm.projectMasterName" placeholder="请选择项目经理1">
+							  <template #suffix>
+								  <el-button  style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia2">
+								  </el-button>
+							  </template>
+						  </el-input>
 					  </el-form-item>
 				  </el-col>
 				  <el-col :span="12">
-                  <el-form-item label="项目经理2" prop="realHeader"
+                  <el-form-item label="项目经理2" prop="realHeaderName"
                                 :rules="[
                    ]">
-                    <UserSelectSignatory style="width: 100%" ref="userSelect2" :disabled="status === 'audit' || status === 'taskFormDetail'"
-										 :readonly="true" :limit='1' :modelValue="inputForm.realHeader"
-										 @update:modelValue='(value) => {changeSignatory2(value)}'></UserSelectSignatory>
-                  </el-form-item>
+<!--                    <UserSelectSignatory style="width: 100%" ref="userSelect2" :disabled="status === 'audit' || status === 'taskFormDetail'"-->
+<!--										 :readonly="true" :limit='1' :modelValue="inputForm.realHeader"-->
+<!--										 @update:modelValue='(value) => {changeSignatory2(value)}'></UserSelectSignatory>-->
+					  <el-input @blur="changeSignatory2(inputForm.realHeader)" @focus="openUserDia3" v-model="inputForm.realHeaderName" placeholder="请选择项目经理2">
+						  <template #suffix>
+							  <el-button  style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia3">
+							  </el-button>
+						  </template>
+					  </el-input>
+				  </el-form-item>
                 </el-col>
 
 
@@ -426,6 +443,9 @@
     <CwProjectBusinessTypeListForm ref="cwProjectBusinessTypeListForm" @getBusinessType="getBusinessType"></CwProjectBusinessTypeListForm>
     <ContractNameForm ref="contractNameForm"></ContractNameForm>
     <CwClientPageForm ref="cwClientPageForm" @getProgram="getProgram"></CwClientPageForm>
+	  <user-select1 ref="userSelect1" @doSubmit="selectUser1"></user-select1>
+	  <user-select2 ref="userSelect2" @doSubmit="selectUser2"></user-select2>
+	  <user-select3 ref="userSelect3" @doSubmit="selectUser3"></user-select3>
   </div>
 
 
@@ -449,6 +469,9 @@
   import CwProjectBusinessTypeService from '@/api/cw/projectBusinessType/CwProjectBusinessTypeService'
   import projectReportService from "@/api/cw/reportManagement/ProjectReportService";
   import cwFinanceInvoiceService from "@/api/cw/invoice/CwFinanceInvoiceService";
+  import UserSelect1 from '@/views/utils/UserTreeSelect'
+  import UserSelect2 from '@/views/utils/UserTreeSelect'
+  import UserSelect3 from '@/views/utils/UserTreeSelect'
   export default {
     props: {
       businessId: {
@@ -487,7 +510,9 @@
           planStartDate: '',
           planEndDate: '',
           projectMasterId: '',
+          projectMasterName: '',
           projectLeaderId: '',
+          projectLeaderName: '',
           procInsId: '',
           processDefinitionId: '',
           status: '',
@@ -504,6 +529,7 @@
           businessTypeName: '',
           planDate: [],
           realHeader: '',
+          realHeaderName: '',
           clientContactsName: '',
           reportType: '',
 		  projectClassification: '',
@@ -588,7 +614,10 @@
       CwProjectBusinessTypeListForm,
       ContractNameForm,
       UserSelectSignatory,
-	  CwProjectBusinessTypeService
+	  CwProjectBusinessTypeService,
+		UserSelect1,
+		UserSelect2,
+		UserSelect3,
     },
     methods: {
       getKeyWatch (keyWatch) {
@@ -622,6 +651,8 @@
           planStartDate: '',
           planEndDate: '',
           projectMasterId: '',
+          projectMasterName: '',
+          projectLeaderName: '',
           projectLeaderId: '',
           procInsId: '',
           processDefinitionId: '',
@@ -639,6 +670,7 @@
           businessTypeName: '',
           planDate: [],
           realHeader: '',
+          realHeaderName: '',
           clientContactsName: '',
           reportType: '',
 			projectClassification: '',
@@ -725,7 +757,13 @@
               this.loading = false
               this.$message.error('“项目经理1”与“项目经理2”至少填写一项')
               throw new Error('“项目经理1”与“项目经理2”至少填写一项')
-            }
+            }else {
+				if (this.inputForm.projectMasterName === this.inputForm.realHeaderName) {
+					this.loading = false
+					this.$message.error('项目经理1和项目经理2不可以相同')
+					throw new Error('项目经理1和项目经理2不可以相同')
+				}
+			}
             if (this.commonJS.isEmpty(this.inputForm.cwProjectClientInfoDTOList)) {
               this.loading = false
               this.$message.error('“被服务单位”中至少填写一条信息')
@@ -1026,16 +1064,17 @@
       // 项目经理1改变事件
       changeSignatory1 (value) {
       	console.log('项目经理1', value)
-        if (this.inputForm.realHeader === value && this.commonJS.isNotEmpty(value)) {
+        if (this.inputForm.realHeaderName === value && this.commonJS.isNotEmpty(value)) {
           this.$message.warning('项目经理1和项目经理2不可以相同')
           this.$nextTick(() => {
             this.inputForm.projectMasterId = ''
-            this.$refs.userSelect1.changeNameValue('')
-            this.$refs.userSelect1.clearSelectData()
+            this.inputForm.projectMasterName = ''
+            // this.$refs.userSelect1.changeNameValue('')
+            // this.$refs.userSelect1.clearSelectData()
             this.$forceUpdate()
           })
         } else {
-          this.inputForm.projectMasterId = value
+          this.inputForm.projectMasterName = value
         }
       },
       // 项目经理2改变事件
@@ -1044,8 +1083,9 @@
           this.$message.warning('项目经理1和项目经理2不可以相同')
           this.$nextTick(() => {
             this.inputForm.realHeader = ''
-            this.$refs.userSelect2.changeNameValue('')
-            this.$refs.userSelect2.clearSelectData()
+            this.inputForm.realHeaderName = ''
+            // this.$refs.userSelect2.changeNameValue('')
+            // this.$refs.userSelect2.clearSelectData()
             this.$forceUpdate()
           })
         } else {
@@ -1146,7 +1186,31 @@
 			}else {
 				this.ifCheck = true
 			}
-		}
+		},
+		openUserDia1(){
+			this.$refs.userSelect1.init()
+		},
+		selectUser1(user){
+			console.log(user[0].name)
+			this.inputForm.projectLeaderId=user[0].id
+			this.inputForm.projectLeaderName=user[0].name
+		},
+		openUserDia2(){
+			this.$refs.userSelect2.init()
+		},
+		selectUser2(user){
+			console.log(user[0].name)
+			this.inputForm.projectMasterId=user[0].id
+			this.inputForm.projectMasterName=user[0].name
+		},
+		openUserDia3(){
+			this.$refs.userSelect3.init()
+		},
+		selectUser3(user){
+			console.log(user[0].name)
+			this.inputForm.realHeader=user[0].id
+			this.inputForm.realHeaderName=user[0].name
+		},
     }
   }
 </script>

+ 68 - 11
src/views/cw/projectRecords/ProjectRecordsForm.vue

@@ -239,27 +239,45 @@
                 </el-col>
 
                 <el-col :span="12">
-                  <el-form-item label="现场负责人" prop="projectLeaderId"
+                  <el-form-item label="现场负责人" prop="projectLeaderName"
                                 :rules="[
                    ]">
-                    <UserSelect :readonly="true" :disabled="method === 'view'" :limit='1' :modleValue="inputForm.projectLeaderId" @update:modelValue='(value) => {inputForm.projectLeaderId = value}'></UserSelect>
-                  </el-form-item>
+<!--                    <UserSelect :readonly="true" :disabled="method === 'view'" :limit='1' :modleValue="inputForm.projectLeaderId" @update:modelValue='(value) => {inputForm.projectLeaderId = value}'></UserSelect>-->
+					  <el-input  v-model="inputForm.projectLeaderName" placeholder="请选择现场负责人">
+						  <template #suffix>
+							  <el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia1">
+							  </el-button>
+						  </template>
+					  </el-input>
+				  </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="项目经理1" prop="projectMasterId"
+                  <el-form-item label="项目经理1" prop="projectMasterName"
                                 :rules="[
                                 {required: true, message:'项目经理1不能为空', trigger:'blur'}
                    ]">
                     <!--                    <el-input v-model="inputForm.projectMasterId" placeholder="请填写项目经理" clearable></el-input>-->
-                    <UserSelect :readonly="true" :disabled="method === 'view'" :limit='1' :modelValue="inputForm.projectMasterId" @update:modelValue='(value) => {inputForm.projectMasterId = value}'></UserSelect>
-                  </el-form-item>
+<!--                    <UserSelect :readonly="true" :disabled="method === 'view'" :limit='1' :modelValue="inputForm.projectMasterId" @update:modelValue='(value) => {inputForm.projectMasterId = value}'></UserSelect>-->
+					  <el-input  v-model="inputForm.projectMasterName" placeholder="请选择项目经理1">
+						  <template #suffix>
+							  <el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia2">
+							  </el-button>
+						  </template>
+					  </el-input>
+				  </el-form-item>
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="项目经理2" prop="realHeader"
                                 :rules="[
                    ]">
-                    <UserSelect :readonly="true" :disabled="method === 'view'" :limit='1' :modelValue="inputForm.realHeader" @update:modelValue='(value) => {inputForm.realHeader = value}'></UserSelect>
-                  </el-form-item>
+<!--                    <UserSelect :readonly="true" :disabled="method === 'view'" :limit='1' :modelValue="inputForm.realHeader" @update:modelValue='(value) => {inputForm.realHeader = value}'></UserSelect>-->
+					  <el-input  v-model="inputForm.realHeaderName" placeholder="请选择项目经理2">
+						  <template #suffix>
+							  <el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia3">
+							  </el-button>
+						  </template>
+					  </el-input>
+				  </el-form-item>
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="创建人" prop="createBy.name"
@@ -548,6 +566,9 @@
       <InvoiceForm ref="invoiceFormDialog"></InvoiceForm>
       <ReportManagementForm ref="reportManagementForm"></ReportManagementForm>
       <ProjectRecordsForm ref="projectRecordsForm"></ProjectRecordsForm>
+		<user-select1 ref="userSelect1" @doSubmit="selectUser1"></user-select1>
+		<user-select2 ref="userSelect2" @doSubmit="selectUser2"></user-select2>
+		<user-select3 ref="userSelect3" @doSubmit="selectUser3"></user-select3>
     </el-dialog>
   </div>
 </template>
@@ -566,6 +587,9 @@
   import contractInfoService from '@/api/cw/workContract/contractInfoService'
   import cwFinanceInvoiceService from '@/api/cw/invoice/CwFinanceInvoiceService'
   import userService from '@/api/sys/UserService'
+  import UserSelect1 from '@/views/utils/UserTreeSelect'
+  import UserSelect2 from '@/views/utils/UserTreeSelect'
+  import UserSelect3 from '@/views/utils/UserTreeSelect'
   export default {
     name: 'ProjectRecordsForm',
     props: {
@@ -602,8 +626,10 @@
           auditYear: '',
           planStartDate: '',
           planEndDate: '',
-          projectMasterId: '',
-          projectLeaderId: '',
+			projectMasterId: '',
+			projectMasterName: '',
+			projectLeaderId: '',
+			projectLeaderName: '',
           procInsId: '',
           processDefinitionId: '',
           status: '',
@@ -620,6 +646,7 @@
           businessTypeName: '',
           planDate: [],
           realHeader: '',
+			realHeaderName: '',
           clientContactsName: '',
           reportType: '',
 			projectClassification: '',
@@ -700,6 +727,9 @@
       WorkContractChooseCom,
       CwProjectBusinessTypeListForm,
       ContractNameForm,
+		UserSelect1,
+		UserSelect2,
+		UserSelect3,
       InvoiceForm: () => import('../invoice/InvoiceForm'),
       ReportManagementForm: () => import('../reportManagement/ReportManagementForm')
     },
@@ -738,6 +768,8 @@
           planEndDate: '',
           projectMasterId: '',
           projectLeaderId: '',
+			projectMasterName: '',
+			projectLeaderName: '',
           procInsId: '',
           processDefinitionId: '',
           status: '',
@@ -754,6 +786,7 @@
           businessTypeName: '',
           planDate: [],
           realHeader: '',
+			realHeaderName: '',
 			reportType: '',
 			projectClassification: '',
           clientContactsName: '',
@@ -1280,7 +1313,31 @@
             throw new Error('客户联系人中,第' + (index + 1) + '条数据的“联系方式1”未填写')
           }
         })
-      }
+      },
+		openUserDia1(){
+			this.$refs.userSelect1.init()
+		},
+		selectUser1(user){
+			console.log(user[0].name)
+			this.inputForm.projectLeaderId=user[0].id
+			this.inputForm.projectLeaderName=user[0].name
+		},
+		openUserDia2(){
+			this.$refs.userSelect2.init()
+		},
+		selectUser2(user){
+			console.log(user[0].name)
+			this.inputForm.projectMasterId=user[0].id
+			this.inputForm.projectMasterName=user[0].name
+		},
+		openUserDia3(){
+			this.$refs.userSelect3.init()
+		},
+		selectUser3(user){
+			console.log(user[0].name)
+			this.inputForm.realHeader=user[0].id
+			this.inputForm.realHeaderName=user[0].name
+		},
     }
   }
 </script>

+ 54 - 8
src/views/cw/projectRecords/ProjectRecordsList.vue

@@ -10,15 +10,33 @@
       </el-form-item>
       <el-form-item v-if="showHideItem" label="项目经理1" prop="projectMasterName">
 <!--        <el-input v-model="searchForm.projectMasterName" placeholder="请输入项目经理" clearable></el-input>-->
-        <UserSelect :limit='1' :modelValue="searchForm.projectMasterName" @update:modelValue='(value, label) => {searchForm.projectMasterName = value}'></UserSelect>
-      </el-form-item>
+<!--        <UserSelect :limit='1' :modelValue="searchForm.projectMasterName" @update:modelValue='(value, label) => {searchForm.projectMasterName = value}'></UserSelect>-->
+		  <el-input  v-model="searchForm.projectMasterName" placeholder="请选择项目经理1">
+			  <template #suffix>
+				  <el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia1">
+				  </el-button>
+			  </template>
+		  </el-input>
+	  </el-form-item>
       <el-form-item v-if="showHideItem" label="项目经理2" prop="realHeaderName">
         <!--        <el-input v-model="searchForm.projectMasterName" placeholder="请输入项目经理" clearable></el-input>-->
-        <UserSelect :limit='1' :modelValue="searchForm.realHeaderName" @update:modelValue='(value, label) => {searchForm.realHeaderName = value}'></UserSelect>
-      </el-form-item>
+<!--        <UserSelect :limit='1' :modelValue="searchForm.realHeaderName" @update:modelValue='(value, label) => {searchForm.realHeaderName = value}'></UserSelect>-->
+		  <el-input  v-model="searchForm.realHeaderName" placeholder="请选择项目经理2">
+			  <template #suffix>
+				  <el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia2">
+				  </el-button>
+			  </template>
+		  </el-input>
+	  </el-form-item>
 		<el-form-item v-if="showHideItem" label="创建人" prop="createBy.name">
 			<!--        <el-input  v-model="searchForm.createBy.name" placeholder="请输入创建人" clearable></el-input>-->
-			<UserSelect2 :limit='1' :modelValue="searchForm.createBy.name" @update:modelValue='(value, label) => {searchForm.createBy.name = value}'></UserSelect2>
+<!--			<UserSelect2 :limit='1' :modelValue="searchForm.createBy.name" @update:modelValue='(value, label) => {searchForm.createBy.name = value}'></UserSelect2>-->
+			<el-input  v-model="searchForm.createBy.name" placeholder="请选择创建人">
+				<template #suffix>
+					<el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia3">
+					</el-button>
+				</template>
+			</el-input>
 		</el-form-item>
       <el-form-item v-if="showHideItem" label="创建时间" prop="createDates">
         <el-date-picker
@@ -155,11 +173,14 @@
     <ContractNameForm ref="contractNameForm"></ContractNameForm>
     <ProjectRecordsAddForm ref="projectRecordsAddForm" @refreshList="refreshList"></ProjectRecordsAddForm>
 	  <CwProjectBusinessTypeListForm ref="cwProjectBusinessTypeListForm"></CwProjectBusinessTypeListForm>
+	  <user-select1 ref="userSelect1" @doSubmit="selectUser1"></user-select1>
+	  <user-select2 ref="userSelect2" @doSubmit="selectUser2"></user-select2>
+	  <user-select3 ref="userSelect3" @doSubmit="selectUser3"></user-select3>
   </div>
 </template>
 
 <script>
-	import UserSelect2 from '@/components/userSelect'
+	// import UserSelect2 from '@/components/userSelect'
   import projectRecordsService from '@/api/cw/projectRecords/ProjectRecordsService'
   import taskService from '@/api/flowable/TaskService'
   import processService from '@/api/flowable/ProcessService'
@@ -170,7 +191,9 @@
   import ContractNameForm from '../workContract/ContractNameForm'
   import ProjectRecordsAddForm from './ProjectRecordsAddForm'
   import SelectTree from '@/components/treeSelect/treeSelect.vue'
-
+	import UserSelect1 from '@/views/utils/UserTreeSelect'
+	import UserSelect2 from '@/views/utils/UserTreeSelect'
+	import UserSelect3 from '@/views/utils/UserTreeSelect'
 	export default {
     data () {
       return {
@@ -213,7 +236,9 @@
       ContractNameForm,
       ProjectRecordsAddForm,
 	  UserSelect2,
-	  SelectTree
+	  SelectTree,
+		UserSelect1,
+		UserSelect3
     },
     computed: {
       userName () {
@@ -471,6 +496,27 @@
           }
         })
       },
+		openUserDia1(){
+			this.$refs.userSelect1.init()
+		},
+		selectUser1(user){
+			console.log(user[0].name)
+			this.searchForm.projectMasterName=user[0].name
+		},
+		openUserDia2(){
+			this.$refs.userSelect2.init()
+		},
+		selectUser2(user){
+			console.log(user[0].name)
+			this.searchForm.realHeaderName=user[0].name
+		},
+		openUserDia3(){
+			this.$refs.userSelect3.init()
+		},
+		selectUser3(user){
+			console.log(user[0].name)
+			this.searchForm.createBy.name=user[0].name
+		},
     }
   }
 </script>

+ 33 - 16
src/views/cw/projectReportArchive/ProjectReportArchiveDetailList.vue

@@ -6,19 +6,25 @@
         <el-input v-model="searchForm.cwProjectRecordsDTO.projectName" placeholder="请输入项目名称" clearable></el-input>
       </el-form-item>
       <el-form-item label="项目经理" prop="cwProjectRecordsDTO.projectMasterId">
-        <SelectUserTree
-          ref="companyTree"
-          :props="{
-                  value: 'id',             // ID字段名
-                  label: 'name',         // 显示名称
-                  children: 'children'    // 子级字段名
-                }"
-          :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"
-          :value="searchForm.cwProjectRecordsDTO.projectMasterId"
-          :clearable="true"
-          :accordion="true"
-		  size="default"
-          @getValue="(value) => {searchForm.cwProjectRecordsDTO.projectMasterId=value}"/>
+<!--        <SelectUserTree-->
+<!--          ref="companyTree"-->
+<!--          :props="{-->
+<!--                  value: 'id',             // ID字段名-->
+<!--                  label: 'name',         // 显示名称-->
+<!--                  children: 'children'    // 子级字段名-->
+<!--                }"-->
+<!--          :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"-->
+<!--          :value="searchForm.cwProjectRecordsDTO.projectMasterId"-->
+<!--          :clearable="true"-->
+<!--          :accordion="true"-->
+<!--		  size="default"-->
+<!--          @getValue="(value) => {searchForm.cwProjectRecordsDTO.projectMasterId=value}"/>-->
+		  <el-input  v-model="searchForm.cwProjectRecordsDTO.projectMasterId" placeholder="请选择项目经理">
+			  <template #suffix>
+				  <el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia">
+				  </el-button>
+			  </template>
+		  </el-input>
       </el-form-item>
       <el-form-item v-if="showHideItem" label="案卷号" prop="number">
         <el-input v-model="searchForm.number" placeholder="请输入案卷号" clearable></el-input>
@@ -160,7 +166,9 @@
       </div>
       <ProjectRecordsForm ref="projectRecordsForm"></ProjectRecordsForm>
       <ProjectReportArchiveForm ref="projectReportArchiveForm"></ProjectReportArchiveForm>
-    </div>
+		<user-select ref="userSelect2" @doSubmit="selectUser"></user-select>
+
+	</div>
   </div>
 </template>
 
@@ -170,6 +178,7 @@
   import ProjectRecordsForm from '../projectRecords/ProjectRecordsForm'
   import ProjectReportArchiveForm from './ProjectReportArchiveForm'
   import SelectUserTree from '@/views/utils/treeUserSelect'
+  import UserSelect from '@/views/utils/UserTreeSelect'
   import XEUtils from 'xe-utils'
   export default {
     data () {
@@ -248,7 +257,8 @@
     components: {
       ProjectRecordsForm,
       ProjectReportArchiveForm,
-      SelectUserTree
+      SelectUserTree,
+		UserSelect
     },
     computed: {
       userName () {
@@ -356,7 +366,14 @@
             console.log(err.response)
           }
         })
-      }
+      },
+		openUserDia(){
+			this.$refs.userSelect2.init()
+		},
+		selectUser(user){
+			console.log(user[0].name)
+			this.searchForm.cwProjectRecordsDTO.projectMasterId=user[0].name
+		},
     }
   }
 </script>

+ 56 - 9
src/views/cw/projectReportArchive/ProjectReportArchiveList.vue

@@ -13,12 +13,24 @@
       </el-form-item>
       <el-form-item v-if="showHideItem" label="项目经理1" prop="cwProjectRecordsDTO.projectMasterName">
 <!--        <el-input v-model="searchForm.cwProjectRecordsDTO.projectMasterName" placeholder="请输入项目经理" clearable></el-input>-->
-        <UserSelect :limit='1' :modelValue="searchForm.cwProjectRecordsDTO.projectMasterName" @update:modelValue='(value, label) => {searchForm.cwProjectRecordsDTO.projectMasterName = value}'></UserSelect>
-      </el-form-item>
+<!--        <UserSelect :limit='1' :modelValue="searchForm.cwProjectRecordsDTO.projectMasterName" @update:modelValue='(value, label) => {searchForm.cwProjectRecordsDTO.projectMasterName = value}'></UserSelect>-->
+		  <el-input  v-model="searchForm.cwProjectRecordsDTO.projectMasterName" placeholder="请选择项目经理1">
+			  <template #suffix>
+				  <el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia1">
+				  </el-button>
+			  </template>
+		  </el-input>
+	  </el-form-item>
       <el-form-item v-if="showHideItem" label="项目经理2" prop="cwProjectRecordsDTO.realHeaderName">
         <!--        <el-input v-model="searchForm.cwProjectRecordsDTO.projectMasterName" placeholder="请输入项目经理" clearable></el-input>-->
-        <UserSelect :limit='1' :modelValue="searchForm.cwProjectRecordsDTO.realHeaderName" @update:modelValue='(value, label) => {searchForm.cwProjectRecordsDTO.realHeaderName = value}'></UserSelect>
-      </el-form-item>
+<!--        <UserSelect :limit='1' :modelValue="searchForm.cwProjectRecordsDTO.realHeaderName" @update:modelValue='(value, label) => {searchForm.cwProjectRecordsDTO.realHeaderName = value}'></UserSelect>-->
+		  <el-input  v-model="searchForm.cwProjectRecordsDTO.realHeaderName" placeholder="请选择项目经理2">
+			  <template #suffix>
+				  <el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia2">
+				  </el-button>
+			  </template>
+		  </el-input>
+	  </el-form-item>
       <el-form-item v-if="showHideItem" label="档案年度" prop="year">
         <el-date-picker
           v-model="searchForm.year"
@@ -48,8 +60,14 @@
 
       <el-form-item v-if="showHideItem" label="创建人" prop="createBy.name">
 <!--        <el-input  v-model="searchForm.createBy.name" placeholder="请输入创建人" clearable></el-input>-->
-        <UserSelect2 :limit='1' :modelValue="searchForm.createBy.name" @update:modelValue='(value, label) => {searchForm.createBy.name = value}'></UserSelect2>
-      </el-form-item>
+<!--        <UserSelect2 :limit='1' :modelValue="searchForm.createBy.name" @update:modelValue='(value, label) => {searchForm.createBy.name = value}'></UserSelect2>-->
+		  <el-input  v-model="searchForm.createBy.name" placeholder="请选择创建人">
+			  <template #suffix>
+				  <el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia3">
+				  </el-button>
+			  </template>
+		  </el-input>
+	  </el-form-item>
       <el-form-item v-if="showHideItem" label="创建时间" prop="createDates">
         <el-date-picker
           placement="bottom-start"
@@ -230,6 +248,9 @@
       <ProjectReportArchiveForm ref="projectReportArchiveForm" @refreshList="refreshList"></ProjectReportArchiveForm>
       <ProjectReportArchiveDia ref="projectReportArchiveDia" @refreshList="refreshList"></ProjectReportArchiveDia>
 		<ProjectReportBorrowMessageForm ref="projectReportBorrowMessageForm" @refreshDataList="refreshList"></ProjectReportBorrowMessageForm>
+		<user-select1 ref="userSelect1" @doSubmit="selectUser1"></user-select1>
+		<user-select2 ref="userSelect2" @doSubmit="selectUser2"></user-select2>
+		<user-select3 ref="userSelect3" @doSubmit="selectUser3"></user-select3>
     </div>
   </div>
 </template>
@@ -245,11 +266,14 @@
   import ProjectRecordsForm from '../projectRecords/ProjectRecordsForm'
   import ProjectReportArchiveForm from './ProjectReportArchiveForm'
   import UserSelect from '@/views/cw/workClientInfo/clientUserSelect'
-  import UserSelect2 from '@/components/userSelect'
+  // import UserSelect2 from '@/components/userSelect'
   import projectRecordsService from '@/api/cw/projectRecords/ProjectRecordsService'
   import XEUtils from 'xe-utils'
   import officeService from '@/api/sys/OfficeService'
 	import ProjectReportArchiveDia from "./ProjectReportArchiveDia";
+	import UserSelect1 from '@/views/utils/UserTreeSelect'
+	import UserSelect2 from '@/views/utils/UserTreeSelect'
+	import UserSelect3 from '@/views/utils/UserTreeSelect'
   export default {
     data () {
       return {
@@ -338,7 +362,9 @@
       UserSelect,
 	  UserSelect2,
 		ProjectReportBorrowMessageForm,
-		ProjectReportArchiveDia
+		ProjectReportArchiveDia,
+		UserSelect1,
+		UserSelect3
     },
     computed: {
       userName () {
@@ -746,7 +772,28 @@
           }
         }
         return false
-      }
+      },
+		openUserDia1(){
+			this.$refs.userSelect1.init()
+		},
+		selectUser1(user){
+			console.log(user[0].name)
+			this.searchForm.cwProjectRecordsDTO.projectMasterName=user[0].name
+		},
+		openUserDia2(){
+			this.$refs.userSelect2.init()
+		},
+		selectUser2(user){
+			console.log(user[0].name)
+			this.searchForm.cwProjectRecordsDTO.realHeaderName=user[0].name
+		},
+		openUserDia3(){
+			this.$refs.userSelect3.init()
+		},
+		selectUser3(user){
+			console.log(user[0].name)
+			this.searchForm.createBy.name=user[0].name
+		},
     }
   }
 </script>

+ 36 - 4
src/views/cw/reimbursementApproval/info/InfoList.vue

@@ -24,10 +24,22 @@
 				</el-date-picker>
 			</el-form-item>
 			<el-form-item v-if="showHideItem" label="经办人" prop="handled">
-				<UserSelect :limit='1' :modelValue="searchForm.handled" @update:modelValue='(value, label) => {searchForm.handled = value}'></UserSelect>
+<!--				<UserSelect :limit='1' :modelValue="searchForm.handled" @update:modelValue='(value, label) => {searchForm.handled = value}'></UserSelect>-->
+				<el-input  v-model="searchForm.handled" placeholder="请选择经办人">
+					<template #suffix>
+						<el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia1">
+						</el-button>
+					</template>
+				</el-input>
 			</el-form-item>
 			<el-form-item v-if="showHideItem" label="报销人" prop="reimBy">
-				<UserSelect :limit='1' :modelValue="searchForm.reimBy" @update:modelValue='(value, label) => {searchForm.reimBy = value}'></UserSelect>
+<!--				<UserSelect :limit='1' :modelValue="searchForm.reimBy" @update:modelValue='(value, label) => {searchForm.reimBy = value}'></UserSelect>-->
+				<el-input  v-model="searchForm.reimBy" placeholder="请选择报销人">
+					<template #suffix>
+						<el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia2">
+						</el-button>
+					</template>
+				</el-input>
 			</el-form-item>
 			<el-form-item v-if="showHideItem" label="报销项" prop="reimbursementType">
 				<el-select v-model="searchForm.reimbursementType" placeholder="请选择" style="width:100%;" clearable>
@@ -226,6 +238,8 @@
 				<ContractNameForm ref="contractNameForm"></ContractNameForm>
 				<InfoUpdateForm ref="infoUpdateForm" @refreshDataList="refreshList"></InfoUpdateForm>
 				<ProjectListForm ref="projectListForm"></ProjectListForm>
+				<user-select1 ref="userSelect1" @doSubmit="selectUser1"></user-select1>
+				<user-select2 ref="userSelect2" @doSubmit="selectUser2"></user-select2>
 			</div>
 		</div>
 	</div>
@@ -246,6 +260,8 @@
 	import userService from '@/api/sys/UserService'
 	import InfoUpdateForm from './InfoUpdateForm'
 	import ProjectListForm from './ProgramForm'
+	import UserSelect1 from '@/views/utils/UserTreeSelect'
+	import UserSelect2 from '@/views/utils/UserTreeSelect'
 	export default {
 		data () {
 			return {
@@ -298,7 +314,9 @@
 			UserSelect,
 			ContractNameForm,
 			InfoUpdateForm,
-			ProjectListForm
+			ProjectListForm,
+			UserSelect1,
+			UserSelect2,
 		},
 		mounted () {
 			this.$nextTick(() => {
@@ -865,7 +883,21 @@
 					}
 				}
 				return false
-			}
+			},
+			openUserDia1(){
+				this.$refs.userSelect1.init()
+			},
+			selectUser1(user){
+				console.log(user[0].name)
+				this.searchForm.handled=user[0].name
+			},
+			openUserDia2(){
+				this.$refs.userSelect2.init()
+			},
+			selectUser2(user){
+				console.log(user[0].name)
+				this.searchForm.reimBy=user[0].name
+			},
 		}
 	}
 </script>

+ 66 - 18
src/views/cw/reportCancellApply/ReportCancellApplyList.vue

@@ -9,28 +9,46 @@
         <el-input v-model="searchForm.projectName" placeholder="请输入项目名称" clearable></el-input>
       </el-form-item>
       <el-form-item v-if="showHideItem" label="项目经理1" prop="projectMasterName">
-        <UserSelect :limit='1' :modelValue="searchForm.projectMasterName" @update:modelValue='(value, label) => {searchForm.projectMasterName = value}'></UserSelect>
-      </el-form-item>
+<!--        <UserSelect :limit='1' :modelValue="searchForm.projectMasterName" @update:modelValue='(value, label) => {searchForm.projectMasterName = value}'></UserSelect>-->
+		  <el-input  v-model="searchForm.projectMasterName" placeholder="请选择项目经理1">
+			  <template #suffix>
+				  <el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia1">
+				  </el-button>
+			  </template>
+		  </el-input>
+	  </el-form-item>
       <el-form-item v-if="showHideItem" label="项目经理2" prop="projectMaster2Name">
-        <UserSelect :limit='1' :modelValue="searchForm.projectMaster2Name" @update:modelValue='(value, label) => {searchForm.projectMaster2Name = value}'></UserSelect>
-      </el-form-item>
+<!--        <UserSelect :limit='1' :modelValue="searchForm.projectMaster2Name" @update:modelValue='(value, label) => {searchForm.projectMaster2Name = value}'></UserSelect>-->
+		  <el-input  v-model="searchForm.projectMaster2Name" placeholder="请选择项目经理2">
+			  <template #suffix>
+				  <el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia2">
+				  </el-button>
+			  </template>
+		  </el-input>
+	  </el-form-item>
 <!--      <el-form-item label="创建人" prop="createBy">-->
 <!--        <el-input v-model="searchForm.createBy" placeholder="请输入创建人" clearable></el-input>-->
 <!--      </el-form-item>-->
       <el-form-item v-if="showHideItem" label="创建人" prop="createBy">
-        <SelectUserTree
-          ref="companyTree"
-          :props="{
-                  value: 'id',             // ID字段名
-                  label: 'name',         // 显示名称
-                  children: 'children'    // 子级字段名
-                }"
-          :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"
-          :value="searchForm.createBy"
-          :clearable="true"
-          :accordion="true"
-		  size="default"
-          @getValue="(value) => {searchForm.createBy=value}"/>
+<!--        <SelectUserTree-->
+<!--          ref="companyTree"-->
+<!--          :props="{-->
+<!--                  value: 'id',             // ID字段名-->
+<!--                  label: 'name',         // 显示名称-->
+<!--                  children: 'children'    // 子级字段名-->
+<!--                }"-->
+<!--          :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"-->
+<!--          :value="searchForm.createBy"-->
+<!--          :clearable="true"-->
+<!--          :accordion="true"-->
+<!--		  size="default"-->
+<!--          @getValue="(value) => {searchForm.createBy=value}"/>-->
+		  <el-input  v-model="searchForm.createBy" placeholder="请选择创建人">
+			  <template #suffix>
+				  <el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia3">
+				  </el-button>
+			  </template>
+		  </el-input>
       </el-form-item>
       <el-form-item v-if="showHideItem" label="创建时间" prop="contractDates">
         <el-date-picker
@@ -145,6 +163,9 @@
     </div>
     <ReportManagementForm ref="reportManagementForm"></ReportManagementForm>
     <ReportCancellApplyForm ref="reportCancellApplyForm"></ReportCancellApplyForm>
+	  <user-select1 ref="userSelect1" @doSubmit="selectUser1"></user-select1>
+	  <user-select2 ref="userSelect2" @doSubmit="selectUser2"></user-select2>
+	  <user-select3 ref="userSelect3" @doSubmit="selectUser3"></user-select3>
   </div>
 </template>
 
@@ -158,6 +179,9 @@
   import userService from '@/api/sys/UserService'
   import SelectUserTree from '@/views/utils/treeUserSelect'
   import UserSelect from '@/views/cw/workClientInfo/clientUserSelect'
+  import UserSelect1 from '@/views/utils/UserTreeSelect'
+  import UserSelect2 from '@/views/utils/UserTreeSelect'
+  import UserSelect3 from '@/views/utils/UserTreeSelect'
   export default {
     data () {
       return {
@@ -199,7 +223,10 @@
       ReportManagementForm,
       ReportCancellApplyForm,
       SelectUserTree,
-      UserSelect
+      UserSelect,
+		UserSelect2,
+		UserSelect1,
+		UserSelect3
     },
     computed: {
       userName () {
@@ -504,6 +531,27 @@
 				}
 			})
 		},
+		openUserDia1(){
+			this.$refs.userSelect1.init()
+		},
+		selectUser1(user){
+			console.log(user[0].name)
+			this.searchForm.projectMasterName=user[0].name
+		},
+		openUserDia2(){
+			this.$refs.userSelect2.init()
+		},
+		selectUser2(user){
+			console.log(user[0].name)
+			this.searchForm.projectMaster2Name=user[0].name
+		},
+		openUserDia3(){
+			this.$refs.userSelect3.init()
+		},
+		selectUser3(user){
+			console.log(user[0].name)
+			this.searchForm.createBy=user[0].name
+		},
     }
   }
 </script>

+ 89 - 17
src/views/cw/reportCancellApply/ReportCancellApplyTaskForm.vue

@@ -104,8 +104,14 @@
                               :rules="[
                    ]">
                   <!--                <el-input v-model="inputForm.signatureAnnotator1" placeholder="请填写签字注师1" clearable></el-input>-->
-                  <UserSelect :disabled="true" ref="userSelect1" :readonly="true" :limit='1' :modelValue="inputForm.reportDetail.signatureAnnotator1" @update:modelValue='(value) => {changeSignatory1(value)}'></UserSelect>
-                </el-form-item>
+<!--                  <UserSelect :disabled="true" ref="userSelect1" :readonly="true" :limit='1' :modelValue="inputForm.reportDetail.signatureAnnotator1" @update:modelValue='(value) => {changeSignatory1(value)}'></UserSelect>-->
+					<el-input :disabled="true" :readonly="true" @focus="openUserDia1" v-model="inputForm.reportDetail.signatureAnnotator1Name" placeholder="请选择签字注师1">
+						<template #suffix>
+							<el-button :disabled="true" :readonly="true"  style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia1">
+							</el-button>
+						</template>
+					</el-input>
+				</el-form-item>
               </el-col>
 
               <el-col v-if="inputForm.reportDetail.signatureType === '1'|| inputForm.reportDetail.signatureType === '3' || commonJS.isEmpty(inputForm.reportDetail.signatureType)" :span="12">
@@ -113,8 +119,14 @@
                               :rules="[
                    ]">
                   <!--                <el-input v-model="inputForm.signatureAnnotator2" placeholder="请填写签字注师2" clearable></el-input>-->
-                  <UserSelect ref="userSelect2" :disabled="true" :readonly="true" :limit='1' :modelValue="inputForm.reportDetail.signatureAnnotator2" @update:modelValue='(value) => {changeSignatory2(value)}'></UserSelect>
-                </el-form-item>
+<!--                  <UserSelect ref="userSelect2" :disabled="true" :readonly="true" :limit='1' :modelValue="inputForm.reportDetail.signatureAnnotator2" @update:modelValue='(value) => {changeSignatory2(value)}'></UserSelect>-->
+					<el-input :disabled="true" :readonly="true"  @focus="openUserDia2" v-model="inputForm.reportDetail.signatureAnnotator2Name" placeholder="请选择签字注师2">
+						<template #suffix>
+							<el-button :disabled="true" :readonly="true"  style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia2">
+							</el-button>
+						</template>
+					</el-input>
+				</el-form-item>
               </el-col>
 
               <el-col v-if="inputForm.reportDetail.signatureType === '2' " :span="12">
@@ -123,8 +135,14 @@
                               {required: true, message:'签字注师1不能为空', trigger:'blur'}
                    ]">
                   <!--                <el-input v-model="inputForm.signatureAnnotator1" placeholder="请填写签字注师1" clearable></el-input>-->
-                  <UserSelect ref="userSelect1" :disabled="true" :readonly="true" :limit='1' :modelValue="inputForm.reportDetail.signatureAnnotator1" @update:modelValue='(value) => {changeSignatory1(value)}'></UserSelect>
-                </el-form-item>
+<!--                  <UserSelect ref="userSelect1" :disabled="true" :readonly="true" :limit='1' :modelValue="inputForm.reportDetail.signatureAnnotator1" @update:modelValue='(value) => {changeSignatory1(value)}'></UserSelect>-->
+					<el-input :disabled="true" :readonly="true"  @focus="openUserDia1" v-model="inputForm.reportDetail.signatureAnnotator1Name" placeholder="请选择签字注师1">
+						<template #suffix>
+							<el-button :disabled="true" :readonly="true"  style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia1">
+							</el-button>
+						</template>
+					</el-input>
+				</el-form-item>
               </el-col>
               <el-col v-if="inputForm.reportDetail.signatureType === '2' " :span="12">
                 <el-form-item label="签字注师2" prop="reportDetail.signatureAnnotator2"
@@ -132,8 +150,14 @@
                               {required: true, message:'签字注师2不能为空', trigger:'blur'}
                    ]">
                   <!--                <el-input v-model="inputForm.signatureAnnotator2" placeholder="请填写签字注师2" clearable></el-input>-->
-                  <UserSelect ref="userSelect2" :disabled="true" :readonly="true" :limit='1' :modelValue="inputForm.reportDetail.signatureAnnotator2" @update:modelValue='(value) => {changeSignatory2(value)}'></UserSelect>
-                </el-form-item>
+<!--                  <UserSelect ref="userSelect2" :disabled="true" :readonly="true" :limit='1' :modelValue="inputForm.reportDetail.signatureAnnotator2" @update:modelValue='(value) => {changeSignatory2(value)}'></UserSelect>-->
+					<el-input :disabled="true" :readonly="true"  @focus="openUserDia2" v-model="inputForm.reportDetail.signatureAnnotator2Name" placeholder="请选择签字注师2">
+						<template #suffix>
+							<el-button :disabled="true" :readonly="true"  style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia2">
+							</el-button>
+						</template>
+					</el-input>
+				</el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="审计意见类型" prop="reportDetail.opinionType"
@@ -159,11 +183,17 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="报告实际制作人" prop="reportDetail.realCreate"
+                <el-form-item label="报告实际制作人" prop="reportDetail.realCreateName"
                               :rules="[
                    ]">
-                  <UserSelectAll  :readonly="true" :disabled="true" :limit='1' :modelValue="inputForm.reportDetail.realCreate" @update:modelValue='(value) => {inputForm.reportDetail.realCreate = value}'></UserSelectAll>
-                </el-form-item>
+<!--                  <UserSelectAll  :readonly="true" :disabled="true" :limit='1' :modelValue="inputForm.reportDetail.realCreate" @update:modelValue='(value) => {inputForm.reportDetail.realCreate = value}'></UserSelectAll>-->
+					<el-input :readonly="true" :disabled="true" @focus="openUserDia3" v-model="inputForm.reportDetail.realCreateName" placeholder="请选择报告实际制作人">
+						<template #suffix>
+							<el-button :readonly="true" :disabled="true" style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia3">
+							</el-button>
+						</template>
+					</el-input>
+				</el-form-item>
               </el-col>
 
               <el-col :span="12">
@@ -639,6 +669,9 @@
     </el-row>
 
     <ReportCancellApplyChooseCom  ref="reportCancellApplyChooseCom" @getProject="getContract"></ReportCancellApplyChooseCom>
+	  <user-select1 ref="userSelect1" @doSubmit="selectUser1"></user-select1>
+	  <user-select2 ref="userSelect2" @doSubmit="selectUser2"></user-select2>
+	  <user-select3 ref="userSelect3" @doSubmit="selectUser3"></user-select3>
   </div>
 </template>
 
@@ -652,6 +685,9 @@
   import ReportCancellApplyService from '@/api/cw/reportCancellApply/ReportCancellApplyService'
   import ReportCancellApplyChooseCom from './ReportCancellApplyChooseCom'
   import ReportReviewService from '@/api/cw/reportManagement/ReportReviewService'
+  import UserSelect1 from '@/views/utils/UserTreeSelect'
+  import UserSelect2 from '@/views/utils/UserTreeSelect'
+  import UserSelect3 from '@/views/utils/UserTreeSelect'
   export default {
     props: {
       businessId: {
@@ -741,8 +777,10 @@
             projectName: '',
             projectNumber: '',
             officeId: '',
-            signatureAnnotator1: '',
-            signatureAnnotator2: '',
+			  signatureAnnotator1: '',
+			  signatureAnnotator1Name: '',
+			  signatureAnnotator2: '',
+			  signatureAnnotator2Name: '',
             signatureType: '',
             projectMasterName: '',
             cwProjectInfoList: [],
@@ -752,6 +790,7 @@
             servedUnitId: '',
             status: '',
             realCreate: '',
+			  realCreateName: '',
             realHeaderName: '',
             projectMasterId2: '',
             industry: '',
@@ -813,7 +852,10 @@
       UserSelect,
       ReportCancellApplyChooseCom,
       UserSelectAll,
-      UpLoadComponent2
+      UpLoadComponent2,
+		UserSelect1,
+		UserSelect3,
+		UserSelect2,
     },
     methods: {
       getKeyWatch (keyWatch) {
@@ -890,8 +932,10 @@
             projectName: '',
             projectNumber: '',
             officeId: '',
-            signatureAnnotator1: '',
-            signatureAnnotator2: '',
+			  signatureAnnotator1: '',
+			  signatureAnnotator1Name: '',
+			  signatureAnnotator2: '',
+			  signatureAnnotator2Name: '',
             signatureType: '',
             projectMasterName: '',
             cwProjectInfoList: [],
@@ -901,6 +945,7 @@
             servedUnitId: '',
             status: '',
             realCreate: '',
+			  realCreateName: '',
             realHeaderName: '',
             projectMasterId2: '',
             industry: '',
@@ -1021,7 +1066,9 @@
           projectNumber: '',
           officeId: '',
           signatureAnnotator1: '',
+          signatureAnnotator1Name: '',
           signatureAnnotator2: '',
+          signatureAnnotator2Name: '',
           signatureType: '',
           projectMasterName: '',
           cwProjectInfoList: [],
@@ -1031,6 +1078,7 @@
           servedUnitId: '',
           status: '',
           realCreate: '',
+          realCreateName: '',
           realHeaderName: '',
           projectMasterId2: '',
           industry: '',
@@ -1376,7 +1424,31 @@
         this.projectReportService.saveFlowableParam(this.inputForm).then((data) => {
           window.open(data, '_blank')
         })
-      }
+      },
+		openUserDia1(){
+			this.$refs.userSelect1.init()
+		},
+		selectUser1(user){
+			console.log(user[0].name)
+			this.inputForm.reportDetail.signatureAnnotator1Name=user[0].name
+			this.inputForm.reportDetail.signatureAnnotator1=user[0].id
+		},
+		openUserDia2(){
+			this.$refs.userSelect2.init()
+		},
+		selectUser2(user){
+			console.log(user[0].name)
+			this.inputForm.reportDetail.signatureAnnotator2Name=user[0].name
+			this.inputForm.reportDetail.signatureAnnotator2=user[0].id
+		},
+		openUserDia3(){
+			this.$refs.userSelect3.init()
+		},
+		selectUser3(user){
+			console.log(user[0].name)
+			this.inputForm.reportDetail.realCreateName=user[0].name
+			this.inputForm.reportDetail.realCreate=user[0].id
+		},
     }
   }
 </script>

+ 67 - 20
src/views/cw/reportCancellApplyArchived/ReportCancellApplyArchivedList.vue

@@ -9,28 +9,46 @@
         <el-input v-model="searchForm.projectName" placeholder="请输入项目名称" clearable></el-input>
       </el-form-item>
       <el-form-item v-if="showHideItem" label="项目经理1" prop="projectMasterName">
-        <UserSelect :limit='1' :modelValue="searchForm.projectMasterName" @update:modelValue='(value, label) => {searchForm.projectMasterName = value}'></UserSelect>
-      </el-form-item>
+<!--        <UserSelect :limit='1' :modelValue="searchForm.projectMasterName" @update:modelValue='(value, label) => {searchForm.projectMasterName = value}'></UserSelect>-->
+		  <el-input  v-model="searchForm.projectMasterName" placeholder="请选择项目经理1">
+			  <template #suffix>
+				  <el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia1">
+				  </el-button>
+			  </template>
+		  </el-input>
+	  </el-form-item>
       <el-form-item v-if="showHideItem" label="项目经理2" prop="projectMaster2Name">
-        <UserSelect :limit='1' :modelValue="searchForm.projectMaster2Name" @update:modelValue='(value, label) => {searchForm.projectMaster2Name = value}'></UserSelect>
-      </el-form-item>
+<!--        <UserSelect :limit='1' :modelValue="searchForm.projectMaster2Name" @update:modelValue='(value, label) => {searchForm.projectMaster2Name = value}'></UserSelect>-->
+		  <el-input  v-model="searchForm.projectMaster2Name" placeholder="请选择项目经理2">
+			  <template #suffix>
+				  <el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia2">
+				  </el-button>
+			  </template>
+		  </el-input>
+	  </el-form-item>
 <!--      <el-form-item label="创建人" prop="createBy">-->
 <!--        <el-input v-model="searchForm.createBy" placeholder="请输入创建人" clearable></el-input>-->
 <!--      </el-form-item>-->
       <el-form-item v-if="showHideItem" label="创建人" prop="createBy">
-        <SelectUserTree
-          ref="companyTree"
-          :props="{
-                  value: 'id',             // ID字段名
-                  label: 'name',         // 显示名称
-                  children: 'children'    // 子级字段名
-                }"
-          :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"
-          :value="searchForm.createBy"
-          :clearable="true"
-          :accordion="true"
-		  size="default"
-          @getValue="(value) => {searchForm.createBy=value}"/>
+<!--        <SelectUserTree-->
+<!--          ref="companyTree"-->
+<!--          :props="{-->
+<!--                  value: 'id',             // ID字段名-->
+<!--                  label: 'name',         // 显示名称-->
+<!--                  children: 'children'    // 子级字段名-->
+<!--                }"-->
+<!--          :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"-->
+<!--          :value="searchForm.createBy"-->
+<!--          :clearable="true"-->
+<!--          :accordion="true"-->
+<!--		  size="default"-->
+<!--          @getValue="(value) => {searchForm.createBy=value}"/>-->
+		  <el-input  v-model="searchForm.createBy" placeholder="请选择创建人">
+			  <template #suffix>
+				  <el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia3">
+				  </el-button>
+			  </template>
+		  </el-input>
       </el-form-item>
       <el-form-item v-if="showHideItem" label="创建时间" prop="contractDates">
         <el-date-picker
@@ -177,6 +195,9 @@
     </div>
     <ReportManagementForm ref="reportManagementForm"></ReportManagementForm>
     <ReportCancellApplyForm ref="reportCancellApplyForm"></ReportCancellApplyForm>
+	  <user-select1 ref="userSelect1" @doSubmit="selectUser1"></user-select1>
+	  <user-select2 ref="userSelect2" @doSubmit="selectUser2"></user-select2>
+	  <user-select3 ref="userSelect3" @doSubmit="selectUser3"></user-select3>
   </div>
 </template>
 
@@ -194,7 +215,9 @@
   import userService from '@/api/sys/userService'
   import SelectUserTree from '@/views/utils/treeUserSelect'
   import UserSelect from '@/views/cw/workClientInfo/clientUserSelect'
-
+  import UserSelect1 from '@/views/utils/UserTreeSelect'
+  import UserSelect2 from '@/views/utils/UserTreeSelect'
+  import UserSelect3 from '@/views/utils/UserTreeSelect'
   export default {
     data () {
       return {
@@ -242,7 +265,10 @@
       ReportManagementForm,
       ReportCancellApplyForm,
       SelectUserTree,
-      UserSelect
+      UserSelect,
+		UserSelect1,
+		UserSelect3,
+		UserSelect2,
     },
     computed: {
       userName () {
@@ -721,7 +747,28 @@
             // console.log(err.response)
           }
         })
-      }
+      },
+		openUserDia1(){
+			this.$refs.userSelect1.init()
+		},
+		selectUser1(user){
+			console.log(user[0].name)
+			this.searchForm.projectMasterName=user[0].name
+		},
+		openUserDia2(){
+			this.$refs.userSelect2.init()
+		},
+		selectUser2(user){
+			console.log(user[0].name)
+			this.searchForm.projectMaster2Name=user[0].name
+		},
+		openUserDia3(){
+			this.$refs.userSelect3.init()
+		},
+		selectUser3(user){
+			console.log(user[0].name)
+			this.searchForm.createBy=user[0].name
+		},
     }
   }
 </script>

+ 99 - 27
src/views/cw/reportManagement/ReportManagementAddForm.vue

@@ -94,43 +94,67 @@
           </el-col>
 
           <el-col v-if="inputForm.signatureType === '1' || inputForm.signatureType === '3' || commonJS.isEmpty(inputForm.signatureType)" :span="12">
-            <el-form-item label="签字注师1" prop="signatureAnnotator1"
+            <el-form-item label="签字注师1" prop="signatureAnnotator1Name"
                           :rules="[
                             {required: true, message:'签字注师1不能为空', trigger:'change'}
                    ]">
               <!--                <el-input v-model="inputForm.signatureAnnotator1" placeholder="请填写签字注师1" clearable></el-input>-->
-              <UserSelect style="width: 100%" ref="userSelect1" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator1" @update:modelValue='(value) => {changeSignatory1(value)}'></UserSelect>
-            </el-form-item>
+<!--              <UserSelect style="width: 100%" ref="userSelect1" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator1" @update:modelValue='(value) => {changeSignatory1(value)}'></UserSelect>-->
+				<el-input @blur="changeSignatory1(inputForm.signatureAnnotator1)" @focus="openUserDia1" v-model="inputForm.signatureAnnotator1Name" placeholder="请选择签字注师1">
+					<template #suffix>
+						<el-button  style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia1">
+						</el-button>
+					</template>
+				</el-input>
+			</el-form-item>
           </el-col>
 
           <el-col v-if="inputForm.signatureType === '1' || inputForm.signatureType === '3' || commonJS.isEmpty(inputForm.signatureType)" :span="12">
-            <el-form-item label="签字注师2" prop="signatureAnnotator2"
+            <el-form-item label="签字注师2" prop="signatureAnnotator2Name"
                           :rules="[
                             // {required: true, message:'签字注师2不能为空', trigger:'change'}
                    ]">
               <!--                <el-input v-model="inputForm.signatureAnnotator2" placeholder="请填写签字注师2" clearable></el-input>-->
-              <UserSelect2 style="width: 100%" ref="userSelect2" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @update:modelValue='(value) => {changeSignatory2(value)}'></UserSelect2>
+<!--              <UserSelect2 style="width: 100%" ref="userSelect2" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @update:modelValue='(value) => {changeSignatory2(value)}'></UserSelect2>-->
+				<el-input @blur="changeSignatory2(inputForm.signatureAnnotator2)" @focus="openUserDia2" v-model="inputForm.signatureAnnotator2Name" placeholder="请选择签字注师2">
+					<template #suffix>
+						<el-button  style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia2">
+						</el-button>
+					</template>
+				</el-input>
             </el-form-item>
           </el-col>
 
           <el-col v-if="inputForm.signatureType === '2' " :span="12">
-            <el-form-item label="签字注师1" prop="signatureAnnotator1"
+            <el-form-item label="签字注师1" prop="signatureAnnotator1Name"
                           :rules="[
                               {required: true, message:'签字注师1不能为空', trigger:'blur'}
                    ]">
               <!--                <el-input v-model="inputForm.signatureAnnotator1" placeholder="请填写签字注师1" clearable></el-input>-->
-              <UserSelect style="width: 100%" ref="userSelect1" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator1" @update:modelValue='(value) => {changeSignatory1(value)}'></UserSelect>
-            </el-form-item>
+<!--              <UserSelect style="width: 100%" ref="userSelect1" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator1" @update:modelValue='(value) => {changeSignatory1(value)}'></UserSelect>-->
+				<el-input @blur="changeSignatory1(inputForm.signatureAnnotator1)" @focus="openUserDia1"  v-model="inputForm.signatureAnnotator1Name" placeholder="请选择签字注师1">
+					<template #suffix>
+						<el-button  style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia1">
+						</el-button>
+					</template>
+				</el-input>
+			</el-form-item>
           </el-col>
 
           <el-col v-if="inputForm.signatureType === '2' " :span="12">
-            <el-form-item label="签字注师2" prop="signatureAnnotator2"
+            <el-form-item label="签字注师2" prop="signatureAnnotator2Name"
                           :rules="[
                               // {required: true, message:'签字注师2不能为空', trigger:'blur'}
                    ]">
               <!--                <el-input v-model="inputForm.signatureAnnotator2" placeholder="请填写签字注师2" clearable></el-input>-->
-              <UserSelect2 style="width: 100%" ref="userSelect2" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @update:modelValue='(value) => {changeSignatory2(value)}'></UserSelect2>
-            </el-form-item>
+<!--              <UserSelect2 style="width: 100%" ref="userSelect2" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @update:modelValue='(value) => {changeSignatory2(value)}'></UserSelect2>-->
+				<el-input @blur="changeSignatory2(inputForm.signatureAnnotator2)" @focus="openUserDia2" v-model="inputForm.signatureAnnotator2Name" placeholder="请选择签字注师2">
+					<template #suffix>
+						<el-button  style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia2">
+						</el-button>
+					</template>
+				</el-input>
+			</el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="审计意见类型" prop="opinionType"
@@ -162,8 +186,14 @@
                           {required: true, message:'报告实际制作人不能为空', trigger:'blur'},
                           {required: true, message:'报告实际制作人不能为空', trigger:'change'}
                    ]">
-              <UserSelectAll :readonly="true" :disabled="status === 'audit' || status === 'taskFormDetail'" :limit='1' :modelValue="inputForm.realCreate" @update:modelValue='(value) => {inputForm.realCreate = value}'></UserSelectAll>
-            </el-form-item>
+<!--              <UserSelectAll :readonly="true" :disabled="status === 'audit' || status === 'taskFormDetail'" :limit='1' :modelValue="inputForm.realCreate" @update:modelValue='(value) => {inputForm.realCreate = value}'></UserSelectAll>-->
+				<el-input @focus="openUserDia3" v-model="inputForm.realCreateName" placeholder="请选择报告实际制作人">
+					<template #suffix>
+						<el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia3">
+						</el-button>
+					</template>
+				</el-input>
+			</el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="创建时间" prop="createDate"
@@ -528,7 +558,10 @@
 		</template>
     <ProjectRecoredChooseCom  ref="projectRecoredChooseCom" @getProject="getContract"></ProjectRecoredChooseCom>
     <ReportServiceUnitForm ref="reportServiceUnitForm" @getWorkClientChoose="getWorkClientChoose"></ReportServiceUnitForm>
-    </el-dialog>
+		<user-select1 ref="userSelect1" @doSubmit="selectUser1"></user-select1>
+		<user-select2 ref="userSelect2" @doSubmit="selectUser2"></user-select2>
+		<user-select3 ref="userSelect3" @doSubmit="selectUser3"></user-select3>
+	</el-dialog>
   </div>
 </template>
 
@@ -538,12 +571,15 @@
   import UpLoadComponent from '@/views/common/UpLoadComponent'
   import SelectTree from '@/components/treeSelect/treeSelect.vue'
   import UserSelect from '../workClientInfo/clientUserSelect/AccountantUserIndex'
-  import UserSelect2 from '../workClientInfo/clientUserSelect/AccountantUserIndex2'
+  // import UserSelect2 from '../workClientInfo/clientUserSelect/AccountantUserIndex2'
   import UserSelectAll from '@/components/userSelect'
   import projectReportService from '@/api/cw/reportManagement/ProjectReportService'
   import EnterpriseSearchService from '@/api/cw/common/EnterpriseSearchService'
   import ReportServiceUnitForm from './ReportServiceUnitForm'
   import ProjectRecoredChooseCom from '../projectRecords/ProjectRecordsChooseCom'
+  import UserSelect1 from '@/views/utils/UserTreeSelect'
+  import UserSelect2 from '@/views/utils/UserTreeSelect'
+  import UserSelect3 from '@/views/utils/UserTreeSelect'
   export default {
     props: {
       businessId: {
@@ -598,7 +634,9 @@
           projectNumber: '',
           officeId: '',
           signatureAnnotator1: '',
+          signatureAnnotator1Name: '',
           signatureAnnotator2: '',
+          signatureAnnotator2Name: '',
           signatureType: '',
           projectMasterId1: '',
           projectMasterId2: '',
@@ -609,6 +647,7 @@
           servedUnitId: '',
           status: '',
           realCreate: '',
+          realCreateName: '',
           realHeaderName: '',
           industry: '',
           businessObjects: ''
@@ -658,7 +697,9 @@
 	  UserSelect2,
       ReportServiceUnitForm,
       ProjectRecoredChooseCom,
-      UserSelectAll
+      UserSelectAll,
+		UserSelect1,
+		UserSelect3
     },
     methods: {
       getKeyWatch (keyWatch) {
@@ -669,8 +710,9 @@
           this.$message.warning('首次发行签字注师1和首次发行签字注师2不可以相同')
           this.$nextTick(() => {
             this.inputForm.signatureAnnotator1 = ''
-            this.$refs.userSelect1.changeNameValue('')
-            this.$refs.userSelect1.clearSelectData()
+            this.inputForm.signatureAnnotator1Name = ''
+            // this.$refs.userSelect1.changeNameValue('')
+            // this.$refs.userSelect1.clearSelectData()
             this.$forceUpdate()
           })
         } else if (this.commonJS.isNotEmpty(this.inputForm.signatureAnnotator2) &&
@@ -686,8 +728,9 @@
           this.$message.warning('签字注师1和签字注师2至少有一个与项目经理相同')
           this.$nextTick(() => {
             this.inputForm.signatureAnnotator1 = ''
-            this.$refs.userSelect1.changeNameValue('')
-            this.$refs.userSelect1.clearSelectData()
+            this.inputForm.signatureAnnotator1Name = ''
+            // this.$refs.userSelect1.changeNameValue('')
+            // this.$refs.userSelect1.clearSelectData()
             this.$forceUpdate()
           })
         } else {
@@ -699,8 +742,9 @@
           this.$message.warning('首次发行签字注师1和首次发行签字注师2不可以相同')
           this.$nextTick(() => {
             this.inputForm.signatureAnnotator2 = ''
-            this.$refs.userSelect2.changeNameValue('')
-            this.$refs.userSelect2.clearSelectData()
+            this.inputForm.signatureAnnotator2Name = ''
+            // this.$refs.userSelect2.changeNameValue('')
+            // this.$refs.userSelect2.clearSelectData()
             this.$forceUpdate()
           })
         } else if (this.commonJS.isNotEmpty(this.inputForm.signatureAnnotator1) &&
@@ -715,8 +759,9 @@
           this.$message.warning('签字注师1和签字注师2至少有一个与项目经理相同')
           this.$nextTick(() => {
             this.inputForm.signatureAnnotator2 = ''
-            this.$refs.userSelect2.changeNameValue('')
-            this.$refs.userSelect2.clearSelectData()
+            this.inputForm.signatureAnnotator2Name = ''
+            // this.$refs.userSelect2.changeNameValue('')
+            // this.$refs.userSelect2.clearSelectData()
             this.$forceUpdate()
           })
         } else {
@@ -767,14 +812,17 @@
           projectName: '',
           officeId: '',
           projectNumber: '',
-          signatureAnnotator1: '',
-          signatureAnnotator2: '',
+			signatureAnnotator1: '',
+			signatureAnnotator1Name: '',
+			signatureAnnotator2: '',
+			signatureAnnotator2Name: '',
           signatureType: '',
           projectMasterName: '',
           projectMasterId1: '',
           projectMasterId2: '',
           cwProjectInfoList: [],
           realCreate: '',
+          realCreateName: '',
           realHeaderName: '',
           industry: '',
           businessObjects: ''
@@ -1130,7 +1178,31 @@
       changeBusinessType () {
         // 切换业务类型的时候,审计业务类型清空
         this.inputForm.auditBusinessType = ''
-      }
+      },
+		openUserDia1(){
+			this.$refs.userSelect1.init()
+		},
+		selectUser1(user){
+			console.log(user[0].name)
+			this.inputForm.signatureAnnotator1Name=user[0].name
+			this.inputForm.signatureAnnotator1=user[0].id
+		},
+		openUserDia2(){
+			this.$refs.userSelect2.init()
+		},
+		selectUser2(user){
+			console.log(user[0].name)
+			this.inputForm.signatureAnnotator2Name=user[0].name
+			this.inputForm.signatureAnnotator2=user[0].id
+		},
+		openUserDia3(){
+			this.$refs.userSelect3.init()
+		},
+		selectUser3(user){
+			console.log(user[0].name)
+			this.inputForm.realCreateName=user[0].name
+			this.inputForm.realCreate=user[0].id
+		},
     }
   }
 </script>

+ 96 - 24
src/views/cw/reportManagement/ReportManagementForm.vue

@@ -104,8 +104,14 @@
                               :rules="[
                    ]">
                   <!--                <el-input v-model="inputForm.signatureAnnotator1" placeholder="请填写签字注师1" clearable></el-input>-->
-                  <UserSelect style="width: 100%" ref="userSelect1" :disabled="method === 'view'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator1" @update:modelValue='(value) => {changeSignatory1(value)}'></UserSelect>
-                </el-form-item>
+<!--                  <UserSelect style="width: 100%" ref="userSelect1" :disabled="method === 'view'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator1" @update:modelValue='(value) => {changeSignatory1(value)}'></UserSelect>-->
+					<el-input @blur="changeSignatory1(inputForm.signatureAnnotator1)" @focus="openUserDia1"  v-model="inputForm.signatureAnnotator1Name" placeholder="请选择签字注师1">
+						<template #suffix>
+							<el-button  style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia1">
+							</el-button>
+						</template>
+					</el-input>
+				</el-form-item>
               </el-col>
 
               <el-col v-if="inputForm.signatureType === '1'|| inputForm.signatureType === '3' || commonJS.isEmpty(inputForm.signatureType)" :span="12">
@@ -113,8 +119,14 @@
                               :rules="[
                    ]">
                   <!--                <el-input v-model="inputForm.signatureAnnotator2" placeholder="请填写签字注师2" clearable></el-input>-->
-                  <UserSelect2 style="width: 100%" ref="userSelect2" :disabled="method === 'view'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @update:modelValue='(value) => {changeSignatory2(value)}'></UserSelect2>
-                </el-form-item>
+<!--                  <UserSelect2 style="width: 100%" ref="userSelect2" :disabled="method === 'view'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @update:modelValue='(value) => {changeSignatory2(value)}'></UserSelect2>-->
+					<el-input @blur="changeSignatory2(inputForm.signatureAnnotator2)" @focus="openUserDia2" v-model="inputForm.signatureAnnotator2Name" placeholder="请选择签字注师2">
+						<template #suffix>
+							<el-button  style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia2">
+							</el-button>
+						</template>
+					</el-input>
+				</el-form-item>
               </el-col>
 
               <el-col v-if="inputForm.signatureType === '2' " :span="12">
@@ -123,8 +135,14 @@
                               {required: true, message:'签字注师1不能为空', trigger:'blur'}
                    ]">
                   <!--                <el-input v-model="inputForm.signatureAnnotator1" placeholder="请填写签字注师1" clearable></el-input>-->
-                  <UserSelect style="width: 100%" ref="userSelect1" :disabled="method === 'view'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator1" @update:modelValue='(value) => {changeSignatory1(value)}'></UserSelect>
-                </el-form-item>
+<!--                  <UserSelect style="width: 100%" ref="userSelect1" :disabled="method === 'view'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator1" @update:modelValue='(value) => {changeSignatory1(value)}'></UserSelect>-->
+					<el-input @blur="changeSignatory1(inputForm.signatureAnnotator1)" @focus="openUserDia1"  v-model="inputForm.signatureAnnotator1Name" placeholder="请选择签字注师1">
+						<template #suffix>
+							<el-button  style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia1">
+							</el-button>
+						</template>
+					</el-input>
+				</el-form-item>
               </el-col>
               <el-col v-if="inputForm.signatureType === '2' " :span="12">
                 <el-form-item label="签字注师2" prop="signatureAnnotator2"
@@ -132,8 +150,14 @@
                               {required: true, message:'签字注师2不能为空', trigger:'blur'}
                    ]">
                   <!--                <el-input v-model="inputForm.signatureAnnotator2" placeholder="请填写签字注师2" clearable></el-input>-->
-                  <UserSelect2 style="width: 100%" ref="userSelect2" :disabled="method === 'view'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @update:modelValue='(value) => {changeSignatory2(value)}'></UserSelect2>
-                </el-form-item>
+<!--                  <UserSelect2 style="width: 100%" ref="userSelect2" :disabled="method === 'view'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @update:modelValue='(value) => {changeSignatory2(value)}'></UserSelect2>-->
+					<el-input @blur="changeSignatory2(inputForm.signatureAnnotator2)" @focus="openUserDia2" v-model="inputForm.signatureAnnotator2Name" placeholder="请选择签字注师2">
+						<template #suffix>
+							<el-button  style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia2">
+							</el-button>
+						</template>
+					</el-input>
+				</el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="审计意见类型" prop="opinionType"
@@ -164,8 +188,14 @@
                               {required: true, message:'报告实际制作人不能为空', trigger:'blur'},
                           {required: true, message:'报告实际制作人不能为空', trigger:'change'}
                    ]">
-                  <UserSelectAll :readonly="true" :disabled="method === 'view'" :limit='1' :modelValue="inputForm.realCreate" @update:modelValue='(value) => {inputForm.realCreate = value}'></UserSelectAll>
-                </el-form-item>
+<!--                  <UserSelectAll :readonly="true" :disabled="method === 'view'" :limit='1' :modelValue="inputForm.realCreate" @update:modelValue='(value) => {inputForm.realCreate = value}'></UserSelectAll>-->
+					<el-input @focus="openUserDia3" v-model="inputForm.realCreateName" placeholder="请选择报告实际制作人">
+						<template #suffix>
+							<el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia3">
+							</el-button>
+						</template>
+					</el-input>
+				</el-form-item>
               </el-col>
 
               <el-col :span="12">
@@ -896,7 +926,10 @@
 <!--      <WorkClientChooseForm ref="workClientChooseForm" @getWorkClientChoose="getWorkClientChoose"></WorkClientChooseForm>-->
       <ProjectRecoredChooseCom  ref="projectRecoredChooseCom" @getProject="getContract"></ProjectRecoredChooseCom>
       <ReportServiceUnitForm ref="reportServiceUnitForm" @getWorkClientChoose="getWorkClientChoose"></ReportServiceUnitForm>
-    </el-dialog>
+		<user-select1 ref="userSelect1" @doSubmit="selectUser1"></user-select1>
+		<user-select2 ref="userSelect2" @doSubmit="selectUser2"></user-select2>
+		<user-select3 ref="userSelect3" @doSubmit="selectUser3"></user-select3>
+	</el-dialog>
   </div>
 </template>
 
@@ -907,7 +940,7 @@
   import SelectTree from '@/components/treeSelect/treeSelect.vue'
   // import UserSelect from '../workClientInfo/clientUserSelect'
   import UserSelect from '../workClientInfo/clientUserSelect/AccountantUserIndex'
-  import UserSelect2 from '../workClientInfo/clientUserSelect/AccountantUserIndex2'
+  // import UserSelect2 from '../workClientInfo/clientUserSelect/AccountantUserIndex2'
   import UserSelectAll from '@/components/userSelect'
   // import WorkClientChooseForm from '../workClientInfo/WorkClientChooseForm'
   // import WorkContractChooseCom from '../projectRecords/WorkContractChooseCom'
@@ -916,6 +949,9 @@
   import ReportServiceUnitForm from './ReportServiceUnitForm'
   import ProjectRecoredChooseCom from '../projectRecords/ProjectRecordsChooseCom'
   import userService from "@/api/sys/userService";
+  import UserSelect1 from '@/views/utils/UserTreeSelect'
+  import UserSelect2 from '@/views/utils/UserTreeSelect'
+  import UserSelect3 from '@/views/utils/UserTreeSelect'
   export default {
     props: {
       businessId: {
@@ -988,8 +1024,10 @@
           projectName: '',
           projectNumber: '',
           officeId: '',
-          signatureAnnotator1: '',
-          signatureAnnotator2: '',
+			signatureAnnotator1: '',
+			signatureAnnotator1Name: '',
+			signatureAnnotator2: '',
+			signatureAnnotator2Name: '',
           signatureType: '',
           projectMasterName: '',
           cwProjectInfoList: [],
@@ -999,6 +1037,7 @@
           servedUnitId: '',
           status: '',
           realCreate: '',
+			realCreateName: '',
           realHeaderName: '',
           projectMasterId2: '',
           industry: '',
@@ -1055,7 +1094,9 @@
       UpLoadComponentDialog,
       ReportServiceUnitForm,
       ProjectRecoredChooseCom,
-      UserSelectAll
+      UserSelectAll,
+		UserSelect1,
+		UserSelect3
     },
     methods: {
       // seeFileInfo (index) {
@@ -1140,7 +1181,9 @@
           projectNumber: '',
           officeId: '',
           signatureAnnotator1: '',
+          signatureAnnotator1Name: '',
           signatureAnnotator2: '',
+          signatureAnnotator2Name: '',
           signatureType: '',
           projectMasterName: '',
           cwProjectInfoList: [],
@@ -1150,6 +1193,7 @@
           servedUnitId: '',
           status: '',
           realCreate: '',
+          realCreateName: '',
           realHeaderName: '',
           projectMasterId2: '',
           industry: '',
@@ -1583,8 +1627,9 @@
           this.$message.warning('首次发行签字注师1和首次发行签字注师2不可以相同')
           this.$nextTick(() => {
             this.inputForm.signatureAnnotator1 = ''
-            this.$refs.userSelect1.changeNameValue('')
-            this.$refs.userSelect1.clearSelectData()
+            this.inputForm.signatureAnnotator1Name = ''
+            // this.$refs.userSelect1.changeNameValue('')
+            // this.$refs.userSelect1.clearSelectData()
             this.$forceUpdate()
           })
         } else if (this.commonJS.isNotEmpty(this.inputForm.signatureAnnotator2) &&
@@ -1596,8 +1641,9 @@
           this.$message.warning('签字注师1和签字注师2至少有一个与项目经理相同')
           this.$nextTick(() => {
             this.inputForm.signatureAnnotator1 = ''
-            this.$refs.userSelect1.changeNameValue('')
-            this.$refs.userSelect1.clearSelectData()
+            this.inputForm.signatureAnnotator1Name = ''
+            // this.$refs.userSelect1.changeNameValue('')
+            // this.$refs.userSelect1.clearSelectData()
             this.$forceUpdate()
           })
         } else {
@@ -1609,8 +1655,9 @@
           this.$message.warning('首次发行签字注师1和首次发行签字注师2不可以相同')
           this.$nextTick(() => {
             this.inputForm.signatureAnnotator2 = ''
-            this.$refs.userSelect2.changeNameValue('')
-            this.$refs.userSelect2.clearSelectData()
+            this.inputForm.signatureAnnotator2Name = ''
+            // this.$refs.userSelect2.changeNameValue('')
+            // this.$refs.userSelect2.clearSelectData()
             this.$forceUpdate()
           })
         } else if (this.commonJS.isNotEmpty(this.inputForm.signatureAnnotator1) &&
@@ -1621,8 +1668,9 @@
           this.$message.warning('签字注师1和签字注师2至少有一个与项目经理相同')
           this.$nextTick(() => {
             this.inputForm.signatureAnnotator2 = ''
-            this.$refs.userSelect2.changeNameValue('')
-            this.$refs.userSelect2.clearSelectData()
+            this.inputForm.signatureAnnotator2Name = ''
+            // this.$refs.userSelect2.changeNameValue('')
+            // this.$refs.userSelect2.clearSelectData()
             this.$forceUpdate()
           })
         } else {
@@ -1647,7 +1695,31 @@
             console.log(err.response)
           }
         })
-      }
+      },
+		openUserDia1(){
+			this.$refs.userSelect1.init()
+		},
+		selectUser1(user){
+			console.log(user[0].name)
+			this.inputForm.signatureAnnotator1Name=user[0].name
+			this.inputForm.signatureAnnotator1=user[0].id
+		},
+		openUserDia2(){
+			this.$refs.userSelect2.init()
+		},
+		selectUser2(user){
+			console.log(user[0].name)
+			this.inputForm.signatureAnnotator2Name=user[0].name
+			this.inputForm.signatureAnnotator2=user[0].id
+		},
+		openUserDia3(){
+			this.$refs.userSelect3.init()
+		},
+		selectUser3(user){
+			console.log(user[0].name)
+			this.inputForm.realCreateName=user[0].name
+			this.inputForm.realCreate=user[0].id
+		},
     }
   }
 </script>

+ 69 - 22
src/views/cw/reportManagement/ReportManagementList.vue

@@ -12,26 +12,44 @@
         <el-input v-model="searchForm.reportName" placeholder="请输入报告名称" clearable></el-input>
       </el-form-item>
       <el-form-item v-if="showHideItem" label="项目经理1" prop="projectMasterName">
-        <UserSelect :limit='1' :modelValue="searchForm.projectMasterName" @update:modelValue='(value, label) => {searchForm.projectMasterName = value}'></UserSelect>
+<!--        <UserSelect :limit='1' :modelValue="searchForm.projectMasterName" @update:modelValue='(value, label) => {searchForm.projectMasterName = value}'></UserSelect>-->
+		  <el-input  v-model="searchForm.projectMasterName" placeholder="请选择项目经理1">
+			  <template #suffix>
+				  <el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia1">
+				  </el-button>
+			  </template>
+		  </el-input>
       </el-form-item>
       <el-form-item v-if="showHideItem" label="项目经理2" prop="realHeaderName">
-        <UserSelect :limit='1' :modelValue="searchForm.realHeaderName" @update:modelValue='(value, label) => {searchForm.realHeaderName = value}'></UserSelect>
+<!--        <UserSelect :limit='1' :modelValue="searchForm.realHeaderName" @update:modelValue='(value, label) => {searchForm.realHeaderName = value}'></UserSelect>-->
+		  <el-input  v-model="searchForm.realHeaderName" placeholder="请选择项目经理2">
+			  <template #suffix>
+				  <el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia2">
+				  </el-button>
+			  </template>
+		  </el-input>
       </el-form-item>
 
 		<el-form-item v-if="showHideItem" label="创建人" prop="createBy">
-        <SelectUserTree
-          ref="companyTree"
-          :props="{
-                  value: 'id',             // ID字段名
-                  label: 'name',         // 显示名称
-                  children: 'children'    // 子级字段名
-                }"
-          :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"
-          :value="searchForm.createBy"
-          :clearable="true"
-		  size="default"
-          :accordion="true"
-          @getValue="(value) => {searchForm.createBy=value}"/>
+<!--        <SelectUserTree-->
+<!--          ref="companyTree"-->
+<!--          :props="{-->
+<!--                  value: 'id',             // ID字段名-->
+<!--                  label: 'name',         // 显示名称-->
+<!--                  children: 'children'    // 子级字段名-->
+<!--                }"-->
+<!--          :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"-->
+<!--          :value="searchForm.createBy"-->
+<!--          :clearable="true"-->
+<!--		  size="default"-->
+<!--          :accordion="true"-->
+<!--          @getValue="(value) => {searchForm.createBy=value}"/>-->
+			<el-input  v-model="searchForm.createBy" placeholder="请选择创建人">
+				<template #suffix>
+					<el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia3">
+					</el-button>
+				</template>
+			</el-input>
       </el-form-item>
 
 		<!--<el-form-item label="创建人" prop="createBy">
@@ -396,11 +414,13 @@
 		  :limit="1"
 		  @doSubmit="selectUsersToTransferTask"
 	  ></user-select>
-	  <user-select2
-		  ref="userSelect2"
-		  @doSubmit="selectUser">
-	  </user-select2>
-
+<!--	  <user-select2-->
+<!--		  ref="userSelect2"-->
+<!--		  @doSubmit="selectUser">-->
+<!--	  </user-select2>-->
+	  <user-select1 ref="userSelect1" @doSubmit="selectUser1"></user-select1>
+	  <user-select2 ref="userSelect2" @doSubmit="selectUser2"></user-select2>
+	  <user-select3 ref="userSelect3" @doSubmit="selectUser3"></user-select3>
   </div>
 </template>
 
@@ -418,7 +438,10 @@
   import SelectUserTree from '@/views/utils/treeUserSelect'
   import projectRecordsService from '@/api/cw/projectRecords/ProjectRecordsService'
   import UserSelect from '@/views/cw/workClientInfo/clientUserSelect'
-  import UserSelect2 from '@/components/userSelect2/UserSelectDialog';
+  // import UserSelect2 from '@/components/userSelect2/UserSelectDialog';
+  import UserSelect1 from '@/views/utils/UserTreeSelect'
+  import UserSelect2 from '@/views/utils/UserTreeSelect'
+  import UserSelect3 from '@/views/utils/UserTreeSelect'
   export default {
     data () {
       return {
@@ -489,7 +512,9 @@
       SelectUserTree,
       InputNumber,
       UserSelect,
-	  UserSelect2
+	  UserSelect2,
+		UserSelect1,
+		UserSelect3
     },
     computed: {
       userName () {
@@ -1984,6 +2009,28 @@
 				})
 			}
 		},
+
+		openUserDia1(){
+			this.$refs.userSelect1.init()
+		},
+		selectUser1(user){
+			console.log(user[0].name)
+			this.searchForm.projectMasterName=user[0].name
+		},
+		openUserDia2(){
+			this.$refs.userSelect2.init()
+		},
+		selectUser2(user){
+			console.log(user[0].name)
+			this.searchForm.realHeaderName=user[0].name
+		},
+		openUserDia3(){
+			this.$refs.userSelect3.init()
+		},
+		selectUser3(user){
+			console.log(user[0].name)
+			this.searchForm.createBy=user[0].name
+		},
     }
   }
 </script>

+ 76 - 8
src/views/cw/reportManagement/ReportReviewTakeNumberForm.vue

@@ -89,7 +89,13 @@
 										  :rules="[
                    ]">
 								<!--                <el-input v-model="inputForm.signatureAnnotator1" placeholder="请填写签字注师1" clearable></el-input>-->
-								<UserSelect style="width: 100%" ref="userSelect1" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator1" @update:modelValue='(value) => {changeSignatory1(value)}'></UserSelect>
+<!--								<UserSelect style="width: 100%" ref="userSelect1" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator1" @update:modelValue='(value) => {changeSignatory1(value)}'></UserSelect>-->
+								<el-input @blur="changeSignatory1(inputForm.signatureAnnotator1)" @focus="openUserDia1" v-model="inputForm.signatureAnnotator1Name" placeholder="请选择签字注师1">
+									<template #suffix>
+										<el-button  style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia1">
+										</el-button>
+									</template>
+								</el-input>
 							</el-form-item>
 						</el-col>
 
@@ -98,7 +104,13 @@
 										  :rules="[
                    ]">
 								<!--                <el-input v-model="inputForm.signatureAnnotator2" placeholder="请填写签字注师2" clearable></el-input>-->
-								<UserSelect2 style="width: 100%" ref="userSelect2" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @update:modelValue='(value) => {changeSignatory2(value)}'></UserSelect2>
+<!--								<UserSelect2 style="width: 100%" ref="userSelect2" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @update:modelValue='(value) => {changeSignatory2(value)}'></UserSelect2>-->
+								<el-input @blur="changeSignatory2(inputForm.signatureAnnotator2)" @focus="openUserDia2" v-model="inputForm.signatureAnnotator2Name" placeholder="请选择签字注师2">
+									<template #suffix>
+										<el-button  style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia2">
+										</el-button>
+									</template>
+								</el-input>
 							</el-form-item>
 						</el-col>
 
@@ -107,7 +119,13 @@
 										  :rules="[
                    ]">
 								<!--                <el-input v-model="inputForm.signatureAnnotator1" placeholder="请填写签字注师1" clearable></el-input>-->
-								<UserSelect style="width: 100%" ref="userSelect1" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator1" @update:modelValue='(value) => {changeSignatory1(value)}'></UserSelect>
+<!--								<UserSelect style="width: 100%" ref="userSelect1" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator1" @update:modelValue='(value) => {changeSignatory1(value)}'></UserSelect>-->
+								<el-input @blur="changeSignatory1(inputForm.signatureAnnotator1)" @focus="openUserDia1" v-model="inputForm.signatureAnnotator1Name" placeholder="请选择签字注师1">
+									<template #suffix>
+										<el-button  style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia1">
+										</el-button>
+									</template>
+								</el-input>
 							</el-form-item>
 						</el-col>
 
@@ -116,7 +134,13 @@
 										  :rules="[
                    ]">
 								<!--                <el-input v-model="inputForm.signatureAnnotator2" placeholder="请填写签字注师2" clearable></el-input>-->
-								<UserSelect2 style="width: 100%" ref="userSelect2" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @update:modelValue='(value) => {changeSignatory2(value)}'></UserSelect2>
+<!--								<UserSelect2 style="width: 100%" ref="userSelect2" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @update:modelValue='(value) => {changeSignatory2(value)}'></UserSelect2>-->
+								<el-input @blur="changeSignatory2(inputForm.signatureAnnotator2)" @focus="openUserDia2" v-model="inputForm.signatureAnnotator2Name" placeholder="请选择签字注师2">
+									<template #suffix>
+										<el-button  style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia2">
+										</el-button>
+									</template>
+								</el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="12">
@@ -147,7 +171,13 @@
 							<el-form-item label="报告实际制作人" prop="realCreate"
 										  :rules="[
                    ]">
-								<UserSelectAll :readonly="true" :disabled="status === 'audit' || status === 'taskFormDetail'" :limit='1' :modelValue="inputForm.realCreate" @update:modelValue='(value) => {inputForm.realCreate = value}'></UserSelectAll>
+<!--								<UserSelectAll :readonly="true" :disabled="status === 'audit' || status === 'taskFormDetail'" :limit='1' :modelValue="inputForm.realCreate" @update:modelValue='(value) => {inputForm.realCreate = value}'></UserSelectAll>-->
+								<el-input @focus="openUserDia3" v-model="inputForm.realCreateName" placeholder="请选择报告实际制作人">
+									<template #suffix>
+										<el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia3">
+										</el-button>
+									</template>
+								</el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="12">
@@ -453,6 +483,9 @@
 		<ProjectRecoredChooseCom  ref="projectRecoredChooseCom" @getProject="getContract"></ProjectRecoredChooseCom>
 		<ReportServiceUnitForm ref="reportServiceUnitForm" @getWorkClientChoose="getWorkClientChoose"></ReportServiceUnitForm>
 		<FinanceInvoiceRadioForm ref="financeInvoiceRadioForm" @getInvoice="getInvoice"></FinanceInvoiceRadioForm>
+		<user-select1 ref="userSelect1" @doSubmit="selectUser1"></user-select1>
+		<user-select2 ref="userSelect2" @doSubmit="selectUser2"></user-select2>
+		<user-select3 ref="userSelect3" @doSubmit="selectUser3"></user-select3>
 		<!--    <ReportCancellApplyChooseCom  ref="reportCancellApplyChooseCom" @getProject="getContract"></ReportCancellApplyChooseCom>-->
 <!--		<el-dialog v-model="visible" title="Warning" width="300" center>-->
 <!--    <span>-->
@@ -477,7 +510,7 @@
 	// import UpLoadComponent from '@/views/common/UpLoadComponentV2.1'
 	import SelectTree from '@/components/treeSelect/treeSelect.vue'
 	import UserSelect from '../workClientInfo/clientUserSelect/AccountantUserIndex'
-	import UserSelect2 from '../workClientInfo/clientUserSelect/AccountantUserIndex2'
+	// import UserSelect2 from '../workClientInfo/clientUserSelect/AccountantUserIndex2'
 	import UserSelectAll from '@/components/userSelect'
 	import ReportCancellApplyService from '@/api/cw/reportCancellApply/ReportCancellApplyService'
 	import ReportNumberApplyService from '@/api/cw/reportManagement/ReportNumberApplyService'
@@ -488,6 +521,9 @@
 	import projectRecordsService from '@/api/cw/projectRecords/ProjectRecordsService'
 	import FinanceInvoiceRadioForm from "../invoice/FinanceInvoiceRadioForm";
 	import financeInvoiceService from '@/api/cw/invoice/CwFinanceInvoiceService'
+	import UserSelect1 from '@/views/utils/UserTreeSelect'
+	import UserSelect2 from '@/views/utils/UserTreeSelect'
+	import UserSelect3 from '@/views/utils/UserTreeSelect'
 	export default {
 		props: {
 			businessId: {
@@ -530,13 +566,16 @@
 					projectNumber: '',
 					officeId: '',
 					signatureAnnotator1: '',
+					signatureAnnotator1Name: '',
 					signatureAnnotator2: '',
+					signatureAnnotator2Name: '',
 					signatureType: '',
 					projectMasterName: '',
 					cwProjectInfoList: [],
 					status: '',
 					applyStatus: '',
 					realCreate: '',
+					realCreateName: '',
 					userName: '',
 					detailFor1010: [],
 					detailFor1020: [],
@@ -653,7 +692,9 @@
 			UserSelect,
 			UserSelect2,
 			UserSelectAll,
-			FinanceInvoiceRadioForm
+			FinanceInvoiceRadioForm,
+			UserSelect1,
+			UserSelect3
 			// ReportCancellApplyChooseCom
 		},
 		methods: {
@@ -685,13 +726,16 @@
 					projectNumber: '',
 					officeId: '',
 					signatureAnnotator1: '',
+					signatureAnnotator1Name: '',
 					signatureAnnotator2: '',
+					signatureAnnotator2Name: '',
 					signatureType: '',
 					projectMasterName: '',
 					cwProjectInfoList: [],
 					status: '',
 					applyStatus: '',
 					realCreate: '',
+					realCreateName: '',
 					userName: '',
 					detailFor1010: [],
 					detailFor1020: [],
@@ -1258,7 +1302,31 @@
 					this.visible = true
 					this.loading = true
 				}
-			}
+			},
+			openUserDia1(){
+				this.$refs.userSelect1.init()
+			},
+			selectUser1(user){
+				console.log(user[0].name)
+				this.inputForm.signatureAnnotator1Name=user[0].name
+				this.inputForm.signatureAnnotator1=user[0].id
+			},
+			openUserDia2(){
+				this.$refs.userSelect2.init()
+			},
+			selectUser2(user){
+				console.log(user[0].name)
+				this.inputForm.signatureAnnotator2Name=user[0].name
+				this.inputForm.signatureAnnotator2=user[0].id
+			},
+			openUserDia3(){
+				this.$refs.userSelect3.init()
+			},
+			selectUser3(user){
+				console.log(user[0].name)
+				this.inputForm.realCreateName=user[0].name
+				this.inputForm.realCreate=user[0].id
+			},
 
 		}
 	}

+ 76 - 8
src/views/cw/reportManagement/ReportSignatureForm.vue

@@ -90,7 +90,13 @@
 										  {required: true, message: '请选择签字注师1', trigger: 'blur'}
                    ]">
 								<!--                <el-input v-model="inputForm.signatureAnnotator1" placeholder="请填写签字注师1" clearable></el-input>-->
-								<UserSelect style="width: 100%" ref="userSelect1" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator1" @update:modelValue='(value) => {changeSignatory1(value)}'></UserSelect>
+<!--								<UserSelect style="width: 100%" ref="userSelect1" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator1" @update:modelValue='(value) => {changeSignatory1(value)}'></UserSelect>-->
+								<el-input :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" @blur="changeSignatory1(inputForm.signatureAnnotator1)" @focus="openUserDia1" v-model="inputForm.signatureAnnotator1Name" placeholder="请选择签字注师1">
+									<template #suffix>
+										<el-button :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia1">
+										</el-button>
+									</template>
+								</el-input>
 							</el-form-item>
 						</el-col>
 
@@ -100,7 +106,13 @@
 										   {required: true, message: '请选择签字注师2', trigger: 'blur'}
                    ]">
 								<!--                <el-input v-model="inputForm.signatureAnnotator2" placeholder="请填写签字注师2" clearable></el-input>-->
-								<UserSelect2 style="width: 100%" ref="userSelect2" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @update:modelValue='(value) => {changeSignatory2(value)}'></UserSelect2>
+<!--								<UserSelect2 style="width: 100%" ref="userSelect2" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @update:modelValue='(value) => {changeSignatory2(value)}'></UserSelect2>-->
+								<el-input :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" @blur="changeSignatory2(inputForm.signatureAnnotator2)" @focus="openUserDia2" v-model="inputForm.signatureAnnotator2Name" placeholder="请选择签字注师2">
+									<template #suffix>
+										<el-button :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true"  style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia2">
+										</el-button>
+									</template>
+								</el-input>
 							</el-form-item>
 						</el-col>
 
@@ -109,7 +121,13 @@
 										  :rules="[
                    ]">
 								<!--                <el-input v-model="inputForm.signatureAnnotator1" placeholder="请填写签字注师1" clearable></el-input>-->
-								<UserSelect style="width: 100%" ref="userSelect1" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator1" @update:modelValue='(value) => {changeSignatory1(value)}'></UserSelect>
+<!--								<UserSelect style="width: 100%" ref="userSelect1" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator1" @update:modelValue='(value) => {changeSignatory1(value)}'></UserSelect>-->
+								<el-input :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" @blur="changeSignatory1(inputForm.signatureAnnotator1)" @focus="openUserDia1" v-model="inputForm.signatureAnnotator1Name" placeholder="请选择签字注师1">
+									<template #suffix>
+										<el-button :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true"  style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia1">
+										</el-button>
+									</template>
+								</el-input>
 							</el-form-item>
 						</el-col>
 
@@ -118,7 +136,13 @@
 										  :rules="[
                    ]">
 								<!--                <el-input v-model="inputForm.signatureAnnotator2" placeholder="请填写签字注师2" clearable></el-input>-->
-								<UserSelect2 style="width: 100%" ref="userSelect2" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @update:modelValue='(value) => {changeSignatory2(value)}'></UserSelect2>
+<!--								<UserSelect2 style="width: 100%" ref="userSelect2" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @update:modelValue='(value) => {changeSignatory2(value)}'></UserSelect2>-->
+								<el-input :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" @blur="changeSignatory2(inputForm.signatureAnnotator2)" @focus="openUserDia2" v-model="inputForm.signatureAnnotator2Name" placeholder="请选择签字注师2">
+									<template #suffix>
+										<el-button :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true"  style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia2">
+										</el-button>
+									</template>
+								</el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="12">
@@ -149,7 +173,13 @@
 							<el-form-item label="报告实际制作人" prop="realCreate"
 										  :rules="[
                    ]">
-								<UserSelectAll :readonly="true" :disabled="true" :limit='1' :modelValue="inputForm.realCreate" @update:modelValue='(value) => {inputForm.realCreate = value}'></UserSelectAll>
+<!--								<UserSelectAll :readonly="true" :disabled="true" :limit='1' :modelValue="inputForm.realCreate" @update:modelValue='(value) => {inputForm.realCreate = value}'></UserSelectAll>-->
+								<el-input :readonly="true" :disabled="true" @focus="openUserDia3" v-model="inputForm.realCreateName" placeholder="请选择报告实际制作人">
+									<template #suffix>
+										<el-button :readonly="true" :disabled="true" style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia3">
+										</el-button>
+									</template>
+								</el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="12">
@@ -695,6 +725,9 @@
 		</el-row>
 		<ProjectRecoredChooseCom  ref="projectRecoredChooseCom" @getProject="getContract"></ProjectRecoredChooseCom>
 		<ReportServiceUnitForm ref="reportServiceUnitForm" @getWorkClientChoose="getWorkClientChoose"></ReportServiceUnitForm>
+		<user-select1 ref="userSelect1" @doSubmit="selectUser1"></user-select1>
+		<user-select2 ref="userSelect2" @doSubmit="selectUser2"></user-select2>
+		<user-select3 ref="userSelect3" @doSubmit="selectUser3"></user-select3>
 		<!--    <ReportCancellApplyChooseCom  ref="reportCancellApplyChooseCom" @getProject="getContract"></ReportCancellApplyChooseCom>-->
 	</div>
 </template>
@@ -706,7 +739,7 @@
 	// import UpLoadComponent from '@/views/common/UpLoadComponentV2.1'
 	import SelectTree from '@/components/treeSelect/treeSelect.vue'
 	import UserSelect from '../workClientInfo/clientUserSelect/AccountantUserIndex'
-	import UserSelect2 from '../workClientInfo/clientUserSelect/AccountantUserIndex2'
+	// import UserSelect2 from '../workClientInfo/clientUserSelect/AccountantUserIndex2'
 	import UserSelectAll from '@/components/userSelect'
 	import ReportCancellApplyService from '@/api/cw/reportCancellApply/ReportCancellApplyService'
 	import ReportReviewService from '@/api/cw/reportManagement/ReportReviewService'
@@ -714,6 +747,9 @@
 	import EnterpriseSearchService from '@/api/cw/common/EnterpriseSearchService'
 	import CommonApi from '@/api/cw/common/CommonApi'
 	import userService from "@/api/sys/userService";
+	import UserSelect1 from '@/views/utils/UserTreeSelect'
+	import UserSelect2 from '@/views/utils/UserTreeSelect'
+	import UserSelect3 from '@/views/utils/UserTreeSelect'
 	export default {
 		props: {
 			businessId: {
@@ -758,12 +794,15 @@
 					projectNumber: '',
 					officeId: '',
 					signatureAnnotator1: '',
+					signatureAnnotator1Name: '',
 					signatureAnnotator2: '',
+					signatureAnnotator2Name: '',
 					signatureType: '',
 					projectMasterName: '',
 					cwProjectInfoList: [],
 					status: '',
 					realCreate: '',
+					realCreateName: '',
 					userName: '',
 					detailFor1010: [],
 					detailFor1020: [],
@@ -868,7 +907,9 @@
 			SelectTree,
 			UserSelect,
 			UserSelect2,
-			UserSelectAll
+			UserSelectAll,
+			UserSelect1,
+			UserSelect3
 			// ReportCancellApplyChooseCom
 		},
 		methods: {
@@ -899,12 +940,15 @@
 					projectNumber: '',
 					officeId: '',
 					signatureAnnotator1: '',
+					signatureAnnotator1Name: '',
 					signatureAnnotator2: '',
+					signatureAnnotator2Name: '',
 					signatureType: '',
 					projectMasterName: '',
 					cwProjectInfoList: [],
 					status: '',
 					realCreate: '',
+					realCreateName: '',
 					userName: '',
 					detailFor1010: [],
 					detailFor1020: [],
@@ -1400,7 +1444,31 @@
 				this.inputForm.detailFor1030.forEach(res=>{
 					res.reviewComments=now.value
 				})
-			}
+			},
+			openUserDia1(){
+				this.$refs.userSelect1.init()
+			},
+			selectUser1(user){
+				console.log(user[0].name)
+				this.inputForm.signatureAnnotator1Name=user[0].name
+				this.inputForm.signatureAnnotator1=user[0].id
+			},
+			openUserDia2(){
+				this.$refs.userSelect2.init()
+			},
+			selectUser2(user){
+				console.log(user[0].name)
+				this.inputForm.signatureAnnotator2Name=user[0].name
+				this.inputForm.signatureAnnotator2=user[0].id
+			},
+			openUserDia3(){
+				this.$refs.userSelect3.init()
+			},
+			selectUser3(user){
+				console.log(user[0].name)
+				this.inputForm.realCreateName=user[0].name
+				this.inputForm.realCreate=user[0].id
+			},
 
 
 		}

+ 84 - 16
src/views/cw/reportManagement/reportReviewNew/ReportReviewFormNew.vue

@@ -123,8 +123,14 @@
                           {required: true, message: '签字注师1不能为空', trigger: 'blur'}
                    ]">
                 <!--                <el-input v-model="inputForm.signatureAnnotator1" placeholder="请填写签字注师1" clearable></el-input>-->
-                <UserSelect style="width: 100%" ref="userSelect1" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator1" @update:modelValue='(value) => {changeSignatory1(value)}'></UserSelect>
-              </el-form-item>
+<!--                <UserSelect style="width: 100%" ref="userSelect1" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator1" @update:modelValue='(value) => {changeSignatory1(value)}'></UserSelect>-->
+				  <el-input @blur="changeSignatory1(inputForm.signatureAnnotator1)" @focus="openUserDia1" v-model="inputForm.signatureAnnotator1Name" placeholder="请选择签字注师1">
+					  <template #suffix>
+						  <el-button  style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia1">
+						  </el-button>
+					  </template>
+				  </el-input>
+			  </el-form-item>
             </el-col>
 
             <el-col v-if="inputForm.signatureType === '1'|| inputForm.signatureType === '3' || commonJS.isEmpty(inputForm.signatureType)" :span="12">
@@ -132,8 +138,14 @@
                             :rules="[
                    ]">
                 <!--                <el-input v-model="inputForm.signatureAnnotator2" placeholder="请填写签字注师2" clearable></el-input>-->
-                <UserSelect2 style="width: 100%" ref="userSelect2" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @update:modelValue='(value) => {changeSignatory2(value)}'></UserSelect2>
-              </el-form-item>
+<!--                <UserSelect2 style="width: 100%" ref="userSelect2" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @update:modelValue='(value) => {changeSignatory2(value)}'></UserSelect2>-->
+				  <el-input @blur="changeSignatory2(inputForm.signatureAnnotator2)" @focus="openUserDia2" v-model="inputForm.signatureAnnotator2Name" placeholder="请选择签字注师2">
+					  <template #suffix>
+						  <el-button  style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia2">
+						  </el-button>
+					  </template>
+				  </el-input>
+			  </el-form-item>
             </el-col>
 
             <el-col v-if="inputForm.signatureType === '2'" :span="12">
@@ -143,8 +155,14 @@
                           {required: true, message: '签字注师1不能为空', trigger: 'blur'}
                    ]">
                 <!--                <el-input v-model="inputForm.signatureAnnotator1" placeholder="请填写签字注师1" clearable></el-input>-->
-                <UserSelect style="width: 100%" ref="userSelect1" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator1" @update:modelValue='(value) => {changeSignatory1(value)}'></UserSelect>
-              </el-form-item>
+<!--                <UserSelect style="width: 100%" ref="userSelect1" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator1" @update:modelValue='(value) => {changeSignatory1(value)}'></UserSelect>-->
+				  <el-input @blur="changeSignatory1(inputForm.signatureAnnotator1)" @focus="openUserDia1" v-model="inputForm.signatureAnnotator1Name" placeholder="请选择签字注师1">
+					  <template #suffix>
+						  <el-button  style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia1">
+						  </el-button>
+					  </template>
+				  </el-input>
+			  </el-form-item>
             </el-col>
 
             <el-col v-if="inputForm.signatureType === '2'" :span="12">
@@ -152,8 +170,14 @@
                             :rules="[
                    ]">
                 <!--                <el-input v-model="inputForm.signatureAnnotator2" placeholder="请填写签字注师2" clearable></el-input>-->
-                <UserSelect2 style="width: 100%" ref="userSelect2" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @update:modelValue='(value) => {changeSignatory2(value)}'></UserSelect2>
-              </el-form-item>
+<!--                <UserSelect2 style="width: 100%" ref="userSelect2" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @update:modelValue='(value) => {changeSignatory2(value)}'></UserSelect2>-->
+				  <el-input @blur="changeSignatory2(inputForm.signatureAnnotator2)" @focus="openUserDia2" v-model="inputForm.signatureAnnotator2Name" placeholder="请选择签字注师2">
+					  <template #suffix>
+						  <el-button  style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia2">
+						  </el-button>
+					  </template>
+				  </el-input>
+			  </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="审计意见类型" prop="opinionType"
@@ -183,7 +207,13 @@
               <el-form-item label="报告实际制作人" prop="realCreate"
                             :rules="[
                    ]">
-                <UserSelectAll :readonly="true" :disabled="status === 'audit' || status === 'taskFormDetail'" :limit='1' :modelValue="inputForm.realCreate" @update:modelValue='(value) => {inputForm.realCreate = value}'></UserSelectAll>
+<!--                <UserSelectAll :readonly="true" :disabled="status === 'audit' || status === 'taskFormDetail'" :limit='1' :modelValue="inputForm.realCreate" @update:modelValue='(value) => {inputForm.realCreate = value}'></UserSelectAll>-->
+				  <el-input @focus="openUserDia3" v-model="inputForm.realCreateName" placeholder="请选择报告实际制作人">
+					  <template #suffix>
+						  <el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia3">
+						  </el-button>
+					  </template>
+				  </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -731,6 +761,9 @@
     </el-row>
     <ProjectRecoredChooseCom  ref="projectRecoredChooseCom" @getProject="getContract"></ProjectRecoredChooseCom>
     <ReportServiceUnitForm ref="reportServiceUnitForm" @getWorkClientChoose="getWorkClientChoose"></ReportServiceUnitForm>
+	  <user-select1 ref="userSelect1" @doSubmit="selectUser1"></user-select1>
+	  <user-select2 ref="userSelect2" @doSubmit="selectUser2"></user-select2>
+	  <user-select3 ref="userSelect3" @doSubmit="selectUser3"></user-select3>
     <!--    <ReportCancellApplyChooseCom  ref="reportCancellApplyChooseCom" @getProject="getContract"></ReportCancellApplyChooseCom>-->
   </div>
 </template>
@@ -742,7 +775,7 @@
   import UpLoadComponent2 from '@/views/common/UpLoadComponentV2.1'
   import SelectTree from '@/components/treeSelect/treeSelect.vue'
   import UserSelect from '../../workClientInfo/clientUserSelect/AccountantUserIndex'
-  import UserSelect2 from '../../workClientInfo/clientUserSelect/AccountantUserIndex2'
+  // import UserSelect2 from '../../workClientInfo/clientUserSelect/AccountantUserIndex2'
   import UserSelectAll from '@/components/userSelect'
   import ReportCancellApplyService from '@/api/cw/reportCancellApply/ReportCancellApplyService'
   import ReportReviewService from '@/api/cw/reportManagement/ReportReviewService'
@@ -750,6 +783,9 @@
   import EnterpriseSearchService from '@/api/cw/common/EnterpriseSearchService'
   import CommonApi from '@/api/cw/common/CommonApi'
   import userService from "@/api/sys/userService";
+  import UserSelect1 from '@/views/utils/UserTreeSelect'
+  import UserSelect2 from '@/views/utils/UserTreeSelect'
+  import UserSelect3 from '@/views/utils/UserTreeSelect'
   export default {
     props: {
       businessId: {
@@ -790,13 +826,16 @@
           projectName: '',
           projectNumber: '',
           officeId: '',
-          signatureAnnotator1: '',
-          signatureAnnotator2: '',
+			signatureAnnotator1: '',
+			signatureAnnotator1Name: '',
+			signatureAnnotator2: '',
+			signatureAnnotator2Name: '',
           signatureType: '',
           projectMasterName: '',
           cwProjectInfoList: [],
           status: '',
           realCreate: '',
+			realCreateName: '',
           userName: '',
           detailFor1010: [],
           detailFor1020: [],
@@ -909,7 +948,9 @@
       SelectTree,
       UserSelect,
 	  UserSelect2,
-      UserSelectAll
+      UserSelectAll,
+		UserSelect1,
+		UserSelect3
       // ReportCancellApplyChooseCom
     },
     methods: {
@@ -942,13 +983,16 @@
           projectName: '',
           projectNumber: '',
           officeId: '',
-          signatureAnnotator1: '',
-          signatureAnnotator2: '',
+			signatureAnnotator1: '',
+			signatureAnnotator1Name: '',
+			signatureAnnotator2: '',
+			signatureAnnotator2Name: '',
           signatureType: '',
           projectMasterName: '',
           cwProjectInfoList: [],
           status: '',
           realCreate: '',
+			realCreateName: '',
           userName: '',
           detailFor1010: [],
           detailFor1020: [],
@@ -1647,7 +1691,31 @@
 				confirmButtonText: '确定',
 				type: 'warning'
 			})
-		}
+		},
+		openUserDia1(){
+			this.$refs.userSelect1.init()
+		},
+		selectUser1(user){
+			console.log(user[0].name)
+			this.inputForm.signatureAnnotator1Name=user[0].name
+			this.inputForm.signatureAnnotator1=user[0].id
+		},
+		openUserDia2(){
+			this.$refs.userSelect2.init()
+		},
+		selectUser2(user){
+			console.log(user[0].name)
+			this.inputForm.signatureAnnotator2Name=user[0].name
+			this.inputForm.signatureAnnotator2=user[0].id
+		},
+		openUserDia3(){
+			this.$refs.userSelect3.init()
+		},
+		selectUser3(user){
+			console.log(user[0].name)
+			this.inputForm.realCreateName=user[0].name
+			this.inputForm.realCreate=user[0].id
+		},
 
 
 	}

+ 84 - 16
src/views/cw/reportManagement/revocationSignature/RevocationSignature.vue

@@ -123,8 +123,14 @@
                           {required: true, message: '签字注师1不能为空', trigger: 'blur'}
                    ]">
                 <!--                <el-input v-model="inputForm.signatureAnnotator1" placeholder="请填写签字注师1" clearable></el-input>-->
-                <UserSelect style="width: 100%" ref="userSelect1" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator1" @update:modelValue='(value) => {changeSignatory1(value)}'></UserSelect>
-              </el-form-item>
+<!--                <UserSelect style="width: 100%" ref="userSelect1" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator1" @update:modelValue='(value) => {changeSignatory1(value)}'></UserSelect>-->
+				  <el-input :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" @blur="changeSignatory1(inputForm.signatureAnnotator1)" @focus="openUserDia1" v-model="inputForm.signatureAnnotator1Name" placeholder="请选择签字注师1">
+					  <template #suffix>
+						  <el-button :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true"  style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia1">
+						  </el-button>
+					  </template>
+				  </el-input>
+			  </el-form-item>
             </el-col>
 
             <el-col v-if="inputForm.signatureType === '1'|| inputForm.signatureType === '3' || commonJS.isEmpty(inputForm.signatureType)" :span="12">
@@ -132,8 +138,14 @@
                             :rules="[
                    ]">
                 <!--                <el-input v-model="inputForm.signatureAnnotator2" placeholder="请填写签字注师2" clearable></el-input>-->
-                <UserSelect2 style="width: 100%" ref="userSelect2" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @update:modelValue='(value) => {changeSignatory2(value)}'></UserSelect2>
-              </el-form-item>
+<!--                <UserSelect2 style="width: 100%" ref="userSelect2" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @update:modelValue='(value) => {changeSignatory2(value)}'></UserSelect2>-->
+				  <el-input :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" @blur="changeSignatory2(inputForm.signatureAnnotator2)" @focus="openUserDia2" v-model="inputForm.signatureAnnotator2Name" placeholder="请选择签字注师2">
+					  <template #suffix>
+						  <el-button :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true"  style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia2">
+						  </el-button>
+					  </template>
+				  </el-input>
+			  </el-form-item>
             </el-col>
 
             <el-col v-if="inputForm.signatureType === '2'" :span="12">
@@ -143,8 +155,14 @@
                           {required: true, message: '签字注师1不能为空', trigger: 'blur'}
                    ]">
                 <!--                <el-input v-model="inputForm.signatureAnnotator1" placeholder="请填写签字注师1" clearable></el-input>-->
-                <UserSelect style="width: 100%" ref="userSelect1" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator1" @update:modelValue='(value) => {changeSignatory1(value)}'></UserSelect>
-              </el-form-item>
+<!--                <UserSelect style="width: 100%" ref="userSelect1" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator1" @update:modelValue='(value) => {changeSignatory1(value)}'></UserSelect>-->
+				  <el-input :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" @blur="changeSignatory1(inputForm.signatureAnnotator1)" @focus="openUserDia1" v-model="inputForm.signatureAnnotator1Name" placeholder="请选择签字注师1">
+					  <template #suffix>
+						  <el-button :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia1">
+						  </el-button>
+					  </template>
+				  </el-input>
+			  </el-form-item>
             </el-col>
 
             <el-col v-if="inputForm.signatureType === '2'" :span="12">
@@ -152,8 +170,14 @@
                             :rules="[
                    ]">
                 <!--                <el-input v-model="inputForm.signatureAnnotator2" placeholder="请填写签字注师2" clearable></el-input>-->
-                <UserSelect2 style="width: 100%" ref="userSelect2" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @update:modelValue='(value) => {changeSignatory2(value)}'></UserSelect2>
-              </el-form-item>
+<!--                <UserSelect2 style="width: 100%" ref="userSelect2" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @update:modelValue='(value) => {changeSignatory2(value)}'></UserSelect2>-->
+				  <el-input :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" @blur="changeSignatory2(inputForm.signatureAnnotator2)" @focus="openUserDia2" v-model="inputForm.signatureAnnotator2Name" placeholder="请选择签字注师2">
+					  <template #suffix>
+						  <el-button :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true"  style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia2">
+						  </el-button>
+					  </template>
+				  </el-input>
+			  </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="审计意见类型" prop="opinionType"
@@ -183,7 +207,13 @@
               <el-form-item label="报告实际制作人" prop="realCreate"
                             :rules="[
                    ]">
-                <UserSelectAll :readonly="true" :disabled="status === 'audit' || status === 'taskFormDetail'" :limit='1' :modelValue="inputForm.realCreate" @update:modelValue='(value) => {inputForm.realCreate = value}'></UserSelectAll>
+<!--                <UserSelectAll :readonly="true" :disabled="status === 'audit' || status === 'taskFormDetail'" :limit='1' :modelValue="inputForm.realCreate" @update:modelValue='(value) => {inputForm.realCreate = value}'></UserSelectAll>-->
+				  <el-input :readonly="true" :disabled="true" @focus="openUserDia3" v-model="inputForm.realCreateName" placeholder="请选择报告实际制作人">
+					  <template #suffix>
+						  <el-button :readonly="true" :disabled="true" style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia3">
+						  </el-button>
+					  </template>
+				  </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -530,6 +560,9 @@
     </el-row>
     <ProjectRecoredChooseCom  ref="projectRecoredChooseCom" @getProject="getContract"></ProjectRecoredChooseCom>
     <ReportServiceUnitForm ref="reportServiceUnitForm" @getWorkClientChoose="getWorkClientChoose"></ReportServiceUnitForm>
+	  <user-select1 ref="userSelect1" @doSubmit="selectUser1"></user-select1>
+	  <user-select2 ref="userSelect2" @doSubmit="selectUser2"></user-select2>
+	  <user-select3 ref="userSelect3" @doSubmit="selectUser3"></user-select3>
     <!--    <ReportCancellApplyChooseCom  ref="reportCancellApplyChooseCom" @getProject="getContract"></ReportCancellApplyChooseCom>-->
   </div>
 </template>
@@ -539,7 +572,7 @@
   import ReportServiceUnitForm from '../ReportServiceUnitForm'
   import SelectTree from '@/components/treeSelect/treeSelect.vue'
   import UserSelect from '../../workClientInfo/clientUserSelect/AccountantUserIndex'
-  import UserSelect2 from '../../workClientInfo/clientUserSelect/AccountantUserIndex2'
+  // import UserSelect2 from '../../workClientInfo/clientUserSelect/AccountantUserIndex2'
   import UserSelectAll from '@/components/userSelect'
   import ReportCancellApplyService from '@/api/cw/reportCancellApply/ReportCancellApplyService'
   import ReportReviewService from '@/api/cw/reportManagement/ReportReviewService'
@@ -547,6 +580,9 @@
   import EnterpriseSearchService from '@/api/cw/common/EnterpriseSearchService'
   import CommonApi from '@/api/cw/common/CommonApi'
   import userService from "@/api/sys/userService";
+  import UserSelect1 from '@/views/utils/UserTreeSelect'
+  import UserSelect2 from '@/views/utils/UserTreeSelect'
+  import UserSelect3 from '@/views/utils/UserTreeSelect'
   export default {
     props: {
       businessId: {
@@ -587,13 +623,16 @@
           projectName: '',
           projectNumber: '',
           officeId: '',
-          signatureAnnotator1: '',
-          signatureAnnotator2: '',
+			signatureAnnotator1: '',
+			signatureAnnotator1Name: '',
+			signatureAnnotator2: '',
+			signatureAnnotator2Name: '',
           signatureType: '',
           projectMasterName: '',
           cwProjectInfoList: [],
           status: '',
           realCreate: '',
+			realCreateName: '',
           userName: '',
           detailFor1010: [],
           detailFor1020: [],
@@ -701,7 +740,9 @@
       SelectTree,
       UserSelect,
 	  UserSelect2,
-      UserSelectAll
+      UserSelectAll,
+		UserSelect1,
+		UserSelect3
       // ReportCancellApplyChooseCom
     },
     methods: {
@@ -734,13 +775,16 @@
           projectName: '',
           projectNumber: '',
           officeId: '',
-          signatureAnnotator1: '',
-          signatureAnnotator2: '',
+			signatureAnnotator1: '',
+			signatureAnnotator1Name: '',
+			signatureAnnotator2: '',
+			signatureAnnotator2Name: '',
           signatureType: '',
           projectMasterName: '',
           cwProjectInfoList: [],
           status: '',
           realCreate: '',
+			realCreateName: '',
           userName: '',
           detailFor1010: [],
           detailFor1020: [],
@@ -1238,7 +1282,31 @@
 				confirmButtonText: '确定',
 				type: 'warning'
 			})
-		}
+		},
+		openUserDia1(){
+			this.$refs.userSelect1.init()
+		},
+		selectUser1(user){
+			console.log(user[0].name)
+			this.inputForm.signatureAnnotator1Name=user[0].name
+			this.inputForm.signatureAnnotator1=user[0].id
+		},
+		openUserDia2(){
+			this.$refs.userSelect2.init()
+		},
+		selectUser2(user){
+			console.log(user[0].name)
+			this.inputForm.signatureAnnotator2Name=user[0].name
+			this.inputForm.signatureAnnotator2=user[0].id
+		},
+		openUserDia3(){
+			this.$refs.userSelect3.init()
+		},
+		selectUser3(user){
+			console.log(user[0].name)
+			this.inputForm.realCreateName=user[0].name
+			this.inputForm.realCreate=user[0].id
+		},
 
 
 	}

+ 20 - 3
src/views/cw/signatureDaily/SignatureDailyList.vue

@@ -29,7 +29,13 @@
 				</el-date-picker>
 			</el-form-item>
 			<el-form-item v-if="showHideItem" label="创建人" prop="createById">
-				<UserSelect :limit='1' :modelValue="searchForm.createById" @update:modelValue='(value, label) => {searchForm.createById = value}'></UserSelect>
+<!--				<UserSelect :limit='1' :modelValue="searchForm.createById" @update:modelValue='(value, label) => {searchForm.createById = value}'></UserSelect>-->
+				<el-input  v-model="searchForm.createById" placeholder="请选择创建人">
+					<template #suffix>
+						<el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia">
+						</el-button>
+					</template>
+				</el-input>
 			</el-form-item>
 
 			<el-form-item v-if="showHideItem" label="签章状态" prop="status">
@@ -156,6 +162,10 @@
 				</vxe-pager>
 
 				<SignatureDailyDia ref="signatureDailyDia" @refreshDataList="refreshList"></SignatureDailyDia>
+				<user-select
+					ref="userSelect2"
+					@doSubmit="selectUser">
+				</user-select>
 			</div>
 		</div>
 	</div>
@@ -163,7 +173,7 @@
 
 <script>
 	import SignatureDailyService from '@/api/cw/signatureDaily/SignatureDailyService'
-	import UserSelect from '@/components/userSelect'
+	import UserSelect from '@/views/utils/UserTreeSelect'
 	import SelectTree from '@/components/treeSelect/treeSelect.vue'
 	import SignatureDailyDia from "./SignatureDailyDia";
 	import taskService from '@/api/flowable/TaskService'
@@ -540,7 +550,14 @@
 					}
 				}
 				return false
-			}
+			},
+			openUserDia(){
+				this.$refs.userSelect2.init()
+			},
+			selectUser(user){
+				console.log(user[0].name)
+				this.searchForm.createById=user[0].name
+			},
 		}
 	}
 </script>

+ 19 - 3
src/views/cw/signatureDaily/SignatureReportList.vue

@@ -29,7 +29,12 @@
 				</el-date-picker>
 			</el-form-item>
 			<el-form-item v-if="showHideItem" label="创建人" prop="createById">
-				<UserSelect :limit='1' :modelValue="searchForm.createById" @update:modelValue='(value, label) => {searchForm.createById = value}'></UserSelect>
+				<el-input  v-model="searchForm.createById" placeholder="请选择创建人">
+					<template #suffix>
+						<el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia">
+						</el-button>
+					</template>
+				</el-input>
 			</el-form-item>
 
 			<el-form-item v-if="showHideItem" label="签章状态" prop="status">
@@ -157,6 +162,10 @@
 				</vxe-pager>
 
 				<SignatureReportDia ref="signatureReportDia" @refreshDataList="refreshList"></SignatureReportDia>
+				<user-select
+					ref="userSelect2"
+					@doSubmit="selectUser">
+				</user-select>
 			</div>
 		</div>
 	</div>
@@ -164,7 +173,7 @@
 
 <script>
 	import SignatureReportService from '@/api/cw/signatureDaily/SignatureReportService'
-	import UserSelect from '@/components/userSelect'
+	import UserSelect from '@/views/utils/UserTreeSelect'
 	import SelectTree from '@/components/treeSelect/treeSelect.vue'
 	import SignatureReportDia from "./SignatureReportDia";
 	import taskService from '@/api/flowable/TaskService'
@@ -534,7 +543,14 @@
 					}
 				}
 				return false
-			}
+			},
+			openUserDia(){
+				this.$refs.userSelect2.init()
+			},
+			selectUser(user){
+				console.log(user[0].name)
+				this.searchForm.createById=user[0].name
+			},
 		}
 	}
 </script>

+ 31 - 15
src/views/cw/workContract/ContractRegistration.vue

@@ -59,19 +59,25 @@
 			  </el-date-picker>
 		  </el-form-item>
 		  <el-form-item v-if="showHideItem" prop="createById" label="创建人:">
-			  <SelectUserTree
-				  ref="companyTree"
-				  :props="{
-                  value: 'id',             // ID字段名
-                  label: 'name',         // 显示名称
-                  children: 'children'    // 子级字段名
-                }"
-				  :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"
-				  :value="searchForm.createById"
-				  :clearable="true"
-				  :accordion="true"
-				  size="default"
-				  @getValue="(value) => {searchForm.createById=value}"/>
+<!--			  <SelectUserTree-->
+<!--				  ref="companyTree"-->
+<!--				  :props="{-->
+<!--                  value: 'id',             // ID字段名-->
+<!--                  label: 'name',         // 显示名称-->
+<!--                  children: 'children'    // 子级字段名-->
+<!--                }"-->
+<!--				  :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"-->
+<!--				  :value="searchForm.createById"-->
+<!--				  :clearable="true"-->
+<!--				  :accordion="true"-->
+<!--				  size="default"-->
+<!--				  @getValue="(value) => {searchForm.createById=value}"/>-->
+			  <el-input  v-model="searchForm.createById" placeholder="请选择创建人">
+				  <template #suffix>
+					  <el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia">
+					  </el-button>
+				  </template>
+			  </el-input>
 		  </el-form-item>
 		  <el-form-item  v-if="showHideItem" prop="department" label="所属部门:">
 			  <SelectTree
@@ -262,6 +268,7 @@
     <WorkClientForm ref="workClientForm" @refreshDataList="refreshList"></WorkClientForm>
 	  <WorkClientChooseRadio ref="workClientChooseRadio" @getWorkClientRadioChoose="getWorkClientChoose2"></WorkClientChooseRadio>
 	  <WorkContractBorrowMessageForm ref="workContractBorrowMessageForm" @refreshDataList="refreshList"></WorkContractBorrowMessageForm>
+	  <user-select ref="userSelect2" @doSubmit="selectUser"></user-select>
   </div>
 </template>
 
@@ -282,6 +289,7 @@
   import userService from '@/api/sys/UserService'
   import SelectTree from '@/components/treeSelect/treeSelect.vue'
   import WorkClientChooseRadio from '@/views/cw/workClientInfo/WorkClientChooseRadioList'
+	import UserSelect from '@/views/utils/UserTreeSelect'
   export default {
     data () {
       return {
@@ -339,7 +347,8 @@
       WorkContractBorrowMessageForm,
       SelectUserTree,
       SelectTree,
-	  WorkClientChooseRadio
+	  WorkClientChooseRadio,
+		UserSelect
     },
     activated () {
       this.is()
@@ -1059,7 +1068,14 @@
 		  },
 		  getWorkClientChoose2(row){
       		this.searchForm.clientContactsName=row.name
-		  }
+		  },
+		  openUserDia(){
+			  this.$refs.userSelect2.init()
+		  },
+		  selectUser(user){
+			  console.log(user[0].name)
+			  this.searchForm.createById=user[0].name
+		  },
     }
   }
 </script>

+ 67 - 29
src/views/finance/invoice/InvoiceForm.vue

@@ -326,19 +326,25 @@
             <el-form-item label="实际开票人" prop="billingPeopleReal"
                           :rules="[
                  ]">
-              <SelectUserTree
-                ref="companyTree"
-                size="large"
-                :props="{
-                  value: 'id',             // ID字段名
-                  label: 'name',         // 显示名称
-                  children: 'children'    // 子级字段名
-                }"
-                :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"
-                :value="inputForm.billingPeopleReal"
-                :clearable="true"
-                :accordion="true"
-                @getValue="(value) => {inputForm.billingPeopleReal=value}"/>
+<!--              <SelectUserTree-->
+<!--                ref="companyTree"-->
+<!--                size="large"-->
+<!--                :props="{-->
+<!--                  value: 'id',             // ID字段名-->
+<!--                  label: 'name',         // 显示名称-->
+<!--                  children: 'children'    // 子级字段名-->
+<!--                }"-->
+<!--                :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"-->
+<!--                :value="inputForm.billingPeopleReal"-->
+<!--                :clearable="true"-->
+<!--                :accordion="true"-->
+<!--                @getValue="(value) => {inputForm.billingPeopleReal=value}"/>-->
+				<el-input  :readonly="true"  @focus="openUserDia1" v-model="inputForm.billingPeopleRealName" placeholder="请选择实际开票人">
+					<template #suffix>
+						<el-button  :readonly="true" style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia1">
+						</el-button>
+					</template>
+				</el-input>
             </el-form-item>
           </el-col>
 
@@ -357,19 +363,25 @@
             <el-form-item label="对账人" prop="reconciliationPeople"
                           :rules="[
                  ]">
-              <SelectUserTree
-                ref="companyTree"
-                size="large"
-                :props="{
-                  value: 'id',             // ID字段名
-                  label: 'name',         // 显示名称
-                  children: 'children'    // 子级字段名
-                }"
-                :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"
-                :value="inputForm.reconciliationPeople"
-                :clearable="true"
-                :accordion="true"
-                @getValue="(value) => {inputForm.reconciliationPeople=value}"/>
+<!--              <SelectUserTree-->
+<!--                ref="companyTree"-->
+<!--                size="large"-->
+<!--                :props="{-->
+<!--                  value: 'id',             // ID字段名-->
+<!--                  label: 'name',         // 显示名称-->
+<!--                  children: 'children'    // 子级字段名-->
+<!--                }"-->
+<!--                :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"-->
+<!--                :value="inputForm.reconciliationPeople"-->
+<!--                :clearable="true"-->
+<!--                :accordion="true"-->
+<!--                @getValue="(value) => {inputForm.reconciliationPeople=value}"/>-->
+				<el-input  :readonly="true"  @focus="openUserDia2" v-model="inputForm.reconciliationPeopleName" placeholder="请选择对账人">
+					<template #suffix>
+						<el-button  :readonly="true" style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia2">
+						</el-button>
+					</template>
+				</el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -610,6 +622,8 @@
     <ProgramPageForm ref="programPageForm" @getProgram="getProgram"></ProgramPageForm>
     <ContractForm  ref="contractForm" @getContract="getContract"></ContractForm>
     <WorkClientForm  ref="workClientForm" @getWorkClient="getWorkClient"></WorkClientForm>
+	  <user-select1 ref="userSelect1" @doSubmit="selectUser1"></user-select1>
+	  <user-select2 ref="userSelect2" @doSubmit="selectUser2"></user-select2>
   </div>
 </template>
 
@@ -622,6 +636,8 @@
   import WorkClientForm from '@/views/program/registered/WorkClientForm'
   import SelectUserTree from '@/views/utils/treeUserSelect'
   import SelectTree from '@/components/treeSelect/treeSelect.vue'
+  import UserSelect1 from '@/views/utils/UserTreeSelect'
+  import UserSelect2 from '@/views/utils/UserTreeSelect'
   export default {
     data () {
       return {
@@ -656,7 +672,9 @@
           billingDate: '',
           collectDate: '',
           billingPeopleReal: this.$store.state.user.id,
-          reconciliationPeople: '',
+			billingPeopleRealName: '',
+			reconciliationPeople: '',
+			reconciliationPeopleName: '',
           reconciliationArea: '',
           remarks: '',
           name: '',
@@ -694,7 +712,9 @@
       WorkClientForm,
       SelectUserTree,
       SelectTree,
-      UpLoadComponent
+      UpLoadComponent,
+		UserSelect1,
+		UserSelect2
     },
     methods: {
       init (receivablesFlag, id, meth) {
@@ -742,7 +762,9 @@
           billingDate: '',
           collectDate: '',
           billingPeopleReal: this.$store.state.user.id,
+			billingPeopleRealName: '',
           reconciliationPeople: '',
+			reconciliationPeopleName: '',
           reconciliationArea: '',
           remarks: '',
           name: '',
@@ -1240,7 +1262,23 @@
           })
         }
         this.$message.success('导入完成')
-      }
+      },
+		openUserDia1(){
+			this.$refs.userSelect1.init()
+		},
+		selectUser1(user){
+			console.log(user[0].name)
+			this.inputForm.billingPeopleRealName=user[0].name
+			this.inputForm.billingPeopleReal=user[0].id
+		},
+		openUserDia2(){
+			this.$refs.userSelect2.init()
+		},
+		selectUser2(user){
+			console.log(user[0].name)
+			this.inputForm.reconciliationPeopleName=user[0].name
+			this.inputForm.reconciliationPeople=user[0].id
+		},
     }
   }
 </script>

+ 68 - 30
src/views/finance/invoice/InvoiceFormTask.vue

@@ -335,19 +335,25 @@
                         {required: true, message:'实际开票人不能为空', trigger:'blur'},
                         {required: true, message:'实际开票人不能为空', trigger:'change'}
                ]">
-            <SelectUserTree
-              ref="companyTree"
-              size="large"
-              :props="{
-                value: 'id',             // ID字段名
-                label: 'name',         // 显示名称
-                children: 'children'    // 子级字段名
-              }"
-              :url="`/system-server/sys/user/treeUserDataAccessOffice?type=2`"
-              :value="inputForm.billingPeopleReal"
-              :clearable="true"
-              :accordion="true"
-              @getValue="(value) => {inputForm.billingPeopleReal=value}"/>
+<!--            <SelectUserTree-->
+<!--              ref="companyTree"-->
+<!--              size="large"-->
+<!--              :props="{-->
+<!--                value: 'id',             // ID字段名-->
+<!--                label: 'name',         // 显示名称-->
+<!--                children: 'children'    // 子级字段名-->
+<!--              }"-->
+<!--              :url="`/system-server/sys/user/treeUserDataAccessOffice?type=2`"-->
+<!--              :value="inputForm.billingPeopleReal"-->
+<!--              :clearable="true"-->
+<!--              :accordion="true"-->
+<!--              @getValue="(value) => {inputForm.billingPeopleReal=value}"/>-->
+			  <el-input  :readonly="true"  @focus="openUserDia1" v-model="inputForm.billingPeopleRealName" placeholder="请选择实际开票人">
+				  <template #suffix>
+					  <el-button  :readonly="true" style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia1">
+					  </el-button>
+				  </template>
+			  </el-input>
           </el-form-item>
         </el-col>
 		  <el-col :span="12">
@@ -366,19 +372,25 @@
                         {required: true, message:'对账人不能为空', trigger:'blur'},
                         {required: true, message:'对账人不能为空', trigger:'change'}
                ]">
-            <SelectUserTree
-              ref="companyTree"
-              size="large"
-              :props="{
-                value: 'id',             // ID字段名
-                label: 'name',         // 显示名称
-                children: 'children'    // 子级字段名
-              }"
-              :url="`/system-server/sys/user/treeUserDataAccessOffice?type=2`"
-              :value="inputForm.reconciliationPeople"
-              :clearable="true"
-              :accordion="true"
-              @getValue="(value) => {inputForm.reconciliationPeople=value}"/>
+<!--            <SelectUserTree-->
+<!--              ref="companyTree"-->
+<!--              size="large"-->
+<!--              :props="{-->
+<!--                value: 'id',             // ID字段名-->
+<!--                label: 'name',         // 显示名称-->
+<!--                children: 'children'    // 子级字段名-->
+<!--              }"-->
+<!--              :url="`/system-server/sys/user/treeUserDataAccessOffice?type=2`"-->
+<!--              :value="inputForm.reconciliationPeople"-->
+<!--              :clearable="true"-->
+<!--              :accordion="true"-->
+<!--              @getValue="(value) => {inputForm.reconciliationPeople=value}"/>-->
+			  <el-input  :readonly="true"  @focus="openUserDia2" v-model="inputForm.reconciliationPeopleName" placeholder="请选择对账人">
+				  <template #suffix>
+					  <el-button  :readonly="true" style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia2">
+					  </el-button>
+				  </template>
+			  </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -633,6 +645,8 @@
     <ProgramPageForm ref="programPageForm" @getProgram="getProgram"></ProgramPageForm>
     <ContractForm  ref="contractForm" @getContract="getContract"></ContractForm>
     <WorkClientForm  ref="workClientForm" @getWorkClient="getWorkClient"></WorkClientForm>
+	  <user-select1 ref="userSelect1" @doSubmit="selectUser1"></user-select1>
+	  <user-select2 ref="userSelect2" @doSubmit="selectUser2"></user-select2>
 	  <!--		邮箱弹窗-->
 	  <el-dialog v-model="dialogFormVisible" style="width: 50%" title="邮箱修改">
 		  <el-form :model="form" label-width="160px">
@@ -680,6 +694,8 @@
   import SelectUserTree from '@/views/utils/treeUserSelect'
   import SelectTree from '@/components/treeSelect/treeSelect.vue'
   import userService from "../../../api/sys/userService";
+  import UserSelect1 from '@/views/utils/UserTreeSelect'
+  import UserSelect2 from '@/views/utils/UserTreeSelect'
   export default {
     props: {
       businessId: {
@@ -729,8 +745,10 @@
           billingDate: '',
           collectDate: '',
           billingPeopleReal: this.$store.state.user.id,
-          reconciliationPeople: '',
-          reconciliationArea: '',
+			billingPeopleRealName: '',
+			reconciliationPeople: '',
+			reconciliationPeopleName: '',
+			reconciliationArea: '',
           remarks: '',
           name: '',
           status: '',
@@ -771,7 +789,9 @@
       WorkClientForm,
       SelectUserTree,
       SelectTree,
-      UpLoadComponent
+      UpLoadComponent,
+		UserSelect1,
+		UserSelect2
     },
     computed: {
       bus: {
@@ -837,7 +857,9 @@
           billingDate: '',
           collectDate: '',
           billingPeopleReal: this.$store.state.user.id,
+			billingPeopleRealName: '',
           reconciliationPeople: '',
+			reconciliationPeopleName: '',
           reconciliationArea: '',
           remarks: '',
           name: '',
@@ -1563,7 +1585,23 @@
 					throw new Error("请输入正确的邮箱地址")
 				}
 			}
-		}
+		},
+		openUserDia1(){
+			this.$refs.userSelect1.init()
+		},
+		selectUser1(user){
+			console.log(user[0].name)
+			this.inputForm.billingPeopleRealName=user[0].name
+			this.inputForm.billingPeopleReal=user[0].id
+		},
+		openUserDia2(){
+			this.$refs.userSelect2.init()
+		},
+		selectUser2(user){
+			console.log(user[0].name)
+			this.inputForm.reconciliationPeopleName=user[0].name
+			this.inputForm.reconciliationPeople=user[0].id
+		},
     }
   }
 </script>

+ 39 - 7
src/views/finance/invoice/InvoiceList.vue

@@ -40,12 +40,24 @@
             clearable>
           </el-input-number>
         </el-form-item>
-        <el-form-item v-if="showHideItem" prop="reconciliationPeople" label="对账人">
-          <UserSelect :limit='1' :modelValue="searchForm.reconciliationPeople" @update:modelValue='(value, label) => {searchForm.reconciliationPeople = value}'></UserSelect>
-        </el-form-item>
+        <el-form-item v-if="showHideItem" prop="reconciliationPeopleName" label="对账人">
+<!--          <UserSelect :limit='1' :modelValue="searchForm.reconciliationPeople" @update:modelValue='(value, label) => {searchForm.reconciliationPeople = value}'></UserSelect>-->
+			<el-input  v-model="searchForm.reconciliationPeopleName" placeholder="请选择对账人">
+				<template #suffix>
+					<el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia1">
+					</el-button>
+				</template>
+			</el-input>
+		</el-form-item>
         <el-form-item v-if="showHideItem" label="经办人" prop="operator">
-          <UserSelect :limit='1' :modelValue="searchForm.operator" @update:modelValue='(value, label) => {searchForm.operator = value}'></UserSelect>
-        </el-form-item>
+<!--          <UserSelect :limit='1' :modelValue="searchForm.operator" @update:modelValue='(value, label) => {searchForm.operator = value}'></UserSelect>-->
+			<el-input  v-model="searchForm.operator" placeholder="请选择经办人">
+				<template #suffix>
+					<el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia2">
+					</el-button>
+				</template>
+			</el-input>
+		</el-form-item>
         <el-form-item v-if="showHideItem" prop="operatorOffice" label="经办人部门">
           <SelectTree
             ref="officeTree"
@@ -294,6 +306,8 @@
     <InvoiceForm  ref="invoiceForm" @refreshDataList="refreshList"></InvoiceForm>
     <ProgramPageForm ref="programPageForm" @getProgram="getProgram"></ProgramPageForm>
     <ProgramForm ref="programForm"></ProgramForm>
+	  <user-select1 ref="userSelect1" @doSubmit="selectUser1"></user-select1>
+	  <user-select2 ref="userSelect2" @doSubmit="selectUser2"></user-select2>
   </div>
 </template>
 
@@ -309,6 +323,8 @@
   import SelectUserTree from '@/views/utils/treeUserSelect'
   import SelectTree from '@/components/treeSelect/treeSelect.vue'
   import ProgramPageForm from '@/views/finance/invoice/ProgramPageForm'
+  import UserSelect1 from '@/views/utils/UserTreeSelect'
+  import UserSelect2 from '@/views/utils/UserTreeSelect'
   export default {
     data () {
       return {
@@ -367,7 +383,9 @@
       SelectUserTree,
       SelectTree,
       ProgramPageForm,
-      ProgramForm
+      ProgramForm,
+		UserSelect1,
+		UserSelect2,
     },
 	  mounted() {
 		  this.$nextTick(() => {
@@ -904,7 +922,21 @@
           }
         }
         return false
-      }
+      },
+		openUserDia1(){
+			this.$refs.userSelect1.init()
+		},
+		selectUser1(user){
+			console.log(user[0].name)
+			this.searchForm.reconciliationPeopleName=user[0].name
+		},
+		openUserDia2(){
+			this.$refs.userSelect2.init()
+		},
+		selectUser2(user){
+			console.log(user[0].name)
+			this.searchForm.operator=user[0].name
+		},
     }
   }
 </script>

+ 70 - 8
src/views/program/registered/ProjectArchiveForm.vue

@@ -112,8 +112,14 @@
                             :rules=" [
                         {required: true, message:'签字评估师1不能为空', trigger:'blur'}
                         ]" >
-                <UserSelect :disabled="status === 'audit' || status === 'taskFormDetail'|| method === 'view'" :readonly="true" :limit='1' :modelValue="inputForm.signatureEvaluatorFirst" @update:modelValue='(value) => {inputForm.signatureEvaluatorFirst = value}'></UserSelect>
-              </el-form-item>
+<!--                <UserSelect :disabled="status === 'audit' || status === 'taskFormDetail'|| method === 'view'" :readonly="true" :limit='1' :modelValue="inputForm.signatureEvaluatorFirst" @update:modelValue='(value) => {inputForm.signatureEvaluatorFirst = value}'></UserSelect>-->
+				  <el-input :disabled="status === 'audit' || status === 'taskFormDetail'|| method === 'view'" :readonly="true" @focus="openUserDia1"  v-model="inputForm.signatureEvaluatorFirstName" placeholder="请选择签字评估师1">
+					  <template #suffix>
+						  <el-button :disabled="status === 'audit' || status === 'taskFormDetail'|| method === 'view'" :readonly="true" style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia1">
+						  </el-button>
+					  </template>
+				  </el-input>
+			  </el-form-item>
             </el-col>
 
 
@@ -122,8 +128,14 @@
                             :rules=" [
                         {required: true, message:'签字评估师2不能为空', trigger:'blur'}
                         ]" >
-                <UserSelect :disabled="status === 'audit' || status === 'taskFormDetail'|| method === 'view'" :readonly="true" :limit='1' :modelValue="inputForm.signatureEvaluatorSecond" @update:modelValue='(value) => {inputForm.signatureEvaluatorSecond = value}'></UserSelect>
-              </el-form-item>
+<!--                <UserSelect :disabled="status === 'audit' || status === 'taskFormDetail'|| method === 'view'" :readonly="true" :limit='1' :modelValue="inputForm.signatureEvaluatorSecond" @update:modelValue='(value) => {inputForm.signatureEvaluatorSecond = value}'></UserSelect>-->
+				  <el-input :disabled="status === 'audit' || status === 'taskFormDetail'|| method === 'view'" :readonly="true" @focus="openUserDia2"  v-model="inputForm.signatureEvaluatorSecondName" placeholder="请选择签字评估师2">
+					  <template #suffix>
+						  <el-button :disabled="status === 'audit' || status === 'taskFormDetail'|| method === 'view'" :readonly="true" style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia2">
+						  </el-button>
+					  </template>
+				  </el-input>
+			  </el-form-item>
             </el-col>
 
             <el-col :span="12">
@@ -423,8 +435,14 @@
                             :rules=" [
                         {required: true, message:'当前处理人不能为空', trigger:'blur'}
                         ]" >
-                <UserSelect :disabled="status === 'audit' || status === 'taskFormDetail'||method === 'view'" :readonly="true" :limit='1' :modelValue="inputForm.currentDisposePerson" @update:modelValue='(value) => {inputForm.currentDisposePerson = value}'></UserSelect>
-              </el-form-item>
+<!--                <UserSelect :disabled="status === 'audit' || status === 'taskFormDetail'||method === 'view'" :readonly="true" :limit='1' :modelValue="inputForm.currentDisposePerson" @update:modelValue='(value) => {inputForm.currentDisposePerson = value}'></UserSelect>-->
+				  <el-input :disabled="status === 'audit' || status === 'taskFormDetail'|| method === 'view'" :readonly="true" @focus="openUserDia3"  v-model="inputForm.currentDisposePersonName" placeholder="请选择当前处理人">
+					  <template #suffix>
+						  <el-button :disabled="status === 'audit' || status === 'taskFormDetail'|| method === 'view'" :readonly="true" style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia3">
+						  </el-button>
+					  </template>
+				  </el-input>
+			  </el-form-item>
             </el-col>
             <el-col :span="12">
               <!--              原司法鉴定-->
@@ -489,6 +507,9 @@
 		<UpLoadComponent ref="uploadComponentPapers"></UpLoadComponent>
 		<!--附件信息 - 其他-->
 		<UpLoadComponent ref="uploadComponentOther"></UpLoadComponent>
+		<user-select1 ref="userSelect1" @doSubmit="selectUser1"></user-select1>
+		<user-select2 ref="userSelect2" @doSubmit="selectUser2"></user-select2>
+		<user-select3 ref="userSelect3" @doSubmit="selectUser3"></user-select3>
 
     </div>
 
@@ -502,6 +523,10 @@
   import RosterSelectForm from '@/views/common/RosterSelectForm'
   import ProgramProjectListInfoService from '@/api/program/ProgramProjectListInfoService'
   import WangEditor from '@/components/editor/WangEditorNoMenu'
+  import UserSelect1 from '@/views/utils/UserTreeSelect'
+  import UserSelect2 from '@/views/utils/UserTreeSelect'
+  import UserSelect3 from '@/views/utils/UserTreeSelect'
+
   export default {
     props: {
       businessId: {
@@ -539,6 +564,7 @@
           reportCharges: 0,
           rentType: '',
           currentDisposePerson: '',
+          currentDisposePersonName: '',
           isInvoice: '',
           invoiceDate: '',
           actualCharges: 0,
@@ -562,7 +588,9 @@
           otherFileList: [],
           auditUserId: '',
           signatureEvaluatorFirst: '',
+          signatureEvaluatorFirstName: '',
           signatureEvaluatorSecond: '',
+          signatureEvaluatorSecondName: '',
           reportNo: '',
           contractNo: '',
 		  reportType: ''
@@ -621,7 +649,10 @@
       RosterSelectForm,
       UserSelect,
       WangEditor,
-      SelectUserTree
+      SelectUserTree,
+		UserSelect1,
+		UserSelect2,
+		UserSelect3
     },
     methods: {
       getKeyWatch (keyWatch) {
@@ -649,6 +680,7 @@
           reportCharges: 0,
           rentType: '',
           currentDisposePerson: '',
+          currentDisposePersonName: '',
           isInvoice: '',
           invoiceDate: '',
           actualCharges: 0,
@@ -672,7 +704,9 @@
           otherFileList: [],
           auditUserId: '',
           signatureEvaluatorFirst: '',
+          signatureEvaluatorFirstName: '',
           signatureEvaluatorSecond: '',
+          signatureEvaluatorSecondName: '',
           reportNo: '',
           contractNo: ''
         }
@@ -693,6 +727,7 @@
             reportCharges: 0,
             rentType: '',
             currentDisposePerson: '',
+            currentDisposePersonName: '',
             isInvoice: '',
             invoiceDate: '',
             actualCharges: 0,
@@ -716,7 +751,9 @@
             otherFileList: [],
             auditUserId: '',
             signatureEvaluatorFirst: '',
+            signatureEvaluatorFirstName: '',
             signatureEvaluatorSecond: '',
+            signatureEvaluatorSecondName: '',
             reportNo: '',
             contractNo: ''
           }
@@ -1056,7 +1093,32 @@
         }
         this.$refs.inputForm.resetFields()
         this.visible = false
-      }
+      },
+		openUserDia1(){
+			this.$refs.userSelect1.init()
+		},
+		selectUser1(user){
+			console.log(user[0].name)
+			this.inputForm.signatureEvaluatorFirstName=user[0].name
+			this.inputForm.signatureEvaluatorFirst=user[0].id
+		},
+		openUserDia2(){
+			this.$refs.userSelect2.init()
+		},
+		selectUser2(user){
+			console.log(user[0].name)
+			this.inputForm.signatureEvaluatorSecondName=user[0].name
+			this.inputForm.signatureEvaluatorSecond=user[0].id
+		},
+		openUserDia3(){
+			this.$refs.userSelect3.init()
+		},
+		selectUser3(user){
+			console.log(user[0].name)
+			this.inputForm.currentDisposePersonName=user[0].name
+			this.inputForm.currentDisposePerson=user[0].id
+		},
+
     }
   }
 </script>

+ 35 - 15
src/views/program/registered/ProjectFormUpdate.vue

@@ -318,19 +318,25 @@
                           :rules="[
                           {required: true, message:'项目负责人不能为空', trigger:'change'}
                  ]">
-              <SelectUserTree
-                ref="companyTree"
-                size="large"
-                :props="{
-                  value: 'id',             // ID字段名
-                  label: 'name',         // 显示名称
-                  children: 'children'    // 子级字段名
-                }"
-                :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"
-                :value="inputForm.projectManager"
-                :clearable="true"
-                :accordion="true"
-                @getValue="(value) => {inputForm.projectManager=value}"/>
+<!--              <SelectUserTree-->
+<!--                ref="companyTree"-->
+<!--                size="large"-->
+<!--                :props="{-->
+<!--                  value: 'id',             // ID字段名-->
+<!--                  label: 'name',         // 显示名称-->
+<!--                  children: 'children'    // 子级字段名-->
+<!--                }"-->
+<!--                :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"-->
+<!--                :value="inputForm.projectManager"-->
+<!--                :clearable="true"-->
+<!--                :accordion="true"-->
+<!--                @getValue="(value) => {inputForm.projectManager=value}"/>-->
+				<el-input @focus="openUserDia" v-model="inputForm.projectManagerName" placeholder="请选择项目负责人">
+					<template #suffix>
+						<el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia">
+						</el-button>
+					</template>
+				</el-input>
             </el-form-item>
           </el-col>
 
@@ -670,6 +676,8 @@
     <WorkClientForm  ref="workClientForm" @getWorkClient="getWorkClient"></WorkClientForm>
     <ContactForm  ref="contactForm" @getContact="getContact"></ContactForm>
     <UserSelectDialog ref="userSelectDialog" @doSubmit="getMember" :limit="1"></UserSelectDialog>
+	  <user-select ref="userSelect2" @doSubmit="selectUser"></user-select>
+
   </div>
 </template>
 
@@ -684,6 +692,7 @@
   import SelectTree from '@/components/treeSelect/treeSelect.vue'
   import XEUtils from 'xe-utils'
   import UserSelectDialog from '@/components/userSelect/UserSelectDialog'
+  import UserSelect from '@/views/utils/UserTreeSelect'
   export default {
     data () {
       return {
@@ -714,6 +723,7 @@
           yearNum: '', // 承做年数
           checkYear: '', // 评估费用核算年度
           projectManager: '', // 项目经理
+			projectManagerName:'',
           reportType: '', // 报告类型
           industry: '', // 所属行业
           enterpriseType: '', // 企业类型
@@ -777,7 +787,8 @@
       WorkClientForm,
       ContactForm,
       SelectTree,
-      UserSelectDialog
+      UserSelectDialog,
+		UserSelect
     },
     methods: {
       init (method, id) {
@@ -803,6 +814,7 @@
           yearNum: '', // 承做年数
           checkYear: '', // 评估费用核算年度
           projectManager: '', // 项目经理
+			projectManagerName: '',
           reportType: '', // 报告类型
           industry: '', // 所属行业
           enterpriseType: '', // 企业类型
@@ -1164,7 +1176,15 @@
           this.inputForm.members[this.tableIndex].name = member[0].name
           this.memberKey = Math.random()
         }
-      }
+      },
+		openUserDia(){
+			this.$refs.userSelect2.init()
+		},
+		selectUser(user){
+			console.log(user[0].name)
+			this.inputForm.projectManagerName=user[0].name
+			this.inputForm.projectManager=user[0].id
+		},
     }
   }
 </script>

+ 19 - 5
src/views/program/registered/ProjectList.vue

@@ -12,8 +12,14 @@
 			<el-input v-model="searchForm.reportNo" placeholder="请输入报告号" clearable></el-input>
 		</el-form-item>
       <el-form-item v-if="showHideItem" label="登记人" prop="createById">
-        <UserSelect :limit='1' :readonly="true" :modelValue="searchForm.createById" @update:modelValue='(value) => {searchForm.createById = value}'></UserSelect>
-      </el-form-item>
+<!--        <UserSelect :limit='1' :readonly="true" :modelValue="searchForm.createById" @update:modelValue='(value) => {searchForm.createById = value}'></UserSelect>-->
+		  <el-input  v-model="searchForm.createById" placeholder="请选择登记人">
+			  <template #suffix>
+				  <el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia">
+				  </el-button>
+			  </template>
+		  </el-input>
+	  </el-form-item>
       <el-form-item v-if="showHideItem" label="项目负责人" prop="projectManagerName">
         <el-input v-model="searchForm.projectManagerName" placeholder="请输入项目负责人" clearable></el-input>
       </el-form-item>
@@ -314,6 +320,7 @@
     <ProofreadBrowseForm  ref="proofreadBrowseForm" @refreshDataList="refreshList"></ProofreadBrowseForm>
     <WorkContractForm2 ref="workContractForm2" @refreshDataList="refreshList"></WorkContractForm2>
 	  <ProjectArchiveFormDialog ref="projectArchiveFormDialog" @refreshDataList="refreshList"></ProjectArchiveFormDialog>
+	  <user-select ref="userSelect2" @doSubmit="selectUser"></user-select>
   </div>
 </template>
 
@@ -330,9 +337,9 @@
   import processService from '@/api/flowable/processService'
   import userService from '@/api/sys/userService'
   import ProofreadIssuedService from '@/api/sys/ProofreadIssuedService'
-  import UserSelect from '@/components/userSelect'
+  // import UserSelect from '@/components/userSelect'
   import ProjectArchiveFormDialog from "./ProjectArchiveFormDialog";
-
+  import UserSelect from '@/views/utils/UserTreeSelect'
   export default {
     data () {
       return {
@@ -1716,7 +1723,14 @@
 		archiveEdit(row){
       		console.log('id',row.archiveId)
       		this.$refs.projectArchiveFormDialog.init('edit',row.archiveId);
-		}
+		},
+		openUserDia(){
+			this.$refs.userSelect2.init()
+		},
+		selectUser(user){
+			console.log(user[0].name)
+			this.searchForm.createById=user[0].name
+		},
     }
   }
 </script>

+ 80 - 24
src/views/program/registered/ProjectThreeAuditForm.vue

@@ -44,25 +44,37 @@
                             :rules="[{required: true, message: '专业评估人员不能为空', trigger: 'blur'},{required: true, message: '专业评估人员不能为空', trigger: 'change'}]"
               >
                 <UserSelect :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'" :readonly="true" :limit="10" :modelValue="inputForm.auditPeopleList" @update:modelValue='(value) => {inputForm.auditPeopleList = value}'></UserSelect>
-              </el-form-item>
+<!--				  <el-input :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'" :readonly="true" @focus="openUserDia1"  v-model="inputForm.auditPeopleListName" placeholder="请选择专业评估人员">-->
+<!--					  <template #suffix>-->
+<!--						  <el-button :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'" :readonly="true" style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia1">-->
+<!--						  </el-button>-->
+<!--					  </template>-->
+<!--				  </el-input>-->
+			  </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="项目负责人" prop="programProjectListInfo.projectManager"
               >
-                <SelectUserTree
-                  ref="companyTree"
-                  size="large"
-                  :props="{
-                  value: 'id',             // ID字段名
-                  label: 'name',         // 显示名称
-                  children: 'children'    // 子级字段名
-                }"
-                  :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"
-                  :value="inputForm.programProjectListInfo.projectManager"
-                  :disabled="true"
-                  :clearable="true"
-                  :accordion="true"
-                  @getValue="(value) => {inputForm.programProjectListInfo.projectManager=value}"/>
+<!--                <SelectUserTree-->
+<!--                  ref="companyTree"-->
+<!--                  size="large"-->
+<!--                  :props="{-->
+<!--                  value: 'id',             // ID字段名-->
+<!--                  label: 'name',         // 显示名称-->
+<!--                  children: 'children'    // 子级字段名-->
+<!--                }"-->
+<!--                  :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"-->
+<!--                  :value="inputForm.programProjectListInfo.projectManager"-->
+<!--                  :disabled="true"-->
+<!--                  :clearable="true"-->
+<!--                  :accordion="true"-->
+<!--                  @getValue="(value) => {inputForm.programProjectListInfo.projectManager=value}"/>-->
+				  <el-input :disabled="true" @focus="openUserDia2"  v-model="inputForm.programProjectListInfo.projectManagerName" placeholder="请选择项目负责人">
+					  <template #suffix>
+						  <el-button :disabled="true" style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia2">
+						  </el-button>
+					  </template>
+				  </el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -71,11 +83,17 @@
               <el-form-item label="选择项目审核人" prop="auditPeople"
                             :rules="[{required: true, message: '审批人不能为空', trigger: 'blur'},{required: true, message: '审批人不能为空', trigger: 'change'}]"
               >
-                <UserSelect :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'"
-							:readonly="true" :limit="1"
-							:modelValue="inputForm.auditPeople"
-							@update:modelValue='(value) => {inputForm.auditPeople = value}'>
-				</UserSelect>
+<!--                <UserSelect :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'"-->
+<!--							:readonly="true" :limit="1"-->
+<!--							:modelValue="inputForm.auditPeople"-->
+<!--							@update:modelValue='(value) => {inputForm.auditPeople = value}'>-->
+<!--				</UserSelect>-->
+				  <el-input :readonly="true" :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'" @focus="openUserDia3"  v-model="inputForm.auditPeopleName" placeholder="请选择项目审核人">
+					  <template #suffix>
+						  <el-button :readonly="true" :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'" style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia3">
+						  </el-button>
+					  </template>
+				  </el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -151,6 +169,10 @@
     </div>
     <ProjectThreeAuditFormDialog ref="threeAuditDetail"></ProjectThreeAuditFormDialog>
 	  <ProjectForm2  ref="projectFormView"></ProjectForm2>
+	  <user-select1 ref="userSelect1" @doSubmit="selectUser1"></user-select1>
+	  <user-select2 ref="userSelect2" @doSubmit="selectUser2"></user-select2>
+	  <user-select3 ref="userSelect3" @doSubmit="selectUser3"></user-select3>
+
   </div>
 </template>
 
@@ -162,6 +184,9 @@
   import ProgramProjectListInfoService from '@/api/program/ProgramProjectListInfoService'
   import WangEditor from '@/components/editor/WangEditorNoMenu'
   import ProjectThreeAuditFormDialog from './ProjectThreeAuditFormDialog'
+  import UserSelect1 from '@/views/utils/UserTreeSelect'
+  import UserSelect2 from '@/views/utils/UserTreeSelect'
+  import UserSelect3 from '@/views/utils/UserTreeSelect'
 
   export default {
     props: {
@@ -193,6 +218,7 @@
           programId: '',
           auditLevel: '',
           auditPeople: '',
+          auditPeopleName: '',
           auditDate: '',
           retainOpinion: '',
           changeOpinion: '',
@@ -206,7 +232,8 @@
           programProjectListInfo: {},
           programAuditAssessPeopleDtoList: [],
           workAttachmentDtoList: [],
-          auditPeopleList: ''
+          auditPeopleList: '',
+          auditPeopleListName: ''
         },
         programId: '',
         supervisorList: [],
@@ -257,7 +284,10 @@
       UserSelect,
       WangEditor,
       SelectUserTree,
-      ProjectThreeAuditFormDialog
+      ProjectThreeAuditFormDialog,
+		UserSelect1,
+		UserSelect2,
+		UserSelect3
     },
     methods: {
       getKeyWatch (keyWatch) {
@@ -275,6 +305,7 @@
           programId: '',
           auditLevel: '',
           auditPeople: '',
+          auditPeopleName: '',
           auditDate: '',
           retainOpinion: '',
           changeOpinion: '',
@@ -294,7 +325,8 @@
           },
           programAuditAssessPeopleDtoList: [],
           workAttachmentDtoList: [],
-          auditPeopleList: ''
+          auditPeopleList: '',
+          auditPeopleListName: '',
         }
         this.inputForm.id = id
         this.visible = true
@@ -662,7 +694,31 @@
 		// 查看
 		viewProjectInfo (projectId) {
 			this.$refs.projectFormView.init('view', projectId, this.inputForm.id1, this.inputForm.id2, this.inputForm.id3, 'archiveId')
-		}
+		},
+		openUserDia1(){
+			this.$refs.userSelect1.init()
+		},
+		selectUser1(user){
+			console.log(user[0].name)
+			this.inputForm.auditPeopleListName=user[0].name
+			this.inputForm.auditPeopleList=user[0].id
+		},
+		openUserDia2(){
+			this.$refs.userSelect2.init()
+		},
+		selectUser2(user){
+			console.log(user[0].name)
+			this.inputForm.programProjectListInfo.projectManagerName=user[0].name
+			this.inputForm.programProjectListInfo.projectManager=user[0].id
+		},
+		openUserDia3(){
+			this.$refs.userSelect3.init()
+		},
+		selectUser3(user){
+			console.log(user[0].name)
+			this.inputForm.auditPeopleName=user[0].name
+			this.inputForm.auditPeople=user[0].id
+		},
     }
   }
 </script>

+ 37 - 16
src/views/program/registered/ProofreadIssuedForm.vue

@@ -28,20 +28,26 @@
 
         <el-col :span="12">
           <el-form-item label="项目负责人" prop="projectManager">
-            <SelectUserTree
-              ref="companyTree"
-              size="large"
-              :props="{
-                  value: 'id',             // ID字段名
-                  label: 'name',         // 显示名称
-                  children: 'children'    // 子级字段名
-                }"
-              :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"
-              :value="inputForm.projectManager"
-              :disabled="true"
-              :clearable="true"
-              :accordion="true"
-              @getValue="(value) => {inputForm.projectManager=value}"/>
+<!--            <SelectUserTree-->
+<!--              ref="companyTree"-->
+<!--              size="large"-->
+<!--              :props="{-->
+<!--                  value: 'id',             // ID字段名-->
+<!--                  label: 'name',         // 显示名称-->
+<!--                  children: 'children'    // 子级字段名-->
+<!--                }"-->
+<!--              :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"-->
+<!--              :value="inputForm.projectManager"-->
+<!--              :disabled="true"-->
+<!--              :clearable="true"-->
+<!--              :accordion="true"-->
+<!--              @getValue="(value) => {inputForm.projectManager=value}"/>-->
+			  <el-input :disabled="true" @focus="openUserDia"  v-model="inputForm.projectManagerName" placeholder="请选择项目负责人">
+				  <template #suffix>
+					  <el-button :disabled="true" style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia">
+					  </el-button>
+				  </template>
+			  </el-input>
           </el-form-item>
         </el-col>
 
@@ -149,6 +155,8 @@
       </el-row>
 
     </el-form>
+	  <user-select ref="userSelect2" @doSubmit="selectUser"></user-select>
+
   </div>
 </template>
 
@@ -157,6 +165,8 @@
   import ProofreadIssuedService from '@/api/sys/ProofreadIssuedService'
   import ProgramProjectListInfoService from '@/api/program/ProgramProjectListInfoService'
   import ProgramServiceTypeService from '@/api/program/ProgramServiceTypeService'
+  import UserSelect from '@/views/utils/UserTreeSelect'
+
   export default {
     props: {
       businessId: {
@@ -185,6 +195,7 @@
           assessmentDate: '',
           reportNo: '',
           projectManager: '',
+          projectManagerName: '',
           department: '',
           isTxtz: '',
           isBgdzdgd: '',
@@ -256,7 +267,8 @@
       }
     },
     components: {
-      SelectUserTree
+      SelectUserTree,
+		UserSelect
     },
     methods: {
       getKeyWatch (keyWatch) {
@@ -275,6 +287,7 @@
           assessmentDate: '',
           reportNo: '',
           projectManager: '',
+          projectManagerName: '',
           department: '',
           isTxtz: '',
           isBgdzdgd: '',
@@ -569,7 +582,15 @@
       // 关闭父页面时调用此方法
       closeThis () {
         this.close()
-      }
+      },
+		openUserDia(){
+			this.$refs.userSelect2.init()
+		},
+		selectUser(user){
+			console.log(user[0].name)
+			this.inputForm.projectManagerName=user[0].name
+			this.inputForm.projectManager=user[0].id
+		},
     }
   }
 </script>

+ 33 - 15
src/views/program/registered/RegisItemForm.vue

@@ -311,19 +311,25 @@
                           :rules="[
                           {required: true, message:'项目负责人不能为空', trigger:'change'}
                  ]">
-              <SelectUserTree
-                ref="companyTree"
-                size="large"
-                :props="{
-                  value: 'id',             // ID字段名
-                  label: 'name',         // 显示名称
-                  children: 'children'    // 子级字段名
-                }"
-                :url="`/system-server/sys/user/treeUserDataAccessOffice?type=2`"
-                :value="inputForm.projectManager"
-                :clearable="true"
-                :accordion="true"
-                @getValue="(value) => {inputForm.projectManager=value}"/>
+<!--              <SelectUserTree-->
+<!--                ref="companyTree"-->
+<!--                size="large"-->
+<!--                :props="{-->
+<!--                  value: 'id',             // ID字段名-->
+<!--                  label: 'name',         // 显示名称-->
+<!--                  children: 'children'    // 子级字段名-->
+<!--                }"-->
+<!--                :url="`/system-server/sys/user/treeUserDataAccessOffice?type=2`"-->
+<!--                :value="inputForm.projectManager"-->
+<!--                :clearable="true"-->
+<!--                :accordion="true"-->
+<!--                @getValue="(value) => {inputForm.projectManager=value}"/>-->
+				<el-input @focus="openUserDia"  v-model="inputForm.projectManagerName" placeholder="请选择项目负责人">
+					<template #suffix>
+						<el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia">
+						</el-button>
+					</template>
+				</el-input>
             </el-form-item>
           </el-col>
 
@@ -697,6 +703,8 @@
       <WorkClientForm  ref="workClientForm" @getWorkClient="getWorkClient"></WorkClientForm>
       <ContactForm  ref="contactForm" @getContact="getContact"></ContactForm>
     <UserSelectDialog ref="userSelectDialog" @doSubmit="getMember" :limit="1"></UserSelectDialog>
+	  <user-select ref="userSelect2" @doSubmit="selectUser"></user-select>
+
 
   </div>
 </template>
@@ -712,6 +720,7 @@
   import SelectTree from '@/components/treeSelect/treeSelect.vue'
   import XEUtils from 'xe-utils'
   import UserSelectDialog from '@/components/userSelect/UserSelectDialog'
+  import UserSelect from '@/views/utils/UserTreeSelect'
 
   export default {
     props: {
@@ -867,7 +876,8 @@
       WorkClientForm,
       ContactForm,
       SelectTree,
-      UserSelectDialog
+      UserSelectDialog,
+		UserSelect
     },
     methods: {
       getKeyWatch (keyWatch) {
@@ -1565,7 +1575,15 @@
           this.inputForm.members[this.tableIndex].name = member[0].name
           this.memberKey = Math.random()
         }
-      }
+      },
+		openUserDia(){
+			this.$refs.userSelect2.init()
+		},
+		selectUser(user){
+			console.log(user[0].name)
+			this.inputForm.projectManagerName=user[0].name
+			this.inputForm.projectManager=user[0].id
+		},
     }
   }
 </script>

+ 20 - 3
src/views/program/signatureDaily/SignatureDailyList.vue

@@ -29,7 +29,13 @@
 				</el-date-picker>
 			</el-form-item>
 			<el-form-item v-if="showHideItem" label="创建人" prop="createById">
-				<UserSelect :limit='1' :modelValue="searchForm.createById" @update:modelValue='(value, label) => {searchForm.createById = value}'></UserSelect>
+<!--				<UserSelect :limit='1' :modelValue="searchForm.createById" @update:modelValue='(value, label) => {searchForm.createById = value}'></UserSelect>-->
+				<el-input  v-model="searchForm.createById" placeholder="请选择创建人">
+					<template #suffix>
+						<el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia">
+						</el-button>
+					</template>
+				</el-input>
 			</el-form-item>
 
 			<el-form-item v-if="showHideItem" label="签章状态" prop="status">
@@ -156,6 +162,8 @@
 				</vxe-pager>
 
 				<SignatureDailyDia ref="signatureDailyDia" @refreshDataList="refreshList"></SignatureDailyDia>
+				<user-select ref="userSelect2" @doSubmit="selectUser"></user-select>
+
 			</div>
 		</div>
 	</div>
@@ -163,11 +171,13 @@
 
 <script>
 	import SignatureDailyService from '@/api/program/signatureDaily/SignatureDailyService'
-	import UserSelect from '@/components/userSelect'
+	// import UserSelect from '@/components/userSelect'
 	import SelectTree from '@/components/treeSelect/treeSelect.vue'
 	import SignatureDailyDia from "./SignatureDailyDia";
 	import taskService from '@/api/flowable/TaskService'
 	import processService from '@/api/flowable/ProcessService'
+	import UserSelect from '@/views/utils/UserTreeSelect'
+
 	import pick from 'lodash.pick'
 
 	import userService from '@/api/sys/UserService'
@@ -540,7 +550,14 @@
 					}
 				}
 				return false
-			}
+			},
+			openUserDia(){
+				this.$refs.userSelect2.init()
+			},
+			selectUser(user){
+				console.log(user[0].name)
+				this.searchForm.createById=user[0].name
+			},
 		}
 	}
 </script>

+ 18 - 4
src/views/program/signatureDaily/SignatureReportList.vue

@@ -29,7 +29,13 @@
 				</el-date-picker>
 			</el-form-item>
 			<el-form-item v-if="showHideItem" label="创建人" prop="createById">
-				<UserSelect :limit='1' :modelValue="searchForm.createById" @update:modelValue='(value, label) => {searchForm.createById = value}'></UserSelect>
+<!--				<UserSelect :limit='1' :modelValue="searchForm.createById" @update:modelValue='(value, label) => {searchForm.createById = value}'></UserSelect>-->
+				<el-input  v-model="searchForm.createById" placeholder="请选择创建人">
+					<template #suffix>
+						<el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia">
+						</el-button>
+					</template>
+				</el-input>
 			</el-form-item>
 
 			<el-form-item v-if="showHideItem" label="签章状态" prop="status">
@@ -157,6 +163,7 @@
 				</vxe-pager>
 
 				<SignatureReportDia ref="signatureReportDia" @refreshDataList="refreshList"></SignatureReportDia>
+				<user-select ref="userSelect2" @doSubmit="selectUser"></user-select>
 			</div>
 		</div>
 	</div>
@@ -164,13 +171,13 @@
 
 <script>
 	import SignatureReportService from '@/api/program/signatureDaily/SignatureReportService'
-	import UserSelect from '@/components/userSelect'
+	// import UserSelect from '@/components/userSelect'
 	import SelectTree from '@/components/treeSelect/treeSelect.vue'
 	import SignatureReportDia from "./SignatureReportDia";
 	import taskService from '@/api/flowable/TaskService'
 	import processService from '@/api/flowable/ProcessService'
 	import pick from 'lodash.pick'
-
+	import UserSelect from '@/views/utils/UserTreeSelect'
 	import userService from '@/api/sys/UserService'
 
 	export default {
@@ -534,7 +541,14 @@
 					}
 				}
 				return false
-			}
+			},
+			openUserDia(){
+				this.$refs.userSelect2.init()
+			},
+			selectUser(user){
+				console.log(user[0].name)
+				this.searchForm.createById=user[0].name
+			},
 		}
 	}
 </script>

+ 38 - 6
src/views/reimbursement/info/InfoList.vue

@@ -25,11 +25,23 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item v-if="showHideItem" label="经办人" prop="handled">
-		  <UserSelect :limit='1' :modelValue="searchForm.handled" @update:modelValue='(value, label) => {searchForm.handled = value}'></UserSelect>
-      </el-form-item>
+<!--		  <UserSelect :limit='1' :modelValue="searchForm.handled" @update:modelValue='(value, label) => {searchForm.handled = value}'></UserSelect>-->
+		  <el-input  v-model="searchForm.handled" placeholder="请选择经办人">
+			  <template #suffix>
+				  <el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia1">
+				  </el-button>
+			  </template>
+		  </el-input>
+	  </el-form-item>
       <el-form-item v-if="showHideItem" label="报销人" prop="reimBy">
-		  <UserSelect :limit='1' :modelValue="searchForm.reimBy" @update:modelValue='(value, label) => {searchForm.reimBy = value}'></UserSelect>
-      </el-form-item>
+<!--		  <UserSelect :limit='1' :modelValue="searchForm.reimBy" @update:modelValue='(value, label) => {searchForm.reimBy = value}'></UserSelect>-->
+		  <el-input  v-model="searchForm.reimBy" placeholder="请选择报销人">
+			  <template #suffix>
+				  <el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia2">
+				  </el-button>
+			  </template>
+		  </el-input>
+	  </el-form-item>
       <el-form-item v-if="showHideItem" label="报销项" prop="reimbursementType">
         <el-select v-model="searchForm.reimbursementType" placeholder="请选择" style="width:100%;" clearable>
           <el-option
@@ -205,6 +217,8 @@
         <ProjectForm ref="projectForm" @refreshDataList="refreshList"></ProjectForm>
         <ContractNameForm ref="contractNameForm"></ContractNameForm>
         <ProjectListForm ref="projectListForm"></ProjectListForm>
+		  <user-select1 ref="userSelect1" @doSubmit="selectUser1"></user-select1>
+		  <user-select2 ref="userSelect2" @doSubmit="selectUser2"></user-select2>
       </div>
     </div>
   </div>
@@ -225,6 +239,8 @@
   import ContractNameForm from '@/views/workContract/WorkContractForm2'
   import ProjectListForm from './ProgramForm'
   import userService from '@/api/sys/UserService'
+  import UserSelect1 from '@/views/utils/UserTreeSelect'
+  import UserSelect2 from '@/views/utils/UserTreeSelect'
   export default {
     data () {
       return {
@@ -277,7 +293,9 @@
       ProjectForm,
       UserSelect,
       ContractNameForm,
-      ProjectListForm
+      ProjectListForm,
+		UserSelect1,
+		UserSelect2,
     },
 	  mounted() {
 		  this.$nextTick(() => {
@@ -809,7 +827,21 @@
           }
         }
         return false
-      }
+      },
+		openUserDia1(){
+			this.$refs.userSelect1.init()
+		},
+		selectUser1(user){
+			console.log(user[0].name)
+			this.searchForm.handled=user[0].name
+		},
+		openUserDia2(){
+			this.$refs.userSelect2.init()
+		},
+		selectUser2(user){
+			console.log(user[0].name)
+			this.searchForm.reimBy=user[0].name
+		},
     }
   }
 </script>

+ 20 - 4
src/views/workClient/WorkClientList.vue

@@ -73,8 +73,14 @@
         </el-form-item>
 
         <el-form-item v-if="showHideItem" label="创建人" prop="createById">
-          <UserSelect :limit='1' :readonly="true" :modelValue="searchForm.createById" @update:modelValue='(value, label) => {searchForm.createById = value}'></UserSelect>
-        </el-form-item>
+<!--          <UserSelect :limit='1' :readonly="true" :modelValue="searchForm.createById" @update:modelValue='(value, label) => {searchForm.createById = value}'></UserSelect>-->
+			<el-input  v-model="searchForm.createById" placeholder="请选择创建人">
+				<template #suffix>
+					<el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia">
+					</el-button>
+				</template>
+			</el-input>
+		</el-form-item>
 
 <!--        <el-form-item label="代表方" prop="deputy">-->
 <!--          <el-select v-model="searchForm.deputy" placeholder="请选择" style="width:100%;">-->
@@ -165,6 +171,8 @@
      </div>
         <!-- 弹窗, 新增 / 修改 -->
     <WorkClientForm  ref="workClientForm" @refreshDataList="refreshList"></WorkClientForm>
+	  <user-select ref="userSelect2" @doSubmit="selectUser"></user-select>
+
   </div>
 </template>
 
@@ -173,7 +181,8 @@
   import WorkClientService from '@/api/sys/WorkClientService'
   import SelectTree from '@/components/treeSelect/treeSelect.vue'
   import SelectUserTree from '@/views/utils/treeUserSelect'
-  import UserSelect from '@/components/userSelect'
+  // import UserSelect from '@/components/userSelect'
+  import UserSelect from '@/views/utils/UserTreeSelect'
   export default {
     data () {
       return {
@@ -322,7 +331,14 @@
         this.applyUserName = ''
         this.$refs.searchForm.resetFields()
         this.refreshList()
-      }
+      },
+		openUserDia(){
+			this.$refs.userSelect2.init()
+		},
+		selectUser(user){
+			console.log(user[0].name)
+			this.searchForm.createById=user[0].name
+		},
     }
   }
 </script>

+ 19 - 4
src/views/workContract/WorkContractList.vue

@@ -53,8 +53,14 @@
         </el-form-item>
 
         <el-form-item v-if="showHideItem" label="创建人" prop="createById">
-          <UserSelect :limit='1' :readonly="true" :modelValue="searchForm.createById" @update:modelValue='(value, label) => {searchForm.createById = value}'></UserSelect>
-        </el-form-item>
+<!--          <UserSelect :limit='1' :readonly="true" :modelValue="searchForm.createById" @update:modelValue='(value, label) => {searchForm.createById = value}'></UserSelect>-->
+			<el-input  v-model="searchForm.createById" placeholder="请选择创建人">
+				<template #suffix>
+					<el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia">
+					</el-button>
+				</template>
+			</el-input>
+		</el-form-item>
 
         <el-form-item>
           <el-button type="default" @click="showHide" :icon="showHideIcon">{{showHideName}}</el-button>
@@ -180,6 +186,7 @@
     <WorkContractForm2 ref="workContractForm2" @refreshDataList="refreshList"></WorkContractForm2>
     <WorkClientForm ref="workClientForm" @refreshDataList="refreshList"></WorkClientForm>
     <WorkContractBorrowMessageForm ref="workContractBorrowMessageForm" @refreshDataList="refreshList"></WorkContractBorrowMessageForm>
+	  <user-select ref="userSelect2" @doSubmit="selectUser"></user-select>
   </div>
 </template>
 
@@ -196,7 +203,8 @@
   import processService from '@/api/flowable/processService'
   import pick from 'lodash.pick'
   import userService from '@/api/sys/userService'
-  import UserSelect from '@/components/userSelect'
+  // import UserSelect from '@/components/userSelect'
+  import UserSelect from '@/views/utils/UserTreeSelect'
   export default {
     data () {
       return {
@@ -932,7 +940,14 @@
           }
         }
         return false
-      }
+      },
+		openUserDia(){
+			this.$refs.userSelect2.init()
+		},
+		selectUser(user){
+			console.log(user[0].name)
+			this.searchForm.createById=user[0].name
+		},
     }
   }
 </script>

+ 36 - 4
src/views/zs/reimbursement/info/InfoList.vue

@@ -25,10 +25,22 @@
 		</el-date-picker>
 	  </el-form-item>
 		<el-form-item  label="经办人" prop="handled">
-			<UserSelect :limit='1' :modelValue="searchForm.handled" @update:modelValue='(value, label) => {searchForm.handled = value}'></UserSelect>
+<!--			<UserSelect :limit='1' :modelValue="searchForm.handled" @update:modelValue='(value, label) => {searchForm.handled = value}'></UserSelect>-->
+			<el-input  v-model="searchForm.handled" placeholder="请选择经办人">
+				<template #suffix>
+					<el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia1">
+					</el-button>
+				</template>
+			</el-input>
 		</el-form-item>
 		<el-form-item  label="报销人" prop="reimBy">
-			<UserSelect :limit='1' :modelValue="searchForm.reimBy" @update:modelValue='(value, label) => {searchForm.reimBy = value}'></UserSelect>
+<!--			<UserSelect :limit='1' :modelValue="searchForm.reimBy" @update:modelValue='(value, label) => {searchForm.reimBy = value}'></UserSelect>-->
+			<el-input  v-model="searchForm.reimBy" placeholder="请选择报销人">
+				<template #suffix>
+					<el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia2">
+					</el-button>
+				</template>
+			</el-input>
 		</el-form-item>
 		<el-form-item v-if="showHideItem" label="报销项" prop="reimbursementType">
 			<el-select v-model="searchForm.reimbursementType" placeholder="请选择" style="width:100%;" clearable>
@@ -216,6 +228,8 @@
 <!--        <ProjectForm ref="projectForm" @refreshDataList="refreshList"></ProjectForm>-->
         <ProjectRecordsForm ref="projectRecordsForm" @refreshDataList="refreshList"></ProjectRecordsForm>
         <ContractNameForm ref="contractNameForm"></ContractNameForm>
+		  <user-select1 ref="userSelect1" @doSubmit="selectUser1"></user-select1>
+		  <user-select2 ref="userSelect2" @doSubmit="selectUser2"></user-select2>
       </div>
     </div>
   </div>
@@ -236,6 +250,8 @@
   import ContractNameForm from '@/views/cw/workContract/ContractNameForm'
   import userService from '@/api/sys/UserService'
   import InfoUpdateForm from "./InfoUpdateForm";
+  import UserSelect1 from '@/views/utils/UserTreeSelect'
+  import UserSelect2 from '@/views/utils/UserTreeSelect'
   export default {
     data () {
       return {
@@ -293,7 +309,9 @@
       ProjectRecordsForm,
       UserSelect,
       ContractNameForm,
-		InfoUpdateForm
+		InfoUpdateForm,
+		UserSelect1,
+		UserSelect2,
     },
     mounted () {
 		this.$nextTick(() => {
@@ -799,7 +817,21 @@
           }
         }
         return false
-      }
+      },
+		openUserDia1(){
+			this.$refs.userSelect1.init()
+		},
+		selectUser1(user){
+			console.log(user[0].name)
+			this.searchForm.handled=user[0].name
+		},
+		openUserDia2(){
+			this.$refs.userSelect2.init()
+		},
+		selectUser2(user){
+			console.log(user[0].name)
+			this.searchForm.reimBy=user[0].name
+		},
     }
   }
 </script>