Browse Source

bug修改

dev_kxc
xzt 1 year ago
parent
commit
621312f021
  1. 1
      jwtech-admin-page/src/views/building/projectInfo/index.vue
  2. 1
      jwtech-admin-page/src/views/building/projectInfo/projectProcess/contract/index.vue
  3. 1
      jwtech-admin-page/src/views/building/projectInfo/projectProcess/designChangeInformation.vue
  4. 2
      jwtech-admin-page/src/views/building/projectInfo/projectProcess/investment/options/purposeFunds.vue
  5. 1
      jwtech-admin-page/src/views/building/projectInfo/projectProcess/investment/options/sourceFunds.vue
  6. 8
      jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/clockingIn.vue
  7. 6
      jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/marginAccount.vue
  8. 3
      jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/payroll.vue
  9. 3
      jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/realNameSystem.vue
  10. 3
      jwtech-admin-page/src/views/building/projectInfo/projectProcess/projectLegalPersonEvaluation.vue
  11. 1
      jwtech-admin-page/src/views/building/projectInfo/projectProcess/qualityControl/options/EngineeringQualitySupervisionAndInspection.vue
  12. 1
      jwtech-admin-page/src/views/building/projectInfo/projectProcess/qualityControl/options/engineeringQualityInspection.vue
  13. 5
      jwtech-admin-page/src/views/building/projectInfo/projectProcess/scheduleManagement.vue
  14. 5
      jwtech-admin-page/src/views/building/projectInfo/projectProcess/supervisionAndManagement/options/supervision.vue
  15. 7
      jwtech-admin-page/src/views/project/bid/index.vue
  16. 8
      jwtech-admin-page/src/views/project/bid/options/PreQualificationPage.vue
  17. 18
      jwtech-admin-page/src/views/project/bid/options/TenderAnnouncementPage.vue
  18. 1
      jwtech-admin-page/src/views/project/bid/options/bidBasePage.vue
  19. 3
      jwtech-admin-page/src/views/project/bid/options/biddingFile.vue
  20. 30
      jwtech-admin-page/src/views/project/bid/options/candidatePage.vue
  21. 3
      jwtech-admin-page/src/views/project/bid/options/projectContract.vue
  22. 3
      jwtech-admin-page/src/views/project/bid/options/winningResultPage.vue
  23. 7
      jwtech-admin-page/src/views/project/plan/index.vue
  24. 1
      jwtech-admin-page/src/views/project/plan/options/ImplementationPage.vue
  25. 7
      jwtech-admin-page/src/views/project/plan/options/planBasePage.vue
  26. 2
      jwtech-admin-page/src/views/project/proposal/index.vue
  27. 35
      jwtech-admin-page/src/views/project/report/index.vue
  28. 7
      jwtech-admin-page/src/views/project/special/index.vue
  29. 2
      jwtech-generator/src/main/resources/vm/vue/index.vue.vm

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

@ -16,7 +16,6 @@
ref="queryForm"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="项目名称" prop="projectName">
<el-input

1
jwtech-admin-page/src/views/building/projectInfo/projectProcess/contract/index.vue

@ -6,7 +6,6 @@
ref="queryForm"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<!-- <el-form-item label="合同编号" prop="contractNumber">
<el-input

1
jwtech-admin-page/src/views/building/projectInfo/projectProcess/designChangeInformation.vue

@ -6,7 +6,6 @@
ref="queryForm"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="变更类型" prop="changeType">
<el-select

2
jwtech-admin-page/src/views/building/projectInfo/projectProcess/investment/options/purposeFunds.vue

