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
2021-07-26 11:31:35 +08:00
parent 735be50bcb b25dafdd5e
commit 5f7698eb9d
2 changed files with 260 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherStandardDetails/index.vue
+1 -1
View File
@@ -40,7 +40,7 @@
<div class="basic-information-content"> <div class="basic-information-content">
<!-- <p><label style=" margin-right: 150px;">标准类别</label><span>{{ sarStandardsInfoEO.standSort || '-' }}</span></p>--> <!-- <p><label style=" margin-right: 150px;">标准类别</label><span>{{ sarStandardsInfoEO.standSort || '-' }}</span></p>-->
<p style="color: #C42626;"> <p style="color: #C42626;">
<label style=" margin-right: 150px;">标准编号</label> <label style=" margin-right: 150px;">标准号</label>
<span v-if="sarStandardsInfoEO.standYear">{{ sarStandardsInfoEO.standSortShow + ' ' + sarStandardsInfoEO.standNumber + '-' + sarStandardsInfoEO.standYear }}</span> <span v-if="sarStandardsInfoEO.standYear">{{ sarStandardsInfoEO.standSortShow + ' ' + sarStandardsInfoEO.standNumber + '-' + sarStandardsInfoEO.standYear }}</span>
<span v-else>{{ sarStandardsInfoEO.standSort + ' ' + sarStandardsInfoEO.standNumber }}</span> <span v-else>{{ sarStandardsInfoEO.standSort + ' ' + sarStandardsInfoEO.standNumber }}</span>
</p> </p>
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+225 -4
View File
@@ -1025,9 +1025,219 @@
<el-button size="mini" type="primary" class="common-button-default" icon="el-icon-check" @click="importFailed = false">确认</el-button> <el-button size="mini" type="primary" class="common-button-default" icon="el-icon-check" @click="importFailed = false">确认</el-button>
</div> </div>
</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">-->
<!--&lt;!&ndash; 标准号&ndash;&gt;-->
<!-- <el-form-item :label="$t('m.standardNo')" class="serch-form-item">-->
<!-- <el-input v-model="sarStandardsSearch.standNumber" :placeholder="$t('m.lookUpByStandardNumber')" clearable :maxlength="100"-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 标准名称&ndash;&gt;-->
<!-- <el-form-item :label="$t('m.standName')" class="serch-form-item">-->
<!-- <el-input v-model="sarStandardsSearch.standName" :placeholder="$t('m.searchByStandardName')" clearable :maxlength="500"-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 标准英文名称&ndash;&gt;-->
<!-- <el-form-item :label="$t('m.standardEnglishName')" class="serch-form-item">-->
<!-- <el-input v-model="sarStandardsSearch.standEnName" :placeholder="$t('m.searchAccordingToStandardEnglishName')" clearable :maxlength="500"-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 标准类别&ndash;&gt;-->
<!-- <el-form-item :label="$t('m.standardCategory')" class="serch-form-item">-->
<!-- <search-select-->
<!-- v-model="sarStandardsSearch.standSort"-->
<!-- :placeholder="$t('m.standardCategoryTips')"-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"-->
<!-- :options="standSortOptions"-->
<!-- clearable/>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 文本状态&ndash;&gt;-->
<!-- <el-form-item :label="$t('m.standStateShow')" class="serch-form-item">-->
<!-- <el-select v-model="sarStandardsSearch.textStatus" :placeholder="$t('m.lookupByStandardStatus')" clearable-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
<!-- <el-option v-for="opt in standStateOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 代替标准号&ndash;&gt;-->
<!-- <el-form-item :label="$t('m.substituteStandardNumber')" class="serch-form-item">-->
<!-- <el-input v-model="sarStandardsSearch.dtbjh" :placeholder="$t('m.lookUpByAlternativeCriteria')" clearable :maxlength="100"-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 标准年份&ndash;&gt;-->
<!-- <el-form-item :label="$t('m.standardYear')" class="serch-form-item">-->
<!-- <el-date-picker-->
<!-- v-model="sarStandardsSearch.standYear"-->
<!-- type="date"-->
<!-- placeholder="根据标准年份查找">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- &lt;!&ndash; 标准发布日期&ndash;&gt;-->
<!-- <el-form-item label="标准发布日期" class="serch-form-item">-->
<!-- <el-date-picker-->
<!-- v-model="sarStandardsSearch.issueTime"-->
<!-- type="date"-->
<!-- placeholder="根据标准发布日期查找">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 标准性质&ndash;&gt;-->
<!-- <el-form-item :label="$t('m.standNatureShow')" class="serch-form-item">-->
<!-- <el-select v-model="sarStandardsSearch.standNature" placeholder="请选择标准性质" clearable-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
<!-- <el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 是否纳入标准清单&ndash;&gt;-->
<!-- <el-form-item title="是否纳入标准清单" label="是否纳入标准清单">-->
<!-- <el-select v-model="sarStandardsSearch.isRelateAccess" class="advanced-one" placeholder="根据是否纳入标准清单查找">-->
<!-- <el-option value="yes" label="是"></el-option>-->
<!-- <el-option value="no" label="否"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 实施日期&ndash;&gt;-->
<!-- <el-form-item label="实施日期">-->
<!-- <el-date-picker-->
<!-- v-model="sarStandardsSearch.putTime"-->
<!-- type="date"-->
<!-- placeholder="根据实施日期查找">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 新车型实施日期&ndash;&gt;-->
<!-- <el-form-item title="新车型实施日期" label="新车型实施日期">-->
<!-- <el-date-picker-->
<!-- v-model="sarStandardsSearch.XCXTime"-->
<!-- type="date"-->
<!-- placeholder="根据新车型实施日期查找">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 在产车实施日期&ndash;&gt;-->
<!-- <el-form-item title="在产车实施日期" label="在产车实施日期">-->
<!-- <el-date-picker-->
<!-- v-model="sarStandardsSearch.ZCCTime"-->
<!-- type="date"-->
<!-- placeholder="根据在产车实施日期查找">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 归口管理部门&ndash;&gt;-->
<!-- <el-form-item label="归口管理部门">-->
<!-- <el-input v-model="sarStandardsSearch.nameShow" clearable placeholder="根据归口管理部门查找"-->
<!-- @keyup.enter.native="btnSearch"></el-input>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 起草单位&ndash;&gt;-->
<!-- <el-form-item label="起草单位">-->
<!-- <el-select v-model="sarStandardsSearch.qcdw" placeholder="根据起草单位查找" clearable-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
<!-- <el-option v-for="opt in qcdwOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 我司参与深度&ndash;&gt;-->
<!-- <el-form-item label="我司参与深度">-->
<!-- <el-select v-model="sarStandardsSearch.nameShow" placeholder="请选择我司参与深度" clearable-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
<!-- <el-option v-for="opt in cysdOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 能源类型&ndash;&gt;-->
<!-- <el-form-item label="能源类型">-->
<!-- <el-select v-model="sarStandardsSearch.energyKind" placeholder="请选择能源类型" clearable-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
<!-- <el-option v-for="opt in nylxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 适用车型&ndash;&gt;-->
<!-- <el-form-item :label="$t('m.applicableModels')" class="serch-form-item">-->
<!-- <el-select v-model="sarStandardsSearch.applyArctic" :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
<!-- <el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 适用产品线（新增字段）&ndash;&gt;-->
<!-- <el-form-item :label="$t('m.applicableProductLine')" class="serch-form-item">-->
<!-- <el-select v-model="sarStandardsSearch.sycpx" :placeholder="$t('m.searchByApplicableProductLine')" clearable-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
<!-- <el-option v-for="opt in sycpxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 适用认证&ndash;&gt;-->
<!-- <el-form-item label="适用认证">-->
<!-- <el-select v-model="sarStandardsSearch.syzr" placeholder="根据适用认证查找" clearable-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
<!-- <el-option v-for="opt in syzrOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 责任部门&ndash;&gt;-->
<!-- <el-form-item label="责任部门">-->
<!-- <el-select v-model="sarStandardsSearch.zrbm" placeholder="根据责任部门查找" clearable-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
<!-- <el-option v-for="opt in zrbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 责任工程师&ndash;&gt;-->
<!-- <el-form-item label="责任工程师">-->
<!-- <el-select v-model="sarStandardsSearch.dutyEngineer" placeholder="根据责任工程师查找" clearable-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
<!-- <el-option v-for="opt in zrgcsOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 关联模块-VPPS编码&ndash;&gt;-->
<!-- <el-form-item title="关联模块-VPPS编码" label="关联模块-VPPS编码" prop="standNumber">-->
<!-- <el-input v-model="sarStandardsSearch.svpps" clearable-->
<!-- placeholder="根据关联模块-VPPS编码查找"-->
<!-- @keyup.enter.native="btnSearch"></el-input>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 代替标准号&ndash;&gt;-->
<!-- <el-form-item label="代替标准号">-->
<!-- <el-input v-model="sarStandardsSearch.replaceStandNum" clearable placeholder="根据代替标准号查找"-->
<!-- @keyup.enter.native="btnSearch"></el-input>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 关联模块-中文名称&ndash;&gt;-->
<!-- <el-form-item title="关联模块-中文名称" label="关联模块-中文名称" prop="standNumber">-->
<!-- <el-input v-model="sarStandardsSearch.standNumber" clearable-->
<!-- placeholder="根据关联模块-中文名称"-->
<!-- @keyup.enter.native="btnSearch"></el-input>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 采标编号&ndash;&gt;-->
<!-- <el-form-item label="采标编号" prop="nameShow">-->
<!-- <el-input v-model="sarStandardsSearch.nameShow" clearable placeholder="根据采标编号查找"-->
<!-- @keyup.enter.native="btnSearch"></el-input>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 采标程度&ndash;&gt;-->
<!-- <el-form-item label="采标程度" prop="standNumber">-->
<!-- <el-input v-model="sarStandardsSearch.standNumber" clearable-->
<!-- placeholder="根据采标程度查找"-->
<!-- @keyup.enter.native="btnSearch"></el-input>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 引用标准&ndash;&gt;-->
<!-- <el-form-item label="引用标准">-->
<!-- <el-input v-model="sarStandardsSearch.citeStand" clearable placeholder="根据引用标准查找"-->
<!-- @keyup.enter.native="btnSearch"></el-input>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 被引用标准&ndash;&gt;-->
<!-- <el-form-item label="被引用标准">-->
<!-- <el-input v-model="sarStandardsSearch.citedStand" clearable-->
<!-- placeholder="根据被引用标准查找"-->
<!-- @keyup.enter.native="btnSearch"></el-input>-->
<!-- </el-form-item>-->
<!--&lt;!&ndash; 关联模块（新增字段）&ndash;&gt;-->
<!-- <el-form-item :label="$t('m.associatedModule')" class="serch-form-item">-->
<!-- <el-select v-model="sarStandardsSearch.cycvppsbm" :placeholder="$t('m.SearchByAssociatedModule')" clearable-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
<!-- <el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- </div>-->
<!-- </table-tools-bar>-->
<!-- 高级筛选-->
<el-drawer
title="高级搜索"
size="700px"
:wrapperClosable="false"
:visible.sync="isAdvancedSearch">
<div class="demo-drawer-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">
<!-- 标准号--> <!-- 标准号-->
<el-form-item :label="$t('m.standardNo')" class="serch-form-item"> <el-form-item :label="$t('m.standardNo')" class="serch-form-item">
@@ -1230,7 +1440,18 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
</table-tools-bar> <div class="demo-drawer-footer">
<el-button
class="common-button-primary"
icon="el-icon-check"
type="primary"
@click="getDomesticStandardTableBtn(sarStandardsSearch)">搜索</el-button>
<el-button
class="common-button-default"
icon="el-icon-close"
@click="clearAllSearch('sarStandardsSearch')">取消</el-button>
</div>
</el-drawer>
</div> </div>
<!-- 分享 全部选人 --> <!-- 分享 全部选人 -->
<org-table <org-table