Browse Source

Merge remote-tracking branch 'origin/master'

dev_kxc
zhuyulei 1 year ago
parent
commit
786de5b5fb
  1. 1
      jwtech-admin-page/.gitignore
  2. 57
      jwtech-admin-page/src/views/building/projectInfo/projectProcess/investment/options/purposeFunds.vue
  3. 37
      jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/index.vue
  4. 28
      jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/basePage.vue
  5. 1
      jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/qualification_child.vue
  6. 7
      jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/qualification_parent.vue
  7. 74
      jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/performanceRecord.vue
  8. 4
      jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/qualification.vue
  9. 12
      jwtech-generator/src/main/resources/vm/vue/index.vue.vm

1
jwtech-admin-page/.gitignore

@ -18,6 +18,7 @@ selenium-debug.log
*.njsproj *.njsproj
*.sln *.sln
*.local *.local
*.zip
package-lock.json package-lock.json
yarn.lock yarn.lock

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

@ -70,13 +70,13 @@
<el-table ref="refTable" v-loading="loading" :data="contractsList"> <el-table ref="refTable" v-loading="loading" :data="contractsList">
<!-- <el-table-column type="selection" width="55" align="center" fixed /> --> <!-- <el-table-column type="selection" width="55" align="center" fixed /> -->
<el-table-column type="expand" prop="children" fixed> <el-table-column type="expand" prop="children" fixed>
<template slot-scope="scope"> <template slot-scope="props">
<!-- <el-table <!-- <el-table
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
:data="scope.row.children" :data="props.row.children"
border border
> --> > -->
<el-table :data="scope.row.children" border> <el-table :data="props.row.children" border>
<!-- <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
label="序号" label="序号"
@ -86,53 +86,58 @@
/> />
<el-table-column <el-table-column
label="支付期数" label="支付期数"
min-width="60" width="175"
align="center" align="center"
prop="paymentPeriods" prop="paymentPeriods"
/> />
<el-table-column <el-table-column
label="起始年月" label="起始年月"
min-width="70" width="175"
align="center" align="center"
prop="timeScope" prop="timeScope"
/> />
<el-table-column <el-table-column
label="支付时间" label="支付时间"
min-width="45" width="175"
align="center" align="center"
prop="paymentTime" prop="paymentTime"
/> />
<el-table-column <el-table-column
label="本期应付金额(万元)" label="本期应付金额(万元)"
min-width="70" width="175"
align="center" align="center"
prop="payableAmount" prop="payableAmount"
/> />
<el-table-column <el-table-column
label="本期实付金额(万元)" label="本期实付金额(万元)"
min-width="60" width="175"
align="left" align="center"
prop="paidinAmount" prop="paidinAmount"
/> />
<el-table-column <el-table-column
label="本期暂扣款(万元)" label="本期暂扣款(万元)"
min-width="60" width="175"
align="left" align="center"
prop="temporaryWithholding" prop="temporaryWithholding"
/> />
<el-table-column <el-table-column
label="合同支付票据" label="合同支付票据"
min-width="80" width="175"
align="left" align="center"
prop="paymentBill" prop="paymentBill"
/> />
<el-table-column label="操作" min-width="55" align="left"> <el-table-column
<template slot-scope="scope"> label="操作"
width="180"
align="center"
fixed="right"
>
<template slot-scope="props">
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(props.row)"
v-hasPermi="['build:sourceFunds:edit']" v-hasPermi="['build:sourceFunds:edit']"
>修改 >修改
</el-button> </el-button>
@ -140,7 +145,7 @@
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(props.row)"
v-hasPermi="['build:sourceFunds:remove']" v-hasPermi="['build:sourceFunds:remove']"
>删除 >删除
</el-button> </el-button>
@ -162,19 +167,19 @@
label="合同名称" label="合同名称"
align="center" align="center"
prop="contractName" prop="contractName"
min-width="120" width="175"
/> />
<el-table-column <el-table-column
label="合同工期" label="合同工期"
align="center" align="center"
prop="contractDuration" prop="contractDuration"
min-width="120" width="175"
/> />
<el-table-column <el-table-column
label="开工时间" label="开工时间"
align="center" align="center"
prop="commencementTime" prop="commencementTime"
min-width="120" width="175"
> >
</el-table-column> </el-table-column>
@ -182,34 +187,34 @@
label="合同金额(万元)" label="合同金额(万元)"
align="center" align="center"
prop="contractAmount" prop="contractAmount"
min-width="120" width="175"
/> />
<el-table-column <el-table-column
label="应付款金额单位(万元)" label="应付款金额单位(万元)"
align="center" align="center"
prop="payableAmountUnit" prop="payableAmountUnit"
min-width="150" width="175"
/> />
<el-table-column <el-table-column
label="实际支付(万元)" label="实际支付(万元)"
align="center" align="center"
prop="actualPayment" prop="actualPayment"
min-width="150" width="175"
/> />
<el-table-column <el-table-column
label="合同支付完成率" label="合同支付完成率"
align="center" align="center"
prop="payRate" prop="payRate"
min-width="120" width="175"
/> />
<el-table-column <el-table-column
label="操作" label="操作"
align="center" align="center"
class-name="small-padding fixed-width" class-name="small-padding fixed-width"
min-width="180" width="180"
fixed="right" fixed="right"
> >
<template slot-scope="scope"> <template slot-scope="scope">
@ -567,7 +572,7 @@ export default {
// //
close() { close() {
this.reset(); this.reset();
this.getList(); // this.getList();
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {

37
jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/index.vue

@ -133,6 +133,13 @@
:formatter="formatAdcd" :formatter="formatAdcd"
min-width="120" min-width="120"
/> />
<el-table-column
label="企业类型"
align="center"
prop="enterpriseType"
:formatter="enterpriseTypeFormat"
min-width="120"
/>
<el-table-column <el-table-column
label="成立日期" label="成立日期"
align="center" align="center"
@ -359,6 +366,22 @@
</el-cascader> </el-cascader>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24">
<el-form-item label="企业类型" prop="enterpriseType">
<!-- <el-input
v-model="form.enterpriseType"
placeholder="请输入企业类型"
/> -->
<el-radio-group v-model="form.enterpriseType">
<el-radio
v-for="dict in enterpriseTypeOptions"
:key="dict.dictValue"
:label="dict.dictValue"
>{{ dict.dictLabel.replace("资质", "") }}</el-radio
>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="成立日期" prop="establishmentDate"> <el-form-item label="成立日期" prop="establishmentDate">
<el-date-picker <el-date-picker
@ -743,13 +766,25 @@ export default {
}, },
fileList1: [], fileList1: [],
fileList2: [], fileList2: [],
//
enterpriseTypeOptions: [],
}; };
}, },
created() { created() {
this.getTreeData(); this.getTreeData();
this.getList(); this.getList();
this.getDicts("qualification_type").then((response) => {
this.enterpriseTypeOptions = response.data;
});
}, },
methods: { methods: {
//
enterpriseTypeFormat(row, column) {
return this.selectDictLabel(
this.enterpriseTypeOptions,
row.enterpriseType
).replace("资质", "");
},
formatAdcd(row) { formatAdcd(row) {
if (row.adcd) { if (row.adcd) {
let provinceCode = row.adcd.slice(0, 2); let provinceCode = row.adcd.slice(0, 2);
@ -820,6 +855,7 @@ export default {
enterpriseName: null, enterpriseName: null,
investmentComposition: null, investmentComposition: null,
adcd: null, adcd: null,
enterpriseType: null,
establishmentDate: null, establishmentDate: null,
legalRepresentative: null, legalRepresentative: null,
corporateIdNumber: null, corporateIdNumber: null,
@ -861,6 +897,7 @@ export default {
enterpriseName: null, enterpriseName: null,
investmentComposition: null, investmentComposition: null,
adcd: null, adcd: null,
enterpriseType: null,
establishmentDate: null, establishmentDate: null,
legalRepresentative: null, legalRepresentative: null,
corporateIdNumber: null, corporateIdNumber: null,

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

@ -47,6 +47,22 @@
</el-cascader> </el-cascader>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24">
<el-form-item label="企业类型" prop="enterpriseType">
<!-- <el-input
v-model="form.enterpriseType"
placeholder="请输入企业类型"
/> -->
<el-radio-group v-model="form.enterpriseType">
<el-radio
v-for="dict in enterpriseTypeOptions"
:key="dict.dictValue"
:label="dict.dictValue"
>{{ dict.dictLabel.replace("资质", "") }}</el-radio
>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="成立日期" prop="establishmentDate"> <el-form-item label="成立日期" prop="establishmentDate">
<el-date-picker <el-date-picker
@ -426,13 +442,25 @@ export default {
}, },
fileList1: [], fileList1: [],
fileList2: [], fileList2: [],
//
enterpriseTypeOptions: [],
}; };
}, },
created() { created() {
this.getTreeData(); this.getTreeData();
this.getList(); this.getList();
this.getDicts("qualification_type").then((response) => {
this.enterpriseTypeOptions = response.data;
});
}, },
methods: { methods: {
//
enterpriseTypeFormat(row, column) {
return this.selectDictLabel(
this.enterpriseTypeOptions,
row.enterpriseType
).replace("资质", "");
},
handleAdd(key) { handleAdd(key) {
if (key == 0) this.$refs.managementSystem.handleAdd(); if (key == 0) this.$refs.managementSystem.handleAdd();
if (key == 1) this.$refs.SubCompany.handleAdd(); if (key == 1) this.$refs.SubCompany.handleAdd();

1
jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/qualification_child.vue

@ -20,6 +20,7 @@
type="index" type="index"
width="100" width="100"
align="center" align="center"
fixed
:resizable="false" :resizable="false"
/> />
<el-table-column <el-table-column

7
jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/qualification_parent.vue

@ -116,6 +116,7 @@ import {
updateQualifications, updateQualifications,
exportQualifications, exportQualifications,
} from "@/api/enterprise/qualifications"; } from "@/api/enterprise/qualifications";
import { getEnterpriseInfo } from "@/api/enterprise/enterpriseInfo";
export default { export default {
name: "Qualifications", name: "Qualifications",
@ -223,7 +224,7 @@ export default {
enterpriseId: null, enterpriseId: null,
parentId: null, parentId: null,
qualificationCategory: null, qualificationCategory: null,
dynamicCreditScore: null, dynamicCreditScore: 100,
professionalCategory: null, professionalCategory: null,
level: null, level: null,
certificateNo: null, certificateNo: null,
@ -289,6 +290,10 @@ export default {
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset(); this.reset();
getEnterpriseInfo(this.$route.query.baseDataId).then((response) => {
this.form.qualificationCategory = response.data.enterpriseType;
});
this.open = true; this.open = true;
this.title = "添加企业资质"; this.title = "添加企业资质";
}, },

74
jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/performanceRecord.vue

@ -296,10 +296,20 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="项目所在地" prop="projectLocation"> <el-form-item label="项目所在地" prop="projectLocation">
<el-input <!-- <el-input
v-model="form.projectLocation" v-model="form.projectLocation"
placeholder="请输入项目所在地" placeholder="请输入项目所在地"
/> /> -->
<el-cascader
:options="areasOptions"
v-model="form.projectLocation"
:props="areasOptionProps"
placeholder="请选择项目所在地"
clearable
size="small"
style="width: 100%"
>
</el-cascader>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -447,7 +457,7 @@
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> 项目所在地 </template> <template slot="label"> 项目所在地 </template>
{{ this.performanceRecordMsg.projectLocation }} {{ formatProjectLocation(this.performanceRecordMsg) }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> 项目状态 </template> <template slot="label"> 项目状态 </template>
@ -512,7 +522,8 @@ import {
exportPerformanceRecord, exportPerformanceRecord,
} from "@/api/enterprise/performanceRecord"; } from "@/api/enterprise/performanceRecord";
import { getParentQualifications } from "@/api/enterprise/qualifications"; import { getParentQualifications } from "@/api/enterprise/qualifications";
import { getAreasData } from "@/api/areas/index";
import { regionData, codeToText, TextToCode } from "element-china-area-data";
import { getToken } from "@/utils/auth"; import { getToken } from "@/utils/auth";
import { getFileStream } from "@/api/system/upload"; import { getFileStream } from "@/api/system/upload";
@ -521,6 +532,11 @@ export default {
props: ["enterpriseId"], props: ["enterpriseId"],
data() { data() {
return { return {
areasOptionProps: {
emitPath: false, //value
checkStrictly: true, //
},
areasOptions: [],
// //
loading: true, loading: true,
// //
@ -591,6 +607,7 @@ export default {
}; };
}, },
created() { created() {
this.getTreeData();
this.getList(); this.getList();
this.getDicts("qualification_type").then((response) => { this.getDicts("qualification_type").then((response) => {
this.qualificationCategoryOptions = response.data; this.qualificationCategoryOptions = response.data;
@ -600,6 +617,55 @@ export default {
}); });
}, },
methods: { methods: {
formatProjectLocation(row) {
if (row.projectLocation) {
let provinceCode = row.projectLocation.slice(0, 2);
let cityCode = row.projectLocation.slice(2, 4);
let areaCode = row.projectLocation.slice(4, 6);
if (areaCode != "00") {
return (
codeToText[provinceCode] +
"-" +
codeToText[provinceCode + cityCode] +
"-" +
codeToText[provinceCode + cityCode + areaCode]
);
} else if (cityCode != "00") {
return (
codeToText[provinceCode] + "-" + codeToText[provinceCode + cityCode]
);
} else {
return codeToText[provinceCode];
}
}
},
getTreeData() {
getAreasData().then((items) => {
// console.log("getAreasData", items.data);
let res = [];
let getChildren = (res, pid) => {
for (const i of items.data) {
if (i.parentid === pid) {
const newItem = {
label: i.name,
value: i.id,
};
if (i.layer != 3) newItem.children = [];
res.push(newItem);
getChildren(newItem.children, newItem.value);
}
}
};
getChildren(res, items.data[0].parentid);
// console.log("areasOptions", res);
this.areasOptions = res;
// admin
// if (this.$userProfile.createUid != "admin") {
// this.queryParams.data.adcd = this.areasOptions[0].value;
// }
// return res;
});
},
/** 查询工程业绩记录列表 */ /** 查询工程业绩记录列表 */
getList() { getList() {
this.loading = true; this.loading = true;

4
jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/qualification.vue

@ -12,9 +12,9 @@
ref="qualificationParent" ref="qualificationParent"
:enterpriseId="enterpriseId" :enterpriseId="enterpriseId"
/> />
<!-- 企业资质 --> <!-- 企业资质 -->
<div class="listTitle"> <div class="listTitle">
<span>企业资质</span> <span>企业资质</span>
<span class="addBtn" @click="handleAdd('1')"> <span class="addBtn" @click="handleAdd('1')">
<i class="el-icon-plus"></i> <i class="el-icon-plus"></i>
添加 添加

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

@ -19,11 +19,19 @@
clearable clearable
size="small" size="small"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> >
<el-button
type="primary"
slot="append"
icon="el-icon-search"
size="small"
@click="handleQuery"
></el-button>
</el-input>
</el-form-item> </el-form-item>
#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType) #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
<el-form-item label="${comment}" prop="${column.javaField}"> <el-form-item label="${comment}" prop="${column.javaField}">
<el-select v-model="queryParams.data.${column.javaField}" placeholder="请选择${comment}" clearable size="small"> <el-select v-model="queryParams.data.${column.javaField}" placeholder="请选择${comment}" clearable size="small" @change="handleQuery">
<el-option <el-option
v-for="dict in ${column.javaField}Options" v-for="dict in ${column.javaField}Options"
:key="dict.dictValue" :key="dict.dictValue"

Loading…
Cancel
Save