Browse Source

Merge remote-tracking branch 'origin/master'

master
zth 1 month ago
parent
commit
58aa9793b5
  1. 10
      jwtech-admin-page/public/static/信用承诺模板.docx
  2. 2
      jwtech-admin-page/src/views/building/projectInfo/buildProgressWarning/index.vue
  3. 9
      jwtech-admin-page/src/views/building/projectInfo/costChangeWarning/costInfo.vue
  4. 2
      jwtech-admin-page/src/views/building/projectInfo/costChangeWarning/index.vue
  5. 2
      jwtech-admin-page/src/views/building/projectInfo/fundPayWarning/index.vue
  6. 2
      jwtech-admin-page/src/views/building/projectInfo/investCompleteWarning/index.vue
  7. 3
      jwtech-admin-page/src/views/building/projectInfo/projectWarning/index.vue
  8. 31
      jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/basePage.vue
  9. 2
      jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/dynamicCredit.vue
  10. 166
      jwtech-admin-page/src/views/projectStatistics/peasantWorkers/index.vue
  11. 4
      jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiCostChangeRule.java

10
jwtech-admin-page/public/static/信用承诺模板.docx

@ -0,0 +1,10 @@
--------------------------------------------------------------------------------
信用信息公开承诺书
我单位已仔细阅读《工程建设领域项目信息公开和诚信体系建设工作实施意见》(中纪发〔2011〕16号)《关于印发水利工程建设领域项目信息公开和诚信体系建设实施方案的通知》(水建管〔2011〕433号)《广东省社会信用条例》等文件要求,郑重承诺:
依法在广东省水利建设市场信用信息平台提供单位信用信息。我单位信用信息不包含涉及国家秘密、商业秘密、个人隐私以及涉及国家安全、公共安全、经济安全和社会稳定的内容。
严格遵守信息公开的有关规定,我单位信用信息形成之日起及时通过广东省水利建设市场信用信息平台填报、更新并向社会公开。
我单位信用信息均合法、真实、准确和有效,因提供虚假信用信息所产生的一切不良后果和法律责任由本企业自己承担。
我单位的信用信息自觉接受政府、行业组织、社会公众、新闻舆论的监督。
我单位同意《信用信息公开承诺书》向社会公开。
企业名称(盖章): 法定代表人(签字):

2
jwtech-admin-page/src/views/building/projectInfo/buildProgressWarning/index.vue

