Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
zhutianqi
@@ -706,7 +706,7 @@ export default {
|
|||||||
}
|
}
|
||||||
.el-menu-item {
|
.el-menu-item {
|
||||||
padding-left: 29px !important;
|
padding-left: 29px !important;
|
||||||
font-size: 15px;
|
font-size: 14px;
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
height: 40px;
|
height: 40px;
|
||||||
line-height: 40px;
|
line-height: 40px;
|
||||||
|
|||||||
@@ -186,7 +186,7 @@ export default {
|
|||||||
padding: 0;
|
padding: 0;
|
||||||
}
|
}
|
||||||
.footer {
|
.footer {
|
||||||
height: 90px;
|
height: 70px;
|
||||||
line-height: 33px;
|
line-height: 33px;
|
||||||
//margin-top: 0.3vh;
|
//margin-top: 0.3vh;
|
||||||
//line-height: 5.2vh;
|
//line-height: 5.2vh;
|
||||||
|
|||||||
@@ -0,0 +1,118 @@
|
|||||||
|
<template>
|
||||||
|
<div class="stand-warning">
|
||||||
|
<div class="header-area" style="background-color: white">
|
||||||
|
<h3>实施预警</h3>
|
||||||
|
</div>
|
||||||
|
<div class="search-area">
|
||||||
|
<el-form :inline="true" :model="searchForm" class="demo-form-inline">
|
||||||
|
<el-form-item label="标准编号">
|
||||||
|
<el-input clearable size="mini"
|
||||||
|
v-model="searchForm.standCode"
|
||||||
|
placeholder="根据标准编号查找">
|
||||||
|
</el-input>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="标准名称">
|
||||||
|
<el-input clearable size="mini"
|
||||||
|
v-model="searchForm.standName"
|
||||||
|
placeholder="根据标准名称查找">
|
||||||
|
</el-input>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="适用车型">
|
||||||
|
<el-input clearable size="mini"
|
||||||
|
v-model="searchForm.applyType"
|
||||||
|
placeholder="根据适用车型查找">
|
||||||
|
</el-input>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="发布日期" style="margin-right: 10px" class="choose-time-area">
|
||||||
|
<el-date-picker
|
||||||
|
size="mini"
|
||||||
|
clearable
|
||||||
|
v-model="searchForm.putTime"
|
||||||
|
value-format="yyyy-MM-dd"
|
||||||
|
type="daterange"
|
||||||
|
range-separator="-"
|
||||||
|
start-placeholder="开始日期"
|
||||||
|
end-placeholder="结束日期">
|
||||||
|
</el-date-picker>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="实施日期" style="margin-right: 10px" class="choose-time-area">
|
||||||
|
<el-date-picker
|
||||||
|
size="mini"
|
||||||
|
clearable
|
||||||
|
v-model="searchForm.putTime"
|
||||||
|
value-format="yyyy-MM-dd"
|
||||||
|
type="daterange"
|
||||||
|
range-separator="-"
|
||||||
|
start-placeholder="开始日期"
|
||||||
|
end-placeholder="结束日期">
|
||||||
|
</el-date-picker>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="新车型实施日期" style="margin-right: 10px" class="choose-time-area">
|
||||||
|
<el-date-picker
|
||||||
|
size="mini"
|
||||||
|
clearable
|
||||||
|
v-model="searchForm.putTime"
|
||||||
|
value-format="yyyy-MM-dd"
|
||||||
|
type="daterange"
|
||||||
|
range-separator="-"
|
||||||
|
start-placeholder="开始日期"
|
||||||
|
end-placeholder="结束日期">
|
||||||
|
</el-date-picker>
|
||||||
|
</el-form-item><el-form-item label="在产车实施日期" style="margin-right: 10px" class="choose-time-area">
|
||||||
|
<el-date-picker
|
||||||
|
size="mini"
|
||||||
|
clearable
|
||||||
|
v-model="searchForm.putTime"
|
||||||
|
value-format="yyyy-MM-dd"
|
||||||
|
type="daterange"
|
||||||
|
range-separator="-"
|
||||||
|
start-placeholder="开始日期"
|
||||||
|
end-placeholder="结束日期">
|
||||||
|
</el-date-picker>
|
||||||
|
</el-form-item>
|
||||||
|
|
||||||
|
<el-button
|
||||||
|
type="primary"
|
||||||
|
size="mini"
|
||||||
|
@click="searchBtnClick"
|
||||||
|
class="common-button-primary">
|
||||||
|
查询
|
||||||
|
</el-button>
|
||||||
|
<el-button
|
||||||
|
size="mini"
|
||||||
|
@click="clearBtnClick"
|
||||||
|
class="common-button-primary">
|
||||||
|
清空
|
||||||
|
</el-button>
|
||||||
|
</el-form>
|
||||||
|
</div>
|
||||||
|
<div class="data-area">
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
export default {
|
||||||
|
name: "standardWarning",
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
// 头部搜索框
|
||||||
|
searchForm: {
|
||||||
|
//标准编号
|
||||||
|
standCode: "",
|
||||||
|
//标准名称
|
||||||
|
standName: "",
|
||||||
|
//实施日期
|
||||||
|
putTime: "",
|
||||||
|
//适用车型
|
||||||
|
applyType: "",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
|
||||||
|
</style>
|
||||||
@@ -9,12 +9,12 @@
|
|||||||
<!-- <el-tab-pane label="标准预警" name="STANDARD">-->
|
<!-- <el-tab-pane label="标准预警" name="STANDARD">-->
|
||||||
<div class="dynamic-content">
|
<div class="dynamic-content">
|
||||||
<div>
|
<div>
|
||||||
<h5>实施预警</h5>
|
<h5 style="font-size: 20px">实施预警</h5>
|
||||||
</div>
|
</div>
|
||||||
<div class="more">
|
<div class="more">
|
||||||
|
<el-form :inline="true" :model="dynamic" class="demo-form-inline">
|
||||||
<el-row :gutter="24">
|
<el-row :gutter="24">
|
||||||
<el-col span="24">
|
<el-col span="24">
|
||||||
<el-form :inline="true" :model="dynamic" class="demo-form-inline">
|
|
||||||
<el-form-item label="标准编号">
|
<el-form-item label="标准编号">
|
||||||
<el-input clearable size="mini"
|
<el-input clearable size="mini"
|
||||||
v-model="dynamic.standCode"
|
v-model="dynamic.standCode"
|
||||||
@@ -27,6 +27,28 @@
|
|||||||
placeholder="根据标准名称查找">
|
placeholder="根据标准名称查找">
|
||||||
</el-input>
|
</el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-form-item label="适用车型">
|
||||||
|
<el-input clearable size="mini"
|
||||||
|
v-model="dynamic.applyType"
|
||||||
|
placeholder="根据适用车型查找">
|
||||||
|
</el-input>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="发布日期" style="margin-right: 10px" class="choose-time-area">
|
||||||
|
<el-date-picker
|
||||||
|
size="mini"
|
||||||
|
clearable
|
||||||
|
v-model="dynamic.putTime"
|
||||||
|
value-format="yyyy-MM-dd"
|
||||||
|
type="daterange"
|
||||||
|
range-separator="-"
|
||||||
|
start-placeholder="开始日期"
|
||||||
|
end-placeholder="结束日期">
|
||||||
|
</el-date-picker>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
<el-row :gutter="24">
|
||||||
|
<el-col span="24">
|
||||||
<el-form-item label="实施日期" style="margin-right: 10px" class="choose-time-area">
|
<el-form-item label="实施日期" style="margin-right: 10px" class="choose-time-area">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
size="mini"
|
size="mini"
|
||||||
@@ -38,21 +60,33 @@
|
|||||||
start-placeholder="开始日期"
|
start-placeholder="开始日期"
|
||||||
end-placeholder="结束日期">
|
end-placeholder="结束日期">
|
||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
<!-- <el-datePicker-->
|
|
||||||
<!-- clearable size="mini"-->
|
|
||||||
<!-- v-model="dynamic.putTime"-->
|
|
||||||
<!-- value-format="yyyy-MM-dd"-->
|
|
||||||
<!-- placeholder="根据实施日期查找">-->
|
|
||||||
<!-- </el-datePicker>-->
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="适用车型">
|
<el-form-item label="新车型实施日期" style="margin-right: 10px" class="choose-time-area">
|
||||||
<el-input clearable size="mini"
|
<el-date-picker
|
||||||
v-model="dynamic.applyType"
|
size="mini"
|
||||||
placeholder="根据适用车型查找">
|
clearable
|
||||||
</el-input>
|
v-model="dynamic.putTime"
|
||||||
|
value-format="yyyy-MM-dd"
|
||||||
|
type="daterange"
|
||||||
|
range-separator="-"
|
||||||
|
start-placeholder="开始日期"
|
||||||
|
end-placeholder="结束日期">
|
||||||
|
</el-date-picker>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="在产车实施日期" style="margin-right: 10px" class="choose-time-area">
|
||||||
|
<el-date-picker
|
||||||
|
size="mini"
|
||||||
|
clearable
|
||||||
|
v-model="dynamic.putTime"
|
||||||
|
value-format="yyyy-MM-dd"
|
||||||
|
type="daterange"
|
||||||
|
range-separator="-"
|
||||||
|
start-placeholder="开始日期"
|
||||||
|
end-placeholder="结束日期">
|
||||||
|
</el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<div style="margin: 8px 0 0 0; float: right">
|
|
||||||
<el-button
|
<el-button
|
||||||
|
style="margin: 6px 8px 0 0"
|
||||||
type="primary"
|
type="primary"
|
||||||
size="mini"
|
size="mini"
|
||||||
@click="searchBtnClick"
|
@click="searchBtnClick"
|
||||||
@@ -60,42 +94,27 @@
|
|||||||
查询
|
查询
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
|
style="margin: 6px 0 0 0"
|
||||||
size="mini"
|
size="mini"
|
||||||
@click="clearBtnClick"
|
@click="clearBtnClick"
|
||||||
class="common-button-primary">
|
class="common-button-primary">
|
||||||
清空
|
清空
|
||||||
</el-button>
|
</el-button>
|
||||||
<!-- <el-button-->
|
|
||||||
<!-- type="primary"-->
|
|
||||||
<!-- size="mini"-->
|
|
||||||
<!-- v-btn-permission="'5dca375c3d8d57c45e4815acf3611b34'"-->
|
|
||||||
<!-- @click="searchBtnClick"-->
|
|
||||||
<!-- class="common-button-primary">-->
|
|
||||||
<!-- 查询-->
|
|
||||||
<!-- </el-button>-->
|
|
||||||
<!-- <el-button-->
|
|
||||||
<!-- size="mini"-->
|
|
||||||
<!-- @click="clearBtnClick"-->
|
|
||||||
<!-- v-btn-permission="'8258ee44344e92365e7e5bd90f3c8d21'"-->
|
|
||||||
<!-- class="common-button-primary">-->
|
|
||||||
<!-- 清空-->
|
|
||||||
<!-- </el-button>-->
|
|
||||||
</div>
|
|
||||||
</el-form>
|
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
</el-form>
|
||||||
</div>
|
</div>
|
||||||
<div class="content" style="height: 100%; padding-top: 50px; ">
|
<div class="content" style="height: 100%; padding-top: 100px; ">
|
||||||
<el-divider content-position="left" class="dynamic-child-title">新车型实施日期预警</el-divider>
|
<el-divider content-position="left" class="dynamic-child-title">实施日期预警</el-divider>
|
||||||
<el-table
|
<el-table
|
||||||
:data="newItems"
|
:data="newItems"
|
||||||
:height="height"
|
height="260px"
|
||||||
border
|
border
|
||||||
:resizable="false"
|
:resizable="false"
|
||||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
|
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
|
||||||
v-loading="loading.newItems"
|
v-loading="loading.newItems"
|
||||||
>
|
>
|
||||||
<el-table-column prop="standType" label="类型" align="center">
|
<el-table-column prop="standType" label="类型" width="100" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<div v-if="scope.row.sortName === 'BUSINESS_STAND'">企业标准</div>
|
<div v-if="scope.row.sortName === 'BUSINESS_STAND'">企业标准</div>
|
||||||
<div v-if="scope.row.standType === 'FOREIGN'">海外标准法规</div>
|
<div v-if="scope.row.standType === 'FOREIGN'">海外标准法规</div>
|
||||||
@@ -104,7 +123,7 @@
|
|||||||
<div v-if="scope.row.sortName === 'FOREIGN_LAWS'">国外政策</div>
|
<div v-if="scope.row.sortName === 'FOREIGN_LAWS'">国外政策</div>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="standCode" label="标准编号" align="center">
|
<el-table-column prop="standCode" label="标准编号" width="200" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
|
<a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
|
||||||
</template>
|
</template>
|
||||||
@@ -114,14 +133,39 @@
|
|||||||
<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="putTime" label="新车型实施日期" align="center" sortable>
|
<el-table-column prop="standCode" label="条款编号" width="200" align="center">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column prop="standName" width="320" label="条款名称" align="center">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column prop="putTime" label="发布日期" width="120" align="center" sortable>
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<span>{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column prop="putTime" label="实施日期" width="120" align="center" sortable>
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<span>{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column prop="putTime" label="新车型实施日期" width="150" align="center" sortable>
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<span>{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column prop="putTime" label="在产车实施日期" width="150" align="center" sortable>
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span>{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
|
<span>{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="applyType" label="适用车型" align="center">
|
<el-table-column prop="applyType" label="适用车型" align="center">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="操作" align="center" v-if="isShowBtn">
|
<el-table-column label="操作" width="100" align="center" v-if="isShowBtn" fixed="right">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-button
|
<el-button
|
||||||
size="mini"
|
size="mini"
|
||||||
@@ -139,268 +183,169 @@
|
|||||||
autoSize
|
autoSize
|
||||||
@pageChange="page => handlePageChange('newItems', page)"
|
@pageChange="page => handlePageChange('newItems', page)"
|
||||||
@pageSizeChange="pageSize => handlePageSizeChange('newItems', pageSize)"></pagination>
|
@pageSizeChange="pageSize => handlePageSizeChange('newItems', pageSize)"></pagination>
|
||||||
<el-divider content-position="left" class="dynamic-child-title">在产车实施日期预警</el-divider>
|
|
||||||
<el-table
|
|
||||||
:data="oldItems"
|
|
||||||
:height="height"
|
|
||||||
border
|
|
||||||
:resizable="false"
|
|
||||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
|
|
||||||
v-loading="loading.oldItems"
|
|
||||||
>
|
|
||||||
<el-table-column prop="sortName" label="类型" align="center">
|
|
||||||
<template slot-scope="scope">
|
|
||||||
<div v-if="scope.row.sortName === 'BUSINESS_STAND'">企业标准</div>
|
|
||||||
<div v-if="scope.row.standType === 'FOREIGN'">海外标准法规</div>
|
|
||||||
<div v-if="scope.row.standType === 'INLAND'">国内标准法规</div>
|
|
||||||
<div v-if="scope.row.sortName === 'INLAND_LAWS'">国内政策</div>
|
|
||||||
<div v-if="scope.row.sortName === 'FOREIGN_LAWS'">国外政策</div>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column prop="standCode" label="标准编号" align="center">
|
|
||||||
<template slot-scope="scope">
|
|
||||||
<a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column prop="standName" width="320" label="标准名称" align="center">
|
|
||||||
<template slot-scope="scope">
|
|
||||||
<a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column prop="putTime" label="在产车实施日期" align="center" sortable>
|
|
||||||
<template slot-scope="scope">
|
|
||||||
<span>{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column prop="applyType" label="适用车型" align="center">
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column label="操作" align="center" v-if="isShowBtn">
|
|
||||||
<template slot-scope="scope">
|
|
||||||
<el-button
|
|
||||||
size="mini"
|
|
||||||
type="danger"
|
|
||||||
@click="cancelWarning(scope.$index, scope.row)">取消预警
|
|
||||||
</el-button>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
</el-table>
|
|
||||||
<pagination
|
|
||||||
style="position: static;"
|
|
||||||
:page="pageConfig.oldItemsPage"
|
|
||||||
:pageSize="pageConfig.oldItemsPageSize"
|
|
||||||
:total="pageConfig.count2"
|
|
||||||
autoSize
|
|
||||||
@pageChange="page => handlePageChange('oldItems', page)"
|
|
||||||
@pageSizeChange="pageSize => handlePageSizeChange('oldItems', pageSize)"></pagination>
|
|
||||||
<el-divider content-position="left" class="dynamic-child-title">新车型条款预警</el-divider>
|
|
||||||
<el-table
|
|
||||||
:data="newStand"
|
|
||||||
:height="height"
|
|
||||||
border
|
|
||||||
:resizable="false"
|
|
||||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
|
|
||||||
v-loading="loading.newStand"
|
|
||||||
>
|
|
||||||
<el-table-column prop="standCode" label="标准编号" align="center">
|
|
||||||
<template slot-scope="scope">
|
|
||||||
<a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column prop="standName" width="320" label="标准名称" align="center">
|
|
||||||
<template slot-scope="scope">
|
|
||||||
<a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column prop="itemsNum" label="条款号" align="center">
|
|
||||||
<template slot-scope="scope">
|
|
||||||
<div>{{ scope.row.itemsNum }}</div>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column prop="itemsName" label="条款要求" align="center">
|
|
||||||
<template slot-scope="scope">
|
|
||||||
<div>{{ scope.row.itemsName }}</div>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column prop="putTime" label="实施日期" align="center" sortable>
|
|
||||||
<template slot-scope="scope">
|
|
||||||
<span>{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column prop="applyType" label="适用车型" align="center">
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column label="操作" align="center" v-if="isShowBtn">
|
|
||||||
<template slot-scope="scope">
|
|
||||||
<el-button
|
|
||||||
size="mini"
|
|
||||||
type="danger"
|
|
||||||
@click="cancelWarning(scope.$index, scope.row)">取消预警
|
|
||||||
</el-button>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
</el-table>
|
|
||||||
<pagination
|
|
||||||
style="position: static;"
|
|
||||||
:page="pageConfig.newStandPage"
|
|
||||||
:pageSize="pageConfig.newStandPageSize"
|
|
||||||
:total="pageConfig.count3"
|
|
||||||
autoSize
|
|
||||||
@pageChange="page => handlePageChange('newStand', page)"
|
|
||||||
@pageSizeChange="pageSize => handlePageSizeChange('newStand', pageSize)"></pagination>
|
|
||||||
<el-divider content-position="left" class="dynamic-child-title">在产车条款预警</el-divider>
|
|
||||||
<el-table
|
|
||||||
:data="oldStand"
|
|
||||||
:height="height"
|
|
||||||
border
|
|
||||||
:resizable="false"
|
|
||||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
|
|
||||||
v-loading="loading.oldStand"
|
|
||||||
>
|
|
||||||
<el-table-column prop="standCode" label="标准编号" align="center">
|
|
||||||
<template slot-scope="scope">
|
|
||||||
<a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column prop="standName" width="320" label="标准名称" align="center">
|
|
||||||
<template slot-scope="scope">
|
|
||||||
<a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column prop="itemsNum" label="条款号" align="center">
|
|
||||||
<template slot-scope="scope">
|
|
||||||
<div>{{ scope.row.itemsNum }}</div>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column prop="itemsName" label="条款要求" align="center">
|
|
||||||
<template slot-scope="scope">
|
|
||||||
<div>{{ scope.row.itemsName }}</div>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column prop="putTime" label="实施日期" align="center" sortable>
|
|
||||||
<template slot-scope="scope">
|
|
||||||
<span>{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column prop="applyType" label="适用车型" align="center">
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column label="操作" align="center" v-if="isShowBtn">
|
|
||||||
<template slot-scope="scope">
|
|
||||||
<el-button
|
|
||||||
size="mini"
|
|
||||||
type="danger"
|
|
||||||
@click="cancelWarning(scope.$index, scope.row)">取消预警
|
|
||||||
</el-button>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
</el-table>
|
|
||||||
<pagination
|
|
||||||
style="position: static;"
|
|
||||||
:page="pageConfig.oldStandPage"
|
|
||||||
:pageSize="pageConfig.oldStandPageSize"
|
|
||||||
:total="pageConfig.count4"
|
|
||||||
autoSize
|
|
||||||
@pageChange="page => handlePageChange('oldStand', page)"
|
|
||||||
@pageSizeChange="pageSize => handlePageSizeChange('oldStand', pageSize)"></pagination>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<!-- </el-tab-pane>-->
|
|
||||||
<!-- <el-tab-pane label="政策预警" name="POLICY">-->
|
|
||||||
<!-- <div class="dynamic-content">-->
|
|
||||||
<!-- <h5>实施预警</h5>-->
|
|
||||||
<!-- <div class="content" style="height: 100%; padding-top: 5px; ">-->
|
|
||||||
<!-- <div class="content-group">-->
|
|
||||||
<!-- <el-divider content-position="left" class="dynamic-child-title">新车型实施日期预警</el-divider>-->
|
|
||||||
<!-- <div class="table-wrap">-->
|
|
||||||
<!-- <el-table-->
|
|
||||||
<!-- :data="newPolicy"-->
|
|
||||||
<!-- :height="tableHeight"-->
|
|
||||||
<!-- border-->
|
|
||||||
<!-- :resizable="false"-->
|
|
||||||
<!-- v-loading="loading.newPolicy"-->
|
|
||||||
<!-- :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"-->
|
|
||||||
<!-- >-->
|
|
||||||
<!-- <el-table-column prop="policyId" label="政策编号" align="center">-->
|
|
||||||
<!-- <template slot-scope="scope">-->
|
|
||||||
<!-- <a @click="showStandDetails(scope.row)">{{ scope.row.policyId }}</a>-->
|
|
||||||
<!-- </template>-->
|
|
||||||
<!-- </el-table-column>-->
|
|
||||||
<!-- <el-table-column prop="policyName" label="政策名称" align="center">-->
|
|
||||||
<!-- <template slot-scope="scope">-->
|
|
||||||
<!-- <a @click="showStandDetails(scope.row)">{{ scope.row.policyName }}</a>-->
|
|
||||||
<!-- </template>-->
|
|
||||||
<!-- </el-table-column>-->
|
|
||||||
<!-- <el-table-column prop="putTime" label="新车型实施日期" align="center" sortable>-->
|
|
||||||
<!-- <template slot-scope="scope">-->
|
|
||||||
<!-- {{ (scope.row.putTime ? scope.row.putTime.substring(0, 11) : "") }}-->
|
|
||||||
<!-- </template>-->
|
|
||||||
<!-- </el-table-column>-->
|
|
||||||
<!-- <el-table-column label="操作" align="center" width="150" v-if="isShowBtn">-->
|
|
||||||
<!-- <template slot-scope="scope">-->
|
|
||||||
<!-- <el-button-->
|
|
||||||
<!-- size="mini"-->
|
|
||||||
<!-- type="danger"-->
|
|
||||||
<!-- @click="cancelWarning(scope.$index, scope.row)">取消预警</el-button>-->
|
|
||||||
<!-- </template>-->
|
|
||||||
<!-- </el-table-column>-->
|
|
||||||
<!-- </el-table>-->
|
|
||||||
<!-- </div>-->
|
|
||||||
<!-- <pagination-->
|
|
||||||
<!-- style="position: static;"-->
|
|
||||||
<!-- :page="pageConfig.newPolicyPage"-->
|
|
||||||
<!-- :pageSize="pageConfig.newPolicyPageSize"-->
|
|
||||||
<!-- :total="pageConfig.count5"-->
|
|
||||||
<!-- autoSize-->
|
|
||||||
<!-- @pageChange="page => handlePageChange('newPolicy', page)"-->
|
|
||||||
<!-- @pageSizeChange="pageSize => handlePageSizeChange('newPolicy', pageSize)"></pagination>-->
|
|
||||||
<!-- </div>-->
|
|
||||||
<!-- <div class="content-group">-->
|
|
||||||
<!-- <el-divider content-position="left" class="dynamic-child-title">在产车实施日期预警</el-divider>-->
|
<!-- <el-divider content-position="left" class="dynamic-child-title">在产车实施日期预警</el-divider>-->
|
||||||
<!-- <div class="table-wrap">-->
|
|
||||||
<!-- <el-table-->
|
<!-- <el-table-->
|
||||||
<!-- :data="oldPolicy"-->
|
<!-- :data="oldItems"-->
|
||||||
<!-- :height="tableHeight"-->
|
<!-- :height="height"-->
|
||||||
<!-- border-->
|
<!-- border-->
|
||||||
<!-- :resizable="false"-->
|
<!-- :resizable="false"-->
|
||||||
<!-- v-loading="loading.oldPolicy"-->
|
|
||||||
<!-- :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"-->
|
<!-- :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"-->
|
||||||
|
<!-- v-loading="loading.oldItems"-->
|
||||||
<!-- >-->
|
<!-- >-->
|
||||||
<!-- <el-table-column prop="policyId" label="政策编号" align="center">-->
|
<!-- <el-table-column prop="sortName" label="类型" align="center">-->
|
||||||
<!-- <template slot-scope="scope">-->
|
<!-- <template slot-scope="scope">-->
|
||||||
<!-- <a @click="showStandDetails(scope.row)">{{ scope.row.policyId }}</a>-->
|
<!-- <div v-if="scope.row.sortName === 'BUSINESS_STAND'">企业标准</div>-->
|
||||||
|
<!-- <div v-if="scope.row.standType === 'FOREIGN'">海外标准法规</div>-->
|
||||||
|
<!-- <div v-if="scope.row.standType === 'INLAND'">国内标准法规</div>-->
|
||||||
|
<!-- <div v-if="scope.row.sortName === 'INLAND_LAWS'">国内政策</div>-->
|
||||||
|
<!-- <div v-if="scope.row.sortName === 'FOREIGN_LAWS'">国外政策</div>-->
|
||||||
<!-- </template>-->
|
<!-- </template>-->
|
||||||
<!-- </el-table-column>-->
|
<!-- </el-table-column>-->
|
||||||
<!-- <el-table-column prop="policyName" label="政策名称" align="center">-->
|
<!-- <el-table-column prop="standCode" label="标准编号" align="center">-->
|
||||||
<!-- <template slot-scope="scope">-->
|
<!-- <template slot-scope="scope">-->
|
||||||
<!-- <a @click="showStandDetails(scope.row)">{{ scope.row.policyName }}</a>-->
|
<!-- <a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>-->
|
||||||
|
<!-- </template>-->
|
||||||
|
<!-- </el-table-column>-->
|
||||||
|
<!-- <el-table-column prop="standName" width="320" label="标准名称" align="center">-->
|
||||||
|
<!-- <template slot-scope="scope">-->
|
||||||
|
<!-- <a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>-->
|
||||||
<!-- </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>-->
|
||||||
<!-- <template slot-scope="scope">-->
|
<!-- <template slot-scope="scope">-->
|
||||||
<!-- {{ (scope.row.putTime ? scope.row.putTime.substring(0, 11) : "") }}-->
|
<!-- <span>{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>-->
|
||||||
<!-- </template>-->
|
<!-- </template>-->
|
||||||
<!-- </el-table-column>-->
|
<!-- </el-table-column>-->
|
||||||
<!-- <el-table-column label="操作" align="center" width="150" v-if="isShowBtn">-->
|
<!-- <el-table-column prop="applyType" label="适用车型" align="center">-->
|
||||||
|
<!-- </el-table-column>-->
|
||||||
|
<!-- <el-table-column label="操作" align="center" v-if="isShowBtn">-->
|
||||||
<!-- <template slot-scope="scope">-->
|
<!-- <template slot-scope="scope">-->
|
||||||
<!-- <el-button-->
|
<!-- <el-button-->
|
||||||
<!-- size="mini"-->
|
<!-- size="mini"-->
|
||||||
<!-- type="danger"-->
|
<!-- type="danger"-->
|
||||||
<!-- @click="cancelWarning(scope.$index, scope.row)">取消预警</el-button>-->
|
<!-- @click="cancelWarning(scope.$index, scope.row)">取消预警-->
|
||||||
|
<!-- </el-button>-->
|
||||||
<!-- </template>-->
|
<!-- </template>-->
|
||||||
<!-- </el-table-column>-->
|
<!-- </el-table-column>-->
|
||||||
<!-- </el-table>-->
|
<!-- </el-table>-->
|
||||||
<!-- </div>-->
|
|
||||||
<!-- <pagination-->
|
<!-- <pagination-->
|
||||||
<!-- style="position: static;"-->
|
<!-- style="position: static;"-->
|
||||||
<!-- :page="pageConfig.oldPolicyPage"-->
|
<!-- :page="pageConfig.oldItemsPage"-->
|
||||||
<!-- :pangSize="pageConfig.oldPolicyPageSize"-->
|
<!-- :pageSize="pageConfig.oldItemsPageSize"-->
|
||||||
<!-- :total="pageConfig.count6"-->
|
<!-- :total="pageConfig.count2"-->
|
||||||
<!-- autoSize-->
|
<!-- autoSize-->
|
||||||
<!-- @pageChange="page => handlePageChange('oldPolicy', page)"-->
|
<!-- @pageChange="page => handlePageChange('oldItems', page)"-->
|
||||||
<!-- @pageSizeChange="pageSize => handlePageSizeChange('oldPolicy', pageSize)"></pagination>-->
|
<!-- @pageSizeChange="pageSize => handlePageSizeChange('oldItems', pageSize)"></pagination>-->
|
||||||
<!-- </div>-->
|
<!-- <el-divider content-position="left" class="dynamic-child-title">新车型条款预警</el-divider>-->
|
||||||
<!-- </div>-->
|
<!-- <el-table-->
|
||||||
<!-- </div>-->
|
<!-- :data="newStand"-->
|
||||||
<!-- </el-tab-pane>-->
|
<!-- :height="height"-->
|
||||||
<!-- </el-tabs>-->
|
<!-- border-->
|
||||||
|
<!-- :resizable="false"-->
|
||||||
|
<!-- :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"-->
|
||||||
|
<!-- v-loading="loading.newStand"-->
|
||||||
|
<!-- >-->
|
||||||
|
<!-- <el-table-column prop="standCode" label="标准编号" align="center">-->
|
||||||
|
<!-- <template slot-scope="scope">-->
|
||||||
|
<!-- <a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>-->
|
||||||
|
<!-- </template>-->
|
||||||
|
<!-- </el-table-column>-->
|
||||||
|
<!-- <el-table-column prop="standName" width="320" label="标准名称" align="center">-->
|
||||||
|
<!-- <template slot-scope="scope">-->
|
||||||
|
<!-- <a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>-->
|
||||||
|
<!-- </template>-->
|
||||||
|
<!-- </el-table-column>-->
|
||||||
|
<!-- <el-table-column prop="itemsNum" label="条款号" align="center">-->
|
||||||
|
<!-- <template slot-scope="scope">-->
|
||||||
|
<!-- <div>{{ scope.row.itemsNum }}</div>-->
|
||||||
|
<!-- </template>-->
|
||||||
|
<!-- </el-table-column>-->
|
||||||
|
<!-- <el-table-column prop="itemsName" label="条款要求" align="center">-->
|
||||||
|
<!-- <template slot-scope="scope">-->
|
||||||
|
<!-- <div>{{ scope.row.itemsName }}</div>-->
|
||||||
|
<!-- </template>-->
|
||||||
|
<!-- </el-table-column>-->
|
||||||
|
<!-- <el-table-column prop="putTime" label="实施日期" align="center" sortable>-->
|
||||||
|
<!-- <template slot-scope="scope">-->
|
||||||
|
<!-- <span>{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>-->
|
||||||
|
<!-- </template>-->
|
||||||
|
<!-- </el-table-column>-->
|
||||||
|
<!-- <el-table-column prop="applyType" label="适用车型" align="center">-->
|
||||||
|
<!-- </el-table-column>-->
|
||||||
|
<!-- <el-table-column label="操作" align="center" v-if="isShowBtn">-->
|
||||||
|
<!-- <template slot-scope="scope">-->
|
||||||
|
<!-- <el-button-->
|
||||||
|
<!-- size="mini"-->
|
||||||
|
<!-- type="danger"-->
|
||||||
|
<!-- @click="cancelWarning(scope.$index, scope.row)">取消预警-->
|
||||||
|
<!-- </el-button>-->
|
||||||
|
<!-- </template>-->
|
||||||
|
<!-- </el-table-column>-->
|
||||||
|
<!-- </el-table>-->
|
||||||
|
<!-- <pagination-->
|
||||||
|
<!-- style="position: static;"-->
|
||||||
|
<!-- :page="pageConfig.newStandPage"-->
|
||||||
|
<!-- :pageSize="pageConfig.newStandPageSize"-->
|
||||||
|
<!-- :total="pageConfig.count3"-->
|
||||||
|
<!-- autoSize-->
|
||||||
|
<!-- @pageChange="page => handlePageChange('newStand', page)"-->
|
||||||
|
<!-- @pageSizeChange="pageSize => handlePageSizeChange('newStand', pageSize)"></pagination>-->
|
||||||
|
<!-- <el-divider content-position="left" class="dynamic-child-title">在产车条款预警</el-divider>-->
|
||||||
|
<!-- <el-table-->
|
||||||
|
<!-- :data="oldStand"-->
|
||||||
|
<!-- :height="height"-->
|
||||||
|
<!-- border-->
|
||||||
|
<!-- :resizable="false"-->
|
||||||
|
<!-- :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"-->
|
||||||
|
<!-- v-loading="loading.oldStand"-->
|
||||||
|
<!-- >-->
|
||||||
|
<!-- <el-table-column prop="standCode" label="标准编号" align="center">-->
|
||||||
|
<!-- <template slot-scope="scope">-->
|
||||||
|
<!-- <a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>-->
|
||||||
|
<!-- </template>-->
|
||||||
|
<!-- </el-table-column>-->
|
||||||
|
<!-- <el-table-column prop="standName" width="320" label="标准名称" align="center">-->
|
||||||
|
<!-- <template slot-scope="scope">-->
|
||||||
|
<!-- <a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>-->
|
||||||
|
<!-- </template>-->
|
||||||
|
<!-- </el-table-column>-->
|
||||||
|
<!-- <el-table-column prop="itemsNum" label="条款号" align="center">-->
|
||||||
|
<!-- <template slot-scope="scope">-->
|
||||||
|
<!-- <div>{{ scope.row.itemsNum }}</div>-->
|
||||||
|
<!-- </template>-->
|
||||||
|
<!-- </el-table-column>-->
|
||||||
|
<!-- <el-table-column prop="itemsName" label="条款要求" align="center">-->
|
||||||
|
<!-- <template slot-scope="scope">-->
|
||||||
|
<!-- <div>{{ scope.row.itemsName }}</div>-->
|
||||||
|
<!-- </template>-->
|
||||||
|
<!-- </el-table-column>-->
|
||||||
|
<!-- <el-table-column prop="putTime" label="实施日期" align="center" sortable>-->
|
||||||
|
<!-- <template slot-scope="scope">-->
|
||||||
|
<!-- <span>{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>-->
|
||||||
|
<!-- </template>-->
|
||||||
|
<!-- </el-table-column>-->
|
||||||
|
<!-- <el-table-column prop="applyType" label="适用车型" align="center">-->
|
||||||
|
<!-- </el-table-column>-->
|
||||||
|
<!-- <el-table-column label="操作" align="center" v-if="isShowBtn">-->
|
||||||
|
<!-- <template slot-scope="scope">-->
|
||||||
|
<!-- <el-button-->
|
||||||
|
<!-- size="mini"-->
|
||||||
|
<!-- type="danger"-->
|
||||||
|
<!-- @click="cancelWarning(scope.$index, scope.row)">取消预警-->
|
||||||
|
<!-- </el-button>-->
|
||||||
|
<!-- </template>-->
|
||||||
|
<!-- </el-table-column>-->
|
||||||
|
<!-- </el-table>-->
|
||||||
|
<!-- <pagination-->
|
||||||
|
<!-- style="position: static;"-->
|
||||||
|
<!-- :page="pageConfig.oldStandPage"-->
|
||||||
|
<!-- :pageSize="pageConfig.oldStandPageSize"-->
|
||||||
|
<!-- :total="pageConfig.count4"-->
|
||||||
|
<!-- autoSize-->
|
||||||
|
<!-- @pageChange="page => handlePageChange('oldStand', page)"-->
|
||||||
|
<!-- @pageSizeChange="pageSize => handlePageSizeChange('oldStand', pageSize)"></pagination>-->
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -809,10 +754,10 @@ export default {
|
|||||||
},
|
},
|
||||||
watch: {},
|
watch: {},
|
||||||
mounted() {
|
mounted() {
|
||||||
this.height = $(".content").height() * 0.4;
|
// this.height = $(".content").height() * 0.4;
|
||||||
window.onresize = () => {
|
// window.onresize = () => {
|
||||||
this.height = $(".content").height() * 0.4;
|
// this.height = $(".content").height() * 0.4;
|
||||||
};
|
// };
|
||||||
//从数据库中查询下拉框数据
|
//从数据库中查询下拉框数据
|
||||||
this.$http.get("sys/dictype/getDicTypeListCode", {}, {
|
this.$http.get("sys/dictype/getDicTypeListCode", {}, {
|
||||||
_this: this
|
_this: this
|
||||||
@@ -1043,7 +988,6 @@ export default {
|
|||||||
|
|
||||||
.dynamic-content {
|
.dynamic-content {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
overflow-y: hidden;
|
|
||||||
width: 100%;
|
width: 100%;
|
||||||
position: relative;
|
position: relative;
|
||||||
|
|
||||||
@@ -1072,13 +1016,14 @@ export default {
|
|||||||
|
|
||||||
.more {
|
.more {
|
||||||
margin-top: 30px;
|
margin-top: 30px;
|
||||||
|
|
||||||
/deep/ .el-input__inner {
|
/deep/ .el-input__inner {
|
||||||
width: 155px;
|
width: 185px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.choose-time-area {
|
.choose-time-area {
|
||||||
/deep/ .el-input__inner {
|
/deep/ .el-input__inner {
|
||||||
width: 220px;
|
width: 210px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1178,6 +1123,7 @@ export default {
|
|||||||
.content {
|
.content {
|
||||||
padding-bottom: 10px;
|
padding-bottom: 10px;
|
||||||
height: calc(~'100% - 40px');
|
height: calc(~'100% - 40px');
|
||||||
|
|
||||||
/deep/ .el-button--mini {
|
/deep/ .el-button--mini {
|
||||||
padding: 5px 7px;
|
padding: 5px 7px;
|
||||||
font-size: 8px;
|
font-size: 8px;
|
||||||
|
|||||||
@@ -1629,19 +1629,6 @@ export default {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
getTaskId () {
|
|
||||||
queryTaskFirst({
|
|
||||||
bpnId: this.$route.query.bpnId
|
|
||||||
}).then(res => {
|
|
||||||
let mes = JSON.parse(res.mes)
|
|
||||||
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
|
|
||||||
this.roleForm = mes.roleForm
|
|
||||||
this.commentText = mes.commentText
|
|
||||||
this.taskIds=mes.taskIds
|
|
||||||
//表单文件处理
|
|
||||||
this.getFormFieldList(mes.form)
|
|
||||||
})
|
|
||||||
},
|
|
||||||
choiceZRR1 (type, title, id) {
|
choiceZRR1 (type, title, id) {
|
||||||
this.drawerTitle = title
|
this.drawerTitle = title
|
||||||
this.modalShowFlag1 = true
|
this.modalShowFlag1 = true
|
||||||
@@ -2215,7 +2202,12 @@ export default {
|
|||||||
if (res) {
|
if (res) {
|
||||||
const processForm = JSON.parse(res.mesg)
|
const processForm = JSON.parse(res.mesg)
|
||||||
this.commentText = processForm.commentText
|
this.commentText = processForm.commentText
|
||||||
|
if (processForm.form === undefined) {
|
||||||
this.getFormFieldList(processForm)
|
this.getFormFieldList(processForm)
|
||||||
|
} else {
|
||||||
|
//表单文件处理
|
||||||
|
this.getFormFieldList(processForm.form)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}).catch(e => {
|
}).catch(e => {
|
||||||
console.log("错误")
|
console.log("错误")
|
||||||
@@ -2238,7 +2230,6 @@ export default {
|
|||||||
this.form.prcName = this.prcName
|
this.form.prcName = this.prcName
|
||||||
this.form['id'] = item.id
|
this.form['id'] = item.id
|
||||||
|
|
||||||
console.log("this.form",this.form);
|
|
||||||
|
|
||||||
// 遍历对象
|
// 遍历对象
|
||||||
for(const p in this.form) {
|
for(const p in this.form) {
|
||||||
@@ -2328,22 +2319,22 @@ export default {
|
|||||||
this.form.country=this.countryArr;
|
this.form.country=this.countryArr;
|
||||||
this.saveLoading = true
|
this.saveLoading = true
|
||||||
let _formData = new FormData()
|
let _formData = new FormData()
|
||||||
// _formData.append('id', this.bpnId)
|
_formData.append('id', this.bpnId)
|
||||||
_formData.append('createUser', this.$store.getters.userInfo.userId)
|
// _formData.append('createUser', this.$store.getters.userInfo.userId)
|
||||||
_formData.append('createUserName', this.$store.getters.userInfo.uName)
|
// _formData.append('createUserName', this.$store.getters.userInfo.uName)
|
||||||
_formData.append('prcType', '1')
|
_formData.append('prcType', '1')
|
||||||
_formData.append('taskIds', this.taskIds)
|
_formData.append('taskIds', this.taskIds)
|
||||||
_formData.append('json', JSON.stringify({
|
_formData.append('json', JSON.stringify({
|
||||||
form: this.form,
|
form: this.form,
|
||||||
roleForm: this.roleForm,
|
roleForm: this.roleForm,
|
||||||
commentText: this.commentText,
|
commentText: this.commentText,
|
||||||
taskInfo: '申请人修订',
|
// taskInfo: '申请人修订',
|
||||||
taskIds:this.taskIds
|
// taskIds:this.taskIds
|
||||||
}))
|
}))
|
||||||
saveTaskFirst(_formData).then(res => {
|
saveTaskForPub(_formData).then(res => {
|
||||||
this.saveLoading = false
|
this.saveLoading = false
|
||||||
this.$message.success('保存成功')
|
this.$message.success('保存成功')
|
||||||
// this.bpnId = res.result
|
this.bpnId = res.result
|
||||||
}).catch(e => {
|
}).catch(e => {
|
||||||
this.saveLoading = false
|
this.saveLoading = false
|
||||||
})
|
})
|
||||||
@@ -2442,7 +2433,6 @@ export default {
|
|||||||
this.getData()
|
this.getData()
|
||||||
},
|
},
|
||||||
mounted () {
|
mounted () {
|
||||||
this.getTaskId()
|
|
||||||
this.processTable()
|
this.processTable()
|
||||||
this.$http.get('sys/dictype/getDicTypeListCode', '', {
|
this.$http.get('sys/dictype/getDicTypeListCode', '', {
|
||||||
_this: this
|
_this: this
|
||||||
|
|||||||
Reference in New Issue
Block a user