项目报告归档修改

src/views/modules/cw/projectReportArchive/ProjectReportArchiveForm.vue

@@ -24,6 +24,13 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
+                  <el-form-item label="档案号" prop="fileNumber"
+                                :rules="[
+                   ]">
+                    <el-input :disabled="true" v-model="inputForm.fileNumber" placeholder="请填写档案号" clearable></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
                   <el-form-item label="项目名称" prop="cwProjectRecordsDTO.projectName"
                                 :rules="[
                                 {required: true, message:'项目名称不能为空', trigger:'blur'},
@@ -221,6 +228,11 @@
                     <el-input :disabled="true" v-model="scope.row.signatureAnnotator2Name" placeholder="签字注师2" clearable></el-input>
                   </template>
                 </vxe-table-column>
+                <vxe-table-column align="center" field="reportCreateName" title="报告主办人" :edit-render="{}">
+                  <template v-slot:edit="scope">
+                    <el-input :readonly="true" v-model="scope.row.reportCreateName" placeholder="报告主办人" clearable></el-input>
+                  </template>
+                </vxe-table-column>
                 <vxe-table-column align="center" field="remarks" title="审计意见" :edit-render="{}">
                   <template v-slot:edit="scope">
                     <el-input :disabled="status !== 'audit'" v-model="scope.row.remarks" placeholder="审计意见" clearable></el-input>
@@ -321,7 +333,8 @@
             status: '',
             contractId: ''
           },
-          auditedUnitsName: ''
+          auditedUnitsName: '',
+          fileNumber: ''
         },
         keyWatch: '',
         activeName: 'report',
@@ -422,7 +435,8 @@
             status: '',
             contractId: ''
           },
-          auditedUnitsName: ''
+          auditedUnitsName: '',
+          fileNumber: ''
         }
         this.inputForm.id = id
         this.loading = false
@@ -601,7 +615,8 @@
             status: '',
             contractId: ''
           },
-          auditedUnitsName: ''
+          auditedUnitsName: '',
+          fileNumber: ''
         }
         this.$refs.uploadComponent.clearUpload()
         this.$refs.inputForm.resetFields()
@@ -688,7 +703,9 @@
               signatureAnnotator1: item.signatureAnnotator1,
               signatureAnnotator1Name: item.signatureAnnotator1Name,
               signatureAnnotator2: item.signatureAnnotator2,
-              signatureAnnotator2Name: item.signatureAnnotator2Name
+              signatureAnnotator2Name: item.signatureAnnotator2Name,
+              createBy: item.createBy,
+              reportCreateName: item.createName
             }
             this.$refs.reportTable.insertAt(p)
             this.inputForm.cwProjectReportArchiveReportDTOList.push(p)

src/views/modules/cw/projectReportArchive/ProjectReportArchiveList.vue

@@ -5,6 +5,9 @@
       <el-form-item label="档案名称" prop="name">
         <el-input size="small" v-model="searchForm.name" placeholder="请输入档案名称" clearable></el-input>
       </el-form-item>
+      <el-form-item label="档案号" prop="fileNumber">
+        <el-input size="small" v-model="searchForm.fileNumber" placeholder="请输入档案号" clearable></el-input>
+      </el-form-item>
       <el-form-item label="项目名称" prop="cwProjectRecordsDTO.projectName">
         <el-input size="small" v-model="searchForm.cwProjectRecordsDTO.projectName" placeholder="请输入项目名称" clearable></el-input>
       </el-form-item>
@@ -105,6 +108,7 @@
               <span v-else>{{scope.row.name}}</span>
             </template>
           </vxe-column>
+          <vxe-column min-width="150" align="center" title="档案号" field="fileNumber"></vxe-column>
           <vxe-column min-width="230" align="center" title="项目名称" field="cwProjectRecordsDTO.projectName">
             <template slot-scope="scope">
               <el-link  type="primary" :underline="false" v-if="hasPermission('cwProjectRecords:view')" @click="viewProject(scope.row.projectId)">{{commonJS.isNotEmpty(scope.row.cwProjectRecordsDTO)?scope.row.cwProjectRecordsDTO.projectName:''}}</el-link>
