wangqiang před 2 roky
rodič
revize
18f5eeb1e5

+ 1 - 1
src/views/cw/projectRecords/ProjectRecordsAddForm.vue

@@ -223,7 +223,7 @@
                                 :rules="[
                    ]">
                     <UserSelectSignatory style="width: 100%" ref="userSelect2" :disabled="status === 'audit' || status === 'taskFormDetail'"
-										 :modelValue="true" :limit='1' :value="inputForm.realHeader"
+										 :readonly="true" :limit='1' :modelValue="inputForm.realHeader"
 										 @update:modelValue='(value) => {changeSignatory2(value)}'></UserSelectSignatory>
                   </el-form-item>
                 </el-col>

+ 4 - 4
src/views/cw/projectRecords/ProjectRecordsForm.vue

@@ -176,7 +176,7 @@
                     <el-date-picker
                       v-model="inputForm.auditYear"
                       type="year"
-                      value-format="yyyy"
+                      value-format="YYYY"
                       placeholder="选择评审计期间"
                       style="width:100%"
                       placement="bottom-start"
@@ -208,7 +208,7 @@
                   <el-form-item label="现场负责人" prop="projectLeaderId"
                                 :rules="[
                    ]">
-                    <UserSelect :readonly="true" :disabled="method === 'view'" :limit='1' :value="inputForm.projectLeaderId" @getValue='(value) => {inputForm.projectLeaderId = value}'></UserSelect>
+                    <UserSelect :readonly="true" :disabled="method === 'view'" :limit='1' :modleValue="inputForm.projectLeaderId" @update:modelValue='(value) => {inputForm.projectLeaderId = value}'></UserSelect>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
@@ -217,14 +217,14 @@
                                 {required: true, message:'项目经理1不能为空', trigger:'blur'}
                    ]">
                     <!--                    <el-input v-model="inputForm.projectMasterId" placeholder="请填写项目经理" clearable></el-input>-->
-                    <UserSelect :readonly="true" :disabled="method === 'view'" :limit='1' :value="inputForm.projectMasterId" @getValue='(value) => {inputForm.projectMasterId = value}'></UserSelect>
+                    <UserSelect :readonly="true" :disabled="method === 'view'" :limit='1' :modelValue="inputForm.projectMasterId" @update:modelValue='(value) => {inputForm.projectMasterId = value}'></UserSelect>
                   </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' :value="inputForm.realHeader" @getValue='(value) => {inputForm.realHeader = value}'></UserSelect>
+                    <UserSelect :readonly="true" :disabled="method === 'view'" :limit='1' :modelValue="inputForm.realHeader" @update:modelValue='(value) => {inputForm.realHeader = value}'></UserSelect>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">

+ 2 - 2
src/views/cw/projectRecords/ProjectRecordsList.vue

@@ -10,11 +10,11 @@
       </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' :userName="searchForm.projectMasterName" @getValue='(value, label) => {searchForm.projectMasterName = label}'></UserSelect>
+        <UserSelect :limit='1' :modelValue="searchForm.projectMasterName" @update:modelValue='(value, label) => {searchForm.projectMasterName = value}'></UserSelect>
       </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' :userName="searchForm.realHeaderName" @getValue='(value, label) => {searchForm.realHeaderName = label}'></UserSelect>
+        <UserSelect :limit='1' :modelValue="searchForm.realHeaderName" @update:modelValue='(value, label) => {searchForm.realHeaderName = value}'></UserSelect>
       </el-form-item>
       <el-form-item v-if="showHideItem" label="创建时间" prop="createDates">
         <el-date-picker

+ 1 - 1
src/views/cw/projectReportArchive/ProjectReportArchiveForm.vue

@@ -116,7 +116,7 @@
                     <el-date-picker
                       v-model="inputForm.year"
                       type="year"
-                      value-format="yyyy"
+                      value-format="YYYY"
                       placeholder="选择档案年度"
                       style="width:100%"
                       placement="bottom-start"

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

@@ -13,11 +13,11 @@
       </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' :userName="searchForm.cwProjectRecordsDTO.projectMasterName" @update:modelValue='(value, label) => {searchForm.cwProjectRecordsDTO.projectMasterName = label}'></UserSelect>
