会计-项目管理,报告管理,筛选项新增,导出新增列,报告新增审定金额

src/views/cw/projectRecords/ProjectRecordsList.vue

@@ -75,6 +75,39 @@
 				</el-option>
 			</el-select>
 		</el-form-item>
+		<el-form-item v-if="showHideItem" label="报告日期" prop="reportDates">
+			<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.reportDates"
+				type="datetimerange"
+				range-separator="至"
+				start-placeholder="开始日期"
+				end-placeholder="结束日期">
+			</el-date-picker>
+		</el-form-item>
+		<el-form-item v-if="showHideItem" label="报告类型" prop="cwReportType">
+			<el-select v-model="searchForm.cwReportType" clearable placeholder="请选择" style="width:100%;">
+				<el-option
+					v-for="item in $dictUtils.getDictList('cw_report_title_type')"
+					:key="item.value"
+					:label="item.label"
+					:value="item.value">
+				</el-option>
+			</el-select>
+		</el-form-item>
+		<el-form-item v-if="showHideItem" label="项目分类" prop="projectClassification">
+			<el-select v-model="searchForm.projectClassification" clearable placeholder="请选择" style="width:100%;">
+				<el-option
+					v-for="item in $dictUtils.getDictList('project_classification')"
+					: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>
@@ -211,7 +244,10 @@
           realHeaderName: '',
 			createBy: {
 				name: ''
-			}
+			},
+			cwReportType:'', //报告类型
+			cwReportDates:[], // 报告日期
+			projectClassification: '' //项目分类
         },
         dataList: [],
         tablePage: {

src/views/cw/reportCancellApply/ReportCancellApplyTaskForm.vue

@@ -230,6 +230,28 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+				<el-col :span="12" v-if="inputForm.reportDetail.reportType === '1'">
+					<el-form-item label="审定金额(不含税/元)" prop="approvedNoIncludingTax"
+								  :rules="[
+                   ]">
+						<el-input :disabled="true" v-model="inputForm.reportDetail.approvedNoIncludingTax" placeholder="请填写审定金额（不含税/元）" v-on:input="inputForm.reportDetail.approvedNoIncludingTax=inputForm.reportDetail.approvedNoIncludingTax.replace(/[^\d.]/g,'')
+							  .replace(/^\./g,'')
+							  .replace(/\.{2,}/g,'.')
+							  .replace('.','$#$').replace(/\./g,'').replace('$#$','.')
+							  .replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3').replace(/^0+/, '0')" clearable></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12" v-if="inputForm.reportDetail.reportType === '1'">
+					<el-form-item label="审定金额(含税/元)" prop="approvedIncludingTax"
+								  :rules="[
+                   ]">
+						<el-input :disabled="true"  v-model="inputForm.reportDetail.approvedIncludingTax" placeholder="请填写审定金额（含税/元）" v-on:input="inputForm.reportDetail.approvedIncludingTax=inputForm.reportDetail.approvedIncludingTax.replace(/[^\d.]/g,'')
+							  .replace(/^\./g,'')
+							  .replace(/\.{2,}/g,'.')
+							  .replace('.','$#$').replace(/\./g,'').replace('$#$','.')
+							  .replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3').replace(/^0+/, '0')" clearable></el-input>
+					</el-form-item>
+				</el-col>
               <el-col :span="12">
                 <el-form-item label="所属行业" prop="reportDetail.industry"
                               :rules="[
@@ -794,7 +816,9 @@
             realHeaderName: '',
             projectMasterId2: '',
             industry: '',
-            businessObjects: ''
+            businessObjects: '',
+			  approvedIncludingTax:'',
+			  approvedNoIncludingTax:''
           }
         },
         keyWatch: '',
@@ -949,7 +973,9 @@
             realHeaderName: '',
             projectMasterId2: '',
             industry: '',
-            businessObjects: ''
+            businessObjects: '',
+			  approvedIncludingTax:'',
+			  approvedNoIncludingTax:''
           }
         }
         this.inputForm.id = id
@@ -1082,7 +1108,9 @@
           realHeaderName: '',
           projectMasterId2: '',
           industry: '',