@@ -180,7 +184,8 @@
             name: ''
           },
           createDates: [],
-          reportNo: ''
+          reportNo: '',
+          fileNumber: ''
         },
         dataList: [],
         tablePage: {

src/views/modules/cw/projectReportArchive/ProjectReportArchiveTaskForm.vue

@@ -15,6 +15,13 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
+                  <el-form-item label="档案号" prop="fileNumber"
+                                :rules="[
+                   ]">
+                    <el-input :disabled="true" v-model="inputForm.fileNumber" placeholder="请填写档案号" clearable></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
                   <el-form-item label="项目名称" prop="cwProjectRecordsDTO.projectName"
                                 :rules="[
                                 {required: true, message:'项目名称不能为空', trigger:'blur'},
@@ -212,6 +219,11 @@
                     <el-input :readonly="true" v-model="scope.row.signatureAnnotator2Name" placeholder="签字注师2" clearable></el-input>
                   </template>
                 </vxe-table-column>
+                <vxe-table-column align="center" field="reportCreateName" title="报告主办人" :edit-render="{}">
+                  <template v-slot:edit="scope">
+                    <el-input :readonly="true" v-model="scope.row.reportCreateName" placeholder="报告主办人" clearable></el-input>
+                  </template>
+                </vxe-table-column>
                 <vxe-table-column align="center" field="remarks" title="审计意见" :edit-render="{}">
                   <template v-slot:edit="scope">
                     <el-input :disabled="status !== 'audit'" v-model="scope.row.remarks" placeholder="审计意见" clearable></el-input>
@@ -307,7 +319,8 @@
             status: '',
             contractId: ''
           },
-          auditedUnitsName: ''
+          auditedUnitsName: '',
+          fileNumber: ''
         },
         keyWatch: '',
         activeName: 'report',
@@ -400,7 +413,8 @@
             status: '',
             contractId: ''
           },
-          auditedUnitsName: ''
+          auditedUnitsName: '',
+          fileNumber: ''
         }
         this.inputForm.id = id
         this.loading = false
@@ -607,7 +621,8 @@
             status: '',
             contractId: ''
           },
-          auditedUnitsName: ''
+          auditedUnitsName: '',
+          fileNumber: ''
         }
         this.$refs.uploadComponent.clearUpload()
         this.$refs.inputForm.resetFields()
@@ -693,7 +708,9 @@
               signatureAnnotator1: item.signatureAnnotator1,
               signatureAnnotator1Name: item.signatureAnnotator1Name,
               signatureAnnotator2: item.signatureAnnotator2,
-              signatureAnnotator2Name: item.signatureAnnotator2Name
+              signatureAnnotator2Name: item.signatureAnnotator2Name,
+              createBy: item.createBy,
+              reportCreateName: item.createName
             }
             this.$refs.reportTable.insertAt(p)
             this.inputForm.cwProjectReportArchiveReportDTOList.push(p)

src/views/modules/cw/projectReportArchive/ReportChooseByProjectCom.vue

@@ -45,9 +45,10 @@
           <vxe-column type="seq" width="60" title="序号"></vxe-column>
           <vxe-column type="checkbox" width="40px"></vxe-column>
           <vxe-column min-width="230" align="center" title="报告文号" field="reportNo"></vxe-column>
-          <vxe-column min-width="230" align="center" title="报告日期" field="reportDate"></vxe-column>
-          <vxe-column min-width="230" align="center" title="签字注师1" field="signatureAnnotator1Name"></vxe-column>
-          <vxe-column min-width="230" align="center" title="签字注师2" field="signatureAnnotator2Name"></vxe-column>
+          <vxe-column min-width="180" align="center" title="报告日期" field="reportDate"></vxe-column>
+          <vxe-column min-width="150" align="center" title="签字注师1" field="signatureAnnotator1Name"></vxe-column>
+          <vxe-column min-width="150" align="center" title="签字注师2" field="signatureAnnotator2Name"></vxe-column>
+          <vxe-column min-width="150" align="center" title="报告主办人" field="createName"></vxe-column>
         </vxe-table>
         <vxe-pager
           background