+        <UserSelect :limit='1' :modelValue="searchForm.cwProjectRecordsDTO.projectMasterName" @update:modelValue='(value, label) => {searchForm.cwProjectRecordsDTO.projectMasterName = value}'></UserSelect>
       </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' :userName="searchForm.cwProjectRecordsDTO.realHeaderName" @update:modelValue='(value, label) => {searchForm.cwProjectRecordsDTO.realHeaderName = label}'></UserSelect>
+        <UserSelect :limit='1' :modelValue="searchForm.cwProjectRecordsDTO.realHeaderName" @update:modelValue='(value, label) => {searchForm.cwProjectRecordsDTO.realHeaderName = value}'></UserSelect>
       </el-form-item>
       <el-form-item v-if="showHideItem" label="档案年度" prop="year">
         <el-date-picker
@@ -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' :userName="searchForm.createBy.name" @update:modelValue='(value, label) => {searchForm.createBy.name = label}'></UserSelect>
+        <UserSelect :limit='1' :userName="searchForm.createBy.name" @update:modelValue='(value, label) => {searchForm.createBy.name = value}'></UserSelect>
       </el-form-item>
       <el-form-item v-if="showHideItem" label="创建时间" prop="createDates">
         <el-date-picker

+ 2 - 2
src/views/cw/reportCancellApply/ReportCancellApplyList.vue

@@ -9,10 +9,10 @@
         <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' :userName="searchForm.projectMasterName" @getValue='(value, label) => {searchForm.projectMasterName = label}'></UserSelect>
+        <UserSelect :limit='1' :modelValue="searchForm.projectMasterName" @update:modelValue='(value, label) => {searchForm.projectMasterName = value}'></UserSelect>
       </el-form-item>
       <el-form-item v-if="showHideItem" label="项目经理2" prop="projectMaster2Name">
-        <UserSelect :limit='1' :userName="searchForm.projectMaster2Name" @getValue='(value, label) => {searchForm.projectMaster2Name = label}'></UserSelect>
+        <UserSelect :limit='1' :modelValue="searchForm.projectMaster2Name" @update:modelValue='(value, label) => {searchForm.projectMaster2Name = value}'></UserSelect>
       </el-form-item>
 <!--      <el-form-item label="创建人" prop="createBy">-->
 <!--        <el-input v-model="searchForm.createBy" placeholder="请输入创建人" clearable></el-input>-->

+ 2 - 2
src/views/cw/reportCancellApplyArchived/ReportCancellApplyArchivedForm.vue

@@ -52,7 +52,7 @@
                                 :rules="[
                    ]">
                     <!--                    <el-input v-model="inputForm.projectMasterId" placeholder="请填写项目经理" clearable></el-input>-->
-                    <UserSelect :disabled="true" :limit='1' :value="inputForm.cwProjectRecordsDTO.projectMasterId" @getValue='(value) => {inputForm.cwProjectRecordsDTO.projectMasterId = value}'></UserSelect>
+                    <UserSelect :disabled="true" :limit='1' :modelValue="inputForm.cwProjectRecordsDTO.projectMasterId" @update:modelValue='(value) => {inputForm.cwProjectRecordsDTO.projectMasterId = value}'></UserSelect>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
@@ -60,7 +60,7 @@
                                 :rules="[
                    ]">
                     <!--                    <el-input v-model="inputForm.projectMasterId" placeholder="请填写项目经理" clearable></el-input>-->
-                    <UserSelect :disabled="true" :limit='1' :value="inputForm.cwProjectRecordsDTO.realHeader" @getValue='(value) => {inputForm.cwProjectRecordsDTO.realHeader = value}'></UserSelect>
+                    <UserSelect :disabled="true" :limit='1' :modelValue="inputForm.cwProjectRecordsDTO.realHeader" @update:modelValue='(value) => {inputForm.cwProjectRecordsDTO.realHeader = value}'></UserSelect>
                   </el-form-item>
                 </el-col>
                 <!--            <el-col :span="12">-->

+ 2 - 2
src/views/cw/reportCancellApplyArchived/ReportCancellApplyArchivedList.vue

@@ -9,10 +9,10 @@
         <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' :userName="searchForm.projectMasterName" @getValue='(value, label) => {searchForm.projectMasterName = label}'></UserSelect>
+        <UserSelect :limit='1' :modelValue="searchForm.projectMasterName" @update:modelValue='(value, label) => {searchForm.projectMasterName = value}'></UserSelect>
       </el-form-item>
       <el-form-item v-if="showHideItem" label="项目经理2" prop="projectMaster2Name">
