优化、调整、bug修复

src/views/modules/cw/projectRecords/ProjectRecordsForm.vue

@@ -788,10 +788,10 @@
             if (this.commonJS.isEmpty(this.inputForm.cwProjectClientInfoDTOList)) {
               this.inputForm.cwProjectClientInfoDTOList = []
             }
-            if (this.commonJS.isEmpty(this.inputForm.projectMasterId)) {
+            if (this.commonJS.isEmpty(this.inputForm.projectMasterId) && this.method !== 'view') {
               this.inputForm.projectMasterId = JSON.parse(localStorage.getItem('user')).id
             }
-            if (this.commonJS.isEmpty(this.inputForm.projectLeaderId)) {
+            if (this.commonJS.isEmpty(this.inputForm.projectLeaderId) && this.method !== 'view') {
               this.inputForm.projectLeaderId = JSON.parse(localStorage.getItem('user')).id
             }
             if (this.commonJS.isEmpty(this.inputForm.projectMoney)) {

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

@@ -47,11 +47,19 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="项目经理" prop="cwProjectRecordsDTO.projectMasterId"
+                  <el-form-item label="项目经理1" prop="cwProjectRecordsDTO.projectMasterName"
                                 :rules="[
                    ]">
-                    <!--                    <el-input v-model="inputForm.projectMasterId" placeholder="请填写项目经理" clearable></el-input>-->
-                    <UserSelect size="medium" :disabled="true" :limit='1' :value="inputForm.cwProjectRecordsDTO.projectMasterId" @getValue='(value) => {inputForm.cwProjectRecordsDTO.projectMasterId = value}'></UserSelect>
+                    <el-input :disabled="true" v-model="inputForm.cwProjectRecordsDTO.projectMasterName" placeholder="请填写项目经理1"></el-input>
+                    <!--                    <UserSelect size="medium" :disabled="true" :limit='1' :value="inputForm.cwProjectRecordsDTO.projectMasterId" @getValue='(value) => {inputForm.cwProjectRecordsDTO.projectMasterId = value}'></UserSelect>-->
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="项目经理2" prop="cwProjectRecordsDTO.realHeaderName"
+                                :rules="[
+                   ]">
+                    <el-input :disabled="true" v-model="inputForm.cwProjectRecordsDTO.realHeaderName" placeholder="请填写项目经理2"></el-input>
+                    <!--                    <UserSelect size="medium" :disabled="true" :limit='1' :value="inputForm.cwProjectRecordsDTO.projectMasterId" @getValue='(value) => {inputForm.cwProjectRecordsDTO.projectMasterId = value}'></UserSelect>-->
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">

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

@@ -11,10 +11,14 @@
       <el-form-item label="项目名称" prop="cwProjectRecordsDTO.projectName">
         <el-input size="small" v-model="searchForm.cwProjectRecordsDTO.projectName" placeholder="请输入项目名称" clearable></el-input>
       </el-form-item>
-      <el-form-item label="项目经理" prop="cwProjectRecordsDTO.projectMasterName">
+      <el-form-item label="项目经理1" prop="cwProjectRecordsDTO.projectMasterName">
 <!--        <el-input size="small" v-model="searchForm.cwProjectRecordsDTO.projectMasterName" placeholder="请输入项目经理" clearable></el-input>-->
         <UserSelect :limit='1' :userName="searchForm.cwProjectRecordsDTO.projectMasterName" @getValue='(value, label) => {searchForm.cwProjectRecordsDTO.projectMasterName = label}'></UserSelect>
       </el-form-item>
+      <el-form-item label="项目经理2" prop="cwProjectRecordsDTO.realHeaderName">
+        <!--        <el-input size="small" v-model="searchForm.cwProjectRecordsDTO.projectMasterName" placeholder="请输入项目经理" clearable></el-input>-->
+        <UserSelect :limit='1' :userName="searchForm.cwProjectRecordsDTO.realHeaderName" @getValue='(value, label) => {searchForm.cwProjectRecordsDTO.realHeaderName = label}'></UserSelect>
+      </el-form-item>
       <el-form-item label="档案年度" prop="year">
         <el-date-picker
           size="small"
@@ -142,7 +146,8 @@
             </template>
           </vxe-column>
           <vxe-column min-width="220" align="center" title="报告文号" field="reportNo"></vxe-column>
-          <vxe-column min-width="150" align="center" title="项目经理" field="cwProjectRecordsDTO.projectMasterName"></vxe-column>
+          <vxe-column min-width="150" align="center" title="项目经理1" field="cwProjectRecordsDTO.projectMasterName"></vxe-column>
+          <vxe-column min-width="150" align="center" title="项目经理2" field="cwProjectRecordsDTO.realHeaderName"></vxe-column>
           <vxe-column min-width="230" align="center" title="被审计单位" field="auditedUnitsName"></vxe-column>
           <vxe-column min-width="150" align="center" title="报告册数" field="reportNum"></vxe-column>
           <vxe-column min-width="150" align="center" title="底稿册数" field="papersNum"></vxe-column>
@@ -221,7 +226,8 @@
           name: '',
           cwProjectRecordsDTO: {
             projectName: '',
-            projectMasterName: ''
+            projectMasterName: '',
+            realHeaderName: ''
           },
           year: '',
           number: '',

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

@@ -38,11 +38,19 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="项目经理" prop="cwProjectRecordsDTO.projectMasterId"
+                  <el-form-item label="项目经理1" prop="cwProjectRecordsDTO.projectMasterName"
                                 :rules="[
                    ]">
