Kaynağa Gözat

Merge remote-tracking branch 'origin/master'

sangwenwei 1 yıl önce
ebeveyn
işleme
340f3fab16

+ 5 - 3
src/views/cw/projectReportArchive/ProjectReportArchiveList.vue

@@ -48,7 +48,7 @@
 
       <el-form-item v-if="showHideItem" label="创建人" prop="createBy.name">
 <!--        <el-input  v-model="searchForm.createBy.name" placeholder="请输入创建人" clearable></el-input>-->
-        <UserSelect :limit='1' :modelValue="searchForm.createBy.name" @update:modelValue='(value, label) => {searchForm.createBy.name = value}'></UserSelect>
+        <UserSelect2 :limit='1' :modelValue="searchForm.createBy.name" @update:modelValue='(value, label) => {searchForm.createBy.name = value}'></UserSelect2>
       </el-form-item>
       <el-form-item v-if="showHideItem" label="创建时间" prop="createDates">
         <el-date-picker
@@ -230,7 +230,8 @@
   import userService from '@/api/sys/UserService'
   import ProjectRecordsForm from '../projectRecords/ProjectRecordsForm'
   import ProjectReportArchiveForm from './ProjectReportArchiveForm'
-  import UserSelect from '@/components/userSelect'
+  import UserSelect from '@/views/cw/workClientInfo/clientUserSelect'
+  import UserSelect2 from '@/components/userSelect'
   import projectRecordsService from '@/api/cw/projectRecords/ProjectRecordsService'
   import XEUtils from 'xe-utils'
   import officeService from '@/api/sys/OfficeService'
@@ -317,7 +318,8 @@
     components: {
       ProjectRecordsForm,
       ProjectReportArchiveForm,
-      UserSelect
+      UserSelect,
+	  UserSelect2
     },
     computed: {
       userName () {