-          businessObjects: ''
+          businessObjects: '',
+			approvedIncludingTax:'',
+			approvedNoIncludingTax:''
         }
         this.reviewBys = []
         if (this.commonJS.isNotEmpty(row.reportNo)) {

src/views/cw/reportManagement/ReportManagementAddForm.vue

@@ -240,6 +240,28 @@
               </el-select>
             </el-form-item>
           </el-col>
+			<el-col :span="12" v-if="inputForm.reportType === '1'">
+				<el-form-item label="审定金额(不含税/元)" prop="approvedNoIncludingTax"
+							  :rules="[
+                   ]">
+					<el-input v-model="inputForm.approvedNoIncludingTax" placeholder="请填写审定金额（不含税/元）" v-on:input="inputForm.approvedNoIncludingTax=inputForm.approvedNoIncludingTax.replace(/[^\d.]/g,'')
+							  .replace(/^\./g,'')
+							  .replace(/\.{2,}/g,'.')
+							  .replace('.','$#$').replace(/\./g,'').replace('$#$','.')
+							  .replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3').replace(/^0+/, '0')" clearable></el-input>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12" v-if="inputForm.reportType === '1'">
+				<el-form-item label="审定金额(含税/元)" prop="approvedIncludingTax"
+							  :rules="[
+                   ]">
+					<el-input  v-model="inputForm.approvedIncludingTax" placeholder="请填写审定金额（含税/元）" v-on:input="inputForm.approvedIncludingTax=inputForm.approvedIncludingTax.replace(/[^\d.]/g,'')
+							  .replace(/^\./g,'')
+							  .replace(/\.{2,}/g,'.')
+							  .replace('.','$#$').replace(/\./g,'').replace('$#$','.')
+							  .replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3').replace(/^0+/, '0')" clearable></el-input>
+				</el-form-item>
+			</el-col>
           <el-col :span="12">
             <el-form-item label="所属行业" prop="industry"
                           :rules="[
@@ -650,7 +672,9 @@
           realCreateName: '',
           realHeaderName: '',
           industry: '',
-          businessObjects: ''
+          businessObjects: '',
+			approvedIncludingTax:'',
+			approvedNoIncludingTax:''
         },
         keyWatch: '',
         activeName: 'enclosure',
@@ -825,7 +849,9 @@
           realCreateName: '',
           realHeaderName: '',
           industry: '',
-          businessObjects: ''
+          businessObjects: '',
+			approvedIncludingTax:'',
+			approvedNoIncludingTax:''
         }
         this.inputForm.id = id
         this.loading = false

src/views/cw/reportManagement/ReportManagementForm.vue

@@ -249,6 +249,28 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+				<el-col :span="12" v-if="inputForm.reportType === '1'">
+					<el-form-item label="审定金额(不含税/元)" prop="approvedNoIncludingTax"
+								  :rules="[
+                   ]">
+						<el-input v-model="inputForm.approvedNoIncludingTax" placeholder="请填写审定金额（不含税/元）" v-on:input="inputForm.approvedNoIncludingTax=inputForm.approvedNoIncludingTax.replace(/[^\d.]/g,'')
+							  .replace(/^\./g,'')
+							  .replace(/\.{2,}/g,'.')
+							  .replace('.','$#$').replace(/\./g,'').replace('$#$','.')
+							  .replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3').replace(/^0+/, '0')" clearable></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12" v-if="inputForm.reportType === '1'">
+					<el-form-item label="审定金额(含税/元)" prop="approvedIncludingTax"
+								  :rules="[
+                   ]">
+						<el-input  v-model="inputForm.approvedIncludingTax" placeholder="请填写审定金额（含税/元）" v-on:input="inputForm.approvedIncludingTax=inputForm.approvedIncludingTax.replace(/[^\d.]/g,'')
+							  .replace(/^\./g,'')
+							  .replace(/\.{2,}/g,'.')
+							  .replace('.','$#$').replace(/\./g,'').replace('$#$','.')
+							  .replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3').replace(/^0+/, '0')" clearable></el-input>
+					</el-form-item>
+				</el-col>
               <el-col :span="12">
                 <el-form-item label="所属行业" prop="industry"
                               :rules="[
@@ -1049,7 +1071,10 @@
           projectMasterId2: '',
           industry: '',
           businessObjects: '',
-			invoiceNumber:''
+			invoiceNumber:'',
+			approvedIncludingTax:'',
+			approvedNoIncludingTax:''
+
         },
         keyWatch: '',
         activeName: 'enclosure',
@@ -1206,7 +1231,9 @@
           projectMasterId2: '',
           industry: '',
           businessObjects: '',
-			invoiceNumber:''
+			invoiceNumber:'',
+			approvedIncludingTax:'',
+			approvedNoIncludingTax:''
         }
         this.inputForm.id = id
         this.loading = false

src/views/cw/reportManagement/ReportManagementList.vue

@@ -124,6 +124,39 @@
           end-placeholder="结束日期">
         </el-date-picker>
       </el-form-item>
+		<el-form-item v-if="showHideItem" label="报告日期" prop="reportDates">
+			<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.reportDates"
+				type="datetimerange"
+				range-separator="至"
+				start-placeholder="开始日期"
+				end-placeholder="结束日期">
+			</el-date-picker>
+		</el-form-item>
+		<el-form-item v-if="showHideItem" label="报告类型" prop="reportType">
+			<el-select v-model="searchForm.reportType" placeholder="请选择" style="width:100%;" clearable>
+				<el-option
+					v-for="item in $dictUtils.getDictList('cw_report_title_type')"
+					:key="item.value"
+					:label="item.label"
+					:value="item.value">
+				</el-option>
+			</el-select>
+		</el-form-item>
+		<el-form-item v-if="showHideItem" label="项目分类" prop="projectClassification">
+			<el-select v-model="searchForm.projectClassification" placeholder="请选择" style="width:100%;" clearable>
+				<el-option
+					v-for="item in $dictUtils.getDictList('project_classification')"
+					: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>
@@ -473,7 +506,10 @@
           contractDates: [],
           projectMasterName: '', // 项目经理1
           realHeaderName: '', // 项目经理2
