FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

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