Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
super_liu
@@ -269,10 +269,16 @@
|
||||
<!-- <p class="half" v-if="saveStandType === 'INLAND_STAND'"><label style=" margin-right: 150px;">标准性质</label><span>{{-->
|
||||
<!-- standMap[sarStandardsInfoEO.standNature] || '-'-->
|
||||
<!-- }}</span></p>-->
|
||||
<p class="half" v-if="saveStandType === 'INLAND_STAND'"><label
|
||||
<!--<p class="half" v-if="saveStandType === 'INLAND_STAND'"><label
|
||||
style=" margin-right: 150px;">标准体系</label><span>{{
|
||||
sarStandardsInfoEO.standSystem || '-'
|
||||
}}</span></p>
|
||||
}}</span>
|
||||
</p>-->
|
||||
<p class="half"><label
|
||||
style=" margin-right: 150px;">标准体系</label><span>{{
|
||||
sarStandardsInfoEO.standSystem || '-'
|
||||
}}</span>
|
||||
</p>
|
||||
<p class="half">
|
||||
<label style=" margin-right: 84px;">是否纳入认证清单</label><span>{{
|
||||
sarStandardsInfoEO.isRelateAccess ? (sarStandardsInfoEO.isRelateAccess === '1' ? '是' : '否') : '-'
|
||||
|
||||
@@ -152,39 +152,40 @@
|
||||
<a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="itemsNum" label="条款编号" width="200" align="center">
|
||||
<el-table-column prop="itemsNum" label="条款编号" width="120" align="center">
|
||||
<template slot-scope="scope">
|
||||
<a @click="handlePreview(scope.row)">{{ scope.row.itemsNum }}</a>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="itemsName" width="320" label="条款名称" align="center">
|
||||
<el-table-column prop="itemsName" width="320" label="条款名称" align="center" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
<a @click="handlePreview(scope.row)">{{ scope.row.itemsName }}</a>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="termsConditions" label="条款内容" width="400" align="center" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column prop="issueTime" label="发布日期" width="120" align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.issueTime ? scope.row.issueTime.substring(0, 10) : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="ssrq" label="实施日期" width="120" align="center">
|
||||
<el-table-column prop="ssrq" label="实施日期" width="200" align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.ssrq }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="xcxssrq" label="新车型实施日期" width="150" align="center">
|
||||
<el-table-column prop="xcxssrq" label="新车型实施日期" width="200" align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.xcxssrq }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="zccssrq" label="在产车实施日期" width="150" align="center">
|
||||
<el-table-column prop="zccssrq" label="在产车实施日期" width="200" align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.zccssrq }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="applyType" label="适用车型" align="center">
|
||||
<el-table-column prop="applyType" label="适用车型" width="150" align="center">
|
||||
</el-table-column>
|
||||
<!-- <el-table-column label="操作" width="100" align="center" v-if="isShowBtn" fixed="right">
|
||||
<el-table-column label="操作" width="100" align="center" v-if="isShowBtn" fixed="right">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
@@ -192,7 +193,7 @@
|
||||
@click="cancelWarning(scope.$index, scope.row)">取消预警
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>-->
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<pagination
|
||||
style="position: static;"
|
||||
@@ -549,12 +550,14 @@ export default {
|
||||
this.$http.get('sys/EarlyWarning/ChangePermissions', {
|
||||
id: row.id,
|
||||
}, {}, res => {
|
||||
if (res.ok === true) {
|
||||
this.pageConfig.page = 1
|
||||
this.pageConfig.newPolicyPage = 1
|
||||
this.pageConfig.oldPolicyPage = 1
|
||||
this.searchBtnClick()
|
||||
this.getEarlyDate()
|
||||
}
|
||||
}
|
||||
)
|
||||
}).catch(() => {
|
||||
this.$message.warning('取消事件')
|
||||
|
||||
@@ -128,7 +128,8 @@
|
||||
</el-radio-group>
|
||||
<el-button @click="form.isRelateAccess = ''" v-show="form.isRelateAccess !== null>0" size="mini" type="primary" circle icon="el-icon-close" style="margin-left: 10px;margin-bottom: 3px"></el-button>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="verifySarStandard && form.standInData === '0' " label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
|
||||
<!--v-if="verifySarStandard && form.standInData === '0' " -->
|
||||
<el-form-item label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
|
||||
<el-input v-model="form.standSystem" clearable placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
|
||||
<tree-select-new
|
||||
:key="key"
|
||||
|
||||
@@ -132,7 +132,7 @@
|
||||
<el-radio label="2">否</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
|
||||
<el-form-item label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
|
||||
<el-input v-model="form.standSystem" disabled></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
|
||||
|
||||
@@ -131,7 +131,7 @@
|
||||
<el-radio label="2">否</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
|
||||
<el-form-item label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
|
||||
<el-input v-model="form.standSystem" disabled></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
|
||||
|
||||
@@ -127,7 +127,7 @@
|
||||
</el-radio-group>
|
||||
<el-button @click="form.isRelateAccess = ''" v-show="form.isRelateAccess !== null>0" size="mini" type="primary" circle icon="el-icon-close" style="margin-left: 10px;margin-bottom: 3px"></el-button>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
|
||||
<el-form-item label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
|
||||
<el-input v-model="form.standSystem" placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
|
||||
<tree-select-new
|
||||
:key="key"
|
||||
|
||||
@@ -68,7 +68,7 @@
|
||||
<div class="search-area">
|
||||
<div class="left">
|
||||
<el-form :modal="standCommonlySearch" inline class="label-input-form" @keyup.enter.native="searchBtnClick(standCommonlySearch)">
|
||||
<!-- <el-form-item label="标准类别" class="search-item">
|
||||
<!-- <el-form-item label="标准类别" class="search-item">
|
||||
<el-select v-model="standCommonlySearch.standSort" filterable>
|
||||
<el-option
|
||||
v-for="item in standSortOptions"
|
||||
@@ -111,7 +111,7 @@
|
||||
@click="clearAllSearch('standCommonlySearch')">清空
|
||||
</el-button>
|
||||
<el-button type="primary" class="common-button-primary" size="mini" v-btn-permission="'cce80ba303858ee9943f17e93946c2ff'" @click="selectMoreBtn">
|
||||
<i class="iconfont" ></i>高级查询
|
||||
<i class="iconfont"></i>高级查询
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
@@ -182,7 +182,7 @@
|
||||
fontWeight: 'bold', height: '48px'}"
|
||||
@selection-change="standSelectChange"
|
||||
@sort-change="sortChange">
|
||||
<!-- v-if="isPermission('4d01342db0f56f01bfceaee7b46904f4,8871ed1be74cf65851659514880bb50a,29bf24bbd156c06f136cc89b1c7b2bb0')>0"-->
|
||||
<!-- v-if="isPermission('4d01342db0f56f01bfceaee7b46904f4,8871ed1be74cf65851659514880bb50a,29bf24bbd156c06f136cc89b1c7b2bb0')>0"-->
|
||||
<el-table-column
|
||||
type="selection"
|
||||
min-width="5%"
|
||||
@@ -395,7 +395,7 @@
|
||||
<el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="exportTestItem">提交</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
<!-- <table-tools-bar v-model="isAdvancedSearch" @search="getDomesticStandardTableBtn(sarStandardsSearch)"
|
||||
<!-- <table-tools-bar v-model="isAdvancedSearch" @search="getDomesticStandardTableBtn(sarStandardsSearch)"
|
||||
@reset="clearAllSearch('sarStandardsSearch')">
|
||||
<div slot="content">
|
||||
<el-form :model="sarStandardsSearch" :inline="true" class="label-input-form table-lattice" style="display: flex;flex-wrap: wrap">
|
||||
@@ -622,7 +622,7 @@
|
||||
v-model="sarStandardsSearch['CLLX']"
|
||||
></custom-select-array>
|
||||
</template>
|
||||
<!-- <el-form-item :label="$t('m.applicableModels')" class="add-form-item form-item-disabled">
|
||||
<!-- <el-form-item :label="$t('m.applicableModels')" class="add-form-item form-item-disabled">
|
||||
<el-select v-model="sarStandardsSearch.applyArctic"
|
||||
:placeholder="$t('m.searchAccordingToThApplicableModel')" clearable
|
||||
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
|
||||
@@ -639,7 +639,7 @@
|
||||
v-model="advanceSearchMapping['SYCPX']"
|
||||
></custom-select-array>
|
||||
</template>
|
||||
<!-- <el-form-item :label="$t('m.applicableProductLine')" class="add-form-item form-item-disabled">
|
||||
<!-- <el-form-item :label="$t('m.applicableProductLine')" class="add-form-item form-item-disabled">
|
||||
<el-select v-model="advanceSearchMapping.SYCPX" :placeholder="$t('m.searchByApplicableProductLine')"
|
||||
clearable
|
||||
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
|
||||
@@ -670,7 +670,7 @@
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</template>
|
||||
<!-- <template>
|
||||
<!-- <template>
|
||||
<custom-select-array
|
||||
:key="zrgcsOptions.options"
|
||||
:config="zrgcsOptions"
|
||||
@@ -713,7 +713,7 @@
|
||||
v-model="advanceSearchMapping['NYLX']"
|
||||
></custom-select-array>
|
||||
</template>
|
||||
<!-- <el-form-item label="能源类型" class="add-form-item form-item-disabled">
|
||||
<!-- <el-form-item label="能源类型" class="add-form-item form-item-disabled">
|
||||
<el-select v-model="advanceSearchMapping.NYLX" placeholder="请选择能源类型" clearable
|
||||
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
|
||||
<el-option v-for="opt in nylxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
|
||||
@@ -729,7 +729,7 @@
|
||||
v-model="advanceSearchMapping['SYRZ']"
|
||||
></custom-select-array>
|
||||
</template>
|
||||
<!-- <el-form-item label="适用认证" class="add-form-item form-item-disabled">
|
||||
<!-- <el-form-item label="适用认证" class="add-form-item form-item-disabled">
|
||||
<el-select v-model="advanceSearchMapping.SYRZ" placeholder="根据适用认证查找" clearable
|
||||
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
|
||||
<el-option v-for="opt in syrzOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
|
||||
@@ -754,7 +754,7 @@
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</template>
|
||||
<!-- <template>
|
||||
<!-- <template>
|
||||
<custom-select-array
|
||||
:key="zrbmOptions.options"
|
||||
:config="zrbmOptions"
|
||||
@@ -811,7 +811,7 @@
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<!-- 被代替标准号-->
|
||||
<!-- <el-form-item label="被代替标准号" class="add-form-item form-item-disabled">
|
||||
<!-- <el-form-item label="被代替标准号" class="add-form-item form-item-disabled">
|
||||
<el-input v-model="sarStandardsSearch.replacedStandNum" clearable placeholder="根据被代替标准号查找"
|
||||
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
|
||||
</el-form-item>-->
|
||||
@@ -858,7 +858,7 @@
|
||||
:rules="sarStandardsInfoRules"
|
||||
class="label-input-form"
|
||||
>
|
||||
<!-- <el-form-item
|
||||
<!-- <el-form-item
|
||||
prop="isRelateAccess"
|
||||
label-width="150px"
|
||||
class="add-form-item"
|
||||
@@ -945,22 +945,22 @@
|
||||
placeholder="请输入标准英文名称"
|
||||
clearable></el-input>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item prop="standNature" label-width="150px" class="add-form-item">-->
|
||||
<!-- <template slot="label">标准性质</template>-->
|
||||
<!-- <el-select v-model="sarStandardsInfoEO.standNature"-->
|
||||
<!-- placeholder="请选择标准性质"-->
|
||||
<!-- clearable>-->
|
||||
<!-- <el-option-->
|
||||
<!-- v-for="item in standNatureOptions"-->
|
||||
<!-- placeholder="请选择"-->
|
||||
<!-- :key="item.value"-->
|
||||
<!-- :value="item.value"-->
|
||||
<!-- :label="item.label"-->
|
||||
<!-- >-->
|
||||
<!-- {{ item.label }}-->
|
||||
<!-- </el-option>-->
|
||||
<!-- </el-select>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item prop="standNature" label-width="150px" class="add-form-item">-->
|
||||
<!-- <template slot="label">标准性质</template>-->
|
||||
<!-- <el-select v-model="sarStandardsInfoEO.standNature"-->
|
||||
<!-- placeholder="请选择标准性质"-->
|
||||
<!-- clearable>-->
|
||||
<!-- <el-option-->
|
||||
<!-- v-for="item in standNatureOptions"-->
|
||||
<!-- placeholder="请选择"-->
|
||||
<!-- :key="item.value"-->
|
||||
<!-- :value="item.value"-->
|
||||
<!-- :label="item.label"-->
|
||||
<!-- >-->
|
||||
<!-- {{ item.label }}-->
|
||||
<!-- </el-option>-->
|
||||
<!-- </el-select>-->
|
||||
<!-- </el-form-item>-->
|
||||
<el-form-item title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
|
||||
prop="standState" label-width="150px" class="add-form-item">
|
||||
<template slot="label">文本状态</template>
|
||||
@@ -997,17 +997,15 @@
|
||||
<el-option value="2" label="否" key="2"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item
|
||||
<el-form-item
|
||||
prop="standSystem"
|
||||
label-width="150px"
|
||||
class="add-form-item"
|
||||
>
|
||||
<template slot="label">标准体系</template>
|
||||
<tree-select
|
||||
:data="standSystemOptions"
|
||||
:defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
|
||||
:nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select>
|
||||
</el-form-item>-->
|
||||
<el-input v-model="sarStandardsInfoEO.standSystem" placeholder="选择标准体系"
|
||||
@click.native="choiceZRR1('standSystem', '标准体系', sarStandardsInfoEO.standSystem)"></el-input>
|
||||
</el-form-item>
|
||||
</template>
|
||||
<template v-for="field in displayLocation.child">
|
||||
<template v-if="field.attrField === 'EOPSSRQ'">
|
||||
@@ -1137,7 +1135,7 @@
|
||||
:disabled="formdisableflag"
|
||||
></custom-date-pick>
|
||||
</template>
|
||||
<!-- 发布稿的组件 -->
|
||||
<!-- 发布稿的组件 -->
|
||||
<template v-else-if="field.attrType === 'FILE' && field.attrField !== 'FBGBJBD'">
|
||||
<custom-file
|
||||
|
||||
@@ -1190,7 +1188,7 @@
|
||||
<template slot="label">责任工程师</template>
|
||||
<el-input v-model="sarStandardsInfoEO['ZRGCS']" placeholder="选择责任工程师" @click.native="choiceZRRS('zrgcs', '选择责任工程师', sarStandardsInfoEO['ZRGCS'])">
|
||||
</el-input>
|
||||
<!-- <el-input
|
||||
<!-- <el-input
|
||||
:key="field.attrField"
|
||||
:config="field"
|
||||
clearable
|
||||
@@ -1717,6 +1715,16 @@
|
||||
:nodeList="nodeListZRBM"
|
||||
@checkedRole="drawerCheckZRBM"
|
||||
/>
|
||||
|
||||
<tree-select-new
|
||||
:multiple=false
|
||||
:lazy=false
|
||||
:modalShowFlag="modalShowFlag1"
|
||||
:drawerTitle="drawerTitle"
|
||||
width="500"
|
||||
:data="standSystemOptions"
|
||||
:defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
|
||||
:nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -1909,7 +1917,7 @@ export default {
|
||||
validFlag: '0',
|
||||
standSort: '',
|
||||
standNumber: '',
|
||||
standName:'',
|
||||
standName: '',
|
||||
menuId: '',
|
||||
sarStandardsSearch: ''
|
||||
},
|
||||
@@ -1922,21 +1930,21 @@ export default {
|
||||
standSystemOptions: [], // 标准体系下拉框
|
||||
sycpxOptions: {
|
||||
attrName: '适用产品线',
|
||||
options:[]
|
||||
options: []
|
||||
}, // 适用产品线下拉框
|
||||
zrbmOptions: {
|
||||
attrName: '责任部门',
|
||||
options:[]
|
||||
options: []
|
||||
}, // 责任部门下拉框
|
||||
zrgcsOptions: {
|
||||
attrName: '责任工程师',
|
||||
options:[]
|
||||
options: []
|
||||
}, // 责任工程师下拉框
|
||||
txlbOptions: [], // 体系类别下拉框
|
||||
standSortConfigOptions: [], // 标准类别下拉框
|
||||
applyArcticOptions: {
|
||||
attrName: '适用车型',
|
||||
options:[]
|
||||
options: []
|
||||
}, // 适用车型下拉框
|
||||
standStateOptions: [], // 标准状态下拉框
|
||||
standNatureOptions: [], // 标准性质下拉框
|
||||
@@ -1944,7 +1952,7 @@ export default {
|
||||
emergyKindOptions: [], // 能源种类下拉框
|
||||
applyAuthOptions: {
|
||||
attrName: '适用认证',
|
||||
options:[]
|
||||
options: []
|
||||
}, // 适用认证下拉框
|
||||
categoryOptions: [], // 所属类别下拉框
|
||||
categoryConfigOptions: [], // 所属类别下拉框
|
||||
@@ -1954,11 +1962,11 @@ export default {
|
||||
cysdOptions: [], //我司参与深度下拉框
|
||||
nylxOptions: {
|
||||
attrName: '能源类型',
|
||||
options:[]
|
||||
options: []
|
||||
},//能源类型下拉框
|
||||
syrzOptions: {
|
||||
attrName: '适用认证',
|
||||
options:[]
|
||||
options: []
|
||||
},//适用认证下拉框
|
||||
gkglbmOptions: [],//归口管理部门下拉框
|
||||
// 树形结构
|
||||
@@ -2453,7 +2461,7 @@ export default {
|
||||
orgData: [],
|
||||
delLoading: false,
|
||||
standState: '',
|
||||
filterText: ''
|
||||
filterText: '',
|
||||
}
|
||||
},
|
||||
props: {},
|
||||
@@ -2478,30 +2486,30 @@ export default {
|
||||
methods: {
|
||||
// 限制导出框输入的字符
|
||||
btKeyUp(e) {
|
||||
e.target.value = e.target.value.replace(/[`~!@#$%^&*()\+=<>?"{}|,\/;'\\[\]·~！@#￥%……&*（）——\+={}|《》？：“”【】、；‘’，。、. <>]/g,"");
|
||||
e.target.value = e.target.value.replace(/[`~!@#$%^&*()\+=<>?"{}|,\/;'\\[\]·~！@#￥%……&*（）——\+={}|《》？：“”【】、；‘’，。、. <>]/g, "");
|
||||
},
|
||||
// 左右拖动事件
|
||||
dragControllerLR: function() {
|
||||
dragControllerLR: function () {
|
||||
var resize = document.getElementById("resize");
|
||||
var left = document.getElementById("left");
|
||||
var right = document.getElementById("right");
|
||||
var box = document.getElementById("foreignStandardsAndRegulations");
|
||||
resize.onmousedown = function(e){
|
||||
resize.onmousedown = function (e) {
|
||||
var startX = e.clientX;
|
||||
resize.left = resize.offsetLeft;
|
||||
document.onmousemove = function(e){
|
||||
document.onmousemove = function (e) {
|
||||
var endX = e.clientX;
|
||||
|
||||
var moveLen = resize.left + (endX - startX);
|
||||
var maxT = box.clientWidth - resize.offsetWidth;
|
||||
if(moveLen<150) moveLen = 150;
|
||||
if(moveLen>maxT-150) moveLen = maxT-150;
|
||||
if (moveLen < 150) moveLen = 150;
|
||||
if (moveLen > maxT - 150) moveLen = maxT - 150;
|
||||
|
||||
resize.style.left = moveLen;
|
||||
left.style.width = moveLen + "px";
|
||||
right.style.width = (box.clientWidth - moveLen - 5) + "px";
|
||||
}
|
||||
document.onmouseup = function(evt){
|
||||
document.onmouseup = function (evt) {
|
||||
document.onmousemove = null;
|
||||
document.onmouseup = null;
|
||||
resize.releaseCapture && resize.releaseCapture();
|
||||
@@ -2510,15 +2518,15 @@ export default {
|
||||
return false;
|
||||
}
|
||||
},
|
||||
isPermission (value) {
|
||||
isPermission(value) {
|
||||
let hasCount = 0
|
||||
let set =new Set( value.split(","))
|
||||
let set = new Set(value.split(","))
|
||||
let menuList = store.getters.getMenuList
|
||||
if (menuList === '') {
|
||||
return hasCount
|
||||
} else {
|
||||
menuList.map((menu) => {
|
||||
if ( set.has(menu.id)|| value === undefined || value === '') {
|
||||
if (set.has(menu.id) || value === undefined || value === '') {
|
||||
hasCount++
|
||||
}
|
||||
})
|
||||
@@ -2606,17 +2614,17 @@ export default {
|
||||
this.$set(this.textStatusMap, item.value, item.label)
|
||||
})
|
||||
},
|
||||
choiceZRRS (type, title, id) {
|
||||
choiceZRRS(type, title, id) {
|
||||
this.nodeList = []
|
||||
this.nodeList.push(id)
|
||||
this.userType = type
|
||||
this.drawerTitle = title
|
||||
this.modalShowRoleFlag = true
|
||||
},
|
||||
checkedRole2 (data) {
|
||||
checkedRole2(data) {
|
||||
let idList = ''
|
||||
let nameList = ''
|
||||
data.forEach( item => {
|
||||
data.forEach(item => {
|
||||
if (nameList.length > 0) {
|
||||
nameList += ','
|
||||
idList += ','
|
||||
@@ -2624,11 +2632,11 @@ export default {
|
||||
idList += item.id
|
||||
nameList += item.name
|
||||
})
|
||||
if (this.drawerTitle === '选择我司署名人'){
|
||||
if (this.drawerTitle === '选择我司署名人') {
|
||||
this.sarStandardsInfoEO['WSSMR'] = nameList
|
||||
}else if (this.drawerTitle === '选择责任工程师'){
|
||||
} else if (this.drawerTitle === '选择责任工程师') {
|
||||
this.sarStandardsInfoEO['ZRGCS'] = nameList
|
||||
}else if (this.drawerTitle === '查询责任工程师'){
|
||||
} else if (this.drawerTitle === '查询责任工程师') {
|
||||
this.advanceSearchMapping['ZRGCS'] = nameList
|
||||
}
|
||||
|
||||
@@ -2649,8 +2657,18 @@ export default {
|
||||
},
|
||||
popoverHide(checkedIds, checkedData) {
|
||||
if (checkedData) {
|
||||
this.sarStandardsInfoEO.standSystem = checkedData.id
|
||||
if (checkedData.length > 0) {
|
||||
this.sarStandardsInfoEO.standSystem = checkedData.map(item => item.menuName).join(",")
|
||||
} else {
|
||||
this.sarStandardsInfoEO.standSystem = checkedData.menuName
|
||||
}
|
||||
}
|
||||
this.modalShowFlag1 = false
|
||||
this.$forceUpdate()
|
||||
},
|
||||
|
||||
popoverHideCancel() {
|
||||
this.modalShowFlag1 = false
|
||||
},
|
||||
closeModal() {
|
||||
this.productModal = false
|
||||
@@ -3060,33 +3078,33 @@ export default {
|
||||
this.sarStandardsSearch.standSort = ''
|
||||
this.sarStandardsSearch.standNumber = ''
|
||||
this.sarStandardsSearch.page = 1
|
||||
this.advanceSearchMapping.txlbOption= '' //标准体系
|
||||
this.advanceSearchMapping.GXHBQ= '' //标签
|
||||
this.advanceSearchMapping.CYSD= '' //我司参与深度
|
||||
this.advanceSearchMapping.GKDW= '' //归口管理部门
|
||||
this.advanceSearchMapping.SSRQ= ''//实施日期
|
||||
this.advanceSearchMapping.XCXSSRQ= ''//新车型实施日期
|
||||
this.advanceSearchMapping.ZCCSSRQ= ''//在产车实施日期
|
||||
this.advanceSearchMapping.QCDW= ''//起草单位
|
||||
this.advanceSearchMapping.NYLX= ''//能源类型
|
||||
this.advanceSearchMapping.SYRZ= ''//适用认证
|
||||
this.advanceSearchMapping.ZRGCS= ''//责任工程师
|
||||
this.advanceSearchMapping.CBBH= ''//采标编号
|
||||
this.advanceSearchMapping.CBCD= ''//采标程度
|
||||
this.advanceSearchMapping.YYBJ= ''//引用标准
|
||||
this.advanceSearchMapping.BYYBJ= ''//被引用标准
|
||||
this.advanceSearchMapping.TXLB= ''//体系类别
|
||||
this.advanceSearchMapping.CYCVPPSBM= '',
|
||||
this.advanceSearchMapping.CYCVPPSCN= ''
|
||||
this.advanceSearchMapping.KCCVPPSBM= ''
|
||||
this.advanceSearchMapping.KCCVPPSCN= ''
|
||||
this.advanceSearchMapping.DYBXH= ''
|
||||
this.advanceSearchMapping.DYMC= ''
|
||||
this.advanceSearchMapping.CYSD= ''
|
||||
this.advanceSearchMapping.CLLX= ''
|
||||
this.advanceSearchMapping.SYCPX= ''
|
||||
this.advanceSearchMapping.ZRBM= ''
|
||||
this.advanceSearchMapping.WSSMR= ''
|
||||
this.advanceSearchMapping.txlbOption = '' //标准体系
|
||||
this.advanceSearchMapping.GXHBQ = '' //标签
|
||||
this.advanceSearchMapping.CYSD = '' //我司参与深度
|
||||
this.advanceSearchMapping.GKDW = '' //归口管理部门
|
||||
this.advanceSearchMapping.SSRQ = ''//实施日期
|
||||
this.advanceSearchMapping.XCXSSRQ = ''//新车型实施日期
|
||||
this.advanceSearchMapping.ZCCSSRQ = ''//在产车实施日期
|
||||
this.advanceSearchMapping.QCDW = ''//起草单位
|
||||
this.advanceSearchMapping.NYLX = ''//能源类型
|
||||
this.advanceSearchMapping.SYRZ = ''//适用认证
|
||||
this.advanceSearchMapping.ZRGCS = ''//责任工程师
|
||||
this.advanceSearchMapping.CBBH = ''//采标编号
|
||||
this.advanceSearchMapping.CBCD = ''//采标程度
|
||||
this.advanceSearchMapping.YYBJ = ''//引用标准
|
||||
this.advanceSearchMapping.BYYBJ = ''//被引用标准
|
||||
this.advanceSearchMapping.TXLB = ''//体系类别
|
||||
this.advanceSearchMapping.CYCVPPSBM = '',
|
||||
this.advanceSearchMapping.CYCVPPSCN = ''
|
||||
this.advanceSearchMapping.KCCVPPSBM = ''
|
||||
this.advanceSearchMapping.KCCVPPSCN = ''
|
||||
this.advanceSearchMapping.DYBXH = ''
|
||||
this.advanceSearchMapping.DYMC = ''
|
||||
this.advanceSearchMapping.CYSD = ''
|
||||
this.advanceSearchMapping.CLLX = ''
|
||||
this.advanceSearchMapping.SYCPX = ''
|
||||
this.advanceSearchMapping.ZRBM = ''
|
||||
this.advanceSearchMapping.WSSMR = ''
|
||||
this.isAdvancedSearch = false
|
||||
} else if (flag === 2) {
|
||||
// 标准条目搜索
|
||||
@@ -3799,21 +3817,21 @@ export default {
|
||||
const advanceSearchVOList = [];
|
||||
for (let key in this.advanceSearchMapping) {
|
||||
const value = this.advanceSearchMapping[key];
|
||||
if (value !== null && value !== '' && (key === 'NYLX' || key === 'SYRZ' || key === 'SYCPX' || (item.CLLX&&item.CLLX.length>0)) ){
|
||||
if (value !== null && value !== '' && (key === 'NYLX' || key === 'SYRZ' || key === 'SYCPX' || (item.CLLX && item.CLLX.length > 0))) {
|
||||
advanceSearchVOList.push({
|
||||
connect: "and",
|
||||
field: key || '',
|
||||
type: 'regexp',
|
||||
value: value.join(',')
|
||||
});
|
||||
}else if (value !== null && value !== '' && (key === 'SSRQ' || key === 'XCXSSRQ' || key === 'ZCCSSRQ' )){
|
||||
} else if (value !== null && value !== '' && (key === 'SSRQ' || key === 'XCXSSRQ' || key === 'ZCCSSRQ')) {
|
||||
advanceSearchVOList.push({
|
||||
connect: "and",
|
||||
field: key || '',
|
||||
type: 'between',
|
||||
value: value.join(',')
|
||||
});
|
||||
}else if (value !== null && value !== ''){
|
||||
} else if (value !== null && value !== '') {
|
||||
advanceSearchVOList.push({
|
||||
connect: "and",
|
||||
field: key || '',
|
||||
@@ -3825,8 +3843,8 @@ export default {
|
||||
}
|
||||
formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
|
||||
this.SarExportSearchEo = formData
|
||||
formData.startIssueTime = formData.issueTime?formData.issueTime[0]:null
|
||||
formData.endIssueTime = formData.issueTime?formData.issueTime[1]:null
|
||||
formData.startIssueTime = formData.issueTime ? formData.issueTime[0] : null
|
||||
formData.endIssueTime = formData.issueTime ? formData.issueTime[1] : null
|
||||
formData.issueTime = null
|
||||
|
||||
this.SarExportSearchEo = formData
|
||||
@@ -4378,16 +4396,16 @@ export default {
|
||||
this.configStandFlag = false
|
||||
this.selectConfigStand = []
|
||||
},
|
||||
OCRAdd (type) {
|
||||
OCRAdd(type) {
|
||||
let text = ''
|
||||
this.OCRType = type
|
||||
if (type === '0') {
|
||||
text = 'OCR识别'
|
||||
this.OCRTitle = '选择OCR识别文件'
|
||||
} else if(type === '1') {
|
||||
} else if (type === '1') {
|
||||
text = '拆分'
|
||||
this.OCRTitle = '选择拆分文件'
|
||||
}else if(type === '2') {
|
||||
} else if (type === '2') {
|
||||
text = '编辑'
|
||||
this.OCRTitle = '选择编辑文件'
|
||||
}
|
||||
@@ -4401,7 +4419,7 @@ export default {
|
||||
this.$http.get('lawss/sarStandFile/queryFileInfoNew', {
|
||||
type: type,
|
||||
standId: this.selectedList[0]
|
||||
},{
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
this.OCRLoading = false
|
||||
@@ -4414,7 +4432,7 @@ export default {
|
||||
}
|
||||
}
|
||||
})
|
||||
} else if (this.ocrList.length === 1 && type === '2'){
|
||||
} else if (this.ocrList.length === 1 && type === '2') {
|
||||
this.selectStandardPro(this.ocrList[0], 'edit')
|
||||
}
|
||||
},
|
||||
@@ -5046,13 +5064,18 @@ export default {
|
||||
nameList += item.name
|
||||
// }
|
||||
})
|
||||
if (this.drawerTitle === '责任部门'){
|
||||
if (this.drawerTitle === '责任部门') {
|
||||
this.sarStandardsInfoEO.ZRBMId = idList;
|
||||
this.sarStandardsInfoEO['ZRBM'] = nameList;
|
||||
}else if (this.drawerTitle === '查询责任部门'){
|
||||
} else if (this.drawerTitle === '查询责任部门') {
|
||||
this.advanceSearchMapping['ZRBM'] = nameList
|
||||
}
|
||||
},
|
||||
|
||||
choiceZRR1(type, title, id) {
|
||||
this.drawerTitle = title
|
||||
this.modalShowFlag1 = true
|
||||
},
|
||||
},
|
||||
computed: {
|
||||
// 是否拥有拖拽权限
|
||||
@@ -5151,37 +5174,41 @@ export default {
|
||||
</script>
|
||||
|
||||
<style lang="less" scoped>
|
||||
/deep/ .el-table--scrollable-x .el-table__body-wrapper {
|
||||
/deep/ .el-table--scrollable-x .el-table__body-wrapper {
|
||||
overflow-x: scroll;
|
||||
}
|
||||
#left{
|
||||
width:calc(30% - 5px);
|
||||
height:100%;
|
||||
float:left;
|
||||
}
|
||||
}
|
||||
|
||||
#resize{
|
||||
width:5px;
|
||||
height:100%;
|
||||
#left {
|
||||
width: calc(30% - 5px);
|
||||
height: 100%;
|
||||
float: left;
|
||||
}
|
||||
|
||||
#resize {
|
||||
width: 5px;
|
||||
height: 100%;
|
||||
cursor: w-resize;
|
||||
float:left;
|
||||
}
|
||||
float: left;
|
||||
}
|
||||
|
||||
#right{
|
||||
float:right;
|
||||
width:70%;
|
||||
height:100%;
|
||||
}
|
||||
/deep/.contentTitle{
|
||||
#right {
|
||||
float: right;
|
||||
width: 70%;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
/deep/ .contentTitle {
|
||||
width: 100%;
|
||||
}
|
||||
/deep/.el-drawer__container {
|
||||
}
|
||||
|
||||
/deep/ .el-drawer__container {
|
||||
.prc-content-border {
|
||||
/*border: none;*/
|
||||
width: 100%;
|
||||
padding: 0 20px 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/deep/ .icon-tree {
|
||||
margin: 0 5px 0 10px;
|
||||
position: relative;
|
||||
@@ -5283,9 +5310,10 @@ export default {
|
||||
|
||||
#foreignStandardsAndRegulations {
|
||||
|
||||
/deep/ .label-input-form .add-form-item .el-form-item__content .el-input .el-input__inner{
|
||||
/deep/ .label-input-form .add-form-item .el-form-item__content .el-input .el-input__inner {
|
||||
width: 280px;
|
||||
}
|
||||
|
||||
//background: #fff;
|
||||
display: flex;
|
||||
height: 100%;
|
||||
@@ -5340,6 +5368,7 @@ export default {
|
||||
overflow: hidden;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
.collection-btn {
|
||||
padding: 0;
|
||||
border: none;
|
||||
|
||||
Reference in New Issue
Block a user