-                    <!--                    <el-input v-model="inputForm.projectMasterId" placeholder="请填写项目经理" clearable></el-input>-->
-                    <UserSelect size="medium" :disabled="true" :limit='1' :value="inputForm.cwProjectRecordsDTO.projectMasterId" @getValue='(value) => {inputForm.cwProjectRecordsDTO.projectMasterId = value}'></UserSelect>
+                    <el-input :disabled="true" v-model="inputForm.cwProjectRecordsDTO.projectMasterName" placeholder="请填写项目经理1"></el-input>
+<!--                    <UserSelect size="medium" :disabled="true" :limit='1' :value="inputForm.cwProjectRecordsDTO.projectMasterId" @getValue='(value) => {inputForm.cwProjectRecordsDTO.projectMasterId = value}'></UserSelect>-->
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="项目经理2" prop="cwProjectRecordsDTO.realHeaderName"
+                                :rules="[
+                   ]">
+                    <el-input :disabled="true" v-model="inputForm.cwProjectRecordsDTO.realHeaderName" placeholder="请填写项目经理2"></el-input>
+<!--                    <UserSelect size="medium" :disabled="true" :limit='1' :value="inputForm.cwProjectRecordsDTO.projectMasterId" @getValue='(value) => {inputForm.cwProjectRecordsDTO.projectMasterId = value}'></UserSelect>-->
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">

src/views/modules/cw/reportCancellApply/ReportCancellApplyForm.vue

@@ -41,10 +41,17 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="项目经理" prop="projectMasterName"
+                  <el-form-item label="项目经理1" prop="projectMasterName"
                                 :rules="[
                    ]">
-                    <el-input :disabled="true" v-model="inputForm.projectMasterName" placeholder="请填写项目经理" clearable></el-input>
+                    <el-input :disabled="true" v-model="inputForm.projectMasterName" placeholder="请填写项目经理1" clearable></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="项目经理2" prop="projectMaster2Name"
+                                :rules="[
+                   ]">
+                    <el-input :disabled="true" v-model="inputForm.projectMaster2Name" placeholder="请填写项目经理2" clearable></el-input>
                   </el-form-item>
                 </el-col>
 
@@ -135,6 +142,7 @@
           cancellateReason: '',
           reportSponsor: '',
           projectMasterName: '',
+          projectMaster2Name: '',
           cwFileInfoList: [],
           servedUnitId: '',
           status: ''
@@ -252,6 +260,7 @@
           projectName: '',
           cancellateReason: '',
           reportSponsor: '',
+          projectMaster2Name: '',
           projectMasterName: ''
         }
         this.inputForm.id = id
@@ -416,7 +425,9 @@
           contractNum: '',
           payerSubject: '',
           paymentMethod: '',
-          contractId: ''
+          contractId: '',
+          projectMaster2Name: '',
+          projectMasterName: ''
         }
         // this.$refs.uploadComponent.clearUpload()
         this.$refs.inputForm.resetFields()
@@ -502,7 +513,8 @@
         // console.log('row', row)
         this.inputForm.projectName = row.projectName // 项目名称
         this.inputForm.projectId = row.id // 项目id
-        this.inputForm.projectMasterName = row.projectMasterName // 项目经理
+        this.inputForm.projectMasterName = row.projectMasterName // 项目经理1
+        this.inputForm.projectMaster2Name = row.projectMaster2Name // 项目经理2
         this.inputForm.reportNo = row.reportNo // 报告文号
         this.inputForm.reportNewLineId = row.reportNewLineId // 新建行id
         this.clearClientList()

src/views/modules/cw/reportCancellApply/ReportCancellApplyList.vue

@@ -8,7 +8,7 @@
       <el-form-item label="项目名称" prop="projectName">
         <el-input size="small" v-model="searchForm.projectName" placeholder="请输入项目名称" clearable></el-input>
       </el-form-item>