@ -2280,7 +2280,7 @@ export default {
}, },
handleToList (tabNum, row) { handleToList (tabNum, row) {
this.$router.push({ this.$router.push({
path: "/building/build/buildProgressWarning-list", path: "/evaluationEarlyWarning/rulelx/buildProgressWarning-list",
query: { query: {
baseDataId: row.id, baseDataId: row.id,
proNo: row.proNo, proNo: row.proNo,

9
jwtech-admin-page/src/views/building/projectInfo/costChangeWarning/costInfo.vue

@ -45,15 +45,16 @@
<el-table-column label="预警类型" align="center" prop="warnType" :formatter="warningTypeFormat" min-width="120"/> <el-table-column label="预警类型" align="center" prop="warnType" :formatter="warningTypeFormat" min-width="120"/>
<el-table-column label="预警条件" align="center" prop="warnCondition" :formatter="warningConditionFormat" width="80"/> <el-table-column label="预警条件" align="center" prop="warnCondition" :formatter="warningConditionFormat" width="80"/>
<el-table-column label="金额" align="center" prop="amount" min-width="120"/> <el-table-column label="金额" align="center" prop="amount" min-width="120"/>
<el-table-column label="预警级别" align="center" prop="warnLevel" :formatter="warningLevelFormat" width="100"/> <!--<el-table-column label="预警级别" align="center" prop="warnLevel" :formatter="warningLevelFormat" width="100"/>-->
<el-table-column label="时间节点" align="center" prop="dateNode" width="120"/> <el-table-column label="时间节点" align="center" prop="dateNode" width="120"/>
<el-table-column label="预警描述" align="center" prop="ruleMsg" min-width="170"/> <el-table-column label="预警描述" align="center" prop="ruleMsg" min-width="170"/>
<el-table-column label="当前金额" align="center" prop="currentAmount" min-width="170"/>
<!-- <el-table-column label="状态" align="center" prop="status" min-width="120"> <!-- <el-table-column label="状态" align="center" prop="status" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.status=='1' ? '预警' : '正常' }}</span> <span>{{ scope.row.status=='1' ? '预警' : '正常' }}</span>
</template> </template>
</el-table-column> --> </el-table-column> -->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right"> <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@ -70,7 +71,7 @@
v-hasPermi="['build:costChangeWarning:remove']" v-hasPermi="['build:costChangeWarning:remove']"
>删除</el-button> >删除</el-button>
</template> </template>
</el-table-column> </el-table-column>-->
</el-table> </el-table>
<pagination <pagination
@ -188,6 +189,7 @@ export default {
dateNode: null, dateNode: null,
ruleMsg: null, ruleMsg: null,
createUid: null, createUid: null,
currentAmount: null,
createTime: null, createTime: null,
updateUid: null, updateUid: null,
updateTime: null, updateTime: null,
@ -362,6 +364,7 @@ export default {
ruleMsg: null, ruleMsg: null,
createUid: null, createUid: null,
createTime: null, createTime: null,
currentAmount: null,
updateUid: null, updateUid: null,
updateTime: null, updateTime: null,
remark: null, remark: null,

2
jwtech-admin-page/src/views/building/projectInfo/costChangeWarning/index.vue

@ -2259,7 +2259,7 @@ export default {
}, },
handleToList (tabNum, row) { handleToList (tabNum, row) {
this.$router.push({ this.$router.push({
path: "/building/build/costChangeWarning-list", path: "/evaluationEarlyWarning/rulelx/costChangeWarning-list",
query: { query: {
baseDataId: row.id, baseDataId: row.id,
proNo: row.proNo, proNo: row.proNo,

2
jwtech-admin-page/src/views/building/projectInfo/fundPayWarning/index.vue

@ -2265,7 +2265,7 @@ export default {
}, },
handleToList (tabNum, row) { handleToList (tabNum, row) {
this.$router.push({ this.$router.push({
path: "/building/build/fundPayWarning-list", path: "/evaluationEarlyWarning/rulelx/fundPayWarning-list",
query: { query: {
baseDataId: row.id, baseDataId: row.id,
proNo: row.proNo, proNo: row.proNo,

2
jwtech-admin-page/src/views/building/projectInfo/investCompleteWarning/index.vue

@ -2297,7 +2297,7 @@ export default {
handleToList (tabNum, row) { handleToList (tabNum, row) {
this.$router.push({ this.$router.push({
// path: "/project/special/options", // path: "/project/special/options",
path: "/building/build/investCompleteWarning-list", path: "/evaluationEarlyWarning/rulelx/investCompleteWarning-list",
query: { query: {
baseDataId: row.id, baseDataId: row.id,
proNo: row.proNo, proNo: row.proNo,

3
jwtech-admin-page/src/views/building/projectInfo/projectWarning/index.vue

@ -2272,8 +2272,7 @@ export default {
}, },
handleToList (tabNum, row) { handleToList (tabNum, row) {
this.$router.push({ this.$router.push({
// path: "/project/special/options", path: "/evaluationEarlyWarning/rulelx/project-regular-list",
path: "/building/project-regular-list",
query: { query: {
baseDataId: row.id, baseDataId: row.id,
proNo: row.proNo, proNo: row.proNo,

31
jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/basePage.vue

@ -413,7 +413,11 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="信用承诺书" prop="certificateInformation" style="position: relative;"> <el-form-item
label="信用承诺书"
prop="certificateInformation"
style="position: relative"
>
<el-upload <el-upload
class="upload-demo" class="upload-demo"
action="thinking/common/upload" action="thinking/common/upload"
@ -437,9 +441,20 @@
支持jpg/png/pdf/word/excel文件等不超过200M 支持jpg/png/pdf/word/excel文件等不超过200M
</div> </div>
</el-upload> </el-upload>
<span @click=" downloadTemplate('项目法人版广东省智慧水利一期-水工程建设管理模块操作手册.pdf', <span
'(项目法人版)广东省智慧水利一期-水工程建设管理模块操作手册.pdf')" style="color: #2679bc;font-size: 14px;position: absolute;top: 10px; @click="
left: 120px;cursor: pointer;">下载模板</span> downloadTemplate('信用承诺模板.docx', '信用承诺模板.docx')
"
style="
color: #2679bc;
font-size: 14px;
position: absolute;
top: 10px;
left: 120px;
cursor: pointer;
"
>下载模板</span
>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -686,7 +701,7 @@ export default {
}); });
}, },
methods: { methods: {
downloadTemplate(filename, name){ downloadTemplate(filename, name) {
let a = document.createElement("a"); let a = document.createElement("a");
console.log(999, process.env.NODE_ENV); console.log(999, process.env.NODE_ENV);
a.href = "/jgThinking/static/" + filename; a.href = "/jgThinking/static/" + filename;
@ -765,8 +780,8 @@ export default {
if (this.form.safetyProductionAttachment) { if (this.form.safetyProductionAttachment) {
this.fileList2 = JSON.parse(this.form.safetyProductionAttachment); this.fileList2 = JSON.parse(this.form.safetyProductionAttachment);
} }
if (this.form.certificateInformation){ if (this.form.certificateInformation) {
this.fileList5=JSON.parse(this.form.certificateInformation) this.fileList5 = JSON.parse(this.form.certificateInformation);
} }
}); });
}, },
@ -862,7 +877,7 @@ export default {
if (valid) { if (valid) {
this.form.socialCreditCodeAttachment = JSON.stringify(this.fileList1); this.form.socialCreditCodeAttachment = JSON.stringify(this.fileList1);
this.form.safetyProductionAttachment = JSON.stringify(this.fileList2); this.form.safetyProductionAttachment = JSON.stringify(this.fileList2);
this.form.certificateInformation=JSON.stringify(this.fileList5) this.form.certificateInformation = JSON.stringify(this.fileList5);
if (this.form.id != null) { if (this.form.id != null) {
updateEnterpriseInfo(this.form).then((response) => { updateEnterpriseInfo(this.form).then((response) => {
if (response.code === 200) { if (response.code === 200) {

2
jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/dynamicCredit.vue

@ -2,7 +2,7 @@
<div class="app-container"> <div class="app-container">
<!-- 良好行为加分申报 --> <!-- 良好行为加分申报 -->
<div class="listTitle"> <div class="listTitle">
<span>良好行为加分申报</span> <span>良好行为加分申报111</span>
<span <span
class="addBtn" class="addBtn"
@click="handleAdd('0')" @click="handleAdd('0')"

166
jwtech-admin-page/src/views/projectStatistics/peasantWorkers/index.vue

@ -1,7 +1,7 @@
<template> <template>
<!-- 项目基本信息--> <!-- 项目基本信息-->
<div> <div>
<el-row class="query-row" :gutter="20" style="margin-top: 30px;"> <el-row class="query-row" :gutter="20" style="margin-top: 30px">
<el-col v-show="showSearch" :span="16"> <el-col v-show="showSearch" :span="16">
<el-form <el-form
:model="queryParams" :model="queryParams"
@ -51,7 +51,6 @@
> >
</el-cascader> </el-cascader>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-col> </el-col>
<el-col :span="16"> <el-col :span="16">
@ -114,52 +113,34 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery" <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button >重置</el-button
> >
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-col> </el-col>
</el-row> </el-row>
<h2 style="color:#515a6e;text-align: center; font-weight: bold; width: 100%;background-color: #f8f9fb;margin-bottom: 0;height: 40px;line-height: 40px">合计</h2> <h2
<el-table style="width: 100%" title="合计" v-loading="totalLoading"> style="
<el-table-column label="投资总金额" align="center" width="200"> color: #515a6e;
<template #default="{ row }"> text-align: center;
<span style="font-weight: bold">{{ totalData.total }}</span> font-weight: bold;
</template> width: 100%;
</el-table-column> background-color: #f8f9fb;
margin-bottom: 0;
height: 40px;
line-height: 40px;
"
>
合计
</h2>
<el-table-column label="合同总金额" align="center" width="200"> <div class="totalData-wrap" v-loading="totalLoading">
<template #default="{ row }"> <div class="totalData-item" v-for="i in totalDataType" :key="i.key">
<span style="font-weight: bold">{{ totalData.conPay }}</span> <div class="lab">{{ i.lab }}</div>
</template> <div class="val">{{ i.val }}</div>
</el-table-column> </div>
<el-table-column label="农民工总数" align="center" width="200"> </div>
<template #default="{ row }">
<span style="font-weight: bold">{{ totalData.worksTotal }}</span>
</template>
</el-table-column>
<el-table-column label="农民工在场数" align="center" width="200">
<template #default="{ row }">
<span style="font-weight: bold">{{ totalData.enterNum }}</span>
</template>
</el-table-column>
<el-table-column label="农民工退场数" align="center" width="200">
<template #default="{ row }">
<span style="font-weight: bold">{{ totalData.exitNum }}</span>
</template>
</el-table-column>
<el-table-column label="发放工资总数(万元)" align="center" width="200">
<template #default="{ row }">
<span style="font-weight: bold">{{ totalData.payTotal }}</span>
</template>
</el-table-column>
<el-table-column label="总拖欠工资" align="center" width="200">
<template #default="{ row }">
<span style="font-weight: bold">{{ totalData.unPayTotal }}</span>
</template>
</el-table-column>
</el-table>
<el-table v-loading="loading" :data="infoList"> <el-table v-loading="loading" :data="infoList">
<!-- <el-table-column type="selection" width="55" align="center" fixed /> --> <!-- <el-table-column type="selection" width="55" align="center" fixed /> -->
<el-table-column <el-table-column
@ -267,7 +248,6 @@
min-width="180" min-width="180"
/> />
<el-table-column <el-table-column
label="操作" label="操作"
align="right" align="right"
@ -282,9 +262,8 @@
icon="el-icon-view" icon="el-icon-view"
v-hasPermi="['projectStatisticsSort:info:view']" v-hasPermi="['projectStatisticsSort:info:view']"
@click="viewInfo(scope.row)" @click="viewInfo(scope.row)"
>查看</el-button >查看</el-button
> >
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -312,21 +291,26 @@
</template> </template>
<script> <script>
import { listProjectManage, listProjectExport,getNmgList,getNmgTotal } from "@/api/warn/earlyWarning"; import {
listProjectManage,
listProjectExport,
getNmgList,
getNmgTotal,
} from "@/api/warn/earlyWarning";
import { regionData, codeToText, TextToCode } from "element-china-area-data"; import { regionData, codeToText, TextToCode } from "element-china-area-data";
import {getAreasData} from "../../../api/areas"; import { getAreasData } from "../../../api/areas";
export default { export default {
name: "earlyWarin", name: "earlyWarin",
props: ["changeType"], props: ["changeType"],
watch: { watch: {
queryParams(newValue) { queryParams(newValue) {
this.send() // prop this.send(); // prop
} },
}, },
data() { data() {
return { return {
elementByValue:4, elementByValue: 4,
tjQuery:this.query, tjQuery: this.query,
// //
loading: true, loading: true,
// //
@ -377,13 +361,13 @@ export default {
}, },
// //
form: {}, form: {},
totalLoading:false, totalLoading: false,
engineeringGradeOptions: [], engineeringGradeOptions: [],
isMajorProjectOptions:[], isMajorProjectOptions: [],
// //
rules: {}, rules: {},
proMsg: {}, proMsg: {},
totalData:{}, totalData: {},
// //
routeList: [ routeList: [
{ {
@ -400,12 +384,22 @@ export default {
emitPath: false, emitPath: false,
checkStrictly: true, // checkStrictly: true, //
}, },
totalDataType: [
{ lab: "投资总金额", key: "total", val: 0 },
{ lab: "合同总金额", key: "conPay", val: 0 },
{ lab: "农民工总数", key: "worksTotal", val: 0 },
{ lab: "农民工在场数", key: "enterNum", val: 0 },
{ lab: "农民工退场数", key: "exitNum", val: 0 },
{ lab: "发放工资总数(万元)", key: "payTotal", val: 0 },
{ lab: "发放工资总数(万元)", key: "payTotal", val: 0 },
{ lab: "总拖欠工资", key: "unPayTotal", val: 0 },
],
}; };
}, },
created() { created() {
this.getTreeData() this.getTreeData();
this.getList(); this.getList();
this.getNmgTotal() this.getNmgTotal();
this.getDicts("whether").then((response) => { this.getDicts("whether").then((response) => {
this.isMajorProjectOptions = response.data; this.isMajorProjectOptions = response.data;
this.isApprovalOptions = response.data; this.isApprovalOptions = response.data;
@ -465,13 +459,16 @@ export default {
}, },
}, },
methods: { methods: {
getNmgTotal(){ getNmgTotal() {
this.totalLoading=true this.totalLoading = true;
getNmgTotal(this.queryParams).then(res=>{ getNmgTotal(this.queryParams).then((res) => {
this.totalData=res.data this.totalData = res.data;
console.log(this.totalData,'totalData')
this.totalLoading=false this.totalDataType.forEach((item) => {
}) item.val = res.data[item.key] || 0;
});
this.totalLoading = false;
});
}, },
getTreeData() { getTreeData() {
getAreasData().then((items) => { getAreasData().then((items) => {
@ -497,7 +494,7 @@ export default {
}); });
}, },
send() { send() {
this.$bus.$emit("queryParams",this.queryParams) this.$bus.$emit("queryParams", this.queryParams);
}, },
engineeringGradeFormat(row, column) { engineeringGradeFormat(row, column) {
return this.selectDictLabel( return this.selectDictLabel(
@ -517,7 +514,7 @@ export default {
}); });
}, },
changeProjectType() { changeProjectType() {
this.send() this.send();
this.handleQuery(); this.handleQuery();
// console.log(555, this.queryParams.data.projectType.slice(0, 2)); // console.log(555, this.queryParams.data.projectType.slice(0, 2));
const key = this.queryParams.data.projectType?.slice(0, 2); const key = this.queryParams.data.projectType?.slice(0, 2);
@ -616,7 +613,7 @@ export default {
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1;
this.getList(); this.getList();
this.getNmgTotal() this.getNmgTotal();
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
@ -706,6 +703,45 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
@import "@/assets/css/dialog.scss"; @import "@/assets/css/dialog.scss";
.totalData-wrap {
width: 100%;
display: flex;
margin: 20px 0;
.totalData-item {
flex: 1;
display: flex;
height: 105px;
margin-right: 16px;
background-image: linear-gradient(
rgb(199, 243, 227),
rgba(199, 243, 227, 0.3)
);
border-radius: 10px;
box-shadow: 0px 2px 8px 0px #2d78ed1a;
align-items: center;
flex-direction: column;
justify-content: center;
&:nth-last-child(1) {
margin-right: 0;
}
.lab {
font-family: "PingFangSC-Regular", "PingFang SC", sans-serif;
font-weight: 200;
font-style: normal;
font-size: 16px;
}
.val {
margin-top: 10px;
font-weight: 600;
color: #36b29e;
}
}
}
::v-deep { ::v-deep {
.el-dialog { .el-dialog {
margin-top: 2vh !important; margin-top: 2vh !important;

4
jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiCostChangeRule.java

@ -85,4 +85,8 @@ public class BsSgcJsjdBuiCostChangeRule extends BaseEntity
@ApiModelProperty("状态") @ApiModelProperty("状态")
private String status; private String status;
/** 创建人 */
@Excel(name = "当前金额")
@ApiModelProperty("当前金额")
private String currentAmount;
} }

Loading…
Cancel
Save