yangjun
/
yhjz_xcx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BUG调整：计划、总结施工人员汇总显示不对；复制预览格式调整；支出明细-支出查询增加合计；支出明细-支出查询执行人查询条件BUG修改。

This commit is contained in:
曹磊 2024-04-01 10:59:51 +08:00
parent cd8877edc2
commit 1fe3722fad
5 changed files with 56 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/pages/businesszcmx/businesszcmx.vue
View File

@ -197,14 +197,28 @@
<view class="paging" style="display: flex;justify-content: space-between;align-items: center">
<view class="page_btn">
<!-- <view class="up_page" v-if="frontPage" @click="clickFront">上一页</view>-->
<button type="button" size="mini" style="width: 100%;height: 100%;background-color: #FF00FF;color: white" @click="clickFront">上一页</button>
<button v-if="frontPage" type="button" size="mini" style="width: 100%;height: 100%;background-color: #FF00FF;color: white;font-size: 12px;padding-top:2px;" @click="clickFront">上一页</button>
</view>
<view class="page_num">第{{thisPages}}页 共{{pages}}页</view>
<view class="page_btn">
<!-- <view class="down_page" v-if="nextPage" @click="clickNext">下一页</view>-->
<button type="button" size="mini" style="width: 100%;height: 100%;background-color: #FF00FF;color: white" @click="clickNext">下一页</button>
<button v-if="nextPage" type="button" size="mini" style="width: 100%;height: 100%;background-color: #FF00FF;color: white;font-size: 12px;padding-top:2px;" @click="clickNext">下一页</button>
</view>
</view>
<div style="display: flex; justify-content: space-between; align-items: flex-end">
<div style="text-align: left;padding: 10% 0 1% 2%;font: bold 14px 新宋体">三、满足以上条件汇总</div>
</div>
<div style="border-bottom: 2px solid #FF00FF;"></div>
<div>
<tr class="th-row"
style="display: flex;font-size: 12px;border-bottom: 2px solid #FF00FF;font-weight: bold;border-left: 2px solid #FF00FF;border-right: 2px solid #FF00FF">
<td class="trTd" style="width: 34%;text-align: center">合计</td>
<td class="trTd" style="width: 66%;text-align: center">{{zccxhj}}</td>
</tr>
</div>
</div>
<!-- 类别统计-->
<div v-if="lbtj">
@ -662,6 +676,7 @@ export default {
thisPages: 1,//当前页
rows: 10,//每页条数
total: 0,//总条数
zccxhj: 0,//支出查询合计
dataFormZCCX: {
nowYear: "",//当前年度
jsdwId: '',//建设单位id
@ -1047,12 +1062,12 @@ export default {
},
// 获取执行人
getZxr(){
console.log("getZxr");
this.$http.request({
url: this.$http.adornUrl('/business/businesszcmx/getZxr'),
method: 'get'
}).then(({data}) => {
this.dicZxrList = data.page;
})
},
@ -1070,7 +1085,7 @@ export default {
searchZCCXList() {
this.dataListZCCX = [];//支出查询数据
this.dataTJList = [];//统计list
this.dicZxrList = [];//执行人
// this.dicZxrList = [];//执行人
this.zxrId = '';
if(this.userId == 10){
if(this.dataFormZCCX.writeUserId==undefined || this.dataFormZCCX.writeUserId==''){
@ -1096,6 +1111,36 @@ export default {
this.dataListZCCX = data.page.list;
this.total = data.page.totalCount;
this.pages = data.page.totalPage;
if(this.pages > 1){
this.frontPage = true
this.nextPage = true
}else{
this.frontPage = false
this.nextPage = false
}
if(data.page.currPage === data.page.totalPage){
this.nextPage = false
}
if(data.page.currPage === 1){
this.frontPage = false
}
}
})
this.$http.request({
url: this.$http.adornUrl('/business/businesszcmx/zccxhj'),
method: 'get',
params: this.$http.adornParams({
"jsdwId": this.dataFormZCCX.jsdwId,//建设单位id
"startTime": this.dataFormZCCX.startTime,//开始年份
"endTime": this.dataFormZCCX.endTime,//结束年份
"gjz": this.dataFormZCCX.gjz,//关键字
"writeUserId": this.dataFormZCCX.writeUserId,//执行人
"page": this.thisPages,
"limit": this.rows,
})
}).then(({data}) => {
if (data && data.code == 0) {
this.zccxhj = data.page.zccxhj;
}
})
},

2
src/pages/pageplan/businessplan/businessplan.vue
View File

@ -557,7 +557,7 @@ export default {
this.dataList = data.page.dataList;
this.workerDay = data.page.workerDay;
this.workerIdList = data.page.workerIdList;
this.workerNum = Math.ceil(this.workerIdList.length/3);
this.workerNum = Math.ceil(this.workerIdList.length/2);
this.dataForm = {};
this.planTimes = data.page.planTimes;
} else {

4
src/pages/pagetotal/businesstotal.vue
View File

@ -374,7 +374,7 @@ export default {
this.dataList = data.page.dataList;
this.workerDay = data.page.workerDay;
this.workerIdList = data.page.workerIdList;
this.workerNum = Math.ceil(this.workerIdList.length/3);
this.workerNum = Math.ceil(this.workerIdList.length/2);
this.dataForm = {}
this.planTimes = data.page.planTimes;
@ -391,7 +391,7 @@ export default {
this.dataList = data.page.dataList;
this.workerDay = data.page.workerDay;
this.workerIdList = data.page.workerIdList;
this.workerNum = Math.ceil(this.workerIdList.length/3);
this.workerNum = Math.ceil(this.workerIdList.length/2);
this.dataForm = {}
// 未完稿没有数据，则查已完成 status=1
if(this.dataList.length==0){

4
src/pages/pagetotal/businesstotal/businesstotal.vue
View File

@ -379,7 +379,7 @@ export default {
this.workerDay = data.page.workerDay;
this.workerIdList = data.page.workerIdList;
console.log(this.workerIdList)
this.workerNum = Math.ceil(this.workerIdList.length/3);
this.workerNum = Math.ceil(this.workerIdList.length/2);
this.dataForm = {}
this.planTimes = data.page.planTimes;
@ -396,7 +396,7 @@ export default {
this.dataList = data.page.dataList;
this.workerDay = data.page.workerDay;
this.workerIdList = data.page.workerIdList;
this.workerNum = Math.ceil(this.workerIdList.length/3);
this.workerNum = Math.ceil(this.workerIdList.length/2);
this.dataForm = {}
// 未完稿没有数据，则查已完成 status=1
if(this.dataList.length==0){

4
src/utils/httpRequest.js
View File

@ -7,9 +7,9 @@ var Fly=require("flyio/dist/npm/wx")
var http=new Fly
// 本地
const BaseUrl='http://localhost:2222/renren-fast'
// const BaseUrl='http://localhost:2222/renren-fast'
//生产
// const BaseUrl='https://www.youhuajianzhu.cn/renren-fast'
const BaseUrl='https://www.youhuajianzhu.cn/renren-fast'
http.config.timeout = 1000 * 60 * 60 * 24 * 20; //设置超时
http.config.baseURL = BaseUrl; //填写域名