-        <UserSelect :limit='1' :userName="searchForm.projectMaster2Name" @getValue='(value, label) => {searchForm.projectMaster2Name = label}'></UserSelect>
+        <UserSelect :limit='1' :modelValue="searchForm.projectMaster2Name" @update:modelValue='(value, label) => {searchForm.projectMaster2Name = value}'></UserSelect>
       </el-form-item>
 <!--      <el-form-item label="创建人" prop="createBy">-->
 <!--        <el-input v-model="searchForm.createBy" placeholder="请输入创建人" clearable></el-input>-->

+ 4 - 4
src/views/cw/reportManagement/ReportManagementAddForm.vue

@@ -99,7 +99,7 @@
                             {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" @getValue='(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-form-item>
           </el-col>
 
@@ -109,7 +109,7 @@
                             // {required: true, message:'签字注师2不能为空', trigger:'change'}
                    ]">
               <!--                <el-input v-model="inputForm.signatureAnnotator2" placeholder="请填写签字注师2" clearable></el-input>-->
-              <UserSelect style="width: 100%" ref="userSelect2" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @getValue='(value) => {changeSignatory2(value)}'></UserSelect>
+              <UserSelect style="width: 100%" ref="userSelect2" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @update:modelValue='(value) => {changeSignatory2(value)}'></UserSelect>
             </el-form-item>
           </el-col>
 
@@ -119,7 +119,7 @@
                               {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" @getValue='(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-form-item>
           </el-col>
 
@@ -129,7 +129,7 @@
                               // {required: true, message:'签字注师2不能为空', trigger:'blur'}
                    ]">
               <!--                <el-input v-model="inputForm.signatureAnnotator2" placeholder="请填写签字注师2" clearable></el-input>-->
-              <UserSelect style="width: 100%" ref="userSelect2" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @getValue='(value) => {changeSignatory2(value)}'></UserSelect>
+              <UserSelect style="width: 100%" ref="userSelect2" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @update:modelValue='(value) => {changeSignatory2(value)}'></UserSelect>
             </el-form-item>
           </el-col>
           <el-col :span="12">

+ 5 - 5
src/views/cw/reportManagement/ReportManagementForm.vue

@@ -104,7 +104,7 @@
                               :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" @getValue='(value) => {changeSignatory1(value)}'></UserSelect>
+                  <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>
               </el-col>
 
@@ -113,7 +113,7 @@
                               :rules="[
                    ]">
                   <!--                <el-input v-model="inputForm.signatureAnnotator2" placeholder="请填写签字注师2" clearable></el-input>-->
-                  <UserSelect style="width: 100%" ref="userSelect2" :disabled="method === 'view'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @getValue='(value) => {changeSignatory2(value)}'></UserSelect>
+                  <UserSelect style="width: 100%" ref="userSelect2" :disabled="method === 'view'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @update:modelValue='(value) => {changeSignatory2(value)}'></UserSelect>
                 </el-form-item>
               </el-col>
 
@@ -123,7 +123,7 @@
                               {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" @getValue='(value) => {changeSignatory1(value)}'></UserSelect>
+                  <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>
               </el-col>
               <el-col v-if="inputForm.signatureType === '2' " :span="12">
@@ -132,7 +132,7 @@
                               {required: true, message:'签字注师2不能为空', trigger:'blur'}
                    ]">
                   <!--                <el-input v-model="inputForm.signatureAnnotator2" placeholder="请填写签字注师2" clearable></el-input>-->
-                  <UserSelect style="width: 100%" ref="userSelect2" :disabled="method === 'view'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @getValue='(value) => {changeSignatory2(value)}'></UserSelect>
+                  <UserSelect style="width: 100%" ref="userSelect2" :disabled="method === 'view'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @update:modelValue='(value) => {changeSignatory2(value)}'></UserSelect>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -164,7 +164,7 @@
                               {required: true, message:'报告实际制作人不能为空', trigger:'blur'},
                           {required: true, message:'报告实际制作人不能为空', trigger:'change'}
                    ]">
