Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
+3
-1
@@ -353,7 +353,9 @@ export default {
|
||||
name: "ListOfStandardsAndRegulationsDetails",
|
||||
query: {
|
||||
id: item.id,
|
||||
fileIds: item.fileIds
|
||||
fileIds: item.fileIds,
|
||||
page: 1,
|
||||
Size: this.$store.getters.userInfo.configContent
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
@@ -353,7 +353,9 @@ export default {
|
||||
name: "OtherAddEit",
|
||||
query: {
|
||||
id: item.id,
|
||||
fileIds: item.fileIds
|
||||
fileIds: item.fileIds,
|
||||
page: 1,
|
||||
Size: this.$store.getters.userInfo.configContent
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -356,7 +356,9 @@ export default {
|
||||
name: "ProjectAddEit",
|
||||
query: {
|
||||
id: item.id,
|
||||
fileIds: item.fileIds
|
||||
fileIds: item.fileIds,
|
||||
page: 1,
|
||||
Size: this.$store.getters.userInfo.configContent
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -80,9 +80,9 @@
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('m.keywords')" class="search-item">
|
||||
<el-form-item label="标准名称" class="search-item">
|
||||
<el-input
|
||||
v-model="sarAccessInfoSearch.keywords"
|
||||
v-model="sarAccessInfoSearch.standName"
|
||||
placeholder="请输入"
|
||||
:maxlength="100"
|
||||
></el-input>
|
||||
@@ -495,7 +495,7 @@
|
||||
width="210px"
|
||||
label="卡车VPPS中文名称">
|
||||
</el-table-column>
|
||||
<el-table-column width="200">
|
||||
<el-table-column width="240" label="操作">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
class="common-button-default"
|
||||
@@ -558,9 +558,11 @@
|
||||
:wrapperClosable="false"
|
||||
size="800px"
|
||||
>
|
||||
<el-form :modal="editRowData" ref="editRowData" label-width="150px" style="margin: 20px">
|
||||
<el-form :modal="editRowData" label-position="left" ref="editRowData" label-width="150px" style="margin: 20px">
|
||||
<el-form-item label="标准号">
|
||||
<a>{{ editRowData.standSortShow }} {{ editRowData.standNumber }}</a>
|
||||
<el-input v-model.trim="editRowData.standNumber" :disabled="true">
|
||||
<!-- <a>{{ editRowData.standSortShow }} {{ editRowData.standNumber }}</a>-->
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="标准名称" prop="standName">
|
||||
<el-input v-model.trim="editRowData.standName" :disabled="true"></el-input>
|
||||
@@ -656,6 +658,7 @@ import CustomRoleTree from '@/components/CustomFormComponents/roleTree'
|
||||
import stand from "../../../config/pages/attributeCustom/components/stand";
|
||||
import { mapGetters } from 'vuex'
|
||||
import { editDataInfo } from '@/api/unqualProcess'
|
||||
import {interfaceUrl} from "@/sysConfig";
|
||||
export default {
|
||||
name: 'ListOfStandardsAndRegulationsDetails',
|
||||
components: {
|
||||
@@ -1339,6 +1342,7 @@ export default {
|
||||
editTghisRow(row) {
|
||||
this.rowList = row
|
||||
this.editRowData = this.rowList
|
||||
this.editRowData.standNumber = this.rowList.standSortShow + this.rowList.standNumber
|
||||
this.drawerEdit = true
|
||||
},
|
||||
// 抽屉取消按钮
|
||||
@@ -1509,7 +1513,6 @@ export default {
|
||||
// 数据搜索 table select事件
|
||||
sarAccessInfoSearchSelect (val) {
|
||||
this.selectedAccInfoSearchList = val
|
||||
console.log(val)
|
||||
},
|
||||
// 数据搜索 清单类型 table select事件
|
||||
accessSarTypeSelect (selectData) {
|
||||
@@ -1528,8 +1531,13 @@ export default {
|
||||
},
|
||||
// 点击 导出、全部导出按钮事件
|
||||
exportAccessInfo (type) {
|
||||
this.exportTestItemNameFlag = true
|
||||
this.exportName = ''
|
||||
if (this.sarAccessInfoListArry.length > 0) {
|
||||
this.exportTestItemNameFlag = true
|
||||
this.exportName = ''
|
||||
}else {
|
||||
this.$message.warning('请选择数据进行导出')
|
||||
}
|
||||
|
||||
},
|
||||
// 导出确定功能
|
||||
exportTestItem () {
|
||||
@@ -1545,10 +1553,9 @@ export default {
|
||||
for (var accessInfo in exportList) {
|
||||
accIdAndrestype.push(exportList[accessInfo].id)
|
||||
}
|
||||
window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames
|
||||
const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
|
||||
window.open(exportURL)
|
||||
this.$message.success('导出信息成功')
|
||||
} else {
|
||||
this.$message.warning('当前没有需要导出的数据')
|
||||
}
|
||||
this.exportTestItemNameFlag = false
|
||||
},
|
||||
@@ -1952,7 +1959,11 @@ export default {
|
||||
return formatText(str)
|
||||
},
|
||||
getData() {
|
||||
this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById', {id: this.zqaId}, {
|
||||
this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById', {
|
||||
id: this.zqaId,
|
||||
page: this.page,
|
||||
Size: this.Size
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
this.sarAccessInfoList = res.data
|
||||
@@ -1987,6 +1998,8 @@ export default {
|
||||
},
|
||||
mounted () {
|
||||
this.zqaId =this.$route.query.id;
|
||||
this.page = this.$route.query.page
|
||||
this.Size = this.$route.query.Size
|
||||
// this.getData()
|
||||
this.getDept()
|
||||
// 从数据库中查询各下拉框数据
|
||||
|
||||
@@ -102,7 +102,7 @@
|
||||
</el-button>
|
||||
</el-form>
|
||||
<div v-if="!showSelectBox">
|
||||
<el-form :model="standardForm" class="label-input-form" label-width="auto" inline>
|
||||
<el-form :model="standardForm" class="label-input-form" label-width="150px" inline>
|
||||
<el-form-item label="中文名称" class="search-item">
|
||||
<el-input
|
||||
v-model="standardForm.standName"
|
||||
@@ -119,8 +119,9 @@
|
||||
size="small"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="适用车型" >
|
||||
<el-form-item label="适用车型">
|
||||
<el-select
|
||||
class="showBox"
|
||||
v-model="standardForm.typeApplicable"
|
||||
placeholder="请选择"
|
||||
filterable
|
||||
@@ -136,6 +137,7 @@
|
||||
</el-form-item>
|
||||
<el-form-item label="能源类型" >
|
||||
<el-select
|
||||
class="showBox"
|
||||
v-model="standardForm.nylx"
|
||||
placeholder="请选择"
|
||||
filterable
|
||||
@@ -151,6 +153,7 @@
|
||||
</el-form-item>
|
||||
<el-form-item label="责任部门" >
|
||||
<el-select
|
||||
class="showBox"
|
||||
v-model="standardForm.zrbm"
|
||||
placeholder="请选择"
|
||||
filterable
|
||||
@@ -166,6 +169,7 @@
|
||||
</el-form-item>
|
||||
<el-form-item label="适用产品线" >
|
||||
<el-select
|
||||
class="showBox"
|
||||
v-model="standardForm.sycpx"
|
||||
placeholder="请选择"
|
||||
filterable
|
||||
@@ -774,13 +778,12 @@ export default {
|
||||
mounted() {
|
||||
this.$nextTick(() => {
|
||||
let accessRow = JSON.parse(sessionStorage.getItem("accessRow"));
|
||||
console.log(accessRow)
|
||||
this.pageId = accessRow.id
|
||||
this.sarAccessEO = accessRow;
|
||||
this.sarAccessEOInfo = this.sarAccessEO.countryArea.indexOf(',')
|
||||
this.selectInfobyAccid();
|
||||
this.getOrgTreeSource();
|
||||
this.getFileInfo();
|
||||
// this.sarAccessEOInfo = this.sarAccessEO.countryArea.indexOf(',')
|
||||
});
|
||||
|
||||
// 从数据库中查询各下拉框数据
|
||||
@@ -972,6 +975,9 @@ export default {
|
||||
}
|
||||
}
|
||||
|
||||
/deep/.showBox{
|
||||
width: 165px;
|
||||
}
|
||||
.iconClass {
|
||||
width: 18px;
|
||||
height: 18px;
|
||||
|
||||
+22
-29
@@ -13,24 +13,6 @@
|
||||
<el-form-item label="清单类别" prop="detailedList" class="search-item">
|
||||
<el-input v-model="sarAccessEO.detailedList" :disabled="disabledFlag" placeholder="请输入"></el-input>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="适用领域" prop="applicationScope" class="search-item">
|
||||
<el-select
|
||||
v-model="sarAccessEO.applicationScope"
|
||||
multiple
|
||||
placeholder="请选择"
|
||||
filterable
|
||||
:disabled="disabledFlag"
|
||||
class="wx-resolve"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in applyOptions"
|
||||
:value="item.value"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>-->
|
||||
<br/><br/>
|
||||
<el-form-item label="清单说明" prop="remark" class="search-item max-search-item2">
|
||||
<el-input
|
||||
@@ -83,9 +65,9 @@
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('m.keywords')" class="search-item">
|
||||
<el-form-item label="标准名称" class="search-item">
|
||||
<el-input
|
||||
v-model="sarAccessInfoSearch.keywords"
|
||||
v-model="sarAccessInfoSearch.standName"
|
||||
placeholder="请输入"
|
||||
:maxlength="100"
|
||||
></el-input>
|
||||
@@ -433,7 +415,7 @@
|
||||
width="210px"
|
||||
label="卡车VPPS中文名称">
|
||||
</el-table-column>
|
||||
<el-table-column width="150">
|
||||
<el-table-column width="150" label="操作">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
class="common-button-default"
|
||||
@@ -506,6 +488,7 @@ import CustomInputForPolicy from '@/components/CustomFormComponents/InputForPoli
|
||||
import CustomRoleTree from '@/components/CustomFormComponents/roleTree'
|
||||
import stand from "../../../config/pages/attributeCustom/components/stand";
|
||||
import { mapGetters } from 'vuex'
|
||||
import {interfaceUrl} from "@/sysConfig";
|
||||
export default {
|
||||
name: 'OtherAddEit',
|
||||
components: {
|
||||
@@ -615,7 +598,7 @@ export default {
|
||||
askType: '', // 监管类型
|
||||
dataSource: 'INLAND_STAND', // 数据来源
|
||||
page: 1,
|
||||
pageSize: this.$store.getters.userInfo.configContent,
|
||||
Size: this.$store.getters.userInfo.configContent,
|
||||
validFlag: 0,
|
||||
advanceSearchVOStr: ''
|
||||
},
|
||||
@@ -1297,13 +1280,17 @@ export default {
|
||||
|
||||
// 数据搜索table分页条数改变回调
|
||||
drawerPageSizeChange () {
|
||||
this.sarAccessInfoSearch.pageSize = this.$store.getters.userInfo.configContent
|
||||
this.sarAccessInfoSearch.Size = this.$store.getters.userInfo.configContent
|
||||
this.selectLawsStands()
|
||||
},
|
||||
// 点击 导出、全部导出按钮事件
|
||||
exportAccessInfo (type) {
|
||||
this.exportTestItemNameFlag = true
|
||||
this.exportName = ''
|
||||
if (this.sarAccessInfoListArry.length > 0) {
|
||||
this.exportTestItemNameFlag = true
|
||||
this.exportName = ''
|
||||
}else {
|
||||
this.$message.warning('请选择数据进行导出')
|
||||
}
|
||||
},
|
||||
// 导出确定功能
|
||||
exportTestItem () {
|
||||
@@ -1319,10 +1306,10 @@ export default {
|
||||
for (var accessInfo in exportList) {
|
||||
accIdAndrestype.push(exportList[accessInfo].id)
|
||||
}
|
||||
window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames
|
||||
const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
|
||||
window.open(exportURL)
|
||||
// window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames
|
||||
this.$message.success('导出信息成功')
|
||||
} else {
|
||||
this.$message.warning('当前没有需要导出的数据')
|
||||
}
|
||||
this.exportTestItemNameFlag = false
|
||||
},
|
||||
@@ -1727,7 +1714,11 @@ export default {
|
||||
return formatText(str)
|
||||
},
|
||||
getData() {
|
||||
this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById', {id: this.zqaId}, {
|
||||
this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById', {
|
||||
id: this.zqaId,
|
||||
page: this.page,
|
||||
Size: this.Size
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
this.sarAccessInfoList = res.data
|
||||
@@ -1768,6 +1759,8 @@ export default {
|
||||
},
|
||||
mounted () {
|
||||
this.zqaId =this.$route.query.id;
|
||||
this.page = this.$route.query.page
|
||||
this.Size = this.$route.query.Size
|
||||
// this.getData()
|
||||
this.getDept()
|
||||
// 从数据库中查询各下拉框数据
|
||||
|
||||
+20
-25
@@ -13,24 +13,6 @@
|
||||
<el-form-item label="项目名称" prop="projectName" class="search-item">
|
||||
<el-input v-model="sarAccessEO.projectName" :disabled="disabledFlag" placeholder="请输入"></el-input>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="适用领域" prop="applicationScope" class="search-item">
|
||||
<el-select
|
||||
v-model="sarAccessEO.applicationScope"
|
||||
multiple
|
||||
placeholder="请选择"
|
||||
filterable
|
||||
:disabled="disabledFlag"
|
||||
class="wx-resolve"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in applyOptions"
|
||||
:value="item.value"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>-->
|
||||
<br/><br/>
|
||||
<el-form-item label="清单说明" prop="remark" class="search-item max-search-item2">
|
||||
<el-input
|
||||
@@ -83,9 +65,9 @@
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('m.keywords')" class="search-item">
|
||||
<el-form-item label="标准名称" class="search-item">
|
||||
<el-input
|
||||
v-model="sarAccessInfoSearch.keywords"
|
||||
v-model="sarAccessInfoSearch.standName"
|
||||
placeholder="请输入"
|
||||
:maxlength="100"
|
||||
></el-input>
|
||||
@@ -433,7 +415,7 @@
|
||||
width="210px"
|
||||
label="卡车VPPS中文名称">
|
||||
</el-table-column>
|
||||
<el-table-column width="150">
|
||||
<el-table-column width="150" label="操作">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
class="common-button-default"
|
||||
@@ -506,6 +488,7 @@ import CustomInputForPolicy from '@/components/CustomFormComponents/InputForPoli
|
||||
import CustomRoleTree from '@/components/CustomFormComponents/roleTree'
|
||||
import stand from "../../../config/pages/attributeCustom/components/stand";
|
||||
import { mapGetters } from 'vuex'
|
||||
import {interfaceUrl} from "@/sysConfig";
|
||||
export default {
|
||||
name: 'OtherAddEit',
|
||||
components: {
|
||||
@@ -1303,8 +1286,12 @@ export default {
|
||||
},
|
||||
// 点击 导出、全部导出按钮事件
|
||||
exportAccessInfo (type) {
|
||||
this.exportTestItemNameFlag = true
|
||||
this.exportName = ''
|
||||
if (this.sarAccessInfoListArry.length > 0) {
|
||||
this.exportTestItemNameFlag = true
|
||||
this.exportName = ''
|
||||
}else {
|
||||
this.$message.warning('请选择数据进行导出')
|
||||
}
|
||||
},
|
||||
// 导出确定功能
|
||||
exportTestItem () {
|
||||
@@ -1320,7 +1307,9 @@ export default {
|
||||
for (var accessInfo in exportList) {
|
||||
accIdAndrestype.push(exportList[accessInfo].id)
|
||||
}
|
||||
window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames
|
||||
const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
|
||||
window.open(exportURL)
|
||||
// window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames
|
||||
this.$message.success('导出信息成功')
|
||||
} else {
|
||||
this.$message.warning('当前没有需要导出的数据')
|
||||
@@ -1728,7 +1717,11 @@ export default {
|
||||
return formatText(str)
|
||||
},
|
||||
getData() {
|
||||
this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById', {id: this.zqaId}, {
|
||||
this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById', {
|
||||
id: this.zqaId,
|
||||
page: this.page,
|
||||
Size: this.Size
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
this.sarAccessInfoList = res.data
|
||||
@@ -1769,6 +1762,8 @@ export default {
|
||||
},
|
||||
mounted () {
|
||||
this.zqaId =this.$route.query.id;
|
||||
this.page = this.$route.query.page
|
||||
this.Size = this.$route.query.Size
|
||||
//this.getData()
|
||||
this.getDept()
|
||||
// 从数据库中查询各下拉框数据
|
||||
|
||||
@@ -804,6 +804,9 @@
|
||||
label="标准号"
|
||||
align="center"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="standName"
|
||||
@@ -1292,6 +1295,7 @@ export default {
|
||||
children: 'children',
|
||||
label: 'menuName'
|
||||
},
|
||||
id: '',
|
||||
modalShowFlag1: false, // drawer开关
|
||||
modalShowFlag2: false, // drawer开关
|
||||
modalShowFlag3: false, // drawer开关
|
||||
@@ -1433,10 +1437,10 @@ export default {
|
||||
assemClassOptions: [], // 总成分类下拉框
|
||||
qcdwOptions: [], // 起草单位
|
||||
nylxOptions: [], // 能源类型
|
||||
sycpxOptions: [], // 适用产品线
|
||||
// sycpxOptions: [], // 适用产品线
|
||||
syzrOptions: [], // 适用认证
|
||||
zrbmOptions: [], // 责任部门
|
||||
zrgcsOptions: [], // 责任工程师
|
||||
// zrbmOptions: [], // 责任部门
|
||||
// zrgcsOptions: [], // 责任工程师
|
||||
standAttributeList: [],
|
||||
sarStandardsSearch: {
|
||||
page: 1,
|
||||
@@ -1466,7 +1470,7 @@ export default {
|
||||
standNature: '', // 标准性质
|
||||
putTime: '', // 实施日期
|
||||
isRelateAccess: '', // 是否纳入标准清单
|
||||
nameShow: '', // 我司参与深度
|
||||
// nameShow: '', // 我司参与深度
|
||||
qcdw: '', // 起草单位
|
||||
nameShow: '', // 归口管理部门
|
||||
ZCCTime: '', // 在产车实施日期
|
||||
@@ -1765,17 +1769,17 @@ export default {
|
||||
],
|
||||
standYear: [
|
||||
{required: true, message: '标准年份不能为空', trigger: 'change'},
|
||||
{validator: this.verify.testItemCode, trigger: 'change'},
|
||||
{type: 'string', max: 20, message: '标准年份不能超过20个字符', trigger: 'change'}
|
||||
{validator: this.verify.testNumberCode, trigger: 'change'},
|
||||
{type: 'string', max: 100, message: '标准年份不能超过100个字符', trigger: 'change'}
|
||||
],
|
||||
standName: [
|
||||
{required: true, message: '中文名称不能为空', trigger: 'change'},
|
||||
{type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'}
|
||||
],
|
||||
// standEnName: [
|
||||
// {required: true, message: '英文名称不能为空', trigger: 'change'},
|
||||
// {type: 'string', max: 1000, message: '英文名称不能超过1000个字符', trigger: 'change'}
|
||||
// ],
|
||||
standEnName: [
|
||||
{required: false, message: '英文名称不能为空', trigger: 'change'},
|
||||
{type: 'string', max: 500, message: '英文名称不能超过500个字符', trigger: 'change'}
|
||||
],
|
||||
// isRelateAccess: [
|
||||
// { required: true, message: '重要度不能为空', trigger: 'change' }
|
||||
// ],
|
||||
@@ -1793,7 +1797,7 @@ export default {
|
||||
standNumber: [
|
||||
{required: true, type: 'string', message: '标准编号不能为空', trigger: 'change'},
|
||||
{type: 'string', max: 100, message: '标准编号不能超过100个字符', trigger: 'change'},
|
||||
{type: 'string', validator: this.verify.validateStandardItem, trigger: 'change'}
|
||||
{ validator: this.verify.validateStandardItem, trigger: 'change'}
|
||||
],
|
||||
standYear: [
|
||||
{required: true, message: '标准年份不能为空', trigger: 'change'},
|
||||
@@ -1805,7 +1809,7 @@ export default {
|
||||
{type: 'string', max: 500, message: '标准名称不能超过500个字符', trigger: 'change'}
|
||||
],
|
||||
standEnName: [
|
||||
{type: 'string', max: 1000, message: '标准英文名称不能超过1000个字符', trigger: 'change'},
|
||||
{type: 'string', max: 500, message: '标准英文名称不能超过500个字符', trigger: 'change'},
|
||||
{validator: this.verify.valiateEnName, trigger: 'blur'}
|
||||
],
|
||||
synopsis: [
|
||||
@@ -2259,6 +2263,7 @@ export default {
|
||||
},
|
||||
// 编辑标准属性
|
||||
selectStandardPro (item, state) {
|
||||
this.id = item.id
|
||||
this.addOrUPdateFlag = 2
|
||||
this.modalshowtitle = '编辑国内标准'
|
||||
this.modalshowflag = true
|
||||
@@ -2266,6 +2271,7 @@ export default {
|
||||
this.$nextTick(() => {
|
||||
Promise.all([this.queryDisplayLocation()]).then((values) => {
|
||||
const [displayLocation] = values
|
||||
console.log(this.formFieldList, 'assssssssssss')
|
||||
const formFieldList = this.formFieldList
|
||||
this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
|
||||
if(this.sarStandardsInfoEO.standSystem){
|
||||
@@ -2707,19 +2713,35 @@ export default {
|
||||
switch (sortObj.prop) {
|
||||
case 'issueTime' :
|
||||
// 后台联调
|
||||
this.nowOrderBy = '1'
|
||||
if(sortObj.order === null) {
|
||||
this.nowOrderBy = ''
|
||||
} else {
|
||||
this.nowOrderBy = '1'
|
||||
}
|
||||
break;
|
||||
case 'xcxssrq' :
|
||||
// 后台联调
|
||||
this.nowOrderBy = '2'
|
||||
if(sortObj.order === null) {
|
||||
this.nowOrderBy = ''
|
||||
} else {
|
||||
this.nowOrderBy = '2'
|
||||
}
|
||||
break;
|
||||
case 'zccssrq' :
|
||||
// 后台联调
|
||||
this.nowOrderBy = '3'
|
||||
if(sortObj.order === null) {
|
||||
this.nowOrderBy = ''
|
||||
} else {
|
||||
this.nowOrderBy = '3'
|
||||
}
|
||||
break;
|
||||
case 'textStatus' :
|
||||
// 后台联调
|
||||
this.nowOrderBy = '4'
|
||||
if(sortObj.order === null) {
|
||||
this.nowOrderBy = ''
|
||||
} else {
|
||||
this.nowOrderBy = '4'
|
||||
}
|
||||
break;
|
||||
}
|
||||
switch (sortObj.order) {
|
||||
@@ -2729,6 +2751,9 @@ export default {
|
||||
case 'descending' :
|
||||
this.nowOrder = '1'
|
||||
break;
|
||||
default:
|
||||
this.nowOrder = ''
|
||||
break;
|
||||
}
|
||||
}
|
||||
this.getDomesticStandardTable(this.tableFlag)
|
||||
@@ -3093,6 +3118,14 @@ export default {
|
||||
}, res => {
|
||||
this.isSubmit = false
|
||||
if (res.ok) {
|
||||
this.personCollect.collectType = 'INLAND_STAND'
|
||||
this.personCollect.id = this.id
|
||||
this.personCollect.userId = this.$store.getters.userInfo.userId
|
||||
this.$http.get('person/personCollect/updatePersonCollect', this.personCollect, {
|
||||
_this: this,
|
||||
loading: 'loading'
|
||||
}, res => {
|
||||
}, e => {})
|
||||
this.getDomesticStandardTable(this.tableFlag)
|
||||
this.resetForm()
|
||||
if (this.addOrUPdateFlag === 1) {
|
||||
@@ -3855,19 +3888,35 @@ export default {
|
||||
switch (sortObj.prop) {
|
||||
case 'issueTime' :
|
||||
// 后台联调
|
||||
this.sarConfigStandSearch.nowOrderBy = '1'
|
||||
if(sortObj.order === null) {
|
||||
this.sarConfigStandSearch.nowOrderBy = ''
|
||||
} else {
|
||||
this.sarConfigStandSearch.nowOrderBy = '1'
|
||||
}
|
||||
break;
|
||||
case 'xcxssrq' :
|
||||
// 后台联调
|
||||
this.sarConfigStandSearch.nowOrderBy = '2'
|
||||
if(sortObj.order === null) {
|
||||
this.sarConfigStandSearch.nowOrderBy = ''
|
||||
} else {
|
||||
this.sarConfigStandSearch.nowOrderBy = '2'
|
||||
}
|
||||
break;
|
||||
case 'zccssrq' :
|
||||
// 后台联调
|
||||
this.sarConfigStandSearch.nowOrderBy = '3'
|
||||
if(sortObj.order === null) {
|
||||
this.sarConfigStandSearch.nowOrderBy = ''
|
||||
} else {
|
||||
this.sarConfigStandSearch.nowOrderBy = '3'
|
||||
}
|
||||
break;
|
||||
case 'textStatus' :
|
||||
if(sortObj.order === null) {
|
||||
this.sarConfigStandSearch.nowOrderBy = ''
|
||||
} else {
|
||||
this.sarConfigStandSearch.nowOrderBy = '4'
|
||||
}
|
||||
// 后台联调
|
||||
this.sarConfigStandSearch.nowOrderBy = '4'
|
||||
break;
|
||||
}
|
||||
switch (sortObj.order) {
|
||||
@@ -3877,6 +3926,9 @@ export default {
|
||||
case 'descending' :
|
||||
this.sarConfigStandSearch.nowOrder = '1'
|
||||
break;
|
||||
default:
|
||||
this.sarConfigStandSearch.nowOrder = ''
|
||||
break;
|
||||
}
|
||||
}
|
||||
this.selectConfiguraStand()
|
||||
@@ -4110,10 +4162,14 @@ export default {
|
||||
rules.issueTime = [{required: false, message: '发布日期不能为空', trigger: 'change'}]
|
||||
}
|
||||
if (item.attrLen && item.attrType !== 'INPUT_NUM' && item.attrType !== 'DATE_PICKER' && item.attrType !== 'SEL_OPTION' && item.attrType !== 'SEL_OPTS' && item.attrType !== 'DATE_PIC_OPTS') {
|
||||
rule.push({type: 'string', max: item.attrLen, message: `${item.attrName}不能超过${item.attrLen}个字符`, trigger: 'blur'})
|
||||
if (item.attrField === 'DTBJH' || item.attrField === 'YYBJ') {
|
||||
rule.push({type: 'string', max: 100, message: `${item.attrName}不能超过100个字符`, trigger: 'blur'})
|
||||
} else {
|
||||
rule.push({type: 'string', max: item.attrLen, message: `${item.attrName}不能超过${item.attrLen}个字符`, trigger: 'blur'})
|
||||
}
|
||||
}
|
||||
if (item.attrField === 'DTBJH' || item.attrField === 'YYBJ' || item.attrField === 'BYYBJ' || item.attrField === 'CBBH') {
|
||||
rule.push({type: 'string', validator: this.verify.validateStandardItem, trigger: 'blur'})
|
||||
rule.push({ validator: this.verify.validateStandardItem, trigger: 'blur'})
|
||||
}
|
||||
if (rule.length > 0) {
|
||||
rules[item.attrField] = rule
|
||||
|
||||
@@ -499,6 +499,7 @@
|
||||
:config="field"
|
||||
v-model="sarStandardsInfoEO[field.attrField]"
|
||||
:disabled="formdisableflag"
|
||||
:class="field.attrField === 'BYYBJ' ? 'classDisplay' : ''"
|
||||
:data-source-from="field.attrField === 'CBBH' ? 'ALL' : 'INLAND'"
|
||||
:data-source="field.attrField === 'CBBH'"
|
||||
></custom-input-for-standards>
|
||||
|
||||
@@ -30,10 +30,11 @@
|
||||
</div>
|
||||
</el-card>
|
||||
<div class="action-bar">
|
||||
<el-button plain class="common-button-primary" size="mini" @click="addList">调取</el-button>
|
||||
<el-button plain class="common-button-primary" size="mini" @click="deleteList">批量删除</el-button>
|
||||
<el-button plain class="common-button-primary" v-btn-permission="'2c4366e07a5b707bf3d3f4985fb82662'" size="mini" @click="addList">调取</el-button>
|
||||
<el-button plain class="common-button-primary" v-btn-permission="'63d9a5a8f7b6a4095511394a60013eac'" size="mini" @click="deleteList">批量删除</el-button>
|
||||
<el-button class="common-button-default export-button"
|
||||
size="mini" @click="exportStandard"
|
||||
v-btn-permission="'ec6b73db0edd6a379d3ea90af3849861'"
|
||||
title="不勾选时默认导出所有筛选项;勾选时仅导出勾选项"
|
||||
icon="export"
|
||||
>导出</el-button>
|
||||
|
||||
+12
-2
@@ -107,6 +107,13 @@
|
||||
:maxlength="100"
|
||||
clearable></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="项目编号" class="search-item search-item-last">
|
||||
<el-input
|
||||
v-model="sarProStateEO.standId"
|
||||
placeholder="根据项目编号查找"
|
||||
:maxlength="100"
|
||||
clearable></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item class="search-item btn-box">
|
||||
<el-button
|
||||
type="primary"
|
||||
@@ -290,7 +297,8 @@ export default {
|
||||
page: 1,
|
||||
pageSize: this.$store.getters.userInfo.configContent,
|
||||
sarProStateEO: {
|
||||
productName: ''
|
||||
productName: '',
|
||||
standId: ''
|
||||
},
|
||||
sarProStateTotal: 0,
|
||||
sarProStateTotalPage: 1,
|
||||
@@ -338,7 +346,7 @@ export default {
|
||||
}, // 查看项目符合性
|
||||
querySarProStateZero () {
|
||||
var form = this.sarProStateEO
|
||||
form.standId = this.standId
|
||||
// form.standId = this.standId
|
||||
form.current = this.sarProStateTotalPage
|
||||
form.size = this.sarProStatePageSize
|
||||
this.$http.get('sarStandardComplianceAssessResult/product', form, {
|
||||
@@ -354,11 +362,13 @@ export default {
|
||||
}, // 查询项目数据
|
||||
clearSearchProState () {
|
||||
this.sarProStateEO.productName = ''
|
||||
this.sarProStateEO.standId = ''
|
||||
this.sarProStateTotalPage = 1
|
||||
this.querySarProStateZero()
|
||||
}, // 清空条件查询
|
||||
clearSearchPro () {
|
||||
this.sarProStateEO.productName = ''
|
||||
this.sarProStateEO.standId = ''
|
||||
this.showSarProStateModal = false
|
||||
this.standId = ''
|
||||
}, // 关闭查看事件
|
||||
|
||||
Reference in New Issue
Block a user