- | {{ index + 1 }} |
+ {{ index + 1 }} |
{{ item.name }} |
-
+ |
{{ itemCh.totalNum }}
@@ -408,19 +327,20 @@
|
- | 合计 |
- {{ hj }} |
+ 合计 |
+ {{ hj }} |
+ 100% |
-
+
- | 序号 |
- 类别 |
+ 序号 |
+ 类别 |
肖爽 |
侯吉庆 |
李现举 |
@@ -430,8 +350,8 @@
- | {{ index + 1 }} |
- {{ item.typeName }} |
+ {{ index + 1 }} |
+ {{ item.typeName }} |
{{ item.xs }}
|
@@ -448,25 +368,46 @@
- | 以上支出总和 |
+ 以上支出总和 |
{{yszczh.xsyszh}} |
{{yszczh.hdqyszh}} |
{{yszczh.lxjyszh}} |
{{yszczh.hdgyszh}} |
- | 目前收入总和 |
+ 支出占比 |
+ {{yszczh.xsyszb}}% |
+ {{yszczh.hdqyszb}}% |
+ {{yszczh.lxjyszb}}% |
+ {{yszczh.hdgyszb}}% |
+
+
+ | 目前收入总和 |
{{ mqsrzh.xs }} |
{{ mqsrzh.hdq }} |
{{ mqsrzh.lxj }} |
- {{ mqsrzh.hdg }} |
+ / |
- | 目前余额 |
+ 目前余额 |
{{ mqye.xs }} |
{{ mqye.hdq }} |
{{ mqye.lxj }} |
- 0 |
+ / |
+
+
+ | 其中内部转账收入金额 |
+ {{ mqsrzh.xsnb }} |
+ {{ mqsrzh.hdqnb }} |
+ {{ mqsrzh.lxjnb }} |
+ / |
+
+
+ | 其中其它收入金额 |
+ {{ mqsrzh.xsqt }} |
+ {{ mqsrzh.hdqqt }} |
+ {{ mqsrzh.lxjqt }} |
+ / |
@@ -474,106 +415,114 @@
二、内部转账验证
-
+
+
- 支出
侯吉光 |
- 收入
肖爽 |
- 收入
侯吉庆 |
- 收入
李现举 |
- 验证 |
+ 年月 |
+ 支出
侯吉光 |
+ 收入
肖爽 |
+ 收入
侯吉庆 |
+ 收入
李现举 |
+ 验证 |
-
-
-
- |
- {{ dataFormLb['侯吉光'] == null ? 0 : dataFormLb['侯吉光'] }} |
-
- {{ dataFormLb['肖爽'] == undefined ? 0 : dataFormLb['肖爽'] }} |
-
- {{ dataFormLb['侯吉庆'] == undefined ? 0 : dataFormLb['侯吉庆'] }} |
-
- {{ dataFormLb['李现举'] == undefined ? 0 : dataFormLb['李现举'] }} |
- {{ yz }} |
-
+
+
+ | {{ item.ny }} |
+ {{ item.hjg }} |
+
+ {{ item.xs }}
+ |
+
+ {{ item.hjq }}
+ |
+
+ {{ item.lxj }}
+ |
+
+ {{ item.yz }}
+ |
+
+
+
三、经营统计
-
-
一、条件搜索
-
-
二、工资出勤
-
-
-
-
- | 序号 |
- 年月 |
- 姓名 |
- 工资 |
- 出勤 |
- 备注 |
-
-
-
-
- | {{ index + 1 }} |
- {{ item.dateDay }} |
- {{ item.name }} |
-
- {{ item.outMoney !== null ? item.outMoney : '暂无' }}
- |
- {{ item.workDay !== null ? item.workDay : '' }}
- |
- {{ item.remark !== null ? item.remark : '' }}
- |
-
-
-
-
-
@@ -615,35 +564,45 @@
二、食堂标准
-
-
-
-
+
+
+
+
-
-
-
- | 序号 |
- 年月 |
- 月支出金额 |
- 月出勤天数 |
- 标准 |
-
-
-
- | {{ index + 1 }} |
- {{ item.dateA ? item.dateA:''}} |
- {{ item.money?item.money:'0' }} |
- {{ item.day?item.day:'0' }} |
- {{ item.jz?item.jz:'0' }} |
+
+
+
+
+ | 序号 |
+ 年月 |
+ 月支出
金额 |
+ 月出勤
天数 |
+ 修正 |
+ 标准 |
+
+
+
+ | {{ index + 1 }} |
+ {{ item.dateA ? item.dateA:''}} |
+ {{ item.money?item.money:'0' }} |
+ {{ item.day?item.day:'0' }} |
+ |
+ {{ item.jz?item.jz:'0' }} |
+
+
+
+ | 平均 |
+ {{ pjMoney }} |
+ {{ pjDay }} |
+ {{ pjStDay }} |
+ {{ bzJz }} |
-
- | 平均 |
- {{ pjMoney }} |
- {{ pjDay }} |
- {{ bzJz }} |
-
+
+
@@ -696,6 +655,13 @@ export default {
projectList: [],//立项数据
//支出查询
zccx: false,
+ // 分页
+ frontPage: false,//上一页 存在true，不存在false
+ nextPage: false,//下一页 存在true，不存在false
+ pages: 0,//所有页
+ thisPages: 1,//当前页
+ rows: 10,//每页条数
+ total: 0,//总条数
dataFormZCCX: {
nowYear: "",//当前年度
jsdwId: '',//建设单位id
@@ -713,13 +679,9 @@ export default {
dataTJList: [],//统计list
zclbList: [],//获取字典信息
trList: [], // 四人类别统计列表
+ yzList:[],//验证统计列表
yszczh: {}, // 以上支出总和
- mqsrzh: {
- "xs":0,
- "hdq":0,
- "lxj":0,
- "hdg":0
- }, // 目前收入总和
+ mqsrzh: {}, // 目前收入总和
mqye: {}, // 目前余额
///
//类别统计
@@ -755,6 +717,7 @@ export default {
dateSTBZList: [],//食堂标准list
pjMoney: 0,//平均金额
pjDay: 0,//平均天数
+ pjStDay:0, //修正平均
bzJz: 0,//标准均值
userId:'',
zxrId: '',
@@ -800,7 +763,7 @@ export default {
this.pageSize = 30;
if (num == 1) {
wx.setNavigationBarTitle({
- title: '支出明细-支出查询'
+ title: '支出统计-支出查询'
});
this.tabIndex = 1;
this.zccx = true;
@@ -821,7 +784,7 @@ export default {
};
} else if (num == 2) {
wx.setNavigationBarTitle({
- title: '支出明细-统计类别'
+ title: '支出统计-统计类别'
});
this.tabIndex = 2;
this.zccx = false;
@@ -832,7 +795,7 @@ export default {
this.getLatestZclb();
} else if (num == 3) {
wx.setNavigationBarTitle({
- title: '支出明细-工资出勤'
+ title: '支出统计-工资出勤'
});
this.tabIndex = 3;
this.zccx = false;
@@ -844,7 +807,7 @@ export default {
this.searchGZCQList();
} else if (num == 4) {
wx.setNavigationBarTitle({
- title: '支出明细-食堂标准'
+ title: '支出统计-食堂标准'
});
this.tabIndex = 4;
this.zccx = false;
@@ -1071,7 +1034,7 @@ export default {
} else if (this.flag == 5) {
this.dataFormZCCX.writeUserStr = e.label;
this.dataFormZCCX.writeUserId = e.value[0];
- console.log("咋回事"+this.dataFormZCCX.writeUserId)
+ // console.log("咋回事"+this.dataFormZCCX.writeUserId)
this.searchZCCXList();
}
if (this.flag == 6) {
@@ -1093,69 +1056,111 @@ export default {
})
},
+ //点击下一页
+ clickNext() {
+ this.thisPages = this.thisPages + 1;
+ this.searchZCCXList();
+ },
+ //点击上一页
+ clickFront() {
+ this.thisPages = this.thisPages - 1;
+ this.searchZCCXList();
+ },
//----------------------------- 支出查询 ----------------------------
searchZCCXList() {
- console.log(this.dataFormZCCX);
- /*this.pageIndex = 1;
- this.totalPage = 0;*/
this.dataListZCCX = [];//支出查询数据
this.dataTJList = [];//统计list
this.dicZxrList = [];//执行人
this.zxrId = '';
-
if(this.userId == 10){
- console.log(this.dataFormZCCX.writeUserId)
if(this.dataFormZCCX.writeUserId==undefined || this.dataFormZCCX.writeUserId==''){
this.zxrId = 0;
}else{
this.zxrId = this.dataFormZCCX.writeUserId;
}
}
- this.zcpageIndex = 1;
-
- //console.log("执行人"+this.dataFormZCCX.writeUserId)
-
this.$http.request({
- url: this.$http.adornUrl('/business/businesszcmx/zcList'),
+ url: this.$http.adornUrl('/business/businesszcmx/zccxList'),
method: 'get',
params: this.$http.adornParams({
- // "page": this.zcpageIndex,
- // "limit": this.zcpageSize,
- "nowYear": this.dataFormZCCX.nowYear,//当前年度
"jsdwId": this.dataFormZCCX.jsdwId,//建设单位id
- "gclbId": this.dataFormZCCX.gclbId,//工程类别id
"startTime": this.dataFormZCCX.startTime,//开始年份
"endTime": this.dataFormZCCX.endTime,//结束年份
- "gjz": this.dataFormZCCX.gjz,
- "writeUserId": this.dataFormZCCX.writeUserId
+ "gjz": this.dataFormZCCX.gjz,//关键字
+ "writeUserId": this.dataFormZCCX.writeUserId,//执行人
+ "page": this.thisPages,
+ "limit": this.rows,
})
}).then(({data}) => {
- //console.log(data);
if (data && data.code == 0) {
- this.zctotalPage = data.page.list.totalPage;
this.dataListZCCX = data.page.list;
- this.dataListZCCXCommons = [];
- if(this.dataListZCCX.length>10){
- this.dataListZCCXCommons = this.dataListZCCX.slice(0,10)
- }else {
- this.dataListZCCX.forEach(e =>{
- this.dataListZCCXCommons.push(e)
- })
- }
- this.dataTJList = data.page.tj;
- this.dicZxrList = data.page.zxr;
- this.dataListZCCX.forEach((item) => {
- this.recipientList.forEach((itemCh) => {
- // console.log(itemCh.dictId.toString() == item.outPayee)
- if(itemCh.dictId.toString() == item.outPayee){
- item.outPayee = itemCh.name
- }
- })
- })
- // console.log(this.dataListZCCX)
+ this.total = data.page.totalCount;
+ this.pages = data.page.totalPage;
}
})
},
+ // searchZCCXList() {
+ // console.log(this.dataFormZCCX);
+ // /*this.pageIndex = 1;
+ // this.totalPage = 0;*/
+ // this.dataListZCCX = [];//支出查询数据
+ // this.dataTJList = [];//统计list
+ // this.dicZxrList = [];//执行人
+ // this.zxrId = '';
+ //
+ // if(this.userId == 10){
+ // console.log(this.dataFormZCCX.writeUserId)
+ // if(this.dataFormZCCX.writeUserId==undefined || this.dataFormZCCX.writeUserId==''){
+ // this.zxrId = 0;
+ // }else{
+ // this.zxrId = this.dataFormZCCX.writeUserId;
+ // }
+ // }
+ // this.zcpageIndex = 1;
+ //
+ // //console.log("执行人"+this.dataFormZCCX.writeUserId)
+ //
+ // this.$http.request({
+ // url: this.$http.adornUrl('/business/businesszcmx/zcList'),
+ // method: 'get',
+ // params: this.$http.adornParams({
+ // // "page": this.zcpageIndex,
+ // // "limit": this.zcpageSize,
+ // "nowYear": this.dataFormZCCX.nowYear,//当前年度
+ // "jsdwId": this.dataFormZCCX.jsdwId,//建设单位id
+ // "gclbId": this.dataFormZCCX.gclbId,//工程类别id
+ // "startTime": this.dataFormZCCX.startTime,//开始年份
+ // "endTime": this.dataFormZCCX.endTime,//结束年份
+ // "gjz": this.dataFormZCCX.gjz,
+ // "writeUserId": this.dataFormZCCX.writeUserId
+ // })
+ // }).then(({data}) => {
+ // //console.log(data);
+ // if (data && data.code == 0) {
+ // this.zctotalPage = data.page.list.totalPage;
+ // this.dataListZCCX = data.page.list;
+ // this.dataListZCCXCommons = [];
+ // if(this.dataListZCCX.length>10){
+ // this.dataListZCCXCommons = this.dataListZCCX.slice(0,10)
+ // }else {
+ // this.dataListZCCX.forEach(e =>{
+ // this.dataListZCCXCommons.push(e)
+ // })
+ // }
+ // this.dataTJList = data.page.tj;
+ // this.dicZxrList = data.page.zxr;
+ // this.dataListZCCX.forEach((item) => {
+ // this.recipientList.forEach((itemCh) => {
+ // // console.log(itemCh.dictId.toString() == item.outPayee)
+ // if(itemCh.dictId.toString() == item.outPayee){
+ // item.outPayee = itemCh.name
+ // }
+ // })
+ // })
+ // // console.log(this.dataListZCCX)
+ // }
+ // })
+ // },
//------------------------------------------------------------------
//----------------------------- 类别统计 ----------------------------
searchLBTJList() {
@@ -1163,12 +1168,7 @@ export default {
this.dataFormLb = [];//内部转账验证数据
this.yz = "";//验证
this.hj = 0; // 合计
- this.mqsrzh = {
- "xs":0,
- "hdq":0,
- "lxj":0,
- "hdg":0
- }
+ this.mqsrzh = {}
this.mqye = {}
this.$http.request({
url: this.$http.adornUrl('/business/businesszcmx/zclbList'),
@@ -1186,7 +1186,7 @@ export default {
data.page.lb.forEach((item) => {
if(item) {
if(item.id == 137 || item.id == 138 || item.id == 139 || item.id == 140 || item.id == 141 || item.id == 142 || item.id == 143 || item.id == 144 || item.id == 145
- || item.id == 259 || item.id == 260 || item.id == 261 || item.id == 262
+ || item.id == 259 || item.id == 260 || item.id == 327 || item.id == 262
){
//if(item.id == 137 || item.id == 138 || item.id == 139 || item.id == 141 || item.id == 142 || item.id == 143 || item.id == 144 || item.id == 145){
this.hj += item.totalNum
@@ -1197,7 +1197,7 @@ export default {
data.page.lb.forEach((item) => {
if(item) {
if(item.id == 137 || item.id == 138 || item.id == 139 || item.id == 140 || item.id == 141 || item.id == 142 || item.id == 143 || item.id == 144 || item.id == 145
- || item.id == 259 || item.id == 260 || item.id == 261 || item.id == 262
+ || item.id == 259 || item.id == 260 || item.id == 327 || item.id == 262
){
//if(item.id == 137 || item.id == 138 || item.id == 139 || item.id == 141 || item.id == 142 || item.id == 143 || item.id == 144 || item.id == 145){
// this.hj += item.totalNum
@@ -1209,17 +1209,17 @@ export default {
// console.log(this.dataListLBTJ)
// console.log(this.zclbList)
- //console.log(this.hj)
- this.dataFormLb = data.page.tj;
- this.yz = this.dataFormLb['侯吉光'] - (this.dataFormLb['肖爽'] !== undefined ? this.dataFormLb['肖爽'] : 0)
- - (this.dataFormLb['侯吉庆'] !== undefined ? this.dataFormLb['侯吉庆'] : 0)
- - (this.dataFormLb['李现举'] !== undefined ? this.dataFormLb['李现举'] : 0)
- // 四人类别列表-收入
- this.mqsrzh.xs = this.dataFormLb['肖爽'].toFixed(2)
- this.mqsrzh.hdq = this.dataFormLb['侯吉庆'].toFixed(2)
- this.mqsrzh.lxj = this.dataFormLb['李现举'].toFixed(2)
- //console.log(this.yz);
- //console.log(this.dataListLBTJ);
+ // //console.log(this.hj)
+ // this.dataFormLb = data.page.tj;
+ // this.yz = this.dataFormLb['侯吉光'] - (this.dataFormLb['肖爽'] !== undefined ? this.dataFormLb['肖爽'] : 0)
+ // - (this.dataFormLb['侯吉庆'] !== undefined ? this.dataFormLb['侯吉庆'] : 0)
+ // - (this.dataFormLb['李现举'] !== undefined ? this.dataFormLb['李现举'] : 0)
+ // // 四人类别列表-收入
+ // this.mqsrzh.xs = this.dataFormLb['肖爽'].toFixed(2)
+ // this.mqsrzh.hdq = this.dataFormLb['侯吉庆'].toFixed(2)
+ // this.mqsrzh.lxj = this.dataFormLb['李现举'].toFixed(2)
+ // //console.log(this.yz);
+ // //console.log(this.dataListLBTJ);
}
})
@@ -1233,24 +1233,52 @@ export default {
"endTime": this.dataForLBTJ.endTime,
})
}).then(({data}) => {
- //console.log("四人的",data.page)
+ // console.log("四人的",data.page)
this.trList = data.page.list;
+
+ //四人以上支出
this.yszczh.xsyszh = data.page.xsyszh.toFixed(2)
this.yszczh.hdqyszh = data.page.hdqyszh.toFixed(2)
this.yszczh.lxjyszh = data.page.lxjyszh.toFixed(2)
this.yszczh.hdgyszh = data.page.hdgyszh.toFixed(2)
- // mqsrzh: {}, // 目前收入总和
- this.mqsrzh.hdg = 0
- // mqye: {}, // 目前余额
- // this.mqye.xs = (this.mqsrzh.xs - this.yszczh.xsyszh).toFixed(2)
- // this.mqye.hdq = (this.mqsrzh.hdq - this.yszczh.hdqyszh).toFixed(2)
- // this.mqye.lxj = (this.mqsrzh.lxj - this.yszczh.lxjyszh).toFixed(2)
- this.mqye.xs = (this.mqsrzh.xs - data.page.xsyszh).toFixed(2)
- this.mqye.hdq = (this.mqsrzh.hdq - data.page.hdqyszh).toFixed(2)
- this.mqye.lxj = (this.mqsrzh.lxj - data.page.lxjyszh).toFixed(2)
+ //四人以上支出占比
+ this.yszczh.xsyszb = data.page.xsyszb.toFixed(2)
+ this.yszczh.hdqyszb = data.page.hdqyszb.toFixed(2)
+ this.yszczh.lxjyszb = data.page.lxjyszb.toFixed(2)
+ this.yszczh.hdgyszb = data.page.hdgyszb.toFixed(2)
+
+ //三人收入总和
+ this.mqsrzh.xs = data.page.xssrzh.toFixed(2)
+ this.mqsrzh.hdq = data.page.hjqsrzh.toFixed(2)
+ this.mqsrzh.lxj = data.page.lxjsrzh.toFixed(2)
+ //三人收入内部转账总和
+ this.mqsrzh.xsnb = data.page.xssrnb.toFixed(2)
+ this.mqsrzh.hdqnb = data.page.hjqsrnb.toFixed(2)
+ this.mqsrzh.lxjnb = data.page.lxjsrnb.toFixed(2)
+ //三人收入其他总和
+ this.mqsrzh.xsqt = data.page.xssrqt.toFixed(2)
+ this.mqsrzh.hdqqt = data.page.hjqsrqt.toFixed(2)
+ this.mqsrzh.lxjqt = data.page.lxjsrqt.toFixed(2)
+ //三人当前余额
+ this.mqye.xs = (data.page.xssrzh - data.page.xsyszh).toFixed(2)
+ this.mqye.hdq = (data.page.hjqsrzh - data.page.hdqyszh).toFixed(2)
+ this.mqye.lxj = (data.page.lxjsrzh - data.page.lxjyszh).toFixed(2)
})
+ this.$http.request({
+ url: this.$http.adornUrl('/business/businesszcmx/yzList'),
+ method: 'get',
+ params: this.$http.adornParams({
+ "startTime": this.dataForLBTJ.startTime,
+ "endTime": this.dataForLBTJ.endTime,
+ })
+ }).then(({data}) => {
+ // console.log("四人验证",data.page)
+ this.yzList = data.page;
+ })
+
+
},
//获取最新的数据时间
getLatestZclb() {
@@ -1296,6 +1324,7 @@ export default {
this.dateSTBZList = [];
this.pjMoney = 0;//平均金额
this.pjDay = 0;//平均天数
+ this.pjStDay = 0;//修正平均
this.bzJz = 0;//标准均值
//console.log(typeof this.dataForm);
this.$http.request({
@@ -1312,21 +1341,43 @@ export default {
this.dateSTBZList.push(item);
this.pjMoney += item.money;
this.pjDay += item.day;
+ this.pjStDay += item.stday;
})
- this.dateSTBZListCommons = [];
- if(this.dateSTBZList.length>10){
- this.dateSTBZListCommons = this.dateSTBZList.slice(0,10)
- }else {
- this.dateSTBZList.forEach(e =>{
- this.dateSTBZListCommons.push(e)
- })
- }
- console.log(this.pjDay);
- if(this.pjDay !== 0){
- this.bzJz = (this.pjMoney / this.pjDay).toFixed(2)
+ // this.dateSTBZListCommons = [];
+ // if(this.dateSTBZList.length>10){
+ // this.dateSTBZListCommons = this.dateSTBZList.slice(0,10)
+ // }else {
+ // this.dateSTBZList.forEach(e =>{
+ // this.dateSTBZListCommons.push(e)
+ // })
+ // }
+ // console.log(this.pjDay);
+ if(this.pjDay !== 0 || this.pjStDay !== 0){
+ this.bzJz = (this.pjMoney / (this.pjDay+this.pjStDay)).toFixed(2)
} else {
this.bzJz = 0
}
+ this.pjMoney = this.pjMoney.toFixed(2);
+ this.pjDay = this.pjDay.toFixed(2);
+ }
+ })
+ },
+ updateStxzList(){
+ this.$http.request({
+ url: this.$http.adornUrl('/business/businesszcmx/updateStxzList'),
+ method: 'post',
+ body: this.$http.adornData({
+ "list":this.dateSTBZList
+ })
+ }).then(({data}) => {
+ if (data && data.code === 0) {
+ wx.showToast({
+ title: "修正成功",
+ icon: 'none',
+ duration: 4000//持续的时间
+ })
+ this.searchSTBZList()
+ this.$forceUpdate()
}
})
},
@@ -1470,7 +1521,7 @@ export default {
this.zclbList =[];
data.data.forEach((item) => {
if (item.dictCode == "expense_type") {
- console.log(item.children);
+ // console.log(item.children);
//this.zclbList = item.children
item.children.forEach((child) => {
//if(child.dictId!='140'){
@@ -1486,7 +1537,7 @@ export default {
url: this.$http.adornUrl('/business/businesszcmx/biggerTimeList'),
method: 'get'
}).then(({data}) => {
- console.log(data);
+ // console.log(data);
if (data && data.code == 0) {
this.timeList = data.page;
}
@@ -1680,4 +1731,45 @@ export default {
white-space: nowrap;
display: inline-block;
}
+
+.paging{
+ width: 100%;
+ height: 80rpx;
+ font-size: 32rpx;
+ font-family: "PingFangSC";
+ color: #c79b4a;
+ line-height: 36rpx;
+ text-align: center;
+}
+
+.paging .page_btn{
+ width: 140rpx;
+ height: 60rpx;
+ font-size: 32rpx;
+ font-family: "PingFangSC";
+ color: #c79b4a;
+}
+
+.page_num{
+ font-size: 24rpx;
+ font-family: "PingFangSC";
+ /*color: #c79b4a;*/
+ color: #000;
+ /*margin: auto 10%;*/
+}
+
+.cbtn {
+ width: 25%;
+ margin-top: 4%;
+ background-color: #FF00FF;
+ color: #FFFFFF;
+ height: 5vh;
+ border-radius: 5px;
+ font-size: 14px;
+ display: flex;
+ text-align: center;
+ justify-content: center;
+ align-items: center;
+}
+
diff --git a/src/pages/businesszcmx/xmcb.vue b/src/pages/businesszcmx/xmcb.vue
index 51d9e39..9663dc1 100644
--- a/src/pages/businesszcmx/xmcb.vue
+++ b/src/pages/businesszcmx/xmcb.vue
@@ -123,17 +123,19 @@
4.工资统计
-
+
序号 |
位置 |
- 实发工资 |
- 人工成本折算 |
- 差值 |
- 实发占比 |
+
+
+
+
+ 总金额 |
+ 占比 |
@@ -141,29 +143,29 @@
| {{ index + 1 }} |
- {{ item.name }}
+ {{ item.NAME }}
|
-
+ |
{{ item.sfgz }}
|
-
- {{ item.money }}
- |
-
- {{ item.cz }}
- |
-
+
+
+
+
+
+
+ |
{{ item.bfb }}
|
- | 合计 |
- {{gzHj.hjsfgz}} |
- {{gzHj.hjmoney}} |
- {{gzHj.hjcz}} |
- 100% |
+ 以上支出总和 |
+ {{gzHj.hjsfgz}} |
+
+
+ 100% |
@@ -223,12 +225,11 @@ export default {
}),
async:false //同步
}).then(({data}) => {
- //console.log("***********",data.page)
+ // console.log("***********",data.page)
this.gzList = data.page.list;
this.gzHj.hjsfgz = data.page.hjsfgz;
- this.gzHj.hjmoney = data.page.hjmoney;
- this.gzHj.hjcz = data.page.hjcz;
-
+ // this.gzHj.hjmoney = data.page.hjmoney;
+ // this.gzHj.hjcz = data.page.hjcz;
})
},
async getGlf(){
@@ -248,8 +249,7 @@ export default {
},
getXmAndGlf(){
this.xmList = []
- this.xmHj.zje = this.hj.hjzcje + this.glfHj.hjMoney;
- console.log("++++++++++++++++++++"+this.glfHj.hjMoney)
+ this.xmHj.zje = (this.hj.hjzcje + this.glfHj.hjMoney).toFixed(2);
if(parseFloat(this.xmHj.zje) === 0){
let xmbfb = "0.00%";
let glfbfb = "0.00%";
diff --git a/src/pages/pagecontract/businesscontract/addEdit/addEdit.vue b/src/pages/pagecontract/businesscontract/addEdit/addEdit.vue
index a295bdb..6b73a4d 100644
--- a/src/pages/pagecontract/businesscontract/addEdit/addEdit.vue
+++ b/src/pages/pagecontract/businesscontract/addEdit/addEdit.vue
@@ -26,7 +26,7 @@
@@ -34,7 +34,7 @@
@@ -45,8 +45,9 @@
@@ -85,7 +86,7 @@
1.建设单位:
-
@@ -96,7 +97,7 @@
2.施工单位:
-
@@ -109,7 +110,7 @@
-
@@ -122,7 +123,7 @@
4.直非友:
-
@@ -133,7 +134,7 @@
5.监理单位:
-
@@ -144,7 +145,7 @@
6.一审单位:
-
@@ -155,7 +156,7 @@
7.二审单位:
-
@@ -215,33 +216,8 @@
-
-
-
+
+
四、送审进度
@@ -252,49 +228,7 @@
-
+
| 合同金额 |
@@ -305,9 +239,7 @@
|
|
-
+
@@ -317,10 +249,7 @@
|
|
-
-
+
@@ -337,18 +266,7 @@
| 实际竣工时间 |
|
-
+
@@ -392,9 +310,7 @@
|
|
|
-
+
@@ -414,9 +330,7 @@
|
|
|
-
+
@@ -964,10 +878,82 @@ export default {
},
dataFormSubmit() {
// 校验必填项
- if(!this.dataForm.contractName || !this.dataForm.contractJsdwId || !this.dataForm.contractSgdwId || !this.dataForm.contractYear
- || !this.dataForm.contractZfyId || !this.dataForm.contractJldwId || !this.dataForm.contractYsdwId || !this.dataForm.contractEsdwId) {
+ // if(!this.dataForm.contractName || !this.dataForm.contractJsdwId || !this.dataForm.contractSgdwId || !this.dataForm.contractYear
+ // || !this.dataForm.contractZfyId || !this.dataForm.contractJldwId || !this.dataForm.contractYsdwId || !this.dataForm.contractEsdwId) {
+ // wx.showToast({
+ // title: "表单信息均为必填！",
+ // icon: "none",
+ // duration: 2000,
+ // })
+ // return;
+ // }
+ if(!this.dataForm.contractName) {
wx.showToast({
- title: "表单信息均为必填！",
+ title: "请输入合同名称！",
+ icon: "none",
+ duration: 2000,
+ })
+ return;
+ }
+ if(!this.dataForm.excelContractMoney) {
+ wx.showToast({
+ title: "请输入合同金额！",
+ icon: "none",
+ duration: 2000,
+ })
+ return;
+ }
+ if(!this.dataForm.contractJsdwId) {
+ wx.showToast({
+ title: "请选择建设单位！",
+ icon: "none",
+ duration: 2000,
+ })
+ return;
+ }
+ if(!this.dataForm.contractSgdwId) {
+ wx.showToast({
+ title: "请选择施工单位！",
+ icon: "none",
+ duration: 2000,
+ })
+ return;
+ }
+ if(!this.dataForm.contractYear) {
+ wx.showToast({
+ title: "请选择合同年份！",
+ icon: "none",
+ duration: 2000,
+ })
+ return;
+ }
+ if(!this.dataForm.contractZfyId) {
+ wx.showToast({
+ title: "请选择非直友！",
+ icon: "none",
+ duration: 2000,
+ })
+ return;
+ }
+ if(!this.dataForm.contractJldwId) {
+ wx.showToast({
+ title: "请选择监理单位！",
+ icon: "none",
+ duration: 2000,
+ })
+ return;
+ }
+ if(!this.dataForm.contractYsdwId) {
+ wx.showToast({
+ title: "请选择一审单位！",
+ icon: "none",
+ duration: 2000,
+ })
+ return;
+ }
+ if(!this.dataForm.contractEsdwId) {
+ wx.showToast({
+ title: "请选择二审单位！",
icon: "none",
duration: 2000,
})
diff --git a/src/pages/pagecontract/businesscontract/businesscontract.vue b/src/pages/pagecontract/businesscontract/businesscontract.vue
index 2745f88..5d09c1e 100644
--- a/src/pages/pagecontract/businesscontract/businesscontract.vue
+++ b/src/pages/pagecontract/businesscontract/businesscontract.vue
@@ -27,76 +27,6 @@
-
-
2 关键字(all):
@@ -122,8 +52,6 @@
年份 |
合同名称 |
合同金额 |
-
-
操作 |
| | |
@@ -133,11 +61,7 @@
{{ item.contractYear }} |
{{ item.contractNewName? item.contractNewName:item.contractName }} |
{{ "暂无" }} |
-
{{ item.excelContractMoneyNew ? item.excelContractMoneyNew : item.excelContractMoney }} |
-
+
{{ item.excelContractMoneyNew ? item.excelContractMoneyNew : item.excelContractMoney }} |
修改
@@ -477,6 +401,8 @@ export default {
display: flex;
justify-content: center;
align-items: center;
+ font-weight: bold;
+ border: 1px solid #efeded;
}
.trTd {
diff --git a/src/pages/pagecontract/businesscontract/exportProject/exportProject.vue b/src/pages/pagecontract/businesscontract/exportProject/exportProject.vue
index 5c5a4c2..1cad871 100644
--- a/src/pages/pagecontract/businesscontract/exportProject/exportProject.vue
+++ b/src/pages/pagecontract/businesscontract/exportProject/exportProject.vue
@@ -21,102 +21,42 @@
|
| 序号 |
- 立项名称 |
- 施工地点 |
+ 立项名称 |
+
操作 |
-
| {{ indexFa + 1 }} |
-
+ |
{{ item.project }}
{{ item.projectNewName }}
|
-
- {{ son.name }}
- {{ "暂无" }}
- |
+
+
+
+
删除
|
-
| {{ indexFa + 1 }} |
-
+ |
{{ item.project }}
{{ item.projectNewName }}
|
-
- {{ son.name }}
- {{ "暂无" }}
- |
+
+
+
+
删除
|
-
diff --git a/src/pages/pagecontract/businesscontract/importProject/importProject.vue b/src/pages/pagecontract/businesscontract/importProject/importProject.vue
index 05515da..efc6347 100644
--- a/src/pages/pagecontract/businesscontract/importProject/importProject.vue
+++ b/src/pages/pagecontract/businesscontract/importProject/importProject.vue
@@ -29,72 +29,6 @@
-
2 关键字(all)：
@@ -123,102 +57,43 @@
| 序号 |
- 立项名称 |
- 施工地点 |
+ 立项名称 |
+
操作 |
-
+
| {{ indexFa + 1 }} |
-
+ |
{{ item.project }}
{{ item.projectNewName }}
|
-
- {{ son.name }}
- {{ "暂无" }}
- |
+
+
+
+
添加
|
-
| {{ indexFa + 1 }} |
-
+ |
{{ item.project }}
{{ item.projectNewName }}
|
-
- {{ son.name }}
- {{ "暂无" }}
- |
+
+
+
+
添加
|
-
diff --git a/src/pages/pagedict/businessdict/businessdict.vue b/src/pages/pagedict/businessdict/businessdict.vue
index 5985b5d..aada391 100644
--- a/src/pages/pagedict/businessdict/businessdict.vue
+++ b/src/pages/pagedict/businessdict/businessdict.vue
@@ -40,6 +40,7 @@
二、{{ item.name }}
三、{{ item.name }}
四、{{ item.name }}
+
五、{{ item.name }}
+
+
@@ -187,6 +196,40 @@
+
+
+
+ | {{ i + 1 }} |
+ {{ val.name }}
+ |
+
+
+
+
+ | {{ i + 1 }} |
+ {{ val.name }}
+ |
+
+
+
+
+
+ | {{ i + 1 }} |
+ {{ val.name }}
+ |
+
+
+
+
+ | {{ i + 1 }} |
+ {{ val.name }}
+ |
+
+
+
-
-
-
-
-
-
-
-
+
-
-
+
-
2.关键字(all)：
@@ -125,7 +54,7 @@
-
+
@@ -133,13 +62,7 @@
| 序号 |
-
-
- 立项名称 |
- 施工地点 |
-
-
-
+ 立项名称 |
操作 |
@@ -148,32 +71,10 @@
@click="selectOneData(item.projectId, item)">
| {{ indexFa + 1 }} |
-
-
-
-
-
-
-
-
{{ item.project }}
|
- {{ item.projectNewName }} |
- {{ son.name }}
- |
- {{ "暂无" }}
- |
-
+ {{ item.projectNewName }} |
添加
|
@@ -183,31 +84,10 @@
| {{ indexFa + 1 }} |
-
-
-
-
-
-
-
-
{{ item.project }}
|
- {{ item.projectNewName }} |
- {{ son.name }}
- |
- {{ "暂无" }}
- |
-
+ {{ item.projectNewName }} |
添加
|
diff --git a/src/pages/pageoutin/businessoutin/addEdit/outinadd.vue b/src/pages/pageoutin/businessoutin/addEdit/outinadd.vue
index 0e5038d..cf94181 100644
--- a/src/pages/pageoutin/businessoutin/addEdit/outinadd.vue
+++ b/src/pages/pageoutin/businessoutin/addEdit/outinadd.vue
@@ -9,6 +9,7 @@
1.日期：
+
@@ -99,9 +100,15 @@
1.日期：
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
7.收款人：
@@ -198,46 +206,49 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
@@ -289,7 +300,7 @@ export default {
OIWayName: '',
// 收入类别
outType: '',
- // 支出明细表
+ // 每日支出表
OWayName: '', // 支出方式
OWayLB: '', // 支出类别
OProjectName: '', // 立项归属
@@ -322,7 +333,7 @@ export default {
writeUserId: '',//填写人id
approval: '',
},
- //支出明细表form
+ //每日支出表form
dataOOldForm: {
id: '',
outTime: '',
@@ -397,7 +408,7 @@ export default {
},
showPicker(num) {
- //1-支付方式/收款方式(总结表) 2-收付款人（字典中的数据） 3-支出类别 4-支付方式/收款方式(支出明细表) 5-立项归属
+ //1-支付方式/收款方式(总结表) 2-收付款人（字典中的数据） 3-支出类别 4-支付方式/收款方式(每日支出表) 5-立项归属
this.pickerValueArray = [];
this.pickerValueDefault = [];
this.flag = num;
@@ -505,7 +516,7 @@ export default {
},
pickerConfirm(e) {
- //1-支付方式/收款方式(总结表) 2-收付款人（字典中的数据） 3-支出类别 4-支付方式/收款方式(支出明细表)
+ //1-支付方式/收款方式(总结表) 2-收付款人（字典中的数据） 3-支出类别 4-支付方式/收款方式(每日支出表)
if (this.flag == 1) {
this.OIWayName = e.label;
this.dataOIForm.outinCreditingWay = e.value[0];
@@ -707,9 +718,25 @@ export default {
}
})
}*/
- if(!this.dataOForm.outTime || !this.dataOForm.outMoney) {
+ if(!this.dataOForm.outTime) {
wx.showToast({
- title: '缺少必填项！',
+ title: '请选择日期！',
+ icon: 'none',
+ duration: 4000//持续的时间
+ })
+ return;
+ }
+ if(!this.dataOForm.outMoney) {
+ wx.showToast({
+ title: '请填写金额！',
+ icon: 'none',
+ duration: 4000//持续的时间
+ })
+ return;
+ }
+ if(!this.dataOForm.outType) {
+ wx.showToast({
+ title: '请选择支出类别！',
icon: 'none',
duration: 4000//持续的时间
})
@@ -768,7 +795,7 @@ export default {
// 收支总结表收款方式
this.OIWayName = ''
this.outType = ''
- // 支出明细表
+ // 每日支出表
this.OWayName = '' // 支出方式
this.OWayLB = '' // 支出类别
this.OProjectName = '' // 立项归属
@@ -904,7 +931,7 @@ export default {
}
})*/
}
- } else if (params.isLink == '1') { // 支出明细表
+ } else if (params.isLink == '1') { // 每日支出表
this.mxbShow = true;
// 获取对应的数据
this.$http.request({
@@ -912,9 +939,10 @@ export default {
method: 'get'
}).then(({data}) => {
if(data && data.code == 0){
- this.dataOOldForm = {
- ...data.businessOutlay
- }
+ //申请审批
+ // this.dataOOldForm = {
+ // ...data.businessOutlay
+ // }
this.dataOForm = {
...data.businessOutlay
}
@@ -1013,6 +1041,7 @@ export default {
width: 25%;
margin-top: 4%;
background-color: #FF00FF;
+ color: #FFFFFF;
height: 5vh;
border-radius: 5px;
font-size: 14px;
diff --git a/src/pages/pageoutin/businessoutin/businessoutin.vue b/src/pages/pageoutin/businessoutin/businessoutin.vue
index 4561db4..f94b9d2 100644
--- a/src/pages/pageoutin/businessoutin/businessoutin.vue
+++ b/src/pages/pageoutin/businessoutin/businessoutin.vue
@@ -5,7 +5,7 @@
- {{ sysYear }}年度收支总结表
+ {{ sysYear }}年度每日收支总结表
@@ -26,10 +26,10 @@
-->
-
-
-
-
+
+
+
+
@@ -39,13 +39,13 @@
-
+
- | 序号 |
- 日期 |
+ 序号 |
+ 日期 |
昨日余额 |
今日收入 |
今日支出 |
@@ -60,8 +60,8 @@
- | {{ index + 1 }} |
- {{ item.outinDate }} |
+ {{ index + 1 }} |
+ {{ item.outinDate }} |
{{ item.outinYdayBalance !== null ? item.outinYdayBalance : '' }} |
{{ item.outinTdayIncome !== null ? item.outinTdayIncome : '' }} |
{{ item.outinTdayOut !== null ? item.outinTdayOut : '' }} |
@@ -87,8 +87,8 @@
- | {{ index + 1 }} |
- {{ item.outinDate }} |
+ {{ index + 1 }} |
+ {{ item.outinDate }} |
{{ item.outinYdayBalance !== null ? item.outinYdayBalance : '' }} |
{{ item.outinTdayIncome !== null ? item.outinTdayIncome : '' }} |
{{ item.outinTdayOut !== null ? item.outinTdayOut : '' }} |
@@ -156,34 +156,22 @@
-
{{ sysYear }}年度支出明细表
+
+
+
+
+ 第{{thisTotalPages}}页 共{{totalPages}}页
+
+
+
+
+
{{ sysYear }}年度每日支出表
@@ -193,17 +181,17 @@
| 序号 |
日期 |
- 支出金额 |
- 内容 |
- 执行人 |
- 支付方式 |
- 支出类别 |
- 立项归属 |
- 收款人 |
- 地址 |
- 电话 |
- 备注 |
- 操作 |
+ 支出金额 |
+ 内容 |
+ 执行人 |
+ 支付方式 |
+ 支出类别 |
+ 立项归属 |
+ 收款人 |
+
+
+
+ 操作 |
@@ -212,33 +200,32 @@
| {{ index + 1 }} |
{{ item.outTime }} |
- {{ item.outMoney !== null ? item.outMoney : ''}} |
- {{ item.outNr !== null ? item.outNr : ''}} |
- {{ item.writeUserStr !== null ? item.writeUserStr : '' }} |
-
+ | {{ item.outMoney !== null ? item.outMoney : ''}} |
+ {{ item.outNr !== null ? item.outNr : ''}} |
+ {{ item.writeUserStr != null ? item.writeUserStr : '' }} |
+
{{
itemCh.name
}}
|
-
+ |
{{itemCh.name }}
|
-
+ |
{{ itemCh.projectNewName }}
{{ itemCh.project }}
|
-
- {{ item.outPayee ? item.outPayee:' ' }} |
- {{ item.outPayeeAddress !== null ? item.outPayeeAddress : '' }} |
- {{ item.outPayeePhone !== null ? item.outPayeePhone : '' }} |
- {{ item.outRemark !== null ? item.outRemark : '' }} |
-
+ | {{ item.outPayee ? item.outPayee:' ' }} |
+
+
+
+
修改
+ @click="addEdit('/pages/pageoutin/businessoutin/addEdit/main?title=支出管理-每日支出修改&&id='+item.id+'&&isLink=1')">修改
|
@@ -246,100 +233,48 @@
| {{ index + 1 }} |
{{ item.outTime }} |
- {{ item.outMoney !== null ? item.outMoney : '' }} |
- {{ item.outNr !== null ? item.outNr : '' }} |
- {{ item.writeUserStr !== null ? item.writeUserStr : '' }} |
-
+ | {{ item.outMoney !== null ? item.outMoney : '' }} |
+ {{ item.outNr !== null ? item.outNr : '' }} |
+ {{ item.writeUserStr != null ? item.writeUserStr : '' }} |
+
{{itemCh.name}}
|
-
+ |
{{itemCh.name }}
|
-
+ |
{{ itemCh.projectNewName }}
{{ itemCh.project }}
|
-
- {{ item.outPayee ? item.outPayee:' ' }} |
- {{ item.outPayeeAddress !== null ? item.outPayeeAddress : '' }} |
- {{ item.outPayeePhone !== null ? item.outPayeePhone : '' }} |
- {{ item.outRemark !== null ? item.outRemark : '' }} |
-
+ | {{ item.outPayee ? item.outPayee:' ' }} |
+
+
+
+
修改
+ @click="addEdit('/pages/pageoutin/businessoutin/addEdit/main?title=支出管理-每日支出修改&&id='+item.id+'&&isLink=1')">修改
|
- ③ 施工地点：
- {{ itemDic.name }}
-
- ④ 年份：{{ itemChildren.projectYear ? itemChildren.projectYear : "" }}
- ⑤开工时间：{{ itemChildren.projectStart? itemChildren.projectStart : "" }}
- ⑥ 竣工时间：{{ itemChildren.projectEnd ? itemChildren.projectEnd : "" }}
- ⑦ 施工进度：
+
+
+
+
+ ③ 年份：{{ itemChildren.projectYear ? itemChildren.projectYear : "" }}
+ ④开工时间：{{ itemChildren.projectStart? itemChildren.projectStart : "" }}
+ ⑤ 竣工时间：{{ itemChildren.projectEnd ? itemChildren.projectEnd : "" }}
+ ⑥ 施工进度：
{{ itemDic.name }}
- ⑧ 负责工长：{{ itemChildren.fzgz ? itemChildren.fzgz : "" }}
- ⑨ 联络员：{{ itemChildren.lly ? itemChildren.lly : "" }}
- ⑩ 工程类别：
+ ⑦ 负责工长：{{ itemChildren.fzgz ? itemChildren.fzgz : "" }}
+ ⑧ 联络员：{{ itemChildren.lly ? itemChildren.lly : "" }}
+ ⑨ 工程类别：
{{ itemDic.name }}
@@ -111,30 +111,35 @@
-
1、施工内容输入
+
1、内容
+
每日完成的工程量(用数字表达)，进度百分比及待完成的工程内容
-
-
2、材料
+
2、材料、机械及工具
+
需不落项，且具体到数量
-
-
3、机械
+
3、自检总结
+
①计划派工不为1的情况说明(多数为离职未更改、请假、临时换人、施工项目更改等)
+
②实际派工不为1的情况说明(多数为加班，或者突发情况临时请假等)
+
③完成工程量与人员匹配情况是否正常，若不正常，给予情况说明
-
diff --git a/src/pages/pageplan/businessplan/addEdit/importProject/importProjct.vue b/src/pages/pageplan/businessplan/addEdit/importProject/importProjct.vue
index 8da2e50..d5bac55 100644
--- a/src/pages/pageplan/businessplan/addEdit/importProject/importProjct.vue
+++ b/src/pages/pageplan/businessplan/addEdit/importProject/importProjct.vue
@@ -1,22 +1,5 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -76,8 +59,7 @@
style="display: flex;font-size: 12px;border: 2px solid #FDE866;font-weight: bold">
序号 |
- 立项名称 |
- 施工地点 |
+ 立项名称 |
操作 |
@@ -87,15 +69,10 @@
@click="selectOneData(item.projectId)">
| {{ indexFa + 1 }} |
-
+ |
{{ item.project }}
|
- {{ item.projectNewName }} |
- {{ son.name }}
- |
- {{ "暂无" }}
- |
+ {{ item.projectNewName }} |
添加
|
@@ -106,15 +83,10 @@
| {{ indexFa + 1 }} |
-
+ |
{{ item.project }}
|
- {{ item.projectNewName }} |
- {{ son.name }}
- |
- {{ "暂无" }}
- |
+ {{ item.projectNewName }} |
添加
diff --git a/src/pages/pageplan/businessplan/addEdit/importWorker/importWorker.vue b/src/pages/pageplan/businessplan/addEdit/importWorker/importWorker.vue
index 09895ad..95153dd 100644
--- a/src/pages/pageplan/businessplan/addEdit/importWorker/importWorker.vue
+++ b/src/pages/pageplan/businessplan/addEdit/importWorker/importWorker.vue
@@ -5,7 +5,7 @@
- 1 位置(all)：
+ 1 职位(all)：
@@ -15,21 +15,21 @@
:pickerValueArray="pickerValueArrayWz"
:pickerValueDefault='pickerValueDefaultWz'
@onConfirm="pickerConfirmWz">
-
-
+
+
+
+
+
+
+
+
- 3 是否保险(all)：
+ 2 是否保险(all)：
@@ -42,7 +42,7 @@
@onConfirm="pickerConfirmBX">
- 4 关键字(all)：
+ 3 关键字(all)：
@@ -58,43 +58,39 @@
| 序号 |
- 姓名 |
+ 姓名 |
- 职位 |
- 工种 |
+ 岗位 |
+
工时 |
-
-
+
操作 |
| {{ indexList + 1 }} |
- {{ item.name }} |
+ {{ item.name }} |
{{ zw.name }}
|
- 无职位
- |
-
- {{ jb.label }}
- |
-
- 暂无
+ 无岗位
|
+
+
+
+
+
+
+
+
{{workerDay[item.name]*2? workerDay[item.name]: 0}}
|
-
-
-
-
+
+
diff --git a/src/pages/pageplan/businessplan/businessplan.vue b/src/pages/pageplan/businessplan/businessplan.vue
index 7386781..f85552d 100644
--- a/src/pages/pageplan/businessplan/businessplan.vue
+++ b/src/pages/pageplan/businessplan/businessplan.vue
@@ -7,9 +7,9 @@
-
|
- | 序号 |
- 姓名 |
- 状态 |
+
+
+
- 序号 |
- 姓名 |
- 状态 |
+
+
+
- 序号 |
- 姓名 |
- 状态 |
+
+
+
+ 序号 |
+ 姓名 |
+ 状态 |
+ 序号 |
+ 姓名 |
+ 状态 |
- | {{i*3+1}} |
- {{workerIdList[i*3]}} |
- {{ workerDay[workerIdList[i*3]] }} |
+
+
+
- {{workerIdList[i*3+1]==undefined?"":i*3+2}} |
- {{workerIdList[i*3+1]}} |
- {{ workerDay[workerIdList[i*3+1]] }} |
+
+
+
+
+
+
+
+ {{i*2+1}} |
+ {{workerIdList[i*2]}} |
+ {{ workerDay[workerIdList[i*2]] }} |
+
+ {{workerIdList[i*2+1]==undefined?"":i*2+2}} |
+ {{workerIdList[i*2+1]}} |
+ {{ workerDay[workerIdList[i*2+1]] }} |
- {{workerIdList[i*3+2]==undefined?"":i*3+3}} |
- {{workerIdList[i*3+2]}} |
- {{ workerDay[workerIdList[i*3+2]] }} |
@@ -87,16 +101,16 @@
{{item.projectNewName==null?"":item.projectNewName}}
+
+
+
+
+
+
+
- 2.施工地点:
-
- {{item.planSgdd}}
-
-
- 3.负责工长:
+ 2.负责工长:
@@ -104,7 +118,7 @@
- 4.是否一天:
+ 3.是否一天:
- 4.是否一天:
+ 3.是否一天:
@@ -122,7 +136,7 @@
- 5.施工人员:
+ 4.施工人员:
{{item.selectPersion==null?"":item.selectPersion}}
@@ -130,7 +144,7 @@
- 5.施工人员:
+ 4.施工人员:
{{item.selectPersion==null?"":item.selectPersion}}
@@ -176,31 +190,31 @@
+
+
+
+
+
+
+
+
-
-
- 5.施工人员:
+ 4.施工人员:
@@ -278,6 +292,7 @@ export default {
editShow: false,
delShow: false,
tlShow: false,
+ uncommittedShow: false,
twoShow: false,
motto: 'Hello miniprograme',
dataList: [],
@@ -657,9 +672,11 @@ export default {
this.dataList = [];
this.dataForm = {};
this.pickerValueArray = [];
- this.tlShow = false
- this.twoShow = false
+ this.tlShow = false;
+ this.uncommittedShow = false;
+ this.twoShow = false;
this.tlShow = isAuth('business:businessplantl:list')
+ this.uncommittedShow = isAuth('business:businessplan:list')
this.twoShow = isAuth('business:businessplantwo:list')
this.addShow = isAuth('business:businessplan:save')
this.editShow = isAuth('business:businessplan:update')
diff --git a/src/pages/pageplan/businessplan/twoWeekPlan/addEdit/addEdit.vue b/src/pages/pageplan/businessplan/twoWeekPlan/addEdit/addEdit.vue
index 4ab69a4..6678ebb 100644
--- a/src/pages/pageplan/businessplan/twoWeekPlan/addEdit/addEdit.vue
+++ b/src/pages/pageplan/businessplan/twoWeekPlan/addEdit/addEdit.vue
@@ -27,7 +27,7 @@
@@ -59,8 +59,8 @@
序号 |
- 立项名称 |
- 施工地点 |
+ 立项名称 |
+
操作 |
@@ -79,14 +79,14 @@
{{ item.project }}
{{ item.projectNewName }}-->
-
+ |
{{ item.project }}
{{ item.projectNewName }}
|
-
-
- {{ item.sgdd }}
- |
+
+
+
+
@@ -111,14 +111,14 @@
{{ item.project }}
{{ item.projectNewName }}-->
- |
+ |
{{ item.project }}
{{ item.projectNewName }}
|
-
-
- {{ item.sgdd }}
- |
+
+
+
+
@@ -183,10 +183,10 @@ export default {
this.$http.request({
url: this.$http.adornUrl('/business/businessplantwo/list'),
method: 'get',
- params: this.$http.adornParams({
- "startTime": this.dataForm.startTime,
- "endTime": this.dataForm.endTime,
- })
+ // params: this.$http.adornParams({
+ // "startTime": this.dataForm.startTime,
+ // "endTime": this.dataForm.endTime,
+ // })
}).then(({data}) => {
console.log(data);
if (data && data.code === 0) {
@@ -275,6 +275,9 @@ export default {
params: this.$http.adornParams({
"saveIds": saveIds,
"deleteIds": this.delIds.toString(),
+ "twoEditTime":this.dataForm.nowTime,
+ "twoStart":this.dataForm.startTime,
+ "twoEnd":this.dataForm.endTime,
})
}).then(({data}) => {
if (data && data.code === 0) {
diff --git a/src/pages/pageplan/businessplan/twoWeekPlan/addEdit/detail/detail.vue b/src/pages/pageplan/businessplan/twoWeekPlan/addEdit/detail/detail.vue
index f78f415..d191e35 100644
--- a/src/pages/pageplan/businessplan/twoWeekPlan/addEdit/detail/detail.vue
+++ b/src/pages/pageplan/businessplan/twoWeekPlan/addEdit/detail/detail.vue
@@ -134,8 +134,8 @@
| 序号 |
- 立项名称 |
- 施工地点 |
+ 立项名称 |
+
-
+ |
{{ item.project }}
{{ item.projectNewName }}
|
@@ -172,10 +172,10 @@
{{ "暂无" }}
-->
-
- {{ son.name }}
- {{ "暂无" }}
- |
+
+
+
+
-
+ |
{{ item.project }}
{{ item.projectNewName }}
|
@@ -228,10 +228,10 @@
{{ "暂无" }}
-->
-
- {{ son.name }}
- {{ "暂无" }}
- |
+
+
+
+
- 二、属性定义
-
+ 二、属性定义
+
1.建设单位：
@@ -51,19 +51,19 @@
-
+
+
+
+
+
+
+
+
+
+
+
-
-
- 3.施工年份：
+ 2.施工年份：
@@ -71,9 +71,9 @@
-
+
- 4.开工时间：
+ 3.开工时间：
@@ -81,9 +81,9 @@
-
+
- 5.竣工时间：
+ 4.竣工时间：
@@ -91,9 +91,9 @@
-
+
- 6.施工进度：
+ 5.施工进度：
-
+
- 7.负责工长：
+ 6.负责工长：
@@ -112,9 +112,9 @@
-
+
- 8.工程类别：
+ 7.工程类别：
@@ -126,7 +126,7 @@
- 三、 内容简述
+ 三、 内容简述
@@ -134,7 +134,7 @@
- 四、施工照片
+ 四、施工照片
diff --git a/src/pages/pageplan/businessplan/twoWeekPlan/twoWeekPlan.vue b/src/pages/pageplan/businessplan/twoWeekPlan/twoWeekPlan.vue
index a75a6f7..b4f7b94 100644
--- a/src/pages/pageplan/businessplan/twoWeekPlan/twoWeekPlan.vue
+++ b/src/pages/pageplan/businessplan/twoWeekPlan/twoWeekPlan.vue
@@ -7,7 +7,7 @@
-
@@ -27,7 +27,7 @@
-
@@ -54,11 +54,11 @@
序号 |
- 立项名称 |
- 施工地点 |
+ 立项名称 |
+
- 操作 |
+
|
@@ -71,17 +71,17 @@
{{ item.project }}
{{ item.projectNewName }}-->
-
+ |
{{ item.project }}
{{ item.projectNewName }}
|
-
{{ item.sgdd }} |
+
-
- 详情
- |
+
+
+
+
@@ -93,21 +93,21 @@
{{ item.project }}
{{ item.projectNewName }}-->
-
+ |
{{ item.project }}
{{ item.projectNewName }}
|
-
{{ item.sgdd }} |
+
-
- 详情
- |
+
+
+
+
-
+
暂无数据
@@ -155,13 +155,18 @@ export default {
this.$http.request({
url: this.$http.adornUrl('/business/businessplantwo/list'),
method: 'get',
- params: this.$http.adornParams({
- "startTime": this.dataForm.startTime,
- "endTime": this.dataForm.endTime,
- })
+ // params: this.$http.adornParams({
+ // "startTime": this.dataForm.startTime,
+ // "endTime": this.dataForm.endTime,
+ // })
}).then(({data}) => {
if (data && data.code === 0) {
this.dataList = data.page;
+ if(this.dataList.length>0){
+ this.dataForm.nowTime = this.dataList[0].twoEditTime;
+ this.dataForm.startTime = this.dataList[0].twoStart;
+ this.dataForm.endTime = this.dataList[0].twoEnd;
+ }
}
})
},
diff --git a/src/pages/pageplan/businessplan/uncommitted/main.js b/src/pages/pageplan/businessplan/uncommitted/main.js
new file mode 100644
index 0000000..f56975f
--- /dev/null
+++ b/src/pages/pageplan/businessplan/uncommitted/main.js
@@ -0,0 +1,12 @@
+import Vue from 'vue'
+import App from './uncommitted'
+
+// add this to handle exception
+Vue.config.errorHandler = function (err) {
+ if (console && console.error) {
+ console.error(err)
+ }
+}
+
+const app = new Vue(App)
+app.$mount()
diff --git a/src/pages/pageplan/businessplan/uncommitted/uncommitted.vue b/src/pages/pageplan/businessplan/uncommitted/uncommitted.vue
new file mode 100644
index 0000000..9b5fb2b
--- /dev/null
+++ b/src/pages/pageplan/businessplan/uncommitted/uncommitted.vue
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | 序号 |
+ 未总结时间 |
+
+
+
+
+ | {{ index + 1 }} |
+ {{ item.planTime }} |
+
+
+
+ 暂无数据
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/pageproject/businessproject/addEdit/addEdit.vue b/src/pages/pageproject/businessproject/addEdit/addEdit.vue
index 5af51c3..ef3cf26 100644
--- a/src/pages/pageproject/businessproject/addEdit/addEdit.vue
+++ b/src/pages/pageproject/businessproject/addEdit/addEdit.vue
@@ -35,8 +35,9 @@
@@ -69,24 +70,24 @@
:pickerValueDefault='pickerValueDefaultJSDW'
@onConfirm="pickerConfirmJSDW">
-
3.施工年份：
+
2.施工年份：
-
4.开工时间：
+
3.开工时间：
-
5.竣工时间：
+
4.竣工时间：
-
6.施工进度：
+
5.施工进度：
@@ -147,7 +148,7 @@
-
7.负责工长：
+
6.负责工长：
@@ -163,7 +164,7 @@
-
8.联络员：
+
7.联络员：
@@ -179,8 +180,8 @@
-
9.工程类别：
-
+
8.工程类别：
+
@@ -790,6 +791,54 @@ export default {
})
return;
}
+ if(!this.dataForm.projectJsdwId) {
+ wx.showToast({
+ title: '请选择建设单位！',
+ icon: 'none',
+ duration: 2000//持续的时间
+ })
+ return;
+ }
+ if(!this.dataForm.projectYear) {
+ wx.showToast({
+ title: '请选择施工年份！',
+ icon: 'none',
+ duration: 2000//持续的时间
+ })
+ return;
+ }
+ if(!this.dataForm.projectSgjdId) {
+ wx.showToast({
+ title: '请选择施工进度！',
+ icon: 'none',
+ duration: 2000//持续的时间
+ })
+ return;
+ }
+ if(!this.dataForm.projectFzgzId) {
+ wx.showToast({
+ title: '请选择负责工长！',
+ icon: 'none',
+ duration: 2000//持续的时间
+ })
+ return;
+ }
+ if(!this.dataForm.projectLlyId) {
+ wx.showToast({
+ title: '请选择联络员！',
+ icon: 'none',
+ duration: 2000//持续的时间
+ })
+ return;
+ }
+ if(!this.dataForm.projectGclbId) {
+ wx.showToast({
+ title: '请选择工程类别！',
+ icon: 'none',
+ duration: 2000//持续的时间
+ })
+ return;
+ }
this.dataForm.projectPhotoConut = 0;
//console.log(this.dataForm);
if((this.files1.length > 0 && !this.files2.length >0 && !this.files3.length > 0)
diff --git a/src/pages/pageproject/businessproject/businessproject.vue b/src/pages/pageproject/businessproject/businessproject.vue
index ccfe3d5..0a709dd 100644
--- a/src/pages/pageproject/businessproject/businessproject.vue
+++ b/src/pages/pageproject/businessproject/businessproject.vue
@@ -11,14 +11,6 @@
-
-
-
@@ -128,22 +55,10 @@
-
-
-
| 序号 |
- 立项名称 |
- 施工地点 |
+ 立项名称 |
操作 |
@@ -152,109 +67,30 @@
@click="selectOneData(item.projectId)">
| {{ indexFa + 1 }} |
-
+ |
{{ item.project }}
{{ item.projectNewName }}
|
-
- {{ son.name }}
- {{ "暂无" }}
- |
修改
|
-
-
| {{ indexFa + 1 }} |
-
+ |
{{ item.project }}
{{ item.projectNewName }}
|
-
- {{ son.name }}
- {{ "暂无" }}
- |
修改
|
-
-
-
暂无数据
@@ -742,6 +578,7 @@ export default {
display: flex;
justify-content: center;
align-items: center;
+ font-weight: bold;
border: 1px solid #efeded;
}
diff --git a/src/pages/pagetotal/businesstotal.vue b/src/pages/pagetotal/businesstotal.vue
index 6da44fa..02af8bc 100644
--- a/src/pages/pagetotal/businesstotal.vue
+++ b/src/pages/pagetotal/businesstotal.vue
@@ -5,6 +5,7 @@
+
@@ -23,33 +24,46 @@
- | 序号 |
- 姓名 |
- 状态 |
+
+
+
- 序号 |
- 姓名 |
- 状态 |
+
+
+
- 序号 |
- 姓名 |
- 状态 |
+
+
+
+ 序号 |
+ 姓名 |
+ 状态 |
+ 序号 |
+ 姓名 |
+ 状态 |
- | {{i*3+1}} |
- {{workerIdList[i*3]}} |
- {{ workerDay[workerIdList[i*3]] }} |
+
+
+
- {{workerIdList[i*3+1]==undefined?"":i*3+2}} |
- {{workerIdList[i*3+1]}} |
- {{ workerDay[workerIdList[i*3+1]] }} |
+
+
+
- {{workerIdList[i*3+2]==undefined?"":i*3+3}} |
- {{workerIdList[i*3+2]}} |
- {{ workerDay[workerIdList[i*3+2]] }} |
+
+
+
+ {{i*2+1}} |
+ {{workerIdList[i*2]}} |
+ {{ workerDay[workerIdList[i*2]] }} |
+
+ {{workerIdList[i*2+1]==undefined?"":i*2+2}} |
+ {{workerIdList[i*2+1]}} |
+ {{ workerDay[workerIdList[i*2+1]] }} |
@@ -67,23 +81,23 @@
-
1.立项名称111:
+
1.立项名称:
{{item.project==null?"":item.project}}
+
+
+
+
+
+
+
+
-
2.施工地点:
-
-
- {{item.planSgdd}}
-
-
-
-
-
3.负责工长:
+
2.负责工长:
@@ -91,7 +105,7 @@
-
4.是否一天:
+
3.是否一天:
@@ -99,7 +113,7 @@
-
5.施工人员:
+
4.施工人员:
{{item.selectPersion==null?"":item.selectPersion}}
diff --git a/src/pages/pagetotal/businesstotal/businesstotal.vue b/src/pages/pagetotal/businesstotal/businesstotal.vue
index 5702519..eefb79b 100644
--- a/src/pages/pagetotal/businesstotal/businesstotal.vue
+++ b/src/pages/pagetotal/businesstotal/businesstotal.vue
@@ -5,6 +5,7 @@
+
@@ -24,33 +25,46 @@
- | 序号 |
- 姓名 |
- 状态 |
+
+
+
- 序号 |
- 姓名 |
- 状态 |
+
+
+
- 序号 |
- 姓名 |
- 状态 |
+
+
+
+ 序号 |
+ 姓名 |
+ 状态 |
+ 序号 |
+ 姓名 |
+ 状态 |
- | {{i*3+1}} |
- {{workerIdList[i*3]}} |
- {{ workerDay[workerIdList[i*3]] }} |
+
+
+
- {{workerIdList[i*3+1]==undefined?"":i*3+2}} |
- {{workerIdList[i*3+1]}} |
- {{ workerDay[workerIdList[i*3+1]] }} |
+
+
+
- {{workerIdList[i*3+2]==undefined?"":i*3+3}} |
- {{workerIdList[i*3+2]}} |
- {{ workerDay[workerIdList[i*3+2]] }} |
+
+
+
+ {{i*2+1}} |
+ {{workerIdList[i*2]}} |
+ {{ workerDay[workerIdList[i*2]] }} |
+
+ {{workerIdList[i*2+1]==undefined?"":i*2+2}} |
+ {{workerIdList[i*2+1]}} |
+ {{ workerDay[workerIdList[i*2+1]] }} |
@@ -75,17 +89,17 @@
{{item.projectNewName==null?item.project:item.projectNewName}}
+
+
+
+
+
+
+
+
-
2.施工地点:
-
-
- {{item.planSgdd==null?"":item.planSgdd}}
-
-
-
-
-
3.负责工长:
+
2.负责工长:
@@ -93,7 +107,7 @@
-
4.是否一天:
+
3.是否一天:
@@ -101,7 +115,7 @@
-
5.施工人员:
+
4.施工人员:
{{item.selectPersion==null?"":item.selectPersion}}
@@ -214,7 +228,7 @@ export default {
components: {mpvuePicker},
methods: {
- // 已经立项跟踪了 想要回退 必须经过审批
+ // 已经立项跟踪了 想要回退 必须经过审批（审批暂拿掉2024-3-8）
approval(){
// 审批之前先将 isfinised 设置成2代表审批中
this.$http.request({
@@ -222,25 +236,26 @@ export default {
method: 'post',
body: this.$http.adornData({
"dataList": this.dataList,
- "isFinished": "2",
+ // "isFinished": "2", //对应审批暂拿掉
+ "isFinished": "0",
})
}).then(({data}) => {
if (data && data.code === 0) {
- // 提交到审批表中
- this.$http.request({
- url: this.$http.adornUrl('/business/businessapproval/save'),
- method: 'post',
- body: this.$http.adornData({
- 'approvalId': 1,
- 'approvalName': this.planTime,
- 'approvalType': 88,
- "approvalSuccess": 0,
- })
- }).then(({data}) => {
- if (data && data.code === 0) {
+ // 提交到审批表中 //对应审批暂拿掉
+ // this.$http.request({
+ // url: this.$http.adornUrl('/business/businessapproval/save'),
+ // method: 'post',
+ // body: this.$http.adornData({
+ // 'approvalId': 1,
+ // 'approvalName': this.planTime,
+ // 'approvalType': 88,
+ // "approvalSuccess": 0,
+ // })
+ // }).then(({data}) => {
+ // if (data && data.code === 0) {
this.searchData()
- }
- })
+ // }
+ // })
}
})
@@ -347,6 +362,7 @@ export default {
});
},
searchData() {
+ console.log(this.dataListUrl);
// 先查只要进入页面就先查未完稿 status=0
this.$http.request({
url: this.$http.adornUrl(this.dataListUrl),
diff --git a/src/pages/pagetotal/businesstotal/message/message.vue b/src/pages/pagetotal/businesstotal/message/message.vue
index a8987a4..861c9cc 100644
--- a/src/pages/pagetotal/businesstotal/message/message.vue
+++ b/src/pages/pagetotal/businesstotal/message/message.vue
@@ -5,6 +5,8 @@
+
@@ -23,14 +25,14 @@
① 立项名称：{{ dataFormProject.projectNewName }}
① 立项名称：{{ dataFormProject.project }}
② 建设单位：{{ dataFormProject.jsdw }}
-
③ 施工地点：{{ dataFormProject.sgdd }}
-
④ 年份：{{ dataFormProject.projectYear }}
-
⑤ 开工时间：{{ dataFormProject.projectStart }}
-
⑥ 竣工时间：{{ dataFormProject.projectEnd }}
-
⑦ 施工进度：{{ dataFormProject.sgjd }}
-
⑧ 负责工长：{{ dataFormProject.fzgz }}
-
⑨ 联络员：{{ dataFormProject.lly }}
-
⑩ 工程类别：{{ dataFormProject.gclb }}
+
+
③ 年份：{{ dataFormProject.projectYear }}
+
④ 开工时间：{{ dataFormProject.projectStart }}
+
⑤ 竣工时间：{{ dataFormProject.projectEnd }}
+
⑥ 施工进度：{{ dataFormProject.sgjd }}
+
⑦ 负责工长：{{ dataFormProject.fzgz }}
+
⑧ 联络员：{{ dataFormProject.lly }}
+
⑨ 工程类别：{{ dataFormProject.gclb }}
diff --git a/src/pages/pagetotal/businesstotal/totalLyb/totalLyb.vue b/src/pages/pagetotal/businesstotal/totalLyb/totalLyb.vue
index 5e64a9e..d6f27d9 100644
--- a/src/pages/pagetotal/businesstotal/totalLyb/totalLyb.vue
+++ b/src/pages/pagetotal/businesstotal/totalLyb/totalLyb.vue
@@ -5,6 +5,8 @@
+
@@ -427,11 +429,11 @@
- | 序号 |
+ 序号 |
- 立项名称 |
- 施工地点 |
+ 立项名称 |
+
@@ -443,7 +445,7 @@
- | {{ indexFa + 1 }} |
+ {{ indexFa + 1 }} |
-
+ |
{{ item.project }}
{{ item.projectNewName }}
|
@@ -479,10 +481,10 @@
"暂无"
}}
-->
-
- {{ son.name }}
- {{ "暂无" }}
- |
+
+
+
+
-
+ |
{{ item.project }}
{{ item.projectNewName }}
|
@@ -553,10 +555,10 @@
"暂无"
}}
-->
-
- {{ son.name }}
- {{ "暂无" }}
- |
+
+
+
+
+
+
+
+ | 序号 |
+ 未提交类型 |
+ 未提交时间 |
+
+
+
+
+ | {{ index + 1 }} |
+ {{ item.gclb }} |
+ {{ item.planTime }} |
+
+
+
+ 暂无数据
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -281,287 +157,20 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ 第{{thisPages}}页 共{{pages}}页
+
+
+
+
-
+
四、工资账目与保险
@@ -593,16 +202,45 @@
}}
-
三、保险购买情况：
{{ item.insurance ? item.insurance : ' ' }}
+
三、保险购买情况：
+
+
+ {{cutbx(item.insurance)}}
+
+
四、工资账目
-
1.借款明细：
{{ item.borrowingDetails ? item.borrowingDetails : ' ' }}
-
2.工资标准计算方式：
{{ item.gzjsfs ? item.gzjsfs : ' ' }}
-
3.工资结清及时间节点：
{{ item.gzjqjsjjd ? item.gzjqjsjjd : ' ' }}
-
4.备注：
{{ item.remark ? item.remark : ' ' }}
+
1.借款明细：
+
+
+ {{cutjk(item.borrowingDetails)}}
+
+
+
+
2.工资标准计算方式：
+
+
+ {{cutgzbz(item.gzjsfs)}}
+
+
+
+
3.工资结清及时间节点：
+
+
+ {{cutjq(item.gzjqjsjjd)}}
+
+
+
+
4.备注：
+
+
+ {{cutbz(item.remark)}}
+
+
+