Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop
This commit is contained in:
@@ -95,7 +95,7 @@ export default {
|
|||||||
allowType: {
|
allowType: {
|
||||||
type: Array,
|
type: Array,
|
||||||
default: () => {
|
default: () => {
|
||||||
return ['.pdf', '.PDF', '.doc','.DOC', '.docx','.DOCX', '.pptx', '.PPTX', '.ppt', '.PPT', '.jpg','.JPG','.jpeg','.JPEG', '.PNG', '.png', '.xls','.XLS', '.xlsx','.XLSX']
|
return ['.pdf', '.PDF', '.doc','.DOC', '.docx','.DOCX', '.pptx', '.PPTX', '.ppt', '.PPT', '.xls','.XLS', '.xlsx','.XLSX']
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
// 栅格比例
|
// 栅格比例
|
||||||
|
|||||||
@@ -35,17 +35,17 @@
|
|||||||
<div class="search-area">
|
<div class="search-area">
|
||||||
<div class="left">
|
<div class="left">
|
||||||
<el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form" @keyup.enter.native="getReplaceLawsNumRowSearch">
|
<el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form" @keyup.enter.native="getReplaceLawsNumRowSearch">
|
||||||
<el-form-item label="数据来源" class="search-item">
|
<!-- <el-form-item label="数据来源" class="search-item">-->
|
||||||
<el-select v-model="replaceLawsNumForm.dataSource" filterable>
|
<!-- <el-select v-model="replaceLawsNumForm.dataSource" filterable>-->
|
||||||
<el-option
|
<!-- <el-option-->
|
||||||
v-for="item in dataSourceOptions"
|
<!-- v-for="item in dataSourceOptions"-->
|
||||||
:key="item.value"
|
<!-- :key="item.value"-->
|
||||||
:value="item.value"
|
<!-- :value="item.value"-->
|
||||||
:label="item.label"
|
<!-- :label="item.label"-->
|
||||||
>
|
<!-- >-->
|
||||||
</el-option>
|
<!-- </el-option>-->
|
||||||
</el-select>
|
<!-- </el-select>-->
|
||||||
</el-form-item>
|
<!-- </el-form-item>-->
|
||||||
<el-form-item label="企标编号/标准名称" class="search-item input-width">
|
<el-form-item label="企标编号/标准名称" class="search-item input-width">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="replaceLawsNumForm.numberName"
|
v-model="replaceLawsNumForm.numberName"
|
||||||
@@ -125,7 +125,7 @@
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="standStateShow"
|
prop="standStateShow"
|
||||||
label="标准状态"
|
label="文本状态"
|
||||||
width="130">
|
width="130">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
|
|||||||
@@ -146,7 +146,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
<el-dialog
|
<el-dialog
|
||||||
title="系统菜单"
|
title="标准法规树体系"
|
||||||
:visible.sync="modalflag"
|
:visible.sync="modalflag"
|
||||||
:wrapperClosable="false"
|
:wrapperClosable="false"
|
||||||
@close="closeDialogData"
|
@close="closeDialogData"
|
||||||
@@ -188,13 +188,14 @@
|
|||||||
:model="addForm"
|
:model="addForm"
|
||||||
:rules="addFormRules"
|
:rules="addFormRules"
|
||||||
class="label-input-form"
|
class="label-input-form"
|
||||||
|
|
||||||
>
|
>
|
||||||
<el-form-item label="角色名称" prop="name" label-width="80px" class="add-form-item">
|
<el-form-item label="角色名称" prop="name" label-width="100px" class="add-form-item">
|
||||||
<el-input v-model="addForm.name"
|
<el-input v-model="addForm.name"
|
||||||
placeholder="请输入角色名称"
|
placeholder="请输入角色名称"
|
||||||
clearable></el-input>
|
clearable></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="上级角色" prop="parentId" label-width="80px" class="add-form-item">
|
<el-form-item label="上级角色" prop="parentId" label-width="100px" class="add-form-item">
|
||||||
<el-input v-model="addForm.parentId" style="display: none;"
|
<el-input v-model="addForm.parentId" style="display: none;"
|
||||||
clearable></el-input>
|
clearable></el-input>
|
||||||
<el-input v-model="addForm.parent"
|
<el-input v-model="addForm.parent"
|
||||||
@@ -202,12 +203,12 @@
|
|||||||
@click.native="SuperiorRole"
|
@click.native="SuperiorRole"
|
||||||
clearable></el-input>
|
clearable></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="角色描述" prop="remarks" label-width="80px" class="add-form-item">
|
<el-form-item label="角色描述" prop="remarks" label-width="100px" class="add-form-item">
|
||||||
<el-input v-model="addForm.remarks"
|
<el-input v-model="addForm.remarks"
|
||||||
placeholder="请输入角色描述"
|
placeholder="请输入角色描述"
|
||||||
clearable></el-input>
|
clearable></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="角色状态" prop="useFlag" label-width="80px" class="add-form-item">
|
<el-form-item label="角色状态" prop="useFlag" label-width="100px" class="add-form-item">
|
||||||
<el-select class="bead-input" v-model="addForm.useFlag">
|
<el-select class="bead-input" v-model="addForm.useFlag">
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in options"
|
v-for="item in options"
|
||||||
@@ -646,6 +647,9 @@ export default {
|
|||||||
width: calc(~'100% - 15px') !important;
|
width: calc(~'100% - 15px') !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/deep/.el-form-item__content {
|
||||||
|
margin-left: 40px !important;
|
||||||
|
}
|
||||||
.side-bar-collapse {
|
.side-bar-collapse {
|
||||||
background: #5596CC !important;
|
background: #5596CC !important;
|
||||||
color: #FFF;
|
color: #FFF;
|
||||||
@@ -708,6 +712,9 @@ export default {
|
|||||||
height: 500px;
|
height: 500px;
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
}
|
}
|
||||||
|
/deep/.el-form-item__content {
|
||||||
|
margin-left: 40px!important;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/deep/ .el-select__tags {
|
/deep/ .el-select__tags {
|
||||||
|
|||||||
@@ -38,7 +38,7 @@
|
|||||||
<p>
|
<p>
|
||||||
<label style=" margin-right: 139px;"
|
<label style=" margin-right: 139px;"
|
||||||
title="“修订中”为现行有效版本;“已修订”标准的有效性需根据实际实施情况判定"
|
title="“修订中”为现行有效版本;“已修订”标准的有效性需根据实际实施情况判定"
|
||||||
>文本状态<i class="el-icon-warning-outline"></i></label><span style="color: #409EFF;">{{ sarStandardsInfoEO.standStatusShow || '-' }}</span>
|
>文本状态</label><span style="color: #409EFF;">{{ sarStandardsInfoEO.standStatusShow || '-' }}</span>
|
||||||
</p>
|
</p>
|
||||||
<p><label style=" margin-right: 157px;">发布日期</label><span>{{ sarStandardsInfoEO.issueTime || '-' }}</span></p>
|
<p><label style=" margin-right: 157px;">发布日期</label><span>{{ sarStandardsInfoEO.issueTime || '-' }}</span></p>
|
||||||
<p><label style=" margin-right: 122px;">标准实施日期</label><span>{{ sarStandardsInfoEO.putTime || '-' }}</span></p>
|
<p><label style=" margin-right: 122px;">标准实施日期</label><span>{{ sarStandardsInfoEO.putTime || '-' }}</span></p>
|
||||||
|
|||||||
@@ -89,14 +89,6 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="applyType" label="适用车型" align="center">
|
<el-table-column prop="applyType" label="适用车型" align="center">
|
||||||
<template slot-scope="scope">
|
|
||||||
<div v-if="scope.row.applyType === 'EKFCA'">FCA</div>
|
|
||||||
<div v-if="scope.row.applyType === 'EKHEV'">HEV</div>
|
|
||||||
<div v-if="scope.row.applyType === 'EKEV'">纯电动</div>
|
|
||||||
<div v-if="scope.row.applyType === 'EKQY'">传统车</div>
|
|
||||||
<div v-if="scope.row.applyType === 'EKPHEV'">混动</div>
|
|
||||||
<div v-if="scope.row.applyType === 'DIESEL'">柴油</div>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="标准类型" align="center">
|
<el-table-column label="标准类型" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
@@ -105,7 +97,7 @@
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
|
<el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<a @click="showStandDetails(scope.row)">{{ scope.row.dutyEngineer }}</a>
|
<div>{{ scope.row.dutyEngineer }}</div>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="操作" align="center" v-if="isShowBtn">
|
<el-table-column label="操作" align="center" v-if="isShowBtn">
|
||||||
@@ -160,14 +152,6 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="applyType" label="适用车型" align="center">
|
<el-table-column prop="applyType" label="适用车型" align="center">
|
||||||
<template slot-scope="scope">
|
|
||||||
<div v-if="scope.row.applyType === 'EKFCA'">FCA</div>
|
|
||||||
<div v-if="scope.row.applyType === 'EKHEV'">HEV</div>
|
|
||||||
<div v-if="scope.row.applyType === 'EKEV'">纯电动</div>
|
|
||||||
<div v-if="scope.row.applyType === 'EKQY'">传统车</div>
|
|
||||||
<div v-if="scope.row.applyType === 'EKPHEV'">混动</div>
|
|
||||||
<div v-if="scope.row.applyType === 'DIESEL'">柴油</div>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="标准类型" align="center">
|
<el-table-column label="标准类型" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
@@ -176,7 +160,7 @@
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
|
<el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<a @click="showStandDetails(scope.row)">{{ scope.row.dutyEngineer }}</a>
|
<div>{{ scope.row.dutyEngineer }}</div>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="操作" align="center" v-if="isShowBtn">
|
<el-table-column label="操作" align="center" v-if="isShowBtn">
|
||||||
@@ -216,14 +200,14 @@
|
|||||||
<a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
|
<a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="itemsId" label="条款号" align="center">
|
<el-table-column prop="itemsNum" label="条款号" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<a @click="showStandDetails(scope.row)">{{ scope.row.itemsId }}</a>
|
<div>{{ scope.row.itemsNum }}</div>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="itemsName" label="条款要求" align="center">
|
<el-table-column prop="itemsName" label="条款要求" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<a @click="showStandDetails(scope.row)">{{ scope.row.itemsName }}</a>
|
<div>{{ scope.row.itemsName }}</div>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="putTime" label="实施日期" align="center" sortable>
|
<el-table-column prop="putTime" label="实施日期" align="center" sortable>
|
||||||
@@ -232,14 +216,6 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="applyType" label="适用车型" align="center">
|
<el-table-column prop="applyType" label="适用车型" align="center">
|
||||||
<template slot-scope="scope">
|
|
||||||
<div v-if="scope.row.applyType === 'EKFCA'">FCA</div>
|
|
||||||
<div v-if="scope.row.applyType === 'EKHEV'">HEV</div>
|
|
||||||
<div v-if="scope.row.applyType === 'EKEV'">纯电动</div>
|
|
||||||
<div v-if="scope.row.applyType === 'EKQY'">传统车</div>
|
|
||||||
<div v-if="scope.row.applyType === 'EKPHEV'">混动</div>
|
|
||||||
<div v-if="scope.row.applyType === 'DIESEL'">柴油</div>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="mark" label="标准分类" align="center">
|
<el-table-column prop="mark" label="标准分类" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
@@ -249,7 +225,7 @@
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
|
<el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<a @click="showStandDetails(scope.row)">{{ scope.row.dutyEngineer }}</a>
|
<div>{{ scope.row.dutyEngineer }}</div>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="操作" align="center" v-if="isShowBtn">
|
<el-table-column label="操作" align="center" v-if="isShowBtn">
|
||||||
@@ -289,14 +265,14 @@
|
|||||||
<a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
|
<a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="itemsId" label="条款号" align="center">
|
<el-table-column prop="itemsNum" label="条款号" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<a @click="showStandDetails(scope.row)">{{ scope.row.itemsId }}</a>
|
<div>{{ scope.row.itemsNum }}</div>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="itemsName" label="条款要求" align="center">
|
<el-table-column prop="itemsName" label="条款要求" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<a @click="showStandDetails(scope.row)">{{ scope.row.itemsName }}</a>
|
<div>{{ scope.row.itemsName }}</div>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="putTime" label="实施日期" align="center" sortable>
|
<el-table-column prop="putTime" label="实施日期" align="center" sortable>
|
||||||
@@ -305,14 +281,6 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="applyType" label="适用车型" align="center">
|
<el-table-column prop="applyType" label="适用车型" align="center">
|
||||||
<template slot-scope="scope">
|
|
||||||
<div v-if="scope.row.applyType === 'EKFCA'">FCA</div>
|
|
||||||
<div v-if="scope.row.applyType === 'EKHEV'">HEV</div>
|
|
||||||
<div v-if="scope.row.applyType === 'EKEV'">纯电动</div>
|
|
||||||
<div v-if="scope.row.applyType === 'EKQY'">传统车</div>
|
|
||||||
<div v-if="scope.row.applyType === 'EKPHEV'">混动</div>
|
|
||||||
<div v-if="scope.row.applyType === 'DIESEL'">柴油</div>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="mark" label="标准分类" align="center">
|
<el-table-column prop="mark" label="标准分类" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
@@ -322,7 +290,7 @@
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
|
<el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<a @click="showStandDetails(scope.row)">{{ scope.row.dutyEngineer }}</a>
|
<div>{{ scope.row.dutyEngineer }}</div>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="操作" align="center" v-if="isShowBtn">
|
<el-table-column label="操作" align="center" v-if="isShowBtn">
|
||||||
@@ -472,6 +440,8 @@ export default {
|
|||||||
applyType: "",
|
applyType: "",
|
||||||
},
|
},
|
||||||
height: null,
|
height: null,
|
||||||
|
energyKindOptions: [], //存放适用车型数据
|
||||||
|
zrgcs: [], //责任工程师
|
||||||
// 新车型实施日期预警
|
// 新车型实施日期预警
|
||||||
newItems: [],
|
newItems: [],
|
||||||
//政策新车型实施日期预警
|
//政策新车型实施日期预警
|
||||||
@@ -527,11 +497,63 @@ export default {
|
|||||||
}, {
|
}, {
|
||||||
_this: this
|
_this: this
|
||||||
}, res => {
|
}, res => {
|
||||||
console.log(res.data);
|
|
||||||
const result = res.data[0]
|
const result = res.data[0]
|
||||||
for (const field in result) {
|
for (const field in result) {
|
||||||
this[field] = result[field].records
|
this[field] = result[field].records
|
||||||
this.newItems = result.newItems.records
|
this[field].forEach(item => {
|
||||||
|
// 适用车型转换
|
||||||
|
if (item.applyType !== null) {
|
||||||
|
let k = (item.applyType || "").split(",");
|
||||||
|
for (let i in this.energyKindOptions) {
|
||||||
|
for (let m = 0; m < k.length; m++) {
|
||||||
|
if (this.energyKindOptions[i].value === k[m]) {
|
||||||
|
k[m] = this.energyKindOptions[i].label;
|
||||||
|
}
|
||||||
|
item.applyType = k.join(",");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// 责任工程师转换
|
||||||
|
if (item.dutyEngineer !== null) {
|
||||||
|
let k = (item.dutyEngineer || "").split(",");
|
||||||
|
for (let i in this.zrgcs) {
|
||||||
|
for (let m = 0; m < k.length; m++) {
|
||||||
|
if (this.zrgcs[i].value === k[m]) {
|
||||||
|
k[m] = this.zrgcs[i].label;
|
||||||
|
}
|
||||||
|
item.dutyEngineer = k.join(",");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
let arr = result.newItems.records
|
||||||
|
arr.forEach(item => {
|
||||||
|
// 适用车型转换
|
||||||
|
if (item.applyType !== null) {
|
||||||
|
let k = (item.applyType || "").split(",");
|
||||||
|
for (let i in this.energyKindOptions) {
|
||||||
|
for (let m = 0; m < k.length; m++) {
|
||||||
|
if (this.energyKindOptions[i].value === k[m]) {
|
||||||
|
k[m] = this.energyKindOptions[i].label;
|
||||||
|
}
|
||||||
|
item.applyType = k.join(",");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// 责任工程师转换
|
||||||
|
if (item.dutyEngineer !== null) {
|
||||||
|
let k = (item.dutyEngineer || "").split(",");
|
||||||
|
for (let i in this.zrgcs) {
|
||||||
|
for (let m = 0; m < k.length; m++) {
|
||||||
|
if (this.zrgcs[i].value === k[m]) {
|
||||||
|
k[m] = this.zrgcs[i].label;
|
||||||
|
}
|
||||||
|
item.dutyEngineer = k.join(",");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
this.newItems = arr
|
||||||
//可能还需要调整一下条款或标准的顺序(zyh)
|
//可能还需要调整一下条款或标准的顺序(zyh)
|
||||||
switch (field) {
|
switch (field) {
|
||||||
case 'newItems':
|
case 'newItems':
|
||||||
@@ -635,7 +657,6 @@ export default {
|
|||||||
this.newPolicyPage = 1
|
this.newPolicyPage = 1
|
||||||
this.oldPolicypage = 1
|
this.oldPolicypage = 1
|
||||||
}, e => {
|
}, e => {
|
||||||
console.log(e)
|
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
clearBtnClick() {
|
clearBtnClick() {
|
||||||
@@ -653,7 +674,6 @@ export default {
|
|||||||
},
|
},
|
||||||
//取消预警
|
//取消预警
|
||||||
cancelWarning(index, row) {
|
cancelWarning(index, row) {
|
||||||
console.log(index, row)
|
|
||||||
this.$confirm('确认取消预警?', '提示', {
|
this.$confirm('确认取消预警?', '提示', {
|
||||||
confirmButtonText: '确定',
|
confirmButtonText: '确定',
|
||||||
confirmButtonClass: 'common-button-primary',
|
confirmButtonClass: 'common-button-primary',
|
||||||
@@ -661,7 +681,6 @@ export default {
|
|||||||
type: 'warning',
|
type: 'warning',
|
||||||
roundButton: false
|
roundButton: false
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
console.log(569)
|
|
||||||
this.$http.get('sys/EarlyWarning/ChangePermissions', {
|
this.$http.get('sys/EarlyWarning/ChangePermissions', {
|
||||||
id: row.id,
|
id: row.id,
|
||||||
}, {}, res => {
|
}, {}, res => {
|
||||||
@@ -679,7 +698,6 @@ export default {
|
|||||||
})
|
})
|
||||||
},
|
},
|
||||||
showStandDetails(item) {
|
showStandDetails(item) {
|
||||||
console.log(item)
|
|
||||||
let getStandId = item.sarId;
|
let getStandId = item.sarId;
|
||||||
let getStandType = item.sortName;
|
let getStandType = item.sortName;
|
||||||
// this.$http.get("lawss/sarMenu/judgeSarMenuByRole", {
|
// this.$http.get("lawss/sarMenu/judgeSarMenuByRole", {
|
||||||
@@ -805,6 +823,100 @@ export default {
|
|||||||
window.onresize = () => {
|
window.onresize = () => {
|
||||||
this.height = $(".content").height() * 0.4;
|
this.height = $(".content").height() * 0.4;
|
||||||
};
|
};
|
||||||
|
//从数据库中查询下拉框数据
|
||||||
|
this.$http.get("sys/dictype/getDicTypeListCode", {}, {
|
||||||
|
_this: this
|
||||||
|
}, res => {
|
||||||
|
this.energyKindOptions = res.data.ENERGYTYPES; // 文本状态
|
||||||
|
this.zrgcs = res.data.ZRGCSCLASS;
|
||||||
|
this.loading[this.field] = true
|
||||||
|
this.$http.get('sys/EarlyWarning/StandWarning', {
|
||||||
|
applyType: '',
|
||||||
|
...this.pageConfig
|
||||||
|
}, {
|
||||||
|
_this: this
|
||||||
|
}, res => {
|
||||||
|
const result = res.data[0]
|
||||||
|
for (const field in result) {
|
||||||
|
this[field] = result[field].records
|
||||||
|
this[field].forEach(item => {
|
||||||
|
// 适用车型转换
|
||||||
|
if (item.applyType !== null) {
|
||||||
|
let k = (item.applyType || "").split(",");
|
||||||
|
for (let i in this.energyKindOptions) {
|
||||||
|
for (let m = 0; m < k.length; m++) {
|
||||||
|
if (this.energyKindOptions[i].value === k[m]) {
|
||||||
|
k[m] = this.energyKindOptions[i].label;
|
||||||
|
}
|
||||||
|
item.applyType = k.join(",");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// 责任工程师转换
|
||||||
|
if (item.dutyEngineer !== null) {
|
||||||
|
let k = (item.dutyEngineer || "").split(",");
|
||||||
|
for (let i in this.zrgcs) {
|
||||||
|
for (let m = 0; m < k.length; m++) {
|
||||||
|
if (this.zrgcs[i].value === k[m]) {
|
||||||
|
k[m] = this.zrgcs[i].label;
|
||||||
|
}
|
||||||
|
item.dutyEngineer = k.join(",");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
let arr = result.newItems.records
|
||||||
|
arr.forEach(item => {
|
||||||
|
console.log(item.applyType)
|
||||||
|
// 适用车型转换
|
||||||
|
if (item.applyType !== null) {
|
||||||
|
let k = (item.applyType || "").split(",");
|
||||||
|
for (let i in this.energyKindOptions) {
|
||||||
|
for (let m = 0; m < k.length; m++) {
|
||||||
|
if (this.energyKindOptions[i].value === k[m]) {
|
||||||
|
k[m] = this.energyKindOptions[i].label;
|
||||||
|
}
|
||||||
|
item.applyType = k.join(",");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// 责任工程师转换
|
||||||
|
if (item.dutyEngineer !== null) {
|
||||||
|
let k = (item.dutyEngineer || "").split(",");
|
||||||
|
for (let i in this.zrgcs) {
|
||||||
|
for (let m = 0; m < k.length; m++) {
|
||||||
|
if (this.zrgcs[i].value === k[m]) {
|
||||||
|
k[m] = this.zrgcs[i].label;
|
||||||
|
}
|
||||||
|
item.dutyEngineer = k.join(",");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
this.newItems = arr
|
||||||
|
//可能还需要调整一下条款或标准的顺序(zyh)
|
||||||
|
switch (field) {
|
||||||
|
case 'newItems':
|
||||||
|
this.pageConfig.count1 = result.newItems.total
|
||||||
|
break
|
||||||
|
case 'oldItems':
|
||||||
|
this.pageConfig.count2 = result.oldItems.total
|
||||||
|
break
|
||||||
|
case 'newStand':
|
||||||
|
this.pageConfig.count3 = result.newStand.total
|
||||||
|
break
|
||||||
|
case 'oldStand':
|
||||||
|
this.pageConfig.count4 = result.oldStand.total
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (const loading in this.loading) {
|
||||||
|
this.loading[loading] = false
|
||||||
|
}
|
||||||
|
}, e => {
|
||||||
|
});
|
||||||
|
|
||||||
|
});
|
||||||
// this.queryNewTypeByPage();
|
// this.queryNewTypeByPage();
|
||||||
// this.queryProductionVehicleByPage();
|
// this.queryProductionVehicleByPage();
|
||||||
// 四个预警同时查询,loading全部打开
|
// 四个预警同时查询,loading全部打开
|
||||||
|
|||||||
@@ -289,7 +289,7 @@
|
|||||||
@selection-change="handleSelection2"
|
@selection-change="handleSelection2"
|
||||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
|
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
|
||||||
<el-table-column type="selection" width="55" align="center"/>
|
<el-table-column type="selection" width="55" align="center"/>
|
||||||
<el-table-column label="附件名" align="center" prop="fileName"></el-table-column>
|
<el-table-column label="附件名" align="center" prop="fileOldName"></el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -240,6 +240,7 @@ export default {
|
|||||||
name: "wfhxzgStep2",
|
name: "wfhxzgStep2",
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
passInfo: 0,
|
||||||
detailData: [],
|
detailData: [],
|
||||||
loading: false,
|
loading: false,
|
||||||
textarea: '', // 意见
|
textarea: '', // 意见
|
||||||
@@ -336,6 +337,9 @@ export default {
|
|||||||
},
|
},
|
||||||
getFormFieldList (item) {
|
getFormFieldList (item) {
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
|
if (item.passInfo !== undefined) {
|
||||||
|
this.passInfo = JSON.parse(JSON.stringify(item)).passInfo
|
||||||
|
}
|
||||||
this.dataList = JSON.parse(JSON.stringify(item)).standardInfoList
|
this.dataList = JSON.parse(JSON.stringify(item)).standardInfoList
|
||||||
this.textarea = JSON.parse(JSON.stringify(item)).commentText
|
this.textarea = JSON.parse(JSON.stringify(item)).commentText
|
||||||
})
|
})
|
||||||
@@ -406,6 +410,7 @@ export default {
|
|||||||
}
|
}
|
||||||
let json = {
|
let json = {
|
||||||
dockUserList: list,
|
dockUserList: list,
|
||||||
|
passInfo: this.passInfo
|
||||||
}
|
}
|
||||||
let flag=false
|
let flag=false
|
||||||
this.dataList.forEach(item => {
|
this.dataList.forEach(item => {
|
||||||
|
|||||||
@@ -247,6 +247,7 @@ export default {
|
|||||||
name: "wfhxzgStep3",
|
name: "wfhxzgStep3",
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
passInfo: 0,
|
||||||
detailData: [],
|
detailData: [],
|
||||||
loading: false,
|
loading: false,
|
||||||
commentText: '', // 意见
|
commentText: '', // 意见
|
||||||
@@ -320,6 +321,9 @@ export default {
|
|||||||
},
|
},
|
||||||
getFormFieldList (item) {
|
getFormFieldList (item) {
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
|
if (item.passInfo !== undefined) {
|
||||||
|
this.passInfo = JSON.parse(JSON.stringify(item)).passInfo
|
||||||
|
}
|
||||||
let fileData = JSON.parse(JSON.stringify(item)).dockUserList
|
let fileData = JSON.parse(JSON.stringify(item)).dockUserList
|
||||||
for (let i = 0; i<fileData.length; i++) {
|
for (let i = 0; i<fileData.length; i++) {
|
||||||
if (fileData[i].name === this.$store.getters.userInfo.userName) {
|
if (fileData[i].name === this.$store.getters.userInfo.userName) {
|
||||||
@@ -358,11 +362,11 @@ export default {
|
|||||||
if (this.commentText) {
|
if (this.commentText) {
|
||||||
|
|
||||||
var json = {
|
var json = {
|
||||||
|
passInfo: 1,
|
||||||
actionFlag: 1,
|
actionFlag: 1,
|
||||||
commentText: this.commentText,
|
commentText: this.commentText,
|
||||||
standardInfoList: this.standardInfoList,
|
standardInfoList: this.standardInfoList,
|
||||||
}
|
}
|
||||||
this.isSubmit = true
|
|
||||||
const params = new FormData();
|
const params = new FormData();
|
||||||
params.set('json', JSON.stringify(json))
|
params.set('json', JSON.stringify(json))
|
||||||
params.set('userId', this.$store.getters.userInfo.userId)
|
params.set('userId', this.$store.getters.userInfo.userId)
|
||||||
@@ -372,25 +376,10 @@ export default {
|
|||||||
this.$message.success('驳回成功')
|
this.$message.success('驳回成功')
|
||||||
this.$router.push('/processCenter')
|
this.$router.push('/processCenter')
|
||||||
}
|
}
|
||||||
this.isSubmit = false
|
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
this.$message.warning('请输入反馈意见')
|
this.$message.warning('请输入反馈意见')
|
||||||
}
|
}
|
||||||
/* this.$http.post('lawss/activiti/completeTask', {
|
|
||||||
json: JSON.stringify(json),
|
|
||||||
taskId: this.taskIds,
|
|
||||||
userId: this.$store.getters.userInfo.userId
|
|
||||||
}, {}, res => {
|
|
||||||
if (res.success) {
|
|
||||||
this.$message.success('驳回成功')
|
|
||||||
this.$router.push('/processCenter')
|
|
||||||
}
|
|
||||||
this.isSubmit = false
|
|
||||||
})
|
|
||||||
} else {
|
|
||||||
this.$message.warning('请输入反馈意见')
|
|
||||||
}*/
|
|
||||||
},
|
},
|
||||||
// 点击查看
|
// 点击查看
|
||||||
handlePreview (item) {
|
handlePreview (item) {
|
||||||
@@ -468,6 +457,7 @@ export default {
|
|||||||
list.push(item[1])
|
list.push(item[1])
|
||||||
}
|
}
|
||||||
let json = {
|
let json = {
|
||||||
|
passInfo: this.passInfo,
|
||||||
responUserList: list,
|
responUserList: list,
|
||||||
actionFlag: 0
|
actionFlag: 0
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-7
@@ -298,7 +298,6 @@
|
|||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
prop="standName"
|
prop="standName"
|
||||||
label="中文名称"
|
label="中文名称"
|
||||||
width="180px"
|
|
||||||
>
|
>
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
|
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
|
||||||
@@ -308,7 +307,6 @@
|
|||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
prop="standEnName"
|
prop="standEnName"
|
||||||
label="英文名称"
|
label="英文名称"
|
||||||
width="180px"
|
|
||||||
>
|
>
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
|
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
|
||||||
@@ -353,10 +351,8 @@
|
|||||||
{{scope.row.standStatusShow}}
|
{{scope.row.standStatusShow}}
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="操作" align="center" width="50" fixed="right">
|
<el-table-column label="操作" align="center" width="80">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<div @click.stop style="display: inline-block">
|
<div @click.stop style="display: inline-block">
|
||||||
<el-dropdown trigger="click" @command="handleCommand">
|
<el-dropdown trigger="click" @command="handleCommand">
|
||||||
@@ -444,8 +440,6 @@
|
|||||||
:maxlength="100"
|
:maxlength="100"
|
||||||
placeholder="请输入企标编号"
|
placeholder="请输入企标编号"
|
||||||
clearable
|
clearable
|
||||||
readonly
|
|
||||||
disabled
|
|
||||||
></el-input>
|
></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="标准年份" prop="standYear" label-width="150px" class="add-form-item">
|
<el-form-item label="标准年份" prop="standYear" label-width="150px" class="add-form-item">
|
||||||
|
|||||||
@@ -1935,9 +1935,9 @@ export default {
|
|||||||
{type: 'string', max: 500, message: '英文名称不能超过500个字符', trigger: 'change'}
|
{type: 'string', max: 500, message: '英文名称不能超过500个字符', trigger: 'change'}
|
||||||
// {validator: this.verify.valiateEnName, trigger: 'blur'}
|
// {validator: this.verify.valiateEnName, trigger: 'blur'}
|
||||||
],
|
],
|
||||||
// standState: [
|
standState: [
|
||||||
// {required: true, message: '标准状态不能为空', trigger: 'change'}
|
{required: true, message: '文本状态不能为空', trigger: 'change'}
|
||||||
// ],
|
],
|
||||||
replaceStandNum: [
|
replaceStandNum: [
|
||||||
{type: 'string', max: 100, message: '代替标准编号不能超过100个字符', trigger: 'change'}
|
{type: 'string', max: 100, message: '代替标准编号不能超过100个字符', trigger: 'change'}
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -1377,10 +1377,12 @@ export default {
|
|||||||
}, {
|
}, {
|
||||||
_this: this, loading: "loading"
|
_this: this, loading: "loading"
|
||||||
}, res => {
|
}, res => {
|
||||||
|
this.detailedListVersion = res.data[0].detailedListVersion
|
||||||
if (res.data) {
|
if (res.data) {
|
||||||
this.$router.push({
|
this.$router.push({
|
||||||
name: "LocalProductDetail",
|
name: "LocalProductDetail",
|
||||||
query: {
|
query: {
|
||||||
|
detailedListVersion: this.detailedListVersion,
|
||||||
tabName: this.ifMaintaince
|
tabName: this.ifMaintaince
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -47,7 +47,7 @@
|
|||||||
<div class="action-bar">
|
<div class="action-bar">
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<span style="font-size: 16px;font-weight: bold">清单版本: {{ }}</span>
|
<span style="font-size: 16px;font-weight: bold">清单版本: {{ detailedListVersion ? $moment(detailedListVersion).format('YYYY-MM-DD HH:mm:ss') : '-' }}</span>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12" style="text-align: end">
|
<el-col :span="12" style="text-align: end">
|
||||||
<el-button
|
<el-button
|
||||||
@@ -473,6 +473,7 @@ export default {
|
|||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
detailedListVersion: '',
|
||||||
standSortOptions: [],
|
standSortOptions: [],
|
||||||
standCommonlySearch: {
|
standCommonlySearch: {
|
||||||
standSort: '',
|
standSort: '',
|
||||||
@@ -959,6 +960,7 @@ export default {
|
|||||||
...mapGetters(['getLocalPro'])
|
...mapGetters(['getLocalPro'])
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
|
this.detailedListVersion = this.$route.query.detailedListVersion
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.Height = $('.contaiiner').height() - $('.contaiinerCard').height() - 190
|
this.Height = $('.contaiiner').height() - $('.contaiinerCard').height() - 190
|
||||||
window.onresize = () => {
|
window.onresize = () => {
|
||||||
|
|||||||
Reference in New Issue
Block a user