-      <el-form-item label="项目经理" prop="projectMasterId">
+      <el-form-item label="项目经理1" prop="projectMasterId">
         <SelectUserTree
           ref="companyTree"
           :props="{
@@ -23,6 +23,21 @@
           @getValue="(value) => {searchForm.projectMasterId=value}"/>
 <!--        <el-input size="small" v-model="searchForm.projectMaster" placeholder="请输入项目经理" clearable></el-input>-->
       </el-form-item>
+      <el-form-item label="项目经理2" prop="projectMaster2Id">
+        <SelectUserTree
+          ref="companyTree"
+          :props="{
+                  value: 'id',             // ID字段名
+                  label: 'name',         // 显示名称
+                  children: 'children'    // 子级字段名
+                }"
+          :url="`/sys/user/treeUserDataAllOffice?type=2`"
+          :value="searchForm.projectMaster2Id"
+          :clearable="true"
+          :accordion="true"
+          @getValue="(value) => {searchForm.projectMaster2Id=value}"/>
+        <!--        <el-input size="small" v-model="searchForm.projectMaster" placeholder="请输入项目经理" clearable></el-input>-->
+      </el-form-item>
 <!--      <el-form-item label="创建人" prop="createBy">-->
 <!--        <el-input size="small" v-model="searchForm.createBy" placeholder="请输入创建人" clearable></el-input>-->
 <!--      </el-form-item>-->
@@ -93,7 +108,8 @@
           <vxe-column min-width="160" align="center" title="项目编号" field="projectNumber"></vxe-column>
           <vxe-column min-width="160" align="center" title="项目名称" field="projectName"></vxe-column>
           <vxe-column min-width="160" align="center" title="报告所属部门" field="departmentName"></vxe-column>
-          <vxe-column min-width="160" align="center" title="项目经理" field="projectMasterName"></vxe-column>
+          <vxe-column min-width="160" align="center" title="项目经理1" field="projectMasterName"></vxe-column>
+          <vxe-column min-width="160" align="center" title="项目经理2" field="projectMaster2Name"></vxe-column>
           <vxe-column min-width="160" align="center" title="报告主办人" field="reportSponsor"></vxe-column>
           <vxe-column min-width="160" align="center" title="创建人" field="userName"></vxe-column>
           <vxe-column min-width="160" align="center" title="创建时间" field="createDate"></vxe-column>
@@ -151,6 +167,7 @@
           projectNumber: '',
           projectName: '',
           projectMasterId: '',
+          projectMaster2Id: '',
           createBy: '',
           contractDates: []
         },

src/views/modules/cw/reportCancellApply/ReportCancellApplyTaskForm.vue

@@ -32,10 +32,17 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="项目经理" prop="projectMasterName"
+              <el-form-item label="项目经理1" prop="projectMasterName"
                             :rules="[
                    ]">
-                <el-input :disabled="true" v-model="inputForm.projectMasterName" placeholder="请填写项目经理" clearable></el-input>
+                <el-input :disabled="true" v-model="inputForm.projectMasterName" placeholder="请填写项目经理1" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="项目经理2" prop="projectMaster2Name"
+                            :rules="[
+                   ]">
+                <el-input :disabled="true" v-model="inputForm.projectMaster2Name" placeholder="请填写项目经理2" clearable></el-input>
               </el-form-item>
             </el-col>
 
@@ -115,6 +122,7 @@
           cancellateReason: '',
           reportSponsor: '',
           projectMasterName: '',
+          projectMaster2Name: '',
           cwFileInfoList: [],
           servedUnitId: '',
           status: ''
@@ -189,7 +197,8 @@
           projectName: '',
           cancellateReason: '',
           reportSponsor: '',
-          projectMasterName: ''
+          projectMasterName: '',
+          projectMaster2Name: ''
         }
         this.inputForm.id = id
         this.loading = false
@@ -226,7 +235,8 @@
       getContract (row) {
         this.inputForm.projectName = row.projectName // 项目名称
         this.inputForm.projectId = row.id // 项目id
-        this.inputForm.projectMasterName = row.projectMasterName // 项目经理
+        this.inputForm.projectMasterName = row.projectMasterName // 项目经理1
+        this.inputForm.projectMaster2Name = row.projectMaster2Name // 项目经理2
         this.inputForm.reportNo = row.reportNo // 报告文号
         this.inputForm.reportNewLineId = row.reportNewLineId // 新建行id
         this.inputForm.reportSponsor = row.reportSponsor // 报告主办人
@@ -406,7 +416,8 @@
           projectName: '',
           cancellateReason: '',
           reportSponsor: '',
-          projectMasterName: ''
+          projectMasterName: '',
+          projectMaster2Name: ''
         }
         // this.$refs.uploadComponent.clearUpload()
         this.$refs.inputForm.resetFields()

