代码提交

src/components/userSelect/UserSelectDialog.vue

@@ -16,6 +16,7 @@
 							v-model="searchForm.name"
 							prefix-icon="search"
 							placeholder="搜索成员"
+							clearable
 						>
 							<template #append>
 								<el-button
@@ -180,6 +181,7 @@
 		</template>
 
 		<template #footer>
+			<el-button @click="resetSearch()" style="background-color: #F2F6FC" icon="el-icon-refresh-right">重置</el-button>
 			<el-button @click="dialogVisible = false">取 消</el-button>
 			<el-button type="primary" @click="save">确 认</el-button>
 		</template>
@@ -232,6 +234,7 @@ export default {
 	methods: {
 		//打开赋值
 		async open(data) {
+			console.log("进入open方法")
 			this.value = data || [];
 			this.selected = JSON.parse(JSON.stringify(data || []));
 			this.dialogVisible = true;
@@ -240,6 +243,7 @@ export default {
 		},
 		//获取组织
 		async getGroup() {
+			console.log("进入getGroup方法")
 			this.showGrouploading = true;
 			// officeService.treeData().then((data) => {
 			// 	this.officeTreeData = data
@@ -250,7 +254,7 @@ export default {
 			// var allNode = { id: "", type: "1", name: "所有" };
 			// res.unshift(allNode);
 			this.group = res;
-			this.searchForm.companyDTO.id = this.group[0].id;
+			// this.searchForm.companyDTO.id = this.group[0].id;
 		},
 		//获取用户
 		async getUser() {
@@ -307,6 +311,14 @@ export default {
 				);
 			}
 		},
+
+		resetSearch () {
+			this.getGroup()
+			this.searchForm.companyDTO.id = ''
+			this.searchForm.name = ''
+			this.currentPage = 1;
+			this.getUser();
+		},
 		//用户分页点击
 		paginationChange() {
 			this.getUser();

src/views/ccpm/reimbursement/info/ReimbursementForm.vue

@@ -1516,6 +1516,9 @@
 				  if (data === '总经办人员审批') {
 					  this.inputForm.type = '5'
 				  }
+				  if (data === '公司领导审批') {
+					  this.inputForm.type = '5'
+				  }
 				  if (data === '盛所项目财务审批') {
 					  this.inputForm.type = '5'
 				  }

src/views/common/InvoiceReimbursementUpLoadComponent.vue

@@ -356,6 +356,16 @@
       },
 		async changes (file, fileList) {
 			this.uploadKey = Math.random()
+			console.log(fileList)
+			/*for (let i = 0; i < fileList.length; i++) {
+				if (fileList[i].lsUrl) {
+					console.log("删除该文件")
+					//fileList[i].remove()
+					fileList.splice(i, 1);
+					// Since the element is removed, decrease the index by 1 to adjust for the removed element
+					i--;
+				}
+			}*/
       	this.uploadDelFlag = false;
 			// if (file.status !== 'ready') {
 			//   return
@@ -626,6 +636,7 @@
        * 关闭dialog时使用  清除el-upload中上传的文件
        */
       clearUpload () {
+		  this.fileList = []//用于清除上传文件的缓存
         this.$refs.upload.clearFiles()
         this.dataList = []
         this.dataListNew = []

src/views/cw/invoice/InvoiceFormTask.vue

@@ -1484,6 +1484,7 @@
 			  }
 		  },
 		  openProgramPageForm(rowIndex) {
+		  	console.log("进入openProgramPageForm方法")
 			  if (this.commonJS.isEmpty(this.inputForm.financeInvoiceBaseDTOList[0].programName) || this.inputForm.financeInvoiceBaseDTOList.length === 1) {
 				  this.$refs.programPageForm.init()
 			  } else {
@@ -1495,8 +1496,9 @@
 			  }
 			  this.programRow = rowIndex
 		  },
-		  getProgram(rows) {
+		  getProgram(rows,type) {
 		  	console.log('rows',rows)
+		  	console.log('type',type)
 			  if(rows.length >0){
 				  rows.forEach((item, index) => {
 					  this.inputForm.programId = item.id
@@ -1533,21 +1535,38 @@
 				  this.$forceUpdate()
 				  this.programRow = ''
 			  }else {
-				  let r = {
-					  programName: rows.projectName,
-					  contractName: rows.contractName,
-					  programNo: rows.projectNumber,
-					  contractId: rows.contractId,
-					  programId: rows.id,
-					  reportNo: rows.reportNo,
-					  reportType: rows.reportType,
-					  isPreInvoice : rows.isPreInvoice
-				  }
-				  this.$refs.baseTable.insertAt(r)
-				  this.inputForm.financeInvoiceBaseDTOList[0] = r
-				  this.baseKey = Math.random()
-				  this.isPreInvoice = rows.isPreInvoice
-				  this.inputForm.programId = rows.id
+			  	if (type === "4") {
+					this.inputForm.programId = rows.id
+					let r = this.inputForm.financeInvoiceBaseDTOList[this.programRow]
+					r.programName = rows.projectName
+					r.contractName = rows.contractName
+					r.programNo = rows.projectNumber
+					r.contractId = rows.contractId
+					r.programId = rows.id
+					r.reportNo = rows.reportNo
+					r.reportType = rows.reportType
+					r.isPreInvoice = rows.isPreInvoice
+					this.inputForm.financeInvoiceBaseDTOList[this.programRow] = r
+					this.bj1 = rows.bj1
+					this.$forceUpdate()
+					this.programRow = ''
+				}else{
+					let r = {
+						programName: rows.projectName,
+						contractName: rows.contractName,
+						programNo: rows.projectNumber,
+						contractId: rows.contractId,
+						programId: rows.id,
+						reportNo: rows.reportNo,
+						reportType: rows.reportType,
+						isPreInvoice : rows.isPreInvoice
+					}
+					this.$refs.baseTable.insertAt(r)
+					this.inputForm.financeInvoiceBaseDTOList[0] = r
+					this.baseKey = Math.random()
+					this.isPreInvoice = rows.isPreInvoice
+					this.inputForm.programId = rows.id
+				}
 			  }
 
 			  // this.inputForm.reconciliationArea = this.inputForm.financeInvoiceBaseDTOList[0].location

src/views/cw/invoice/ProgramPageForm.vue

@@ -336,6 +336,7 @@
       },
       // 表单提交
       getProgram () {
+      	console.log("进入选择提交方法")
         let rows
 	    let rowsType
         if (this.checkType === '1') {
@@ -389,7 +390,7 @@
         }
 
         this.close()
-        this.$emit('getProgram', rows)
+        this.$emit('getProgram', rows,this.checkType)
       },
       list () {
         this.loading = true

src/views/cw/projectRecords/ProjectRecordsAddForm.vue

@@ -236,16 +236,16 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="现场负责人" prop="projectLeaderName"
+                  <el-form-item label="现场负责人" prop="projectLeaderId"
                                 :rules="[
                    ]">
-<!--                    <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="请选择现场负责人">
+                    <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-input>-->
 				  </el-form-item>
                 </el-col>
 				  <el-col :span="12">

src/views/cw/projectReportArchive/ProjectReportArchiveList.vue

@@ -14,7 +14,7 @@
       <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-input  v-model="searchForm.cwProjectRecordsDTO.projectMasterName" placeholder="请选择项目经理1">
+		  <el-input  v-model="searchForm.cwProjectRecordsDTO.projectMasterName" clearable 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>
@@ -24,7 +24,7 @@
       <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-input  v-model="searchForm.cwProjectRecordsDTO.realHeaderName" placeholder="请选择项目经理2">
+		  <el-input  v-model="searchForm.cwProjectRecordsDTO.realHeaderName" clearable 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>
@@ -271,8 +271,8 @@
   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 UserSelect1 from '@/views/utils/UserTreeSelect2'
+	import UserSelect2 from '@/views/utils/UserTreeSelect2'
 	import UserSelect3 from '@/views/utils/UserTreeSelect'
   export default {
     data () {

src/views/cw/reportCancellApply/ReportCancellApplyList.vue

@@ -10,7 +10,7 @@
       </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-input  v-model="searchForm.projectMasterName" placeholder="请选择项目经理1">
+		  <el-input  v-model="searchForm.projectMasterName" clearable 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>
@@ -19,7 +19,7 @@
 	  </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-input  v-model="searchForm.projectMaster2Name" placeholder="请选择项目经理2">
+		  <el-input  v-model="searchForm.projectMaster2Name" clearable 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>
@@ -179,8 +179,8 @@
   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 UserSelect1 from '@/views/utils/UserTreeSelect2'
+  import UserSelect2 from '@/views/utils/UserTreeSelect2'
   import UserSelect3 from '@/views/utils/UserTreeSelect'
   export default {
     data () {

src/views/cw/reportCancellApplyArchived/ReportCancellApplyArchivedList.vue

@@ -10,7 +10,7 @@
       </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-input  v-model="searchForm.projectMasterName" placeholder="请选择项目经理1">
+		  <el-input  v-model="searchForm.projectMasterName" clearable 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>
@@ -19,7 +19,7 @@
 	  </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-input  v-model="searchForm.projectMaster2Name" placeholder="请选择项目经理2">
+		  <el-input  v-model="searchForm.projectMaster2Name" clearable 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>
@@ -215,8 +215,8 @@
   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 UserSelect1 from '@/views/utils/UserTreeSelect2'
+  import UserSelect2 from '@/views/utils/UserTreeSelect2'
   import UserSelect3 from '@/views/utils/UserTreeSelect'
   export default {
     data () {

src/views/cw/reportManagement/ReportManagementAddForm.vue

@@ -94,66 +94,66 @@
           </el-col>
 
           <el-col v-if="inputForm.signatureType === '1' || inputForm.signatureType === '3' || commonJS.isEmpty(inputForm.signatureType)" :span="12">
-            <el-form-item label="签字注师1" prop="signatureAnnotator1Name"
+			  <el-form-item label="签字注师1" prop="signatureAnnotator1"
                           :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-input @blur="changeSignatory1(inputForm.signatureAnnotator1)" @focus="openUserDia1" v-model="inputForm.signatureAnnotator1Name" placeholder="请选择签字注师1">
+              <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-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="signatureAnnotator2Name"
+            <el-form-item label="签字注师2" prop="signatureAnnotator2"
                           :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>-->
-				<el-input @blur="changeSignatory2(inputForm.signatureAnnotator2)" @focus="openUserDia2" v-model="inputForm.signatureAnnotator2Name" placeholder="请选择签字注师2">
+              <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-input>-->
             </el-form-item>
           </el-col>
 
           <el-col v-if="inputForm.signatureType === '2' " :span="12">
-            <el-form-item label="签字注师1" prop="signatureAnnotator1Name"
+            <el-form-item label="签字注师1" prop="signatureAnnotator1"
                           :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-input @blur="changeSignatory1(inputForm.signatureAnnotator1)" @focus="openUserDia1"  v-model="inputForm.signatureAnnotator1Name" placeholder="请选择签字注师1">
+              <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-input>-->
 			</el-form-item>
           </el-col>
 
           <el-col v-if="inputForm.signatureType === '2' " :span="12">
-            <el-form-item label="签字注师2" prop="signatureAnnotator2Name"
+            <el-form-item label="签字注师2" prop="signatureAnnotator2"
                           :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-input @blur="changeSignatory2(inputForm.signatureAnnotator2)" @focus="openUserDia2" v-model="inputForm.signatureAnnotator2Name" placeholder="请选择签字注师2">
+              <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-input>-->
 			</el-form-item>
           </el-col>
           <el-col :span="12">
@@ -571,14 +571,14 @@
   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 UserSelect2 from '@/views/utils/UserTreeSelect'
   import UserSelect3 from '@/views/utils/UserTreeSelect'
   export default {
     props: {

src/views/cw/reportManagement/ReportManagementForm.vue

@@ -104,13 +104,13 @@
                               :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-input @blur="changeSignatory1(inputForm.signatureAnnotator1)" @focus="openUserDia1"  v-model="inputForm.signatureAnnotator1Name" placeholder="请选择签字注师1">
+                  <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-input>-->
 				</el-form-item>
               </el-col>
 
@@ -119,13 +119,13 @@
                               :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-input @blur="changeSignatory2(inputForm.signatureAnnotator2)" @focus="openUserDia2" v-model="inputForm.signatureAnnotator2Name" placeholder="请选择签字注师2">
+                  <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-input>-->
 				</el-form-item>
               </el-col>
 
@@ -135,13 +135,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="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">
+                  <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-input>-->
 				</el-form-item>
               </el-col>
               <el-col v-if="inputForm.signatureType === '2' " :span="12">
@@ -150,13 +150,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="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">
+                  <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-input>-->
 				</el-form-item>
               </el-col>
               <el-col :span="12">
@@ -940,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'
@@ -950,7 +950,7 @@
   import ProjectRecoredChooseCom from '../projectRecords/ProjectRecordsChooseCom'
   import userService from "@/api/sys/userService";
   import UserSelect1 from '@/views/utils/UserTreeSelect'
-  import UserSelect2 from '@/views/utils/UserTreeSelect'
+  // import UserSelect2 from '@/views/utils/UserTreeSelect'
   import UserSelect3 from '@/views/utils/UserTreeSelect'
   export default {
     props: {

src/views/cw/reportManagement/ReportManagementList.vue

@@ -13,7 +13,7 @@
       </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-input  v-model="searchForm.projectMasterName" placeholder="请选择项目经理1">
+		  <el-input  v-model="searchForm.projectMasterName" clearable 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>
@@ -22,7 +22,7 @@
       </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>-->
-		  <el-input  v-model="searchForm.realHeaderName" placeholder="请选择项目经理2">
+		  <el-input  v-model="searchForm.realHeaderName" clearable 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>
@@ -439,8 +439,8 @@
   import projectRecordsService from '@/api/cw/projectRecords/ProjectRecordsService'
   import UserSelect from '@/views/cw/workClientInfo/clientUserSelect'
   // import UserSelect2 from '@/components/userSelect2/UserSelectDialog';
-  import UserSelect1 from '@/views/utils/UserTreeSelect'
-  import UserSelect2 from '@/views/utils/UserTreeSelect'
+  import UserSelect1 from '@/views/utils/UserTreeSelect2'
+  import UserSelect2 from '@/views/utils/UserTreeSelect2'
   import UserSelect3 from '@/views/utils/UserTreeSelect'
   export default {
     data () {

src/views/cw/reportManagement/ReportReviewTakeNumberForm.vue

@@ -89,13 +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>-->
-								<el-input @blur="changeSignatory1(inputForm.signatureAnnotator1)" @focus="openUserDia1" v-model="inputForm.signatureAnnotator1Name" placeholder="请选择签字注师1">
+								<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-input>-->
 							</el-form-item>
 						</el-col>
 
@@ -104,13 +104,7 @@
 										  :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-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>
+								<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>
 						</el-col>
 
@@ -119,13 +113,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>-->
-								<el-input @blur="changeSignatory1(inputForm.signatureAnnotator1)" @focus="openUserDia1" v-model="inputForm.signatureAnnotator1Name" placeholder="请选择签字注师1">
+								<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-input>-->
 							</el-form-item>
 						</el-col>
 
@@ -134,13 +128,7 @@
 										  :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-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>
+								<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>
 						</el-col>
 						<el-col :span="12">
@@ -510,7 +498,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'
@@ -521,8 +509,8 @@
 	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 UserSelect1 from '@/views/utils/UserTreeSelect2'
+	// import UserSelect2 from '@/views/utils/UserTreeSelect2'
 	import UserSelect3 from '@/views/utils/UserTreeSelect'
 	export default {
 		props: {

src/views/cw/reportManagement/reportReviewNew/ReportReviewFormNew.vue

@@ -123,13 +123,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>-->
-				  <el-input @blur="changeSignatory1(inputForm.signatureAnnotator1)" @focus="openUserDia1" v-model="inputForm.signatureAnnotator1Name" placeholder="请选择签字注师1">
+                <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-input>-->
 			  </el-form-item>
             </el-col>
 
@@ -138,13 +138,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>-->
-				  <el-input @blur="changeSignatory2(inputForm.signatureAnnotator2)" @focus="openUserDia2" v-model="inputForm.signatureAnnotator2Name" placeholder="请选择签字注师2">
+                <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-input>-->
 			  </el-form-item>
             </el-col>
 
@@ -155,13 +155,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>-->
-				  <el-input @blur="changeSignatory1(inputForm.signatureAnnotator1)" @focus="openUserDia1" v-model="inputForm.signatureAnnotator1Name" placeholder="请选择签字注师1">
+                <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-input>-->
 			  </el-form-item>
             </el-col>
 
@@ -170,13 +170,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>-->
-				  <el-input @blur="changeSignatory2(inputForm.signatureAnnotator2)" @focus="openUserDia2" v-model="inputForm.signatureAnnotator2Name" placeholder="请选择签字注师2">
+                <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-input>-->
 			  </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -775,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'
@@ -784,7 +784,7 @@
   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 UserSelect2 from '@/views/utils/UserTreeSelect'
   import UserSelect3 from '@/views/utils/UserTreeSelect'
   export default {
     props: {

src/views/cw/workClientInfo/clientUserSelect/AccountantUserSelectDialog.vue

@@ -449,7 +449,6 @@
           this.$message.error(`你最多只能选择${this.limit}个用户`)
           return
         }
-        console.log(this.dataListAllSelections[0])
         if (this.dataListAllSelections[0].accountantUserCount >= 100 && this.dataListAllSelections[0].accountantUserFlag === 1) {
         	if(this.dataListAllSelections[0].name === '王真' && this.dataListAllSelections[0].accountantUserCount <= 120){
 
@@ -458,6 +457,13 @@
 				return
 			}
         }
+
+		  if(this.dataListAllSelections[0].name === '庞广新' && this.dataListAllSelections[0].accountantUserCount < 99) {
+
+		  }else{
+			  this.$message.error(`庞广新签字注师被选次数不可超过99次`)
+			  return
+		  }
         this.visible = false
         this.$emit('doSubmit', this.dataListAllSelections)
       }

src/views/materialManagement/info/UpdateInfoForm.vue

@@ -60,7 +60,7 @@
               <el-date-picker
                 v-model="inputForm.purchaseDate"
                 type="date"
-                value-format="yyyy-MM-dd"
+                value-format="YYYY-MM-DD"
                 placement="bottom-start"
                 style="width: 100%"
                 placeholder="选择日期">
@@ -422,6 +422,9 @@
               if (this.commonJS.isNotEmpty(data.purchaserAgentId)) {
                 this.purchaserAgentId = data.purchaserAgentId
               }
+              if (this.commonJS.isNotEmpty(data.purchaseDate)) {
+                this.inputForm.purchaseDate = data.purchaseDate
+              }
               if (this.commonJS.isNotEmpty(data.procurementTypeId)) {
                 this.procurementTypeId = data.procurementTypeId
               }

src/views/zs/reimbursement/info/ReimbursementForm.vue

@@ -1462,6 +1462,9 @@
 				  if (data === '总经办人员审批') {
 					  this.inputForm.type = '5'
 				  }
+				  if (data === '公司领导审批') {
+					  this.inputForm.type = '5'
+				  }
               }
               this.reimbursementService.save(this.inputForm).then((data) => {
                 callback(data.businessTable, data.businessId, this.inputForm)