页面样式调整提交

src/layout/components/tags.vue

@@ -307,7 +307,7 @@ export default {
 		padding: 12px 12px 8px 12px;
 	}
 	.adminui-topbar + .page {
-		height: calc(100% - 129px) !important;
+		height: calc(100% - 90px) !important;
 		margin: 12px 12px 8px 12px;
 	}
 }

src/layout/components/topbar2.vue

@@ -21,9 +21,9 @@
 				</transition-group>
 			</el-breadcrumb>
 		</div>
-		<div class="ivu-page-header-title">
+		<!--<div class="ivu-page-header-title">
 			{{ breadList[breadList.length - 1].meta.title }}
-		</div>
+		</div>-->
 	</div>
 </template>
 
@@ -83,7 +83,7 @@ export default {
 }
 .adminui-topbar.inner-bar {
 	.left-panel {
-		margin-bottom: 16px;
+		margin-bottom: 6px;
 		.el-breadcrumb {
 			margin-left: 15px;
 		}
@@ -105,7 +105,7 @@ export default {
 		color: #17233d;
 		font-weight: 500;
 		font-size: 20px;
-		margin-bottom: 16px;
+		margin-bottom: 6px;
 		margin-left: 12px;
 	}
 }

src/style/app.scss

@@ -26,7 +26,7 @@ a,button,input,textarea{-webkit-tap-highlight-color:rgba(0,0,0,0);box-sizing: bo
   .el-menu--horizontal>.el-menu-item {
     border-bottom: none !important;
   }
-  
+
   .el-menu--horizontal>.el-menu-item.is-active {
     border-bottom: none !important;
   }
@@ -35,7 +35,7 @@ a,button,input,textarea{-webkit-tap-highlight-color:rgba(0,0,0,0);box-sizing: bo
 .adminui-header-left {
   display: flex;
   align-items: center;
-  padding-left:20px; 
+  padding-left:20px;
   .logo-bar{
     width: 200px;
   }
@@ -86,7 +86,7 @@ a,button,input,textarea{-webkit-tap-highlight-color:rgba(0,0,0,0);box-sizing: bo
 .adminui-side-split-scroll::-webkit-scrollbar-track {background-color: rgba(255, 255, 255, 0);}
 .adminui-side-split-scroll::-webkit-scrollbar-track:hover {background-color: rgba(255, 255, 255, 0);}
 
-.aminui-side-split+.aminui-side 
+.aminui-side-split+.aminui-side
 {
   width:170px;
   .el-menu-item.is-active{
@@ -151,7 +151,7 @@ a,button,input,textarea{-webkit-tap-highlight-color:rgba(0,0,0,0);box-sizing: bo
     overflow: auto;
 }
 // .vxe-table{
-// 	padding:10px; 
+// 	padding:10px;
 // 	height:100%;
 // 	.vxe-table-body{
 // 		height: calc(100% - 90px);
@@ -188,7 +188,7 @@ a,button,input,textarea{-webkit-tap-highlight-color:rgba(0,0,0,0);box-sizing: bo
     -webkit-transition: all .2s ease-in-out;
     transition: all .2s ease-in-out;
     .query-form {
-      margin-bottom: 16px !important;
+      margin-bottom: 6px !important;
     }
     .query-form + .jp-table{
       height: calc(100% - 66px);
@@ -206,8 +206,8 @@ a,button,input,textarea{-webkit-tap-highlight-color:rgba(0,0,0,0);box-sizing: bo
       }
     }
     .body-tree{
-      height: calc(100% - 50px);	
-    }    
+      height: calc(100% - 50px);
+    }
   }
 .left-panel {
   .query-form {
@@ -238,7 +238,7 @@ a,button,input,textarea{-webkit-tap-highlight-color:rgba(0,0,0,0);box-sizing: bo
       }
     }
     .body-tree{
-      height: calc(100% - 50px);	
+      height: calc(100% - 50px);
     }
 }
 .tree-footer {
@@ -318,7 +318,7 @@ a,button,input,textarea{-webkit-tap-highlight-color:rgba(0,0,0,0);box-sizing: bo
     display: flex;
     align-items: center;
     height: 100%;
-    i { 
+    i {
       margin-left:5px;
       color: #999;
       padding:5px;
@@ -338,4 +338,4 @@ a,button,input,textarea{-webkit-tap-highlight-color:rgba(0,0,0,0);box-sizing: bo
 
 .el-empty {
   margin-top: 100px;
-}
+}

src/views/cw/projectRecords/ProjectMembersList.vue

@@ -68,7 +68,7 @@
               <span v-else>{{scope.row.projectName}}</span>
             </template>
           </vxe-column>
-          <vxe-column min-width="160" align="center" title="项目编号" field="projectNumber"></vxe-column>
+          <vxe-column min-width="150" align="center" title="项目编号" field="projectNumber"></vxe-column>
           <vxe-column min-width="230" align="center" title="合同名称" field="contractName">
             <template #default="scope">
               <el-link  type="primary" :underline="false" v-if="commonJS.isNotEmpty(scope.row.contractId)&&commonJS.isNotEmpty(scope.row.contractName)" @click="viewContract(scope.row.contractId)">{{scope.row.contractName}}</el-link>
@@ -76,9 +76,9 @@
             </template>
           </vxe-column>
           <vxe-column min-width="160" align="center" title="委托方" field="clientContactsName"></vxe-column>
-          <vxe-column min-width="160" align="center" title="成员数量" field="memberCount"></vxe-column>
-          <vxe-column min-width="160" align="center" title="创建人" field="createBy.name"></vxe-column>
-          <vxe-column min-width="160" align="center" title="创建时间" field="createTime"></vxe-column>
+          <vxe-column min-width="80" align="center" title="成员数量" field="memberCount"></vxe-column>
+          <vxe-column min-width="80" align="center" title="创建人" field="createBy.name"></vxe-column>
+          <vxe-column min-width="120" align="center" title="创建时间" field="createTime"></vxe-column>
           <vxe-column title="操作" width="70px" fixed="right" align="center">
             <template  #default="scope">
 <!--              项目创建人、项目组成员、管理员可编辑-->

src/views/cw/projectRecords/ProjectRecordsList.vue

@@ -32,7 +32,7 @@
           end-placeholder="结束日期">
         </el-date-picker>
       </el-form-item>
-		<el-form-item v-if="showHideItem" label="业务类型" prop="businessType">
+		<!--<el-form-item v-if="showHideItem" label="业务类型" prop="businessType">
 			<SelectTree
 				ref="typeTree"
 				:props="{
@@ -46,8 +46,17 @@
 				:accordion="true"
 				size="default"
 				@getValue="(value) => {searchForm.businessType=value}"/>
+		</el-form-item>-->
+		<el-form-item v-if="showHideItem" label="报备类型" prop="filingType">
+			<el-select v-model="searchForm.reportType" placeholder="请选择" style="width:100%;">
+				<el-option
+					v-for="item in $dictUtils.getDictList('cw_work_client_report_type')"
+					:key="item.value"
+					:label="item.label"
+					:value="item.value">
+				</el-option>
+			</el-select>
 		</el-form-item>
-
       <el-form-item>
         <el-button type="default" @click="showHide" :icon="showHideIcon">{{showHideName}}</el-button>
         <el-button type="primary" @click="refreshList()" icon="el-icon-search">查询</el-button>
@@ -98,7 +107,7 @@
           :data="dataList"
           :checkbox-config="{}">
           <vxe-column type="seq" width="60" title="序号"></vxe-column>
-          <vxe-column type="checkbox" width="40" ></vxe-column>
+          <!--<vxe-column type="checkbox" width="40" ></vxe-column>-->
           <vxe-column min-width="230" align="center" title="项目名称" field="projectName">
             <template #default="scope">
               <el-link  type="primary" :underline="false" v-if="hasPermission('cwProjectRecords:view')" @click="view(scope.row.id)">{{scope.row.projectName}}</el-link>
@@ -106,20 +115,20 @@
               <span v-else>{{scope.row.projectName}}</span>
             </template>
           </vxe-column>
-          <vxe-column min-width="160" align="center" title="项目编号" field="projectNumber"></vxe-column>
-			<vxe-column min-width="160" align="center" title="项目规模" field="projectMoney"></vxe-column>
-			<vxe-column min-width="160" align="center" title="业务类型" field="businessTypeName"></vxe-column>
+          <vxe-column min-width="140" align="center" title="项目编号" field="projectNumber"></vxe-column>
+			<vxe-column min-width="110" align="center" title="项目规模(元)" field="projectMoney"></vxe-column>
+			<!--<vxe-column min-width="160" align="center" title="业务类型" field="businessTypeName"></vxe-column>-->
           <vxe-column min-width="230" align="center" title="合同名称" field="contractName">
             <template #default="scope">
               <el-link  type="primary" :underline="false" v-if="commonJS.isNotEmpty(scope.row.contractId)&&commonJS.isNotEmpty(scope.row.contractName)" @click="viewContract(scope.row.contractId)">{{scope.row.contractName}}</el-link>
               <span v-else style="color: red">暂无合同</span>
             </template>
           </vxe-column>
-          <vxe-column min-width="160" align="center" title="客户名称" field="clientContactsName"></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="realHeaderName"></vxe-column>
-          <vxe-column min-width="160" align="center" title="创建人" field="createBy.name"></vxe-column>
-          <vxe-column min-width="160" align="center" title="创建时间" field="createTime"></vxe-column>
+			<vxe-column min-width="80" align="center" title="创建人" field="createBy.name"></vxe-column>
+          <vxe-column min-width="100" align="center" title="项目经理1" field="projectMasterName"></vxe-column>
+          <vxe-column min-width="100" align="center" title="项目经理2" field="realHeaderName"></vxe-column>
+			<vxe-column min-width="200" align="center" title="客户名称" field="clientContactsName"></vxe-column>
+          <vxe-column min-width="120" align="center" title="创建时间" field="createTime"></vxe-column>
           <vxe-column title="操作" width="150px" fixed="right" align="center">
             <template  #default="scope">
               <el-button v-if="hasPermission('cwProjectRecords:edit')&&(scope.row.reportReview !== '1' || isAdmin)&&(scope.row.createBy.id === $store.state.user.id || isAdmin || haveProjectIds.includes(scope.row.id))" text type="primary"  size="small" @click="edit(scope.row.id)">修改</el-button>

src/views/cw/reportCancellApply/ReportCancellApplyList.vue

@@ -93,22 +93,22 @@
           :data="dataList"
           :checkbox-config="{}">
           <vxe-column type="seq" width="60" title="序号"></vxe-column>
-          <vxe-column min-width="160" align="center" title="单据编号" field="documentNo"></vxe-column>
-          <vxe-column min-width="160" align="center" title="报告文号" field="reportNo">
-            <template #default="scope">
-              <el-link  type="primary" :underline="false" v-if="hasPermission('cwProjectReport:list')&&commonJS.isNotEmpty(scope.row.reportId)" @click="viewReport(scope.row.reportId)">{{scope.row.reportNo}}</el-link>
-              <el-link  type="primary" :underline="false" v-else-if="hasPermission('cwProjectReport:list')&&commonJS.isNotEmpty(scope.row.reportId)"  @click="viewReport(scope.row.reportId)">{{scope.row.reportNo}}</el-link>
-              <span v-else>{{scope.row.reportNo}}</span>
-            </template>
-          </vxe-column>
-          <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="100" align="center" title="单据编号" field="documentNo">
+			  <template #default="scope">
+				  <el-link  type="primary" :underline="false" v-if="hasPermission('cwProjectReport:list')&&commonJS.isNotEmpty(scope.row.reportId)" @click="viewReport(scope.row.reportId)">{{scope.row.documentNo}}</el-link>
+				  <el-link  type="primary" :underline="false" v-else-if="hasPermission('cwProjectReport:list')&&commonJS.isNotEmpty(scope.row.reportId)"  @click="viewReport(scope.row.reportId)">{{scope.row.documentNo}}</el-link>
+				  <span v-else>{{scope.row.documentNo}}</span>
+			  </template>
+		  </vxe-column>
+			<vxe-column min-width="150" align="center" title="项目编号" field="projectNumber"></vxe-column>
+			<vxe-column min-width="220" align="center" title="项目名称" field="projectName"></vxe-column>
+          <vxe-column min-width="170" align="center" title="报告文号" field="reportNo"></vxe-column>
+			<vxe-column min-width="100" align="center" title="报告主办人" field="reportSponsor"></vxe-column>
+			<vxe-column min-width="80" align="center" title="创建人" field="userName"></vxe-column>
           <vxe-column min-width="160" align="center" title="报告所属部门" field="departmentName"></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="createDateT"></vxe-column>
+          <vxe-column min-width="100" align="center" title="项目经理1" field="projectMasterName"></vxe-column>
+          <vxe-column min-width="100" align="center" title="项目经理2" field="projectMaster2Name"></vxe-column>
+          <vxe-column min-width="100" align="center" title="创建时间" field="createDateT"></vxe-column>
           <vxe-column  min-width="150px" align="center" fixed="right" title="状态" field="status" >
             <template #default="scope">
               <el-button  @click="detail(scope.row)" effect="dark"

src/views/cw/reportManagement/ReportManagementList.vue

@@ -8,7 +8,7 @@
       <el-form-item label="项目名称" prop="projectName">
         <el-input v-model="searchForm.projectName" placeholder="请输入项目名称" clearable></el-input>
       </el-form-item>
-      <el-form-item v-if="showHideItem" label="项目经理1" prop="projectMasterName">
+      <el-form-item label="项目经理1" prop="projectMasterName">
         <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">
@@ -130,23 +130,23 @@
           :data="dataList"
           :checkbox-config="{}">
           <vxe-column type="seq" width="60" title="序号"></vxe-column>
-          <vxe-column min-width="160" align="center" title="单据编号" field="documentNo">
+          <vxe-column width="100" align="center" title="单据编号" field="documentNo">
             <template #default="scope">
               <el-link  type="primary" :underline="false" v-if="hasPermission('cwProjectReport:list')" @click="view(scope.row.id)">{{scope.row.documentNo}}</el-link>
               <el-link  type="primary" :underline="false" v-else-if="hasPermission('cwProjectReport:list')"  @click="view(scope.row.id,)">{{scope.row.documentNo}}</el-link>
               <span v-else>{{scope.row.documentNo}}</span>
             </template>
           </vxe-column>
-          <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="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="项目经理1" field="projectMasterName"></vxe-column>
-          <vxe-column min-width="160" align="center" title="项目经理2" field="projectMaster2Name"></vxe-column>
+          <vxe-column width="150" align="center" title="项目编号" field="projectNumber"></vxe-column>
+          <vxe-column min-width="220" align="center" title="项目名称" field="projectName"></vxe-column>
+		  <vxe-column width="170" align="center" title="报告文号" field="reportNo"></vxe-column>
+			<vxe-column width="80" align="center" title="创建人" field="userName"></vxe-column>
+          <vxe-column width="120" align="center" title="报告所属部门" field="departmentName"></vxe-column>
+          <vxe-column width="100" align="center" title="项目经理1" field="projectMasterName"></vxe-column>
+          <vxe-column width="100" align="center" title="项目经理2" field="projectMaster2Name"></vxe-column>
+			<vxe-column min-width="160" align="center" title="客户名称" field="servedUnitName"></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="createTime"></vxe-column>
+          <vxe-column width="110" align="center" title="创建时间" field="createTime"></vxe-column>
           <vxe-column  min-width="230px" align="center" fixed="right" title="复核签章状态" field="reviewStatus" >
             <template #default="scope">
               <el-button @click="detail(scope.row)" effect="dark"
@@ -177,7 +177,7 @@
 
             </template>
           </vxe-column>-->
-			<vxe-column  min-width="120px" align="center" fixed="right" title="修改注师" field="signatureAnnotatorStatus" >
+			<vxe-column  min-width="100px" align="center" title="修改注师" field="signatureAnnotatorStatus" >
 				<template #default="scope">
 					<el-button @click="detailSig(scope.row)" effect="dark"
 							   v-if="scope.row.signatureAnnotatorStatus !=='0'"
@@ -236,8 +236,9 @@
                 <!--              被驳回后当前申请人重新调整-->
                 <el-button v-if="hasPermission('cw:workContract:filed')&&scope.row.createById === $store.state.user.id&&scope.row.reviewStatus === '4'" text type="primary" @click="adjustReview(scope.row)">驳回调整</el-button>
                 <!--              复核流程-->
-				<el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5'&& !scope.row.takeNumberType && (scope.row.reviewStatus === '0' || scope.row.reviewStatus === '1' || scope.row.reviewStatus === '3' || scope.row.reviewStatus === undefined || scope.row.reviewStatus === '')" text type="primary" @click="pushTakeNumber(scope.row)">报告号申请</el-button>
-                <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5'&& scope.row.takeNumberType && (scope.row.reviewStatus === '0' || scope.row.reviewStatus === '1' || scope.row.reviewStatus === '3' || scope.row.reviewStatus === undefined || scope.row.reviewStatus === '')" text type="primary" @click="pushF(scope.row)">复核</el-button>
+				  <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5'&& (scope.row.reviewStatus === '0' || scope.row.reviewStatus === '1' || scope.row.reviewStatus === '3' || scope.row.reviewStatus === undefined || scope.row.reviewStatus === '')" text type="primary" @click="pushF(scope.row)">复核</el-button>
+				<!--<el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5'&& !scope.row.takeNumberType && (scope.row.reviewStatus === '0' || scope.row.reviewStatus === '1' || scope.row.reviewStatus === '3' || scope.row.reviewStatus === undefined || scope.row.reviewStatus === '')" text type="primary" @click="pushTakeNumber(scope.row)">报告号申请</el-button>
+                <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5'&& scope.row.takeNumberType && (scope.row.reviewStatus === '0' || scope.row.reviewStatus === '1' || scope.row.reviewStatus === '3' || scope.row.reviewStatus === undefined || scope.row.reviewStatus === '')" text type="primary" @click="pushF(scope.row)">复核</el-button>-->
                 <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5'&& scope.row.reviewStatus === '2'" text type="primary" @click="rebackF(scope.row)">撤回复核申请</el-button>
                 <!--              未选择盖章类型点击签章操作-->
                 <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5' && scope.row.reviewStatus === '5' && !scope.row.signatureType && (this.commonJS.isEmpty(scope.row.newType) || scope.row.newType !== '1')" text type="primary"  @click="pushS(scope.row)">签章</el-button>