src/views/modules/cw/reportCancellApplyArchived/ReportCancellApplyArchivedForm.vue

@@ -49,13 +49,21 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="项目经理" prop="cwProjectRecordsDTO.projectMasterId"
+                  <el-form-item label="项目经理1" prop="cwProjectRecordsDTO.projectMasterId"
                                 :rules="[
                    ]">
                     <!--                    <el-input v-model="inputForm.projectMasterId" placeholder="请填写项目经理" clearable></el-input>-->
                     <UserSelect size="medium" :disabled="true" :limit='1' :value="inputForm.cwProjectRecordsDTO.projectMasterId" @getValue='(value) => {inputForm.cwProjectRecordsDTO.projectMasterId = value}'></UserSelect>
                   </el-form-item>
                 </el-col>
+                <el-col :span="12">
+                  <el-form-item label="项目经理2" prop="cwProjectRecordsDTO.realHeader"
+                                :rules="[
+                   ]">
+                    <!--                    <el-input v-model="inputForm.projectMasterId" placeholder="请填写项目经理" clearable></el-input>-->
+                    <UserSelect size="medium" :disabled="true" :limit='1' :value="inputForm.cwProjectRecordsDTO.realHeader" @getValue='(value) => {inputForm.cwProjectRecordsDTO.realHeader = value}'></UserSelect>
+                  </el-form-item>
+                </el-col>
                 <!--            <el-col :span="12">-->
                 <!--              <el-form-item label="被审计单位" prop="auditedUnitsName"-->
                 <!--                            :rules="[-->
@@ -351,7 +359,8 @@
             procInsId: '',
             processDefinitionId: '',
             status: '',
-            contractId: ''
+            contractId: '',
+            realHeader: ''
           },
           fileNumber: '',
           reportDate: '',
@@ -457,10 +466,10 @@
       init (method, id) {
         this.visible = true
         if (method === 'edit') {
-          this.title = '项目信息修改'
+          this.title = '报告作废归档修改'
           this.method = method
         } else {
-          this.title = '项目详情'
+          this.title = '报告作废归档详情'
           this.method = 'view'
         }
         this.activeName = 'files'
@@ -505,7 +514,8 @@
             procInsId: '',
             processDefinitionId: '',
             status: '',
-            contractId: ''
+            contractId: '',
+            realHeader: ''
           },
           fileNumber: '',
           reportDate: '',
@@ -708,7 +718,8 @@
             procInsId: '',
             processDefinitionId: '',
             status: '',
-            contractId: ''
+            contractId: '',
+            realHeader: ''
           },
           fileNumber: '',
           reportDate: '',

src/views/modules/cw/reportCancellApplyArchived/ReportCancellApplyArchivedList.vue

@@ -8,7 +8,7 @@
       <el-form-item label="项目名称" prop="projectName">
         <el-input size="small" v-model="searchForm.projectName" placeholder="请输入项目名称" clearable></el-input>
       </el-form-item>
-      <el-form-item label="项目经理" prop="projectMasterId">
+      <el-form-item label="项目经理1" prop="projectMasterId">
         <SelectUserTree
           ref="companyTree"
           :props="{
@@ -23,6 +23,21 @@
           @getValue="(value) => {searchForm.projectMasterId=value}"/>
 <!--        <el-input size="small" v-model="searchForm.projectMaster" placeholder="请输入项目经理" clearable></el-input>-->
       </el-form-item>
+      <el-form-item label="项目经理2" prop="projectMaster2Id">
+        <SelectUserTree
+          ref="companyTree"
+          :props="{
+                  value: 'id',             // ID字段名
+                  label: 'name',         // 显示名称
+                  children: 'children'    // 子级字段名
+                }"
+          :url="`/sys/user/treeUserDataAllOffice?type=2`"
+          :value="searchForm.projectMaster2Id"
+          :clearable="true"
+          :accordion="true"
+          @getValue="(value) => {searchForm.projectMaster2Id=value}"/>
+        <!--        <el-input size="small" v-model="searchForm.projectMaster" placeholder="请输入项目经理" clearable></el-input>-->
+      </el-form-item>
 <!--      <el-form-item label="创建人" prop="createBy">-->
 <!--        <el-input size="small" v-model="searchForm.createBy" placeholder="请输入创建人" clearable></el-input>-->
 <!--      </el-form-item>-->
@@ -93,7 +108,8 @@
           <vxe-column min-width="160" align="center" title="项目编号" field="projectNumber"></vxe-column>
           <vxe-column min-width="160" align="center" title="项目名称" field="projectName"></vxe-column>
           <vxe-column min-width="160" align="center" title="报告所属部门" field="departmentName"></vxe-column>
