diff --git a/src/pages/businesszcmx/businesszcmx.vue b/src/pages/businesszcmx/businesszcmx.vue
index 70b1fda..7438de5 100644
--- a/src/pages/businesszcmx/businesszcmx.vue
+++ b/src/pages/businesszcmx/businesszcmx.vue
@@ -197,14 +197,28 @@
-
+
第{{thisPages}}页 共{{pages}}页
-
+
+
+
+
+
+
+
+ | 合计 |
+ {{zccxhj}} |
+
+
+
@@ -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;
}
})
},
diff --git a/src/pages/pageplan/businessplan/businessplan.vue b/src/pages/pageplan/businessplan/businessplan.vue
index f85552d..568161e 100644
--- a/src/pages/pageplan/businessplan/businessplan.vue
+++ b/src/pages/pageplan/businessplan/businessplan.vue
@@ -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 {
diff --git a/src/pages/pagetotal/businesstotal.vue b/src/pages/pagetotal/businesstotal.vue
index 02af8bc..fb90fb0 100644
--- a/src/pages/pagetotal/businesstotal.vue
+++ b/src/pages/pagetotal/businesstotal.vue
@@ -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){
diff --git a/src/pages/pagetotal/businesstotal/businesstotal.vue b/src/pages/pagetotal/businesstotal/businesstotal.vue
index eefb79b..84f7f9d 100644
--- a/src/pages/pagetotal/businesstotal/businesstotal.vue
+++ b/src/pages/pagetotal/businesstotal/businesstotal.vue
@@ -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){
diff --git a/src/utils/httpRequest.js b/src/utils/httpRequest.js
index 9c052da..b7c52b3 100644
--- a/src/utils/httpRequest.js
+++ b/src/utils/httpRequest.js
@@ -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; //填写域名