Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
yanyizhou
@@ -49,7 +49,7 @@
|
|||||||
/>
|
/>
|
||||||
<i
|
<i
|
||||||
title="下载带水印"
|
title="下载带水印"
|
||||||
@click.stop="downloadFileByWater(item.id, item.name)"
|
@click.stop="downloadFileByWater(item.id, item.fileSuffix)"
|
||||||
class="icon-download2"
|
class="icon-download2"
|
||||||
v-btn-permission="''"
|
v-btn-permission="''"
|
||||||
/>
|
/>
|
||||||
@@ -360,7 +360,8 @@ export default {
|
|||||||
name: item.oldFileName,
|
name: item.oldFileName,
|
||||||
uid: item.uid,
|
uid: item.uid,
|
||||||
status: item.status,
|
status: item.status,
|
||||||
id: item.id
|
id: item.id,
|
||||||
|
fileSuffix: item.fileSuffix
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -274,75 +274,77 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
</div>
|
</div>
|
||||||
<el-table
|
<div class="table-height">
|
||||||
:data="standardData"
|
<el-table
|
||||||
v-loading="loading"
|
:data="standardData"
|
||||||
tooltip-effect="dark"
|
v-loading="loading"
|
||||||
style="width: 100%"
|
tooltip-effect="dark"
|
||||||
border
|
style="width: 100%"
|
||||||
ref="table"
|
border
|
||||||
class="table-height"
|
ref="table"
|
||||||
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
|
height="100%"
|
||||||
|
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
|
||||||
fontWeight: 'bold', height: '48px'}"
|
fontWeight: 'bold', height: '48px'}"
|
||||||
@selection-change="selectThree"
|
@selection-change="selectThree"
|
||||||
>
|
|
||||||
<el-table-column
|
|
||||||
type="selection"
|
|
||||||
width="55"
|
|
||||||
align="center">
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column
|
|
||||||
prop="code"
|
|
||||||
align="center"
|
|
||||||
label="标准号">
|
|
||||||
<template slot-scope="scope">
|
|
||||||
<a v-if="scope.row.standYear" class="table-jump"
|
|
||||||
@click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
|
|
||||||
scope.row.standNumber
|
|
||||||
}}-{{ scope.row.standYear }}</a>
|
|
||||||
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{
|
|
||||||
scope.row.standSortShow }}
|
|
||||||
{{ scope.row.standNumber }}</a>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column
|
|
||||||
prop="standName"
|
|
||||||
align="center"
|
|
||||||
label="标准名称"
|
|
||||||
>
|
>
|
||||||
<template slot-scope="scope">
|
<el-table-column
|
||||||
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.standEnName}}</a>
|
type="selection"
|
||||||
</template>
|
width="55"
|
||||||
</el-table-column>
|
align="center">
|
||||||
<el-table-column
|
</el-table-column>
|
||||||
prop="issueTime"
|
<el-table-column
|
||||||
align="center"
|
prop="code"
|
||||||
label="发布日期">
|
align="center"
|
||||||
<template slot-scope="scope">
|
label="标准号">
|
||||||
<span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
|
<template slot-scope="scope">
|
||||||
</template>
|
<a v-if="scope.row.standYear" class="table-jump"
|
||||||
</el-table-column>
|
@click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
|
||||||
<el-table-column
|
scope.row.standNumber
|
||||||
prop="XCXSSRQ"
|
}}-{{ scope.row.standYear }}</a>
|
||||||
align="center"
|
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{
|
||||||
label="新车型实施日期">
|
scope.row.standSortShow }}
|
||||||
</el-table-column>
|
{{ scope.row.standNumber }}</a>
|
||||||
<el-table-column
|
</template>
|
||||||
show-overflow-tooltip
|
</el-table-column>
|
||||||
prop="ZCCSSRQ"
|
<el-table-column
|
||||||
align="center"
|
prop="standName"
|
||||||
label="在产车实施日期">
|
align="center"
|
||||||
</el-table-column>
|
label="标准名称"
|
||||||
<el-table-column
|
>
|
||||||
show-overflow-tooltip
|
<template slot-scope="scope">
|
||||||
prop="textStatus"
|
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.standEnName}}</a>
|
||||||
align="center"
|
</template>
|
||||||
label="文本状态">
|
</el-table-column>
|
||||||
<template slot-scope="scope">
|
<el-table-column
|
||||||
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
|
prop="issueTime"
|
||||||
</template>
|
align="center"
|
||||||
</el-table-column>
|
label="发布日期">
|
||||||
</el-table>
|
<template slot-scope="scope">
|
||||||
|
<span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
prop="XCXSSRQ"
|
||||||
|
align="center"
|
||||||
|
label="新车型实施日期">
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
show-overflow-tooltip
|
||||||
|
prop="ZCCSSRQ"
|
||||||
|
align="center"
|
||||||
|
label="在产车实施日期">
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
show-overflow-tooltip
|
||||||
|
prop="textStatus"
|
||||||
|
align="center"
|
||||||
|
label="文本状态">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
</el-table>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<pagination
|
<pagination
|
||||||
:page="pageNo"
|
:page="pageNo"
|
||||||
|
|||||||
@@ -49,7 +49,7 @@
|
|||||||
/>
|
/>
|
||||||
<i
|
<i
|
||||||
title="下载带水印"
|
title="下载带水印"
|
||||||
@click.stop="downloadFileByWater(item.id, item.name)"
|
@click.stop="downloadFileByWater(item.id, item.fileSuffix)"
|
||||||
class="icon-download2"
|
class="icon-download2"
|
||||||
v-btn-permission="''"
|
v-btn-permission="''"
|
||||||
/>
|
/>
|
||||||
@@ -429,7 +429,8 @@ export default {
|
|||||||
name: item.oldFileName,
|
name: item.oldFileName,
|
||||||
uid: item.uid,
|
uid: item.uid,
|
||||||
status: item.status,
|
status: item.status,
|
||||||
id: item.id
|
id: item.id,
|
||||||
|
fileSuffix: item.fileSuffix
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -305,21 +305,7 @@
|
|||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="乘用车VPPS编码" prop="cycvppsbm" class="add-form-item form-item-disabled">
|
<el-form-item label="乘用车VPPS编码" prop="cycvppsbm" class="add-form-item form-item-disabled">
|
||||||
<el-input v-model="standForm.cycvppsbm" placeholder="选择乘用车VPPS编码" @click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', standForm.cycvppsbm)"></el-input>
|
<el-input v-model="standForm.cycvppsbm" placeholder="请输入乘用车VPPS编码" clearable></el-input>
|
||||||
<tree-select-new
|
|
||||||
width = "800"
|
|
||||||
:key="key1"
|
|
||||||
:lazy=true
|
|
||||||
:multiple=true
|
|
||||||
:check-strictly= true
|
|
||||||
:modalShowFlag="modalShowFlag2"
|
|
||||||
:drawerTitle="drawerTitle"
|
|
||||||
:show-checkBox="showCheckBox"
|
|
||||||
:url="url"
|
|
||||||
:urlChild="urlChild"
|
|
||||||
@popoverHideCancel = "modalShowFlag2 = false"
|
|
||||||
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
|
|
||||||
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
@@ -332,21 +318,7 @@
|
|||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="卡车VPPS编码" prop="kccvppsbm">
|
<el-form-item label="卡车VPPS编码" prop="kccvppsbm">
|
||||||
<el-input v-model="standForm.kccvppsbm" placeholder="选择卡车VPPS编码" @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', standForm.kccvppsbm)"></el-input>
|
<el-input v-model="standForm.kccvppsbm" placeholder="请输入卡车VPPS编码" clearable></el-input>
|
||||||
<tree-select-new
|
|
||||||
width = "800"
|
|
||||||
:key="key2"
|
|
||||||
:lazy=true
|
|
||||||
:multiple=true
|
|
||||||
:check-strictly= true
|
|
||||||
:modalShowFlag="modalShowFlag3"
|
|
||||||
:drawerTitle="drawerTitle"
|
|
||||||
:show-checkBox="showCheckBox"
|
|
||||||
:url="url"
|
|
||||||
@popoverHideCancel = "modalShowFlag3 = false"
|
|
||||||
:urlChild="urlChild"
|
|
||||||
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
|
|
||||||
:nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select-new>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
|||||||
Reference in New Issue
Block a user