-          <vxe-column min-width="160" align="center" title="项目经理" field="projectMasterName"></vxe-column>
+          <vxe-column min-width="160" align="center" title="项目经理1" field="projectMasterName"></vxe-column>
+          <vxe-column min-width="160" align="center" title="项目经理2" field="projectMaster2Name"></vxe-column>
           <vxe-column min-width="160" align="center" title="报告主办人" field="reportSponsor"></vxe-column>
           <vxe-column min-width="160" align="center" title="创建人" field="userName"></vxe-column>
           <vxe-column min-width="160" align="center" title="创建时间" field="createDate"></vxe-column>
@@ -168,6 +184,7 @@
           projectNumber: '',
           projectName: '',
           projectMasterId: '',
+          projectMaster2Id: '',
           createBy: '',
           contractDates: []
         },

src/views/modules/cw/reportCancellApplyArchived/ReportCancellApplyArchivedTaskForm.vue

@@ -40,13 +40,21 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="项目经理" prop="cwProjectRecordsDTO.projectMasterId"
+              <el-form-item label="项目经理1" prop="cwProjectRecordsDTO.projectMasterId"
                             :rules="[
                    ]">
                 <!--                    <el-input v-model="inputForm.projectMasterId" placeholder="请填写项目经理" clearable></el-input>-->
                 <UserSelect size="medium" :disabled="true" :limit='1' :value="inputForm.cwProjectRecordsDTO.projectMasterId" @getValue='(value) => {inputForm.cwProjectRecordsDTO.projectMasterId = value}'></UserSelect>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="项目经理2" prop="cwProjectRecordsDTO.realHeader"
+                            :rules="[
+                   ]">
+                <!--                    <el-input v-model="inputForm.projectMasterId" placeholder="请填写项目经理" clearable></el-input>-->
+                <UserSelect size="medium" :disabled="true" :limit='1' :value="inputForm.cwProjectRecordsDTO.realHeader" @getValue='(value) => {inputForm.cwProjectRecordsDTO.realHeader = value}'></UserSelect>
+              </el-form-item>
+            </el-col>
 <!--            <el-col :span="12">-->
 <!--              <el-form-item label="被审计单位" prop="auditedUnitsName"-->
 <!--                            :rules="[-->
@@ -328,7 +336,8 @@
             procInsId: '',
             processDefinitionId: '',
             applyFileType: '',
-            contractId: ''
+            contractId: '',
+            realHeader: ''
           },
           fileNumber: '',
           reportDate: '',
@@ -434,7 +443,8 @@
             procInsId: '',
             processDefinitionId: '',
             applyFileType: '',
-            contractId: ''
+            contractId: '',
+            realHeader: ''
           },
           fileNumber: '',
           reportDate: '',
@@ -709,7 +719,8 @@
             procInsId: '',
             processDefinitionId: '',
             status: '',
-            contractId: ''
+            contractId: '',
+            realHeader: ''
           },
           fileNumber: '',
           reportDate: '',

src/views/modules/cw/reportManagement/ReportManagementAddForm.vue

@@ -754,6 +754,9 @@
           if (this.commonJS.isEmpty(this.inputForm.realCreate)) {
             this.inputForm.realCreate = JSON.parse(localStorage.getItem('user')).id
           }
+          if (this.commonJS.isEmpty(this.inputForm.signatureType) && this.method !== 'view') {
+            this.inputForm.signatureType = '1'
+          }
           this.$refs.enclosure.clearUpload()
           this.$refs.enclosure.newUpload(this.method, [], 'cwProjectReport', null, null, null, null, false)
           // this.$refs.archiveFile.clearUpload()

src/views/modules/cw/reportManagement/ReportManagementForm.vue

@@ -1148,6 +1148,9 @@
             if (this.formReadOnly) {
               method = 'view'
             }
+            if (this.commonJS.isEmpty(this.inputForm.signatureType) && this.method !== 'view') {
+              this.inputForm.signatureType = '1'
+            }
             if (this.commonJS.isEmpty(data.details)) {
               this.reportReviewService.list('1').then(({data}) => { this.detailDivide(data) })
             } else {

src/views/modules/cw/reportManagement/ReportManagementList.vue

@@ -8,7 +8,7 @@
       <el-form-item label="项目名称" prop="projectName">
         <el-input size="small" v-model="searchForm.projectName" placeholder="请输入项目名称" clearable></el-input>
       </el-form-item>
-      <el-form-item label="项目经理" prop="projectMasterId">
+      <el-form-item label="项目经理1" prop="projectMasterId">
         <SelectUserTree
           ref="companyTree"
           :props="{
@@ -23,6 +23,21 @@
           @getValue="(value) => {searchForm.projectMasterId=value}"/>
 <!--        <el-input size="small" v-model="searchForm.projectMasterName" placeholder="请输入项目经理" clearable></el-input>-->
       </el-form-item>
+      <el-form-item label="项目经理2" prop="projectMaster2Id">
+        <SelectUserTree
+          ref="companyTree"
+          :props="{
+                  value: 'id',             // ID字段名
+                  label: 'name',         // 显示名称
+                  children: 'children'    // 子级字段名
+                }"
+          :url="`/sys/user/treeUserDataAllOffice?type=2`"
+          :value="searchForm.projectMaster2Id"
+          :clearable="true"
+          :accordion="true"
+          @getValue="(value) => {searchForm.projectMaster2Id=value}"/>
+        <!--        <el-input size="small" v-model="searchForm.projectMasterName" placeholder="请输入项目经理" clearable></el-input>-->
+      </el-form-item>
       <el-form-item label="创建人" prop="createBy">
         <SelectUserTree
           ref="companyTree"
