会计报告归档 给归档管理员（樊莉）添加会计和苏州分公司区分的条件限制

src/api/sys/WorkContractFileService.js

@@ -38,4 +38,11 @@ export default class WorkContractService {
 			params: { id: id },
 		});
 	}
+	findcancelByContractInfoId(id) {
+		return request({
+			url: prefix + "/workContract/workContractFile/findByContractInfoId",
+			method: "get",
+			params: { id: id },
+		});
+	}
 }

src/views/cw/projectRecords/ProjectRecordsForm.vue

@@ -296,6 +296,22 @@
 					  </el-input>
 				  </el-form-item>
                 </el-col>
+
+				  <el-col :span="12">
+					  <el-form-item label="项目执行人" prop="projectExecutorName"
+									:rules="[
+                   ]">
+						  <!--                    <UserSelect :readonly="true" :disabled="method === 'view'" :limit='1' :modelValue="inputForm.realHeader" @update:modelValue='(value) => {inputForm.realHeader = value}'></UserSelect>-->
+						  <el-input  v-model="inputForm.projectExecutorName" placeholder="请选择项目执行人">
+							  <template #suffix>
+								  <el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="clearUser2">
+								  </el-button>
+							  </template>
+						  </el-input>
+					  </el-form-item>
+				  </el-col>
+
+
                 <el-col :span="12">
                   <el-form-item label="创建人" prop="createBy.name"
                                 :rules="[

src/views/cw/projectReportArchive/ProjectReportArchiveList.vue

@@ -13,6 +13,16 @@
         <el-input v-model="searchForm.cwProjectRecordsDTO.projectName" placeholder="请输入项目名称" clearable
           :style="styles"></el-input>
       </el-form-item>
+
+		<el-form-item v-if="hasPermission('cwProjectReportArchive:newExport')"  label="报告所属公司" prop="subordinateCompany">
+			<el-select v-model="searchForm.subordinateCompany" placeholder="请选择" style="width:100%;" clearable>
+				<!-- 手动写选项，不再用字典 -->
+				<el-option label="会计公司" value="10003"></el-option>
+				<el-option label="苏州分公司" value="10006"></el-option>
+				<el-option label="全部" value="0"></el-option>
+			</el-select>
+		</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' :modelValue="searchForm.cwProjectRecordsDTO.projectMasterName" @update:modelValue='(value, label) => {searchForm.cwProjectRecordsDTO.projectMasterName = value}'></UserSelect>-->
@@ -335,7 +345,8 @@ export default {
 		praaId: '',
 		praaStatus: '',
         fileNumber: '',
-        archiveSta: ''
+        archiveSta: '',
+		subordinateCompany: ''	//报告所属公司
       },
       dataList: [],
       tablePage: {
@@ -401,6 +412,10 @@ export default {
   created() {
     this.projectReportArchiveService = new ProjectReportArchiveService()
     this.projectReportBorrowService = new ProjectReportBorrowService()
+	  // 关键：只有有权限，才设置默认值 10006
+	  if (this.hasPermission('cwProjectReportArchive:newExport')) {
+		  this.searchForm.subordinateCompany = "10003";
+	  }
   },
   components: {
     ProjectRecordsForm,

src/views/cw/reportManagement/ReportManagementList.vue

@@ -135,6 +135,13 @@
 				<el-input v-model="searchForm.servedUnitName" placeholder="请输入客户名称" clearable :style="styles"></el-input>
 			</el-form-item>
 
+			<el-form-item v-if="showHideItem" label="盖章日期" prop="sealDates">
+				<el-date-picker clearable placement="bottom-start" format="YYYY-MM-DD HH:mm:ss"
+								value-format="YYYY-MM-DD HH:mm:ss" v-model="searchForm.sealDates" type="datetimerange"
+								range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
+				</el-date-picker>
+			</el-form-item>
+
 
 			<el-form-item>
 				<el-button type="default" @click="showHide" :icon="showHideIcon">{{ showHideName }}</el-button>
@@ -594,6 +601,7 @@ export default {
 				filingType: '',
 				cwReportType: '', //报告类型
 				cwReportDates: [], // 报告日期
+				sealDates: [], // 盖章日期
 				projectClassification: '', //项目分类
 				servedUnitName: '' //客户名称
 			},

src/views/workContract/WorkContractList.vue

@@ -15,6 +15,10 @@
 				<el-input v-model="searchForm.no" placeholder="请输入合同编号" clearable></el-input>
 			</el-form-item>
 
+			<el-form-item v-if="showHideItem" label="报告号" prop="reportNo">
+				<el-input v-model="searchForm.reportNo" placeholder="请输入报告号" clearable></el-input>
+			</el-form-item>
+
 			<el-form-item v-if="showHideItem" label="签订日期" prop="contractDates">
 				<el-date-picker placement="bottom-start" v-model="searchForm.contractDates" type="datetimerange"
 					range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
@@ -114,13 +118,15 @@
 							<span v-else>{{ scope.row.filedNo }}</span>
 						</template>
 					</vxe-column>
-					<vxe-column min-width="200px" title="关联报告号" field="reportNo" align="center">
+
+					<vxe-column min-width="200px" title="关联报告号" field="reportNos" align="center">
 						<template #default="scope">
-							<div v-if="scope.row.reportNo && scope.row.reportNo.length > 0">
-								<template v-for="(item, index) in scope.row.reportNo">
-									<el-tag type="primary" v-if="item" :key="index">{{
-										item
-									}}</el-tag>
+							<div>
+								<!-- 把字符串用 split(',') 转成数组直接循环 -->
+								<template v-for="(item, index) in (scope.row.reportNos || '').split(',')">
+									<el-tag type="primary" v-if="item.trim()" :key="index" style="margin-right: 4px;">
+										{{ item.trim() }}
+									</el-tag>
 								</template>
 							</div>
 						</template>
@@ -324,7 +330,8 @@ export default {
 				createById: '',
 				procInsId: '',
 				processDefinitionId: '',
-				contractType: ''
+				contractType: '',
+				reportNo: ''
 			},
 			dataList: [],
 			tablePage: {