Niko
/
shuili_manager
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

update

master
awsl 1 month ago
parent
b98445454b
commit
41e3806e7e
2 changed files with 137 additions and 118 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 249
      jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/newGoodCredit.vue
  2. 6
      jwtech-pc-page/src/views/enterpriseInformation/personDetail.vue

249
jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/newGoodCredit.vue
View File

@ -80,24 +80,24 @@
prop="validityPeriod"
min-width="120"
/>
<!-- <el-table-column-->
<!-- label="获奖公示网址"-->
<!-- align="left"-->
<!-- prop="awardAnnouncementWebsite"-->
<!-- min-width="120"-->
<!-- />-->
<!-- <el-table-column-->
<!-- label="评价日期"-->
<!-- align="left"-->
<!-- prop="evaluationDate"-->
<!-- min-width="120"-->
<!-- />-->
<!-- <el-table-column-->
<!-- label="重合同守信用情况"-->
<!-- align="left"-->
<!-- prop="trustworthyPerformance"-->
<!-- min-width="140"-->
<!-- />-->
<!-- <el-table-column-->
<!-- label="获奖公示网址"-->
<!-- align="left"-->
<!-- prop="awardAnnouncementWebsite"-->
<!-- min-width="120"-->
<!-- />-->
<!-- <el-table-column-->
<!-- label="评价日期"-->
<!-- align="left"-->
<!-- prop="evaluationDate"-->
<!-- min-width="120"-->
<!-- />-->
<!-- <el-table-column-->
<!-- label="重合同守信用情况"-->
<!-- align="left"-->
<!-- prop="trustworthyPerformance"-->
<!-- min-width="140"-->
<!-- />-->
<el-table-column
label="附件"
align="left"
@ -149,7 +149,7 @@
icon="el-icon-edit-outline"
@click="handleExamine(scope.row)"
v-hasPermi="['enterpriseMange:credit:examine']"
>审核</el-button
>审核</el-button
>
<!-- ===================状态按钮===================== -->
<el-button
@ -159,7 +159,7 @@
icon="el-icon-position"
@click="handleReport(scope.row)"
v-hasPermi="['enterprise:credit:report']"
>上报</el-button
>上报</el-button
>
<el-button
v-if="scope.row.status == '2'"
@ -168,7 +168,7 @@
icon="el-icon-position"
@click="handleReport(scope.row)"
v-hasPermi="['enterprise:credit:report']"
>重新上报</el-button
>重新上报</el-button
>
<el-button
v-if="scope.row.status == '1'"
@ -176,7 +176,7 @@
type="text"
icon="el-icon-time"
v-hasPermi="['enterprise:credit:report']"
>待审核</el-button
>待审核</el-button
>
<el-button
v-if="scope.row.status == '2'"
@ -184,7 +184,7 @@
type="text"
icon="el-icon-time"
v-hasPermi="['enterprise:credit:report']"
>已驳回</el-button
>已驳回</el-button
>
<el-button
v-if="scope.row.status == '3'"
@ -193,7 +193,7 @@
icon="el-icon-time"
v-hasPermi="['enterprise:credit:report']"
@click="handleReport(scope.row)"
>已审核</el-button
>已审核</el-button
>
<el-button
v-if="scope.row.status == '4'"
@ -201,7 +201,7 @@
type="text"
icon="el-icon-time"
v-hasPermi="['enterprise:credit:report']"
>已公示</el-button
>已公示</el-button
>
<el-button
v-if="scope.row.status == '5'"
@ -209,7 +209,7 @@
type="text"
icon="el-icon-time"
v-hasPermi="['enterprise:credit:report']"
>已发布</el-button
>已发布</el-button
>
<!-- ===============修改按钮=========== -->
@ -219,7 +219,7 @@
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['enterprise:credit:edit']"
>修改</el-button
>修改</el-button
>
<!-- ===============删除按钮=========== -->
<el-button
@ -228,7 +228,7 @@
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['enterprise:credit:remove']"
>删除</el-button
>删除</el-button
>
</template>
</el-table-column>
@ -254,12 +254,14 @@
<el-form ref="form" :model="form" :rules="rules" label-width="140px">
<el-col :span="12">
<el-form-item label="水行政主管部门" prop="administrativeUnit">
<el-input v-model="form.administrativeUnit" placeholder="请输入水行政主管部门" />
<el-input
v-model="form.administrativeUnit"
placeholder="请输入水行政主管部门"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="项目名称" prop="projectName">
<el-select
ref="selectPro"
v-model="form.projectName"
@ -290,7 +292,6 @@
v-model="form.qualificationCategory"
placeholder="请选择资质类型"
style="width: 100%"
>
<el-option
v-for="dict in qualificationCategoryOptions"
@ -329,7 +330,6 @@
</el-col>
<el-col :span="12">
<el-form-item label="表彰等级" prop="commendationLevel">
<el-input
v-model="form.commendationLevel"
placeholder="请输入表彰等级"
@ -351,69 +351,68 @@
<el-input v-model="form.validity" placeholder="请输入有效期" />
</el-form-item>
</el-col>
<!-- <el-col :span="12">-->
<!-- <el-form-item label="审核时间" prop="evaluationDate">-->
<!-- <el-date-picker-->
<!-- clearable-->
<!-- size="small"-->
<!-- style="width: 100%"-->
<!-- v-model="form.evaluationDate"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="选择审核日期"-->
<!-- >-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item label="企业填报日期" prop="enterpriseReportDate">-->
<!-- <el-date-picker-->
<!-- clearable-->
<!-- size="small"-->
<!-- style="width: 100%"-->
<!-- v-model="form.enterpriseReportDate"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="选择企业填报日期"-->
<!-- >-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item label="加分开始时间" prop="bonusPointBegin">-->
<!-- <el-date-picker-->
<!-- clearable-->
<!-- size="small"-->
<!-- style="width: 100%"-->
<!-- v-model="form.bonusPointBegin"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="选择加分开始时间"-->
<!-- >-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item label="加分有效期至" prop="validityPeriod">-->
<!-- <el-date-picker-->
<!-- clearable-->
<!-- size="small"-->
<!-- style="width: 100%"-->
<!-- v-model="form.validityPeriod"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="选择有效期至"-->
<!-- >-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item label="审核时间" prop="evaluationDate">-->
<!-- <el-date-picker-->
<!-- clearable-->
<!-- size="small"-->
<!-- style="width: 100%"-->
<!-- v-model="form.evaluationDate"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="选择审核日期"-->
<!-- >-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item label="企业填报日期" prop="enterpriseReportDate">-->
<!-- <el-date-picker-->
<!-- clearable-->
<!-- size="small"-->
<!-- style="width: 100%"-->
<!-- v-model="form.enterpriseReportDate"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="选择企业填报日期"-->
<!-- >-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item label="加分开始时间" prop="bonusPointBegin">-->
<!-- <el-date-picker-->
<!-- clearable-->
<!-- size="small"-->
<!-- style="width: 100%"-->
<!-- v-model="form.bonusPointBegin"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="选择加分开始时间"-->
<!-- >-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item label="加分有效期至" prop="validityPeriod">-->
<!-- <el-date-picker-->
<!-- clearable-->
<!-- size="small"-->
<!-- style="width: 100%"-->
<!-- v-model="form.validityPeriod"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="选择有效期至"-->
<!-- >-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="12">
<el-form-item label="是否是水利工程" prop="isWaterCon">
<el-select
v-model="form.isWaterCon"
placeholder="请选择是否是"
style="width: 100%"
>
<el-option
v-for="dict in isOptions"
@ -430,7 +429,6 @@
v-model="form.fillOnYear"
placeholder="请选择是否"
style="width: 100%"
>
<el-option
v-for="dict in isOptions"
@ -447,7 +445,6 @@
v-model="form.provinceBelong"
placeholder="请选择是否"
style="width: 100%"
>
<el-option
v-for="dict in isOptions"
@ -607,15 +604,15 @@
type="primary"
@click="passExamine"
v-hasPermi="['enterpriseMange:credit:passExamine']"
v-if="creditMsg.status=='1'"
>通过审核</el-button
v-if="creditMsg.status == '1'"
>通过审核</el-button
>
<el-button
type="primary"
@click="publicity"
v-hasPermi="['enterpriseMange:credit:passExamine']"
v-if="creditMsg.status=='3'"
>公示信息</el-button
v-if="creditMsg.status == '3'"
>公示信息</el-button
>
<!-- 驳回按钮 -->
<el-popover
@ -644,7 +641,7 @@
<el-button
slot="reference"
type="warning"
v-if="creditMsg.status=='1'"
v-if="creditMsg.status == '1'"
v-hasPermi="['enterpriseMange:credit:TurnDownExamine']"
>
驳回审核
@ -656,7 +653,7 @@
type="primary"
@click="upExamine"
v-hasPermi="['enterpriseMange:credit:upExamine']"
>上 报</el-button
>上 报</el-button
>
<el-button @click="cancel">取 消</el-button>
</div>
@ -722,7 +719,6 @@ import { getAreasData } from "@/api/areas/index";
import { regionData, codeToText, TextToCode } from "element-china-area-data";
import { listInfo } from "@/api/build/projectInfo";
export default {
name: "newGoodCredit",
props: ["enterpriseId"],
@ -806,7 +802,7 @@ export default {
sort: "desc",
},
},
isOptions:[],
isOptions: [],
// 表单参数
form: {},
// 表单校验
@ -817,7 +813,7 @@ export default {
isWaterCon: [
{ required: true, message: "请选择是否", trigger: "blur" },
],
provinceBelong:[
provinceBelong: [
{ required: true, message: "请选择是否", trigger: "blur" },
],
fillOnYear: [
@ -984,8 +980,8 @@ export default {
},
formatDeclarationManagementZones(row) {
const regex = /^[+-]?\d+(\.\d+)?$/;
if (!regex.test(row.declarationManagementZones)){
return ""
if (!regex.test(row.declarationManagementZones)) {
return "";
}
if (row.declarationManagementZones) {
let provinceCode = row.declarationManagementZones.slice(0, 2);
@ -1079,8 +1075,8 @@ export default {
bonusPoints: null,
validityPeriod: null,
awardAnnouncementWebsite: null,
evaluationDate:null,
trustworthyPerformance:null,
evaluationDate: null,
trustworthyPerformance: null,
attachment: null,
status: null,
type: null,
@ -1194,21 +1190,44 @@ export default {
this.remark = "";
},
// 格式化日期为 yyyy-MM-dd HH:mm:ss
formatDate(date) {
const year = date.getFullYear();
const month = String(date.getMonth() + 1).padStart(2, "0");
const day = String(date.getDate()).padStart(2, "0");
const hours = String(date.getHours()).padStart(2, "0");
const minutes = String(date.getMinutes()).padStart(2, "0");
const seconds = String(date.getSeconds()).padStart(2, "0");
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
},
// 通过审核
passExamine() {
this.creditMsg.status = "3";
this.creditMsg.bonusPointBegin=Date.now()
// const currentDate = new Date(Date.now());
// currentDate.setFullYear(currentDate.getFullYear() + this.creditMsg.validity);
// const date=currentDate.getTime()
this.creditMsg.bonusPointBegin = Date.now();
const currentDate = new Date();
currentDate.setFullYear(
currentDate.getFullYear() + this.creditMsg.validity
);
const date = currentDate.getTime();
// this.creditMsg.validityPeriod=date
updateCredit(this.creditMsg).then((response) => {
if (response.code === 200) {
this.msgSuccess("审核通过成功");
this.viewOpen = false;
this.getList();
}
});
console.log(currentDate.getTime());
console.log(
"this.creditMsg.validityPeriod",
this.creditMsg.validityPeriod
);
console.log("formattedDate", this.formatDate(currentDate));
// updateCredit(this.creditMsg).then((response) => {
// if (response.code === 200) {
// this.msgSuccess("审核通过成功");
// this.viewOpen = false;
// this.getList();
// }
// });
},
publicity() {

6
jwtech-pc-page/src/views/enterpriseInformation/personDetail.vue
View File

@ -36,9 +36,9 @@
<el-descriptions-item label="姓名">
{{ personInfo.name }}
</el-descriptions-item>
<!-- <el-descriptions-item label="性别">-->
<!-- {{ personInfo.name }}-->
<!-- </el-descriptions-item>-->
<el-descriptions-item label="性别">
{{ personInfo.name }}
</el-descriptions-item>
<el-descriptions-item label="聘用单位" :span="2">
{{ personInfo.name }}

Write Preview
Loading…
Cancel
Save