@@ -127,7 +142,8 @@
           <vxe-column min-width="160" align="center" title="客户名称" field="servedUnitName"></vxe-column>
           <vxe-column min-width="160" align="center" title="报告文号" field="reportNo"></vxe-column>
           <vxe-column min-width="160" align="center" title="报告所属部门" field="departmentName"></vxe-column>
-          <vxe-column min-width="160" align="center" title="项目经理" field="projectMasterName"></vxe-column>
+          <vxe-column min-width="160" align="center" title="项目经理1" field="projectMasterName"></vxe-column>
+          <vxe-column min-width="160" align="center" title="项目经理2" field="projectMaster2Name"></vxe-column>
 <!--          <vxe-column min-width="160" align="center" title="报告主办人" field="reportSponsor"></vxe-column>-->
           <vxe-column min-width="160" align="center" title="创建人" field="userName"></vxe-column>
           <vxe-column min-width="160" align="center" title="创建时间" field="createDate"></vxe-column>
@@ -143,7 +159,7 @@
             <template slot-scope="scope">
               <el-button v-if="scope.row.signatureType === '1'"  type="text" @click="detailS(scope.row)" effect="dark" size="mini"
                           :type="$dictUtils.getDictLabel('cw_status_flag', scope.row.status1, '-')">
-                {{$dictUtils.getDictLabel("cw_status", scope.row.status1, '-')}}
+                {{scope.row.status1 === '5' ? '电子章已完成' : $dictUtils.getDictLabel("cw_status", scope.row.status1, '-')}}
               </el-button>
               <el-button v-else-if="scope.row.signatureType === '2'" type="text" @click="detailS2(scope.row)" effect="dark" size="mini"
                           :type="$dictUtils.getDictLabel('cw_project_report_sign_status_flag', scope.row.status2, '-')">
@@ -151,7 +167,7 @@
               </el-button>
               <el-button v-else-if="scope.row.signatureType === '3'" type="text" @click="detailS3(scope.row)" effect="dark" size="mini"
                          :type="$dictUtils.getDictLabel('cw_status_flag', scope.row.status3, '-')">
-                {{$dictUtils.getDictLabel("cw_status", scope.row.status3, '-')}}
+                {{scope.row.status3 === '5' ? '实体章已完成' : $dictUtils.getDictLabel("cw_status", scope.row.status3, '-')}}
               </el-button>
               <el-button v-else effect="dark" size="mini" >
                 未发起
@@ -234,6 +250,7 @@
           projectNumber: '',
           projectName: '',
           projectMasterId: '',
+          projectMaster2Id: '',
           createBy: '',
           contractDates: []
         },

src/views/modules/cw/reportManagement/ReportManagementSignatureForm.vue

@@ -789,6 +789,9 @@
             } else {
               this.method = 'false'
             }
+            if (this.commonJS.isEmpty(this.inputForm.signatureType) && this.method !== 'view') {
+              this.inputForm.signatureType = '1'
+            }
             if (this.commonJS.isNotEmpty(this.inputForm.signatureContractId) && this.status === 'audit' && this.commonJS.isNotEmpty(sFiles) && this.inputForm.signatureType !== '3') {
               // 签章按钮展示
               this.$refs.archiveFile.newUpload(this.method, data.cwFileInfoList, 'cwReportSignature', null, null, null, null, false, 'audit')

src/views/modules/cw/reportManagement/ReportManagementTaskForm.vue

@@ -489,6 +489,9 @@
             if (this.status === 'audit' || this.status === 'taskFormDetail') {
               this.method = 'view'
             }
+            if (this.commonJS.isEmpty(this.inputForm.signatureType) && this.method !== 'view') {
+              this.inputForm.signatureType = '1'
+            }
             this.$refs.archiveFile.newUpload(this.method, data.cwFileInfoList, 'cwWorkContract', null, null, null, null, false)
             this.loading = false
           })

