预算汇总调整

src/views/sbysjsp/yshz/detail.vue

@@ -94,7 +94,7 @@
 
       return {
         formDetail: [
-         
+
         ],
         spanArr: [],
         baseUrl:'sbysjsp/yshz/edit',
@@ -106,7 +106,7 @@
             width: 150
           },
           {
-            label: "事项明细",
+            label: "事项",
             prop: "flname",
             fieldType: "ftString",
             width: 150
@@ -132,7 +132,7 @@
         rowIndex,
         columnIndex
       }) {
-        if (column.property == 'bmjc') {
+        if (column.property == 'bmjc'||column.property == 'flname') {
           const _row = this.spanArr[rowIndex]
           const _col = _row > 0 ? 1 : 0
           return {

src/views/sbysjsp/yshz/index.vue

@@ -5,31 +5,34 @@
 		<div class="search" v-condition>
 			<SearchButton :app='app'></SearchButton>
 			<el-row :gutter="20" class="search-row-1">
-        <el-col :span="6" class="search-col">
+        <el-col :span="5" class="search-col">
         	<div class="search-item">
         		<span class="search-span">开始日期:</span>
         		 <el-date-picker   value-format="timestamp" v-model='queryParams.start' ></el-date-picker>
         	</div>
         </el-col>
-        <el-col :span="6" class="search-col">
+        <el-col :span="5" class="search-col">
         	<div class="search-item">
         		<span class="search-span">截止日期:</span>
         			 <el-date-picker   value-format="timestamp" v-model='queryParams.end' ></el-date-picker>
         	</div>
         </el-col>
-        <el-col :span="6" class="search-col">
+        <el-col :span="5" class="search-col">
         	<div class="search-item">
         		<span class="search-span">预算任务:</span>
         		<RelSelect style="width: 100%;" src='hafms/ysfl/query' filterable clearable
         			:match="{value:'id',label:'name'}" v-model='queryParams.flid'></RelSelect>
         	</div>
         </el-col>
-        <el-col :span="6" class="search-col">
+        <el-col :span="5" class="search-col">
         	<div class="search-item">
         		<span class="search-span">状态:</span>
         		<RelSelect style="width: 100%;" src='hafms/yssq/init/zt' filterable clearable
         			:match="{value:'id',label:'name'}" v-model='queryParams.zt'></RelSelect>
         	</div>
+        </el-col>
+        <el-col :span="4" class="search-col">
+        <el-checkbox @change="$refs['TablePager'].pageQuery()" true-label='Y' false-label='N' v-model="queryParams.xsystz">显示调整信息</el-checkbox>
         </el-col>
 
 			</el-row>
@@ -66,6 +69,7 @@
 		<div class="tablePagers">
       <!-- 多选数组转 -->
 			<TablePager
+      fePage
        :operateButtons="false"
        @tpDbClick="tpDbClick"
        :multipleTrans="[
@@ -106,6 +110,7 @@
 				baseUrl: 'hafms/ystz',
 				/* 查询参数*/
 				queryParams: {
+          xsystz:'N',
 					start:new Date().getTime()-1000*60*60*24*30,
 					end: new Date().getTime(),
           flid:'',
@@ -130,6 +135,7 @@
        queryDetail({
         year:row.year,
         flid:row.flid,
+        xsystz:this.queryParams.xsystz
        }).then(res=>{
          if(res.success){
            const {records} = res.data