-                  <UserSelectAll :readonly="true" :disabled="method === 'view'" :limit='1' :value="inputForm.realCreate" @getValue='(value) => {inputForm.realCreate = value}'></UserSelectAll>
+                  <UserSelectAll :readonly="true" :disabled="method === 'view'" :limit='1' :modelValue="inputForm.realCreate" @update:modelValue='(value) => {inputForm.realCreate = value}'></UserSelectAll>
                 </el-form-item>
               </el-col>
 

+ 2 - 2
src/views/cw/reportManagement/ReportManagementList.vue

@@ -9,10 +9,10 @@
         <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' :userName="searchForm.projectMasterName" @getValue='(value, label) => {searchForm.projectMasterName = label}'></UserSelect>
+        <UserSelect :limit='1' :modelValue="searchForm.projectMasterName" @update:modelValue='(value, label) => {searchForm.projectMasterName = value}'></UserSelect>
       </el-form-item>
       <el-form-item v-if="showHideItem" label="项目经理2" prop="realHeaderName">
-        <UserSelect :limit='1' :userName="searchForm.realHeaderName" @getValue='(value, label) => {searchForm.realHeaderName = label}'></UserSelect>
+        <UserSelect :limit='1' :modelValue="searchForm.realHeaderName" @update:modelValue='(value, label) => {searchForm.realHeaderName = value}'></UserSelect>
       </el-form-item>
       <el-form-item v-if="showHideItem" label="创建人" prop="createBy">
         <SelectUserTree

+ 4 - 4
src/views/cw/reportManagement/ReportManagementSignatureForm.vue

@@ -108,7 +108,7 @@
                           {required: true, message: '签字注师1不能为空', trigger: 'blur'}
                    ]">
               <!--                <el-input v-model="inputForm.signatureAnnotator1" placeholder="请填写签字注师1" clearable></el-input>-->
-              <UserSelect style="width: 100%" ref="userSelect1"  :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator1" @getValue='(value) => {changeSignatory1(value)}'></UserSelect>
+              <UserSelect style="width: 100%" ref="userSelect1"  :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator1" @update:modelValue='(value) => {changeSignatory1(value)}'></UserSelect>
             </el-form-item>
           </el-col>
 
@@ -119,7 +119,7 @@
                           // {required: true, message: '签字注师2不能为空', trigger: 'blur'}
                    ]">
               <!--                <el-input v-model="inputForm.signatureAnnotator2" placeholder="请填写签字注师2" clearable></el-input>-->
-              <UserSelect style="width: 100%" ref="userSelect2"  :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @getValue='(value) => {changeSignatory2(value)}'></UserSelect>
+              <UserSelect style="width: 100%" ref="userSelect2"  :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @update:modelValue='(value) => {changeSignatory2(value)}'></UserSelect>
             </el-form-item>
           </el-col>
 
@@ -130,7 +130,7 @@
                           {required: true, message: '签字注师1不能为空', trigger: 'blur'}
                    ]">
               <!--                <el-input v-model="inputForm.signatureAnnotator1" placeholder="请填写签字注师1" clearable></el-input>-->
-              <UserSelect style="width: 100%" ref="userSelect1"  :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator1" @getValue='(value) => {changeSignatory1(value)}'></UserSelect>
+              <UserSelect style="width: 100%" ref="userSelect1"  :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator1" @update:modelValue='(value) => {changeSignatory1(value)}'></UserSelect>
             </el-form-item>
           </el-col>
 
@@ -141,7 +141,7 @@
                           {required: true, message: '签字注师2不能为空', trigger: 'blur'}
                    ]">
               <!--                <el-input v-model="inputForm.signatureAnnotator2" placeholder="请填写签字注师2" clearable></el-input>-->
-              <UserSelect style="width: 100%" ref="userSelect2"  :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @getValue='(value) => {changeSignatory2(value)}'></UserSelect>
+              <UserSelect style="width: 100%" ref="userSelect2"  :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @update:modelValue='(value) => {changeSignatory2(value)}'></UserSelect>
             </el-form-item>
           </el-col>
           <el-col :span="12">

+ 1 - 1
src/views/cw/reportManagement/reportReview/ReportReviewForm.vue

@@ -147,7 +147,7 @@
               <el-form-item label="报告实际制作人" prop="realCreate"
                             :rules="[
                    ]">
-                <UserSelectAll :readonly="true" :disabled="status === 'audit' || status === 'taskFormDetail'" :limit='1' :value="inputForm.realCreate" @getValue='(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-form-item>
             </el-col>
             <el-col :span="12">