src/views/modules/cw/reportManagement/ReportServiceUnitForm.vue

@@ -91,7 +91,8 @@
         searchForm: {
           name: '',
           no: ''
-        }
+        },
+        projectId: ''
       }
     },
     // workClientService: null,
@@ -107,9 +108,10 @@
     methods: {
       init (id) {
         // console.log('projectID', id)
+        this.projectId = id
         this.title = '客户选择'
         this.visibleChoose = true
-        this.list(id)
+        this.list()
       },
       // 表单提交
       getWorkClient () {
@@ -121,14 +123,14 @@
           this.$emit('getWorkClientChoose', row)
         }
       },
-      list (id) {
+      list () {
         this.dataList = []
         this.loading = true
         this.projectReportService.clineList({
           'current': this.tablePage.currentPage,
           'size': this.tablePage.pageSize,
           'orders': this.tablePage.orders,
-          'projectId': id,
+          'projectId': this.projectId,
           ...this.searchForm
         }).then(({data}) => {
           // console.log('进来了projectReportService', data)

src/views/modules/cw/reportManagement/reportReview/ReportReviewForm.vue

@@ -871,6 +871,9 @@
             } else {
               this.method = 'false'
             }
+            if (this.commonJS.isEmpty(this.inputForm.signatureType) && this.method !== 'view') {
+              this.inputForm.signatureType = '1'
+            }
             this.$refs.enclosure.newUpload(this.method, data.cwFileInfoList2, 'cwWorkContract', null, null, null, null, false)
             this.$refs.archiveFile.newUpload('view', data.cwFileInfoList, 'cwWorkContract', null, null, null, null, false)
             this.$refs.signatureFile.newUpload('view', data.signatureFileList, 'cwWorkContract', null, null, null, null, false)

src/views/modules/cw/workClientInfo/WorkClientList.vue

@@ -123,7 +123,7 @@
             </template>
           </vxe-column>
           <vxe-column min-width="160" align="center" title="统一社会信用代码" field="uscCode"></vxe-column>
-          <vxe-column min-width="160" align="center" title="英文名称" field="englishName"></vxe-column>
+<!--          <vxe-column min-width="160" align="center" title="英文名称" field="englishName"></vxe-column>-->
           <vxe-column min-width="160" align="center" title="所属行业" field="industry">
             <template slot-scope="scope">
               {{$dictUtils.getDictLabel('cw_work_client_industry', scope.row.industry, '-')}}

src/views/modules/notify/MyNotifyList.vue

@@ -2,9 +2,44 @@
   <div class="page">
       <el-form size="small" :inline="true" class="query-form" ref="searchForm" :model="searchForm" @keyup.enter.native="refreshList()" @submit.native.prevent>
             <!-- 搜索框-->
-		     <el-form-item prop="title">
+		     <el-form-item label="标题" prop="title">
                 <el-input size="small" v-model="searchForm.title" placeholder="标题" clearable></el-input>
 		     </el-form-item>
+        <el-form-item label="查阅状态" prop="readFlag">
+          <el-select size="small" v-model="searchForm.readFlag" placeholder="查阅状态" clearable>
+            <el-option
+              v-for="item in $dictUtils.getDictList('oa_notify_read')"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="类型" prop="type">
+          <el-select size="small" v-model="searchForm.type" placeholder="类型" clearable>
+            <el-option
+              v-for="item in $dictUtils.getDictList('oa_notify_type')"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="发布者" prop="createName">
+          <UserSelect :limit='1' :userName="searchForm.createName" @getValue='(value, label) => {searchForm.createName = label}'></UserSelect>
+        </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"
+            v-model="searchForm.createDates"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期">
+          </el-date-picker>
+        </el-form-item>
           <el-form-item>
             <el-button  type="primary" @click="refreshList()" size="small" icon="el-icon-search">查询</el-button>
             <el-button @click="resetSearch()" size="small" icon="el-icon-refresh-right">重置</el-button>
@@ -18,7 +53,11 @@
              <el-button :disabled="$refs.notifyTable && $refs.notifyTable.getCheckboxRecords().length === 0" type="warning" size="small" @click="portionRead()">标记为已读</el-button>
            </template>
          </vxe-toolbar>
-
+         <el-tabs v-model="activeName" @tab-click="handleClick">
+           <el-tab-pane label="全部" name="all"></el-tab-pane>
+           <el-tab-pane label="未读" name="read"></el-tab-pane>
+           <el-tab-pane label="已读" name="un_read"></el-tab-pane>
+         </el-tabs>
      <div style="height: calc(100% - 80px);">
         <vxe-table
             border="inner"
@@ -73,6 +112,7 @@
                  </span>
             </template>
           </vxe-column>
+          <vxe-column  min-width="180px"title="创建时间" field="createDate" align="center" ></vxe-column>
             <vxe-column title="操作" width="80" fixed="right" align="center">
                 <template  slot-scope="scope">
                     <el-button  type="text" size="mini" @click="view(scope.row.id)">查看</el-button>
@@ -99,11 +139,16 @@
 <script>
   import NotifyForm from './NotifyForm'
   import NotifyService from '@/api/notify/NotifyService'
+  import UserSelect from '@/components/userSelect'
   export default {
     data () {
       return {
         searchForm: {
-          title: ''
+          title: '',
+          type: '',
+          createName: '',
+          createDates: [],
+          readFlag: ''
         },
         dataList: [],
         tablePage: {
@@ -112,18 +157,22 @@
           pageSize: 10,
           orders: []
         },
-        loading: false
+        loading: false,
+        activeName: ''
       }
     },
     components: {
-      NotifyForm
+      NotifyForm,
+      UserSelect
     },
     notifyService: null,
     created () {
       this.notifyService = new NotifyService()
+      this.activeName = 'all'
     },
     activated () {
       this.refreshList()
+      this.activeName = 'all'
     },
 
     methods: {
@@ -162,6 +211,7 @@
         this.$refs.notifyForm.init('read', id)
       },
       resetSearch () {
+        this.activeName = 'all'
         this.$refs.searchForm.resetFields()
         this.refreshList()
       },
@@ -207,6 +257,18 @@
             this.refreshList()
           })
         })
