Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
zhutianqi
@@ -49,7 +49,7 @@
|
||||
/>
|
||||
<i
|
||||
title="下载带水印"
|
||||
@click.stop="downloadFileByWater(item.id, item.name)"
|
||||
@click.stop="downloadFileByWater(item.id, item.fileSuffix)"
|
||||
class="icon-download2"
|
||||
v-btn-permission="''"
|
||||
/>
|
||||
@@ -360,7 +360,8 @@ export default {
|
||||
name: item.oldFileName,
|
||||
uid: item.uid,
|
||||
status: item.status,
|
||||
id: item.id
|
||||
id: item.id,
|
||||
fileSuffix: item.fileSuffix
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
@@ -274,75 +274,77 @@
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
<el-table
|
||||
:data="standardData"
|
||||
v-loading="loading"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%"
|
||||
border
|
||||
ref="table"
|
||||
class="table-height"
|
||||
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
|
||||
<div class="table-height">
|
||||
<el-table
|
||||
:data="standardData"
|
||||
v-loading="loading"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%"
|
||||
border
|
||||
ref="table"
|
||||
height="100%"
|
||||
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '48px'}"
|
||||
@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="标准名称"
|
||||
@selection-change="selectThree"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.standEnName}}</a>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="issueTime"
|
||||
align="center"
|
||||
label="发布日期">
|
||||
<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>
|
||||
<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">
|
||||
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.standEnName}}</a>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="issueTime"
|
||||
align="center"
|
||||
label="发布日期">
|
||||
<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>
|
||||
<pagination
|
||||
:page="pageNo"
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
/>
|
||||
<i
|
||||
title="下载带水印"
|
||||
@click.stop="downloadFileByWater(item.id, item.name)"
|
||||
@click.stop="downloadFileByWater(item.id, item.fileSuffix)"
|
||||
class="icon-download2"
|
||||
v-btn-permission="''"
|
||||
/>
|
||||
@@ -429,7 +429,8 @@ export default {
|
||||
name: item.oldFileName,
|
||||
uid: item.uid,
|
||||
status: item.status,
|
||||
id: item.id
|
||||
id: item.id,
|
||||
fileSuffix: item.fileSuffix
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1836,9 +1836,11 @@ export default {
|
||||
/** val === '1' (国外) val === '0'（ 国内 ）*/
|
||||
// 国内英文名称不必填 国外必填 ，标准性质国内不体现
|
||||
if (val === '1') {
|
||||
this.rules.standName[0].required = false
|
||||
this.rules.standEnName[0].required = true;
|
||||
this.rules.standNature[0].required = false
|
||||
} else {
|
||||
this.rules.standName[0].required = true
|
||||
this.rules.standNature[0].required = true
|
||||
this.rules.standEnName[0].required = false;
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="标准来源" prop="standInData" class="add-form-item form-item-disabled">
|
||||
<el-radio-group v-model="form.standInData">
|
||||
<el-radio-group v-model="form.standInData" @change="standInChange">
|
||||
<el-radio label="0">国内标准入库</el-radio>
|
||||
<el-radio label="1">海外标准入库</el-radio>
|
||||
</el-radio-group>
|
||||
@@ -1692,6 +1692,23 @@ export default {
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
// 标准来源改变事件
|
||||
standInChange(val) {
|
||||
this.verifySarStandard = false
|
||||
|
||||
/** val === '1' (国外) val === '0'（ 国内 ）*/
|
||||
// 国内英文名称不必填 国外必填 ，标准性质国内不体现
|
||||
if (val === '1') {
|
||||
this.rules.standName[0].required = false
|
||||
this.rules.standNature[0].required = false
|
||||
this.rules.standEnName[0].required = true;
|
||||
} else {
|
||||
this.rules.standName[0].required = true
|
||||
this.rules.standNature[0].required = true
|
||||
this.rules.standEnName[0].required = false;
|
||||
}
|
||||
this.standardSearchForm.standType = val === '0' ? 'INLAND' : 'FOREIGN'
|
||||
},
|
||||
getBusStandFileByAttId(attId) {
|
||||
return new Promise((resolve, reject) => {
|
||||
getBusStandFileByAttId({
|
||||
|
||||
@@ -170,32 +170,32 @@
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">
|
||||
<el-date-picker
|
||||
disabled
|
||||
v-model="form.ssrqgj"
|
||||
type="date"
|
||||
placeholder="请选择实施日期(国际)">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">
|
||||
<el-date-picker
|
||||
disabled
|
||||
v-model="form.xcxssrqgj"
|
||||
type="date"
|
||||
placeholder="请选择新车型实施日期(国家)">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">
|
||||
<el-date-picker
|
||||
disabled
|
||||
v-model="form.zccssrqgj"
|
||||
type="date"
|
||||
placeholder="请选择在产车实施日期(国家)">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<!-- <el-col :span="12">-->
|
||||
<!-- <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">-->
|
||||
<!-- <el-date-picker-->
|
||||
<!-- disabled-->
|
||||
<!-- v-model="form.ssrqgj"-->
|
||||
<!-- type="date"-->
|
||||
<!-- placeholder="请选择实施日期(国际)">-->
|
||||
<!-- </el-date-picker>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">-->
|
||||
<!-- <el-date-picker-->
|
||||
<!-- disabled-->
|
||||
<!-- v-model="form.xcxssrqgj"-->
|
||||
<!-- type="date"-->
|
||||
<!-- placeholder="请选择新车型实施日期(国家)">-->
|
||||
<!-- </el-date-picker>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">-->
|
||||
<!-- <el-date-picker-->
|
||||
<!-- disabled-->
|
||||
<!-- v-model="form.zccssrqgj"-->
|
||||
<!-- type="date"-->
|
||||
<!-- placeholder="请选择在产车实施日期(国家)">-->
|
||||
<!-- </el-date-picker>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-col>-->
|
||||
</el-row>
|
||||
</div>
|
||||
<ProcessTitle>
|
||||
|
||||
@@ -226,6 +226,8 @@
|
||||
background
|
||||
:page-sizes="[20, 40, 60]"
|
||||
:total="total"
|
||||
:page-size="pageSize"
|
||||
@size-change="handleSizeChange"
|
||||
@current-change="handleCurrentChange"
|
||||
>
|
||||
</el-pagination>
|
||||
@@ -753,6 +755,9 @@ export default {
|
||||
handleCurrentChange(currentPage) {
|
||||
this.currentPage = currentPage;
|
||||
},
|
||||
handleSizeChange(size) {
|
||||
this.pageSize = size;
|
||||
},
|
||||
//保存事件
|
||||
handleSave() {
|
||||
this.saveLoading = true;
|
||||
|
||||
Reference in New Issue
Block a user