@ -5,7 +5,6 @@
ref="queryForm"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="合同名称" prop="projectName">
<el-input
@ -782,6 +781,7 @@ export default {
//
reset() {
this.timeScope = [];
this.projectFileList = [];
this.form = {
paymentTerms: null,
paymentPeriods: null,

1
jwtech-admin-page/src/views/building/projectInfo/projectProcess/investment/options/sourceFunds.vue

@ -5,7 +5,6 @@
ref="queryForm"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="下达日期" prop="releaseTime">
<el-date-picker

8
jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/clockingIn.vue

@ -5,9 +5,8 @@
ref="queryForm"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="姓名" prop="name" label-width="40px">
<el-form-item label="姓名" prop="name">
<el-input
v-model="queryParams.data.name"
placeholder="请输入身份证号码"
@ -307,8 +306,9 @@ export default {
attendanceDay: [
{ required: true, message: "请输入考勤年月天数", trigger: "blur" },
{
pattern: /(^[1-9][0-9]{0,8}$)|((^(0){1}$))/,
message: "请输入1-9位正整数,包含0",
// pattern: /(^[1-9][0-9]{0,8}$)|((^(0){1}$))/,
pattern: /(^[0-9]$)|(^[1-2][0-9]$)|(^30$)/,
message: "请输入0-30正整数,包含0",
trigger: "blur",
},
],

6
jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/marginAccount.vue

@ -5,7 +5,6 @@
ref="queryForm"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="收取方式" prop="incomeExpenditureMethods">
<el-select
@ -316,7 +315,7 @@
:close-on-click-modal="false"
>
<el-row :gutter="15">
<el-form ref="form" :model="form" :rules="rules" label-width="194px">
<el-form ref="form" :model="form" :rules="rules" label-width="210px">
<!-- ==============共有============= -->
<el-col :span="12">
<el-form-item label="收取方式" prop="incomeExpenditureMethods">
@ -354,6 +353,7 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="应缴金额" prop="amountPayable">
<el-input
@ -1049,7 +1049,7 @@ export default {
::v-deep {
.el-dialog {
margin-top: 3vh !important;
height: 900px;
// height: 900px;
}
}
</style>

3
jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/payroll.vue

@ -5,7 +5,6 @@
ref="queryForm"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<!-- <el-form-item label="银行账户" prop="bankAccount">
<el-input
@ -34,7 +33,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item label="务工人员姓名" prop="name" label-width="96px">
<el-form-item label="务工人员姓名" prop="name">
<el-input
v-model="queryParams.data.name"
placeholder="请输入务工人员姓名"

3
jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/realNameSystem.vue

@ -5,7 +5,6 @@
ref="queryForm"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<!-- <el-form-item
label="所属单位统一社会信用代码"
@ -29,7 +28,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item label="姓名" prop="name" label-width="40px">
<el-form-item label="姓名" prop="name">
<el-input
v-model="queryParams.data.name"
placeholder="请输入姓名"

3
jwtech-admin-page/src/views/building/projectInfo/projectProcess/projectLegalPersonEvaluation.vue

@ -5,7 +5,6 @@
ref="queryForm"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="评价状态" prop="evaluateStatus">
<el-select
@ -636,7 +635,7 @@ export default {
contractName: null,
legalPerson: null,
cycle: null,
evaluateStatus: "0",
evaluateStatus: null,
remarks: null,
createUid: null,
updateUid: null,

1
jwtech-admin-page/src/views/building/projectInfo/projectProcess/qualityControl/options/EngineeringQualitySupervisionAndInspection.vue

@ -5,7 +5,6 @@
ref="queryForm"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="检查单位" prop="inspectUnit">
<el-input

1
jwtech-admin-page/src/views/building/projectInfo/projectProcess/qualityControl/options/engineeringQualityInspection.vue

@ -5,7 +5,6 @@
ref="queryForm"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="申请时间" prop="applyTime">
<el-date-picker

5
jwtech-admin-page/src/views/building/projectInfo/projectProcess/scheduleManagement.vue

@ -6,9 +6,8 @@
ref="queryForm"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="月度" prop="monthly" label-width="40px">
<el-form-item label="月度" prop="monthly">
<el-date-picker
v-model="queryParams.data.monthly"
type="month"
@ -675,7 +674,7 @@ export default {
projectOverallWorkload: null,
projectOverallInvestmentBenefit: null,
monthlyReportFile: null,
fillingStatus: "0",
fillingStatus: null,
proCode: null,
proNo: null,
createUid: null,

5
jwtech-admin-page/src/views/building/projectInfo/projectProcess/supervisionAndManagement/options/supervision.vue

@ -5,6 +5,7 @@
<el-input
v-model="form.constructionControlUnit"
placeholder="请输入监理单位"
readonly
/>
</el-form-item>
<el-form-item label="监理人员" prop="supervisionPersonnel">
@ -29,10 +30,10 @@
/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<!-- <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</div> -->
</div>
</template>

7
jwtech-admin-page/src/views/project/bid/index.vue

@ -13,12 +13,7 @@
<el-row :gutter="20">
<el-col :span="22">
<!-- 搜索条件 -->
<el-form
:model="proQueryParams"
ref="proQueryParams"
:inline="true"
label-width="70px"
>
<el-form :model="proQueryParams" ref="proQueryParams" :inline="true">
<el-form-item label="项目名称" prop="projectName">
<el-input
v-model="proQueryParams.data.projectName"

8
jwtech-admin-page/src/views/project/bid/options/PreQualificationPage.vue

@ -6,7 +6,7 @@
:inline="true"
v-show="showSearch"
>
<el-form-item label="招标项目编码" prop="projectCode" label-width="100px">
<el-form-item label="招标项目编码" prop="projectCode">
<el-input
v-model="queryParams.data.projectCode"
placeholder="请输入项目编码"
@ -23,11 +23,7 @@
></el-button>
</el-input>
</el-form-item>
<el-form-item
label="资格预审文件获取开始时间"
prop="fileGainTime"
label-width="190px"
>
<el-form-item label="资格预审文件获取开始时间" prop="fileGainTime">
<el-date-picker
clearable
size="small"

18
jwtech-admin-page/src/views/project/bid/options/TenderAnnouncementPage.vue

@ -5,7 +5,6 @@
ref="queryForm"
:inline="true"
v-show="showSearch"
label-width="70px"
>
<el-form-item label="项目编码" prop="investProjectName">
<el-input
@ -522,6 +521,7 @@
:defaultConfig="editorConfig"
:mode="mode"
@onCreated="onCreated"
@onBlur="checkBidContent"
/>
</div>
</el-form-item>
@ -811,7 +811,7 @@
</el-row>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
<el-button @click="checkBidContent"> </el-button>
</div>
</el-dialog>
@ -1288,9 +1288,23 @@ export default {
},
},
methods: {
checkBidContent() {
this.$refs.form.validateField("bidContent");
// let aaa;
// this.$refs.form.validateField("bidContent", (val) => {
// if (!val) {
// aaa = true;
// } else {
// aaa = false;
// }
// });
},
onCreated(editor) {
this.editor = Object.seal(editor); // Object.seal()
this.editor2 = Object.seal(editor); // Object.seal()
// console.log(9999, this.editor, this.checkBidContent);
this.editor.blur = this.checkBidContent;
},
chooseProject(data) {
// console.log(444, data);

1
jwtech-admin-page/src/views/project/bid/options/bidBasePage.vue

@ -5,7 +5,6 @@
ref="queryForm"
:inline="true"
v-show="showSearch"
label-width="100px"
>
<el-form-item label="招标计划名称" prop="bidPlanName">
<el-input

3
jwtech-admin-page/src/views/project/bid/options/biddingFile.vue

@ -5,7 +5,6 @@
ref="queryForm"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<!-- <el-form-item
label="招标项目名称"
@ -28,7 +27,7 @@
></el-button>
</el-input>
</el-form-item> -->
<el-form-item label="招标项目编码" prop="proCode" label-width="100px">
<el-form-item label="招标项目编码" prop="proCode">
<el-input
v-model="queryParams.data.proCode"
placeholder="请输入项目编码"

30
jwtech-admin-page/src/views/project/bid/options/candidatePage.vue

@ -5,7 +5,6 @@
ref="queryForm"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="公示名称" prop="noticeName">
<el-input
@ -24,7 +23,7 @@
></el-button>
</el-input>
</el-form-item>
<el-form-item label="招标项目编码" prop="projectCode" label-width="96px">
<el-form-item label="招标项目编码" prop="projectCode">
<el-input
v-model="queryParams.data.projectCode"
placeholder="请输入项目编码"
@ -362,6 +361,7 @@
:defaultConfig="editorConfig"
:mode="mode"
@onCreated="onCreated"
@onBlur="checkBidContent"
/>
</div>
</el-form-item>
@ -1056,19 +1056,19 @@ export default {
fileList: [],
pickerOptions: {
disabledDate(date) {
return date.getTime()<Date.now()-8.64e7
}
return date.getTime() < Date.now() - 8.64e7;
},
},
pickerOptionsStart: {
disabledDate(date) {
return date.getTime()<Date.now()-8.64e7
}
return date.getTime() < Date.now() - 8.64e7;
},
},
pickerOptionsEnd: {
disabledDate(date) {
return date.getTime()<Date.now()-8.64e7
}
}
return date.getTime() < Date.now() - 8.64e7;
},
},
};
},
created() {
@ -1087,6 +1087,18 @@ export default {
},
},
methods: {
checkBidContent() {
this.$refs.publicityForm.validateField("evaluationSituation");
// let aaa;
// this.$refs.publicityForm.validateField("evaluationSituation", (val) => {
// if (!val) {
// aaa = true;
// } else {
// aaa = false;
// }
// });
},
onCreated(editor) {
this.editor = Object.seal(editor); // Object.seal()
},

3
jwtech-admin-page/src/views/project/bid/options/projectContract.vue

@ -5,7 +5,6 @@
ref="queryForm"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<!-- <el-form-item
label="招标项目名称"
@ -47,7 +46,7 @@
</el-input>
</el-form-item>
<el-form-item label="招标项目编码" prop="proCode" label-width="96px">
<el-form-item label="招标项目编码" prop="proCode">
<el-input
v-model="queryParams.data.proCode"
placeholder="请输入项目编码"

3
jwtech-admin-page/src/views/project/bid/options/winningResultPage.vue

@ -5,7 +5,6 @@
ref="queryForm"
:inline="true"
v-show="showSearch"
label-width="70px"
>
<el-form-item label="公告名称" prop="noticeName">
<el-input
@ -24,7 +23,7 @@
></el-button>
</el-input>
</el-form-item>
<el-form-item label="招标项目编码" prop="projectCode" label-width="100px">
<el-form-item label="招标项目编码" prop="projectCode">
<el-input
v-model="queryParams.data.projectCode"
placeholder="请输入项目编码"

7
jwtech-admin-page/src/views/project/plan/index.vue

@ -11,12 +11,7 @@
</el-breadcrumb>
<el-row :gutter="20" v-show="showSearch">
<el-col :span="22">
<el-form
:model="queryParams"
ref="queryForm"
:inline="true"
label-width="68px"
>
<el-form :model="queryParams" ref="queryForm" :inline="true">
<el-form-item label="计划名称" prop="planName">
<el-input
v-model="queryParams.data.planName"

1
jwtech-admin-page/src/views/project/plan/options/ImplementationPage.vue

@ -5,7 +5,6 @@
ref="queryForm"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="计划名称" prop="planningName">
<el-input

7
jwtech-admin-page/src/views/project/plan/options/planBasePage.vue

@ -31,7 +31,7 @@
>
<el-option
v-for="item in projectNameOptions"
:key="item.value"
:key="item.id"
:label="item.label"
:value="item.value"
@click.native="linkProject(item.proNo, item.adcd)"
@ -49,7 +49,7 @@
>
<el-option
v-for="dict in planTypeOptions"
:key="dict.dictValue"
:key="dict.dictValue + 'planType'"
:label="dict.dictLabel"
:value="dict.dictValue"
></el-option>
@ -67,7 +67,7 @@
>
<el-option
v-for="dict in isMajorOptions"
:key="dict.dictValue"
:key="dict.dictValue + 'isMajor'"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
@ -206,6 +206,7 @@ export default {
// console.log(response);
this.projectNameOptions = response.records.map((item) => {
return {
id: item.id,
value: item.projectName,
label: item.projectName,
proNo: item.proNo,

2
jwtech-admin-page/src/views/project/proposal/index.vue

@ -13,7 +13,7 @@
<el-row :gutter="20" v-show="showSearch">
<el-col :span="22">
<!-- 搜索条件 -->
<el-form :model="queryParams" :inline="true" label-width="68px">
<el-form :model="queryParams" :inline="true">
<el-form-item label="项目名称" prop="projectName">
<el-input
v-model="queryParams.data.projectName"

35
jwtech-admin-page/src/views/project/report/index.vue

@ -185,12 +185,12 @@
prop="projectInvestmentEstimate"
min-width="120"
/>
<el-table-column
<!-- <el-table-column
label="批复意见"
align="center"
prop="approvalOpinion"
min-width="180"
/>
/> -->
<!-- <el-table-column
label="可行性研究报告文件"
align="center"
@ -433,7 +433,7 @@
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="项目内容" prop="content">
<el-form-item label="项目内容" prop="projectContent">
<el-input
v-model="form.projectContent"
placeholder="请输入项目内容"
@ -566,6 +566,10 @@
<template slot="label"> 审批时间 </template>
{{ this.reportMsg.approvalTime }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label"> 批复意见 </template>
{{ this.reportMsg.approvalOpinion }}
</el-descriptions-item>
<el-descriptions-item span="2">
<template slot="label"> 可行性研究报告文件 </template>
@ -720,6 +724,13 @@ export default {
form: {},
//
rules: {
reportTime: [
{
message: "上报时间不能晚于审批时间",
trigger: "blur",
validate: this.compareTime,
},
],
compilingUnit: [
{ max: 250, message: "字符长度最大为250", trigger: "blur" },
],
@ -736,9 +747,11 @@ export default {
},
],
approvalOpinion: [
{ max: 250, message: "字符长度最大为250", trigger: "blur" },
{ max: 1000, message: "字符长度最大为1000", trigger: "blur" },
],
projectContent: [
{ max: 1000, message: "字符长度最大为1000", trigger: "blur" },
],
content: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
},
projectType: "",
proNo: "",
@ -762,6 +775,18 @@ export default {
});
},
methods: {
compareTime() {
if (this.form.reportTime && this.form.approvalTime) {
// dateStr = dateStr.substring(0,19);
let dateStr1 = this.form.reportTime.replace(/-/g, "/");
let dateStr2 = this.form.approvalTime.replace(/-/g, "/");
let timeTamp1 = new Date(dateStr1).getTime();
let timeTamp2 = new Date(dateStr2).getTime();
console.log(1111, timeTamp1, timeTamp2);
if (timeTamp1 > timeTamp2) return false;
return true;
}
},
formatAdcd(row) {
if (row.adcd) {
let provinceCode = row.adcd.slice(0, 2);

7
jwtech-admin-page/src/views/project/special/index.vue

@ -13,12 +13,7 @@
<el-row :gutter="20" v-show="showSearch">
<el-col :span="22">
<!-- 搜索条件 -->
<el-form
:model="queryParams"
ref="queryForm"
:inline="true"
label-width="68px"
>
<el-form :model="queryParams" ref="queryForm" :inline="true">
<el-form-item label="规划名称" prop="projectName">
<el-input
v-model="queryParams.data.projectName"

2
jwtech-generator/src/main/resources/vm/vue/index.vue.vm

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
#foreach($column in $columns)
#if($column.query)
#set($dictType=$column.dictType)

Loading…
Cancel
Save