-          filingType: ''
+          filingType: '',
+			cwReportType:'', //报告类型
+			cwReportDates:[], // 报告日期
+			projectClassification: '' //项目分类
         },
         dataList: [],
         tablePage: {

src/views/cw/reportManagement/ReportReviewTakeNumberForm.vue

@@ -217,6 +217,28 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
+						<el-col :span="12" v-if="inputForm.reportType === '1'">
+							<el-form-item label="审定金额(不含税/元)" prop="approvedNoIncludingTax"
+										  :rules="[
+                   ]">
+								<el-input v-model="inputForm.approvedNoIncludingTax" placeholder="请填写审定金额（不含税/元）" v-on:input="inputForm.approvedNoIncludingTax=inputForm.approvedNoIncludingTax.replace(/[^\d.]/g,'')
+							  .replace(/^\./g,'')
+							  .replace(/\.{2,}/g,'.')
+							  .replace('.','$#$').replace(/\./g,'').replace('$#$','.')
+							  .replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3').replace(/^0+/, '0')" clearable></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :span="12" v-if="inputForm.reportType === '1'">
+							<el-form-item label="审定金额(含税/元)" prop="approvedIncludingTax"
+										  :rules="[
+                   ]">
+								<el-input  v-model="inputForm.approvedIncludingTax" placeholder="请填写审定金额（含税/元）" v-on:input="inputForm.approvedIncludingTax=inputForm.approvedIncludingTax.replace(/[^\d.]/g,'')
+							  .replace(/^\./g,'')
+							  .replace(/\.{2,}/g,'.')
+							  .replace('.','$#$').replace(/\./g,'').replace('$#$','.')
+							  .replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3').replace(/^0+/, '0')" clearable></el-input>
+							</el-form-item>
+						</el-col>
 						<el-col :span="12">
 							<el-form-item label="所属行业" prop="industry"
 										  :rules="[
@@ -609,7 +631,9 @@
 					takeNumberType:'',
 					improperTakeCause: '',
 					invoiceNumber:'',
-					isCompleteInvoice:''
+					isCompleteInvoice:'',
+					approvedIncludingTax:'',
+					approvedNoIncludingTax:''
 				},
 				keyWatch: '',
 				activeName: 'enclosure',
@@ -770,7 +794,9 @@
 					improperTakeCause: '',
 					businessObjects: '',
 					invoiceNumber:'',
-					isCompleteInvoice: ''
+					isCompleteInvoice: '',
+					approvedIncludingTax:'',
+					approvedNoIncludingTax:''
 				}
 				this.inputForm.id = id
 				this.loading = false

src/views/cw/reportManagement/reportReviewNew/ReportReviewFormNew.vue

@@ -258,6 +258,28 @@
                 </el-select>
               </el-form-item>
             </el-col>
+			  <el-col :span="12" v-if="inputForm.reportType === '1'">
+				  <el-form-item label="审定金额(不含税/元)" prop="approvedNoIncludingTax"
+								:rules="[
+                   ]">
+					  <el-input v-model="inputForm.approvedNoIncludingTax" placeholder="请填写审定金额（不含税/元）" v-on:input="inputForm.approvedNoIncludingTax=inputForm.approvedNoIncludingTax.replace(/[^\d.]/g,'')
+							  .replace(/^\./g,'')
+							  .replace(/\.{2,}/g,'.')
+							  .replace('.','$#$').replace(/\./g,'').replace('$#$','.')
+							  .replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3').replace(/^0+/, '0')" clearable></el-input>
+				  </el-form-item>
+			  </el-col>
+			  <el-col :span="12" v-if="inputForm.reportType === '1'">
+				  <el-form-item label="审定金额(含税/元)" prop="approvedIncludingTax"
+								:rules="[
+                   ]">
+					  <el-input  v-model="inputForm.approvedIncludingTax" placeholder="请填写审定金额（含税/元）" v-on:input="inputForm.approvedIncludingTax=inputForm.approvedIncludingTax.replace(/[^\d.]/g,'')
+							  .replace(/^\./g,'')
+							  .replace(/\.{2,}/g,'.')
+							  .replace('.','$#$').replace(/\./g,'').replace('$#$','.')
+							  .replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3').replace(/^0+/, '0')" clearable></el-input>
+				  </el-form-item>
+			  </el-col>
             <el-col :span="12">
               <el-form-item label="所属行业" prop="industry"
                             :rules="[
@@ -885,6 +907,8 @@
 			status1:'',
 			status2:'',
 			status3:'',
+			approvedIncludingTax:'',
+			approvedNoIncludingTax:''
         },
         keyWatch: '',
         activeName: 'enclosure',
@@ -1040,6 +1064,8 @@
 			status1:'',
 			status2:'',
 			status3:'',
+			approvedIncludingTax:'',
+			approvedNoIncludingTax:''
         },
         this.inputForm.id = id
         this.loading = false