财务模块代码提交

src/views/cw/projectRecords/ProjectMembersList.vue

@@ -11,8 +11,8 @@
       <el-form-item label="创建时间" prop="createDates">
         <el-date-picker
           placement="bottom-start"
-          format="yyyy-MM-dd HH:mm:ss"
-          value-format="yyyy-MM-dd HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
           v-model="searchForm.createDates"
           type="datetimerange"
           range-separator="至"

src/views/cw/projectRecords/ProjectRecordsChooseCom.vue

@@ -18,14 +18,14 @@
           <el-form-item label="项目编号" prop="projectNumber">
             <el-input v-model="searchForm.projectNumber" placeholder="请输入项目编号" clearable></el-input>
           </el-form-item>
-          <el-form-item label="项目经理" prop="projectMasterName">
-            <el-input v-model="searchForm.projectMasterName" placeholder="请输入项目经理" clearable></el-input>
+          <el-form-item label="项目经理" prop="projectMasterName2">
+            <el-input v-model="searchForm.projectMasterName2" placeholder="请输入项目经理" clearable></el-input>
           </el-form-item>
           <el-form-item label="创建时间" prop="createDates">
             <el-date-picker
               placement="bottom-start"
-              format="yyyy-MM-dd HH:mm:ss"
-              value-format="yyyy-MM-dd HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
+              value-format="YYYY-MM-DD HH:mm:ss"
               v-model="searchForm.createDates"
               type="datetimerange"
               range-separator="至"
@@ -103,7 +103,7 @@
         },
         dataList: [],
         searchForm: {
-          projectMasterName: '',
+			projectMasterName2: '',
           projectNumber: '',
           projectName: '',
           createDates: [],

src/views/cw/projectReportArchive/ProjectReportArchiveDetailList.vue

@@ -5,7 +5,7 @@
       <el-form-item label="项目名称" prop="cwProjectRecordsDTO.projectName">
         <el-input v-model="searchForm.cwProjectRecordsDTO.projectName" placeholder="请输入项目名称" clearable></el-input>
       </el-form-item>
-      <el-form-item label="创建人" prop="cwProjectRecordsDTO.projectMasterId">
+      <el-form-item label="项目经理" prop="cwProjectRecordsDTO.projectMasterId">
         <SelectUserTree
           ref="companyTree"
           :props="{
@@ -126,8 +126,8 @@
           </vxe-column>
           <vxe-column min-width="150" align="center" title="项目经理" field="cwProjectRecordsDTO.projectMasterName"></vxe-column>
           <vxe-column min-width="230" align="center" title="报告文号" field="reportNo"></vxe-column>
-          <vxe-column min-width="150" align="center" title="报告日期" :formatter="formatDate" field="reportDate"></vxe-column>
-          <vxe-column min-width="150" align="center" title="归档日期" :formatter="formatDate" field="auditDate"></vxe-column>
+          <vxe-column min-width="150" align="center" title="报告日期" field="reportDate"></vxe-column>
+          <vxe-column min-width="150" align="center" title="归档日期" field="auditDate"></vxe-column>
           <vxe-column min-width="150" align="center" title="归档状态" field="status">
             <template #default="scope">
               <span style="color:#5bc0de; font-weight: bold;" v-if="scope.row.status === '暂时未归档'">暂时未归档</span>

src/views/cw/projectReportArchive/ProjectReportArchiveList.vue

@@ -23,7 +23,7 @@
         <el-date-picker
           v-model="searchForm.year"
           type="year"
-          value-format="yyyy"
+          value-format="YYYY"
           placeholder="选择档案年度"
           style="width:100%"
           placement="bottom-start"
@@ -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 = value}'></UserSelect>
+        <UserSelect :limit='1' :modelValue="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

src/views/cw/reportCancellApplyArchived/ReportCancellApplyArchivedForm.vue

@@ -247,7 +247,7 @@
                   </el-form-item>
                 </el-col>
                 <el-form :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''" :disabled="status !== 'audit'"
-                         label-width="135px" @submit.native.prevent>
+						 style="width:100%" label-width="135px" @submit.native.prevent>
                   <el-col :span="24">
                     <el-form-item label="审计意见" prop="reportRemarks"
                                   :rules="[

src/views/cw/reportCancellApplyArchived/ReportCancellApplyArchivedList.vue

@@ -44,7 +44,7 @@
         </el-date-picker>
       </el-form-item>
 
-      <el-form-item label="作废归档状态" prop="status">
+      <el-form-item label="作废归档状态" prop="applyFileType">
         <el-select v-model="searchForm.applyFileType" placeholder="请选择报告作废归档状态" style="width:100%;" clearable>
           <el-option
             v-for="item in $dictUtils.getDictList('filed_type')"
@@ -202,6 +202,7 @@
         showHideName: '展示',
         searchForm: {
           projectNumber: '',
+		  applyFileType: '',
           projectName: '',
           projectMasterId: '',
           projectMaster2Id: '',

src/views/cw/reportCancellApplyArchived/ReportCancellApplyArchivedTaskForm.vue

@@ -236,7 +236,7 @@
                 <el-input :disabled="true" v-model="inputForm.reportCreateName" placeholder="请填写报告主办人" clearable></el-input>
               </el-form-item>
             </el-col>
-            <el-form :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''" :disabled="status !== 'audit'"
+            <el-form style="width:100%" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''" :disabled="status !== 'audit'"
                      label-width="135px" @submit.native.prevent>
               <el-col :span="24">
                 <el-form-item label="审计意见" prop="reportRemarks"

src/views/cw/reportManagement/ReportManagementAddForm.vue

@@ -494,7 +494,7 @@
             <el-form-item label="计算机文号" prop="computerNo"
                           :rules="[
                    ]">
-              <el-input v-model="inputForm.computerNo" placeholder="请输入校对人签名">
+              <el-input v-model="inputForm.computerNo" placeholder="请输入计算机文号">
               </el-input>
             </el-form-item>
           </el-col>