+      },
+      handleClick (event) {
+        if (event.name === 'all') {
+          this.searchForm.readFlag = ''
+        }
+        if (event.name === 'read') {
+          this.searchForm.readFlag = '0'
+        }
+        if (event.name === 'un_read') {
+          this.searchForm.readFlag = '1'
+        }
+        this.refreshList()
       }
     }
   }

src/views/modules/notify/NotifyList.vue

@@ -2,9 +2,34 @@
   <div class="page">
       <el-form size="small" :inline="true" class="query-form" ref="searchForm" :model="searchForm" @keyup.enter.native="refreshList()" @submit.native.prevent>
             <!-- 搜索框-->
-		     <el-form-item prop="title">
+		     <el-form-item label="标题" prop="title">
                 <el-input size="small" v-model="searchForm.title" placeholder="标题" clearable></el-input>
 		     </el-form-item>
+        <el-form-item label="类型" prop="type">
+          <el-select size="small" v-model="searchForm.type" placeholder="类型" clearable>
+            <el-option
+              v-for="item in $dictUtils.getDictList('oa_notify_type')"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="发布者" prop="createName">
+          <UserSelect :limit='1' :userName="searchForm.createName" @getValue='(value, label) => {searchForm.createName = label}'></UserSelect>
+        </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"
+            v-model="searchForm.createDates"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期">
+          </el-date-picker>
+        </el-form-item>
           <el-form-item>
             <el-button  type="primary" @click="refreshList()" size="small" icon="el-icon-search">查询</el-button>
             <el-button @click="resetSearch()" size="small" icon="el-icon-refresh-right">重置</el-button>
@@ -39,7 +64,7 @@
             :checkbox-config="{}">
             <vxe-column type="seq" width="60" title="序号"></vxe-column>
 <!--            <vxe-column type="checkbox"  width="40px"></vxe-column>-->
-            <vxe-column min-width="100px" title="标题" field="title" align="center" >
+            <vxe-column min-width="180px" title="标题" field="title" align="center" >
               <template slot-scope="scope">
                 <el-link  type="primary" :underline="false" v-if="hasPermission('notify:view')"  @click="view(scope.row.id)">{{scope.row.title}}</el-link>
                 <span v-else>{{scope.row.title}}</span>
@@ -76,6 +101,7 @@
                  </span>
               </template>
             </vxe-column>
+          <vxe-column  min-width="180px"title="创建时间" field="createDate" align="center" ></vxe-column>
           <vxe-column  width="100px"align="center" fixed="right" title="关闭状态" field="isClose" >
             <template slot-scope="scope">
               <span v-if="scope.row.isClose === '0'" style="color: #67C23A"> 未关闭 </span>
@@ -127,11 +153,15 @@
   import TaskService from '@/api/flowable/TaskService'
   import ProcessService from '@/api/flowable/ProcessService'
   import UserService from '@/api/sys/UserService'
+  import UserSelect from '@/components/userSelect'
   export default {
     data () {
       return {
         searchForm: {
-          title: ''
+          title: '',
+          type: '',
+          createName: '',
+          createDates: []
         },
         dataList: [],
         tablePage: {
@@ -147,7 +177,8 @@
       }
     },
     components: {
-      NotifyForm
+      NotifyForm,
+      UserSelect
     },
     notifyService: null,
     taskService: null,