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 
# Conflicts:
#	src/pages/regulatoryRepository/nonConfomity/pages/businessDivision.vue
This commit is contained in:
yanyizhou
2021-11-10 15:02:03 +08:00
parent 0b9ccff935 a2e305d6e2
commit 6e3fea9817
19 changed files with 943 additions and 697 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/App.vue
+1 -1
View File
@@ -6,7 +6,7 @@
<div class="sub-container"> <div class="sub-container">
<div style="background-color: #0068B7; height: 65px; width: 100%"> <div style="background-color: #0068B7; height: 65px; width: 100%">
<span style="color: #fff; line-height: 65px; float: left; font-size: 20px; font-weight: 600;"> <span style="color: #fff; line-height: 65px; float: left; font-size: 20px; font-weight: 600;">
标准法规管理系统 Standard and Regulations Management System 标准法规管理系统 Standard and Regulation Management System
</span> </span>
<!-- header头部 右侧内容 当前登录人和退出--> <!-- header头部 右侧内容 当前登录人和退出-->
<div class="header-right" style="display: inline-block; float: right; margin-right: 20px; color: #fff"> <div class="header-right" style="display: inline-block; float: right; margin-right: 20px; color: #fff">
src/components/personalCenter/index.vue
+1 -1
View File
@@ -7,7 +7,7 @@
</div> </div>
</div> </div>
<span style="color: #fff; line-height: 65px; float: left; font-size: 20px; font-weight: 600;"> <span style="color: #fff; line-height: 65px; float: left; font-size: 20px; font-weight: 600;">
标准法规管理系统 Standard and Regulations Management System 标准法规管理系统 Standard and Regulation Management System
</span> </span>
<!-- header头部 右侧内容 当前登录人和退出--> <!-- header头部 右侧内容 当前登录人和退出-->
<!-- <div class="header-right" style="display: inline-block; float: right; margin-right: 20px; color: #fff">--> <!-- <div class="header-right" style="display: inline-block; float: right; margin-right: 20px; color: #fff">-->
src/pages/details/otherBussStandardDetails/index.vue
+11 -9
View File
@@ -2204,6 +2204,16 @@ export default {
} }
} }
for (let i = 0; i < displayLocation.length; i++) {
// sss
if(displayLocation[i].label !== '基础信息' && displayLocation[i].label !== '过程稿件'){
const childList = displayLocation[i].child.filter ( item => item.value !== null && item.value !== '');
if(childList.length === 0){
displayLocation.splice(i,1)
}
}
}
const child = location.child || [] const child = location.child || []
const halfType = ['INPUT_STR', 'DATE_PICKER', 'SEL_OPTION', 'INPUT_NUM'] const halfType = ['INPUT_STR', 'DATE_PICKER', 'SEL_OPTION', 'INPUT_NUM']
const fieldsIsTextAreaOrFile = child.filter(field => { const fieldsIsTextAreaOrFile = child.filter(field => {
@@ -2214,15 +2224,7 @@ export default {
}) })
location.child = [...fieldOthers, ...fieldsIsTextAreaOrFile].sort(this.compare('orderNum')) location.child = [...fieldOthers, ...fieldsIsTextAreaOrFile].sort(this.compare('orderNum'))
}) })
for (let i = 0; i < displayLocation.length; i++) {
// sss
if(displayLocation[i].label !== '基础信息' && displayLocation[i].label !== '过程稿件'){
const childList = displayLocation[i].child.filter ( item => item.value !== null && item.value !== '');
if(childList.length === 0){
displayLocation.splice(i,1)
}
}
}
this.dynamicFormField = displayLocation this.dynamicFormField = displayLocation
sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation)) sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation))
this.loading = false this.loading = false
src/pages/details/otherLawsStandDetails/index.vue
+12 -12
View File
@@ -149,8 +149,8 @@
:key="fileIndex" :key="fileIndex"
> >
<a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a> <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
<i title="下载" @click="downloadFile(file.id)" class="icon-download" v-btn-permission="'9882f477aad895ec56a7464f3e9c0b11'"/> <i title="下载" @click="downloadFile(file.id)" class="icon-download" v-btn-permission="''"/>
<i title="下载带水印" @click="downloadFileByWater(file.id, file.fileSuffix)" class="icon-download2" v-btn-permission="'9bab2662fbd9d0507b39be813371a597'"/> <i title="下载带水印" @click="downloadFileByWater(file.id, file.fileSuffix)" class="icon-download2" v-btn-permission="''"/>
<span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span> <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
</p> </p>
<!-- <el-button--> <!-- <el-button-->
@@ -2112,6 +2112,16 @@ export default {
} }
} }
for (let i = 0; i < displayLocation.length; i++) {
// sss
if(displayLocation[i].label !== '基础信息' && displayLocation[i].label !== '过程稿件'){
const childList = displayLocation[i].child.filter ( item => item.value !== null && item.value !== '');
if(childList.length === 0){
displayLocation.splice(i,1)
}
}
}
const child = location.child || [] const child = location.child || []
const halfType = ['INPUT_STR', 'DATE_PICKER', 'SEL_OPTION', 'INPUT_NUM'] const halfType = ['INPUT_STR', 'DATE_PICKER', 'SEL_OPTION', 'INPUT_NUM']
const fieldsIsTextAreaOrFile = child.filter(field => { const fieldsIsTextAreaOrFile = child.filter(field => {
@@ -2123,16 +2133,6 @@ export default {
location.child = [...fieldOthers, ...fieldsIsTextAreaOrFile].sort(this.compare('orderNum')) location.child = [...fieldOthers, ...fieldsIsTextAreaOrFile].sort(this.compare('orderNum'))
}) })
for (let i = 0; i < displayLocation.length; i++) {
// sss
if(displayLocation[i].label !== '基础信息' && displayLocation[i].label !== '过程稿件'){
const childList = displayLocation[i].child.filter ( item => item.value !== null && item.value !== '');
if(childList.length === 0){
displayLocation.splice(i,1)
}
}
}
this.dynamicFormField = displayLocation this.dynamicFormField = displayLocation
sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation)) sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation))
this.loading = false this.loading = false
src/pages/details/otherStandardDetails/index.vue
+10 -10
View File
@@ -3136,6 +3136,16 @@
} }
} }
for (let i = 0; i < displayLocation.length; i++) {
// sss
if(displayLocation[i].label !== '基础信息' && displayLocation[i].label !== '过程稿件'){
const childList = displayLocation[i].child.filter ( item => item.value !== null && item.value !== '');
if(childList.length === 0){
displayLocation.splice(i,1)
}
}
}
const child = location.child || [] const child = location.child || []
const one = [] const one = []
const half = [] const half = []
@@ -3160,16 +3170,6 @@
location.showAll = false location.showAll = false
}) })
for (let i = 0; i < displayLocation.length; i++) {
// sss
if(displayLocation[i].label !== '基础信息' && displayLocation[i].label !== '过程稿件'){
const childList = displayLocation[i].child.filter ( item => item.value !== null && item.value !== '');
if(childList.length === 0){
displayLocation.splice(i,1)
}
}
}
this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list', { this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list', {
id: this.$route.params.id id: this.$route.params.id
}, { }, {
src/pages/localTool/standAutoSplit/index.vue
+1 -1
View File
@@ -29,7 +29,7 @@
<div class="content"> <div class="content">
<div class="action-bar"> <div class="action-bar">
<el-button size="small" type="primary" @click="spiltStandFile" v-btn-permission="'633d92e841ab4d49fb57b48b45fd0db8'">拆分</el-button> <el-button size="small" type="primary" @click="spiltStandFile" v-btn-permission="'633d92e841ab4d49fb57b48b45fd0db8'">拆分</el-button>
<el-button size="small" type="danger" @click="batchDelete" v-btn-permission="'10ba28487876990927f653a66e1eeb98'">删除</el-button> <el-button size="small" type="danger" @click="batchDelete" v-btn-permission="'e214975dcab66d2e27bf2ed9897f521c'">删除</el-button>
</div> </div>
<div class="table-wrap"> <div class="table-wrap">
<div style="position: absolute;height: 100%;width: 100%;"> <div style="position: absolute;height: 100%;width: 100%;">
src/pages/localTool/standContrast/index.vue
+2 -2
View File
@@ -19,12 +19,12 @@
type="primary" type="primary"
size="mini" size="mini"
class="common-button-primary" class="common-button-primary"
v-btn-permission="'158298eaaf15a57a221c53f69e9ae563'" v-btn-permission="''"
@click="sarStandCompareHisInfo">搜索</el-button> @click="sarStandCompareHisInfo">搜索</el-button>
<el-button <el-button
class="common-button-default" class="common-button-default"
size="mini" size="mini"
v-btn-permission="'9001dda4a41c698209a4c7d05c1f76bc'" v-btn-permission="''"
@click="clearSearchStand">清空</el-button> @click="clearSearchStand">清空</el-button>
</el-formItem> </el-formItem>
</el-form> </el-form>
src/pages/localTool/standardWarning.vue
+2
View File
@@ -43,6 +43,7 @@
<el-button <el-button
type="primary" type="primary"
size="mini" size="mini"
v-btn-permission="'5dca375c3d8d57c45e4815acf3611b34'"
@click="searchBtnClick" @click="searchBtnClick"
class="common-button-primary"> class="common-button-primary">
查询 查询
@@ -50,6 +51,7 @@
<el-button <el-button
size="mini" size="mini"
@click="clearBtnClick" @click="clearBtnClick"
v-btn-permission="'8258ee44344e92365e7e5bd90f3c8d21'"
class="common-button-primary"> class="common-button-primary">
清空 清空
</el-button> </el-button>
src/pages/personal/pages/my-collection/components/CollectionLaws.vue
+6 -7
View File
@@ -15,18 +15,17 @@
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
<el-button <el-button
:loading="searching" :loading="searching"
icon="el-icon-search" v-btn-permission="'1044adc0569438df582585db349f2cde'"
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
round
@click="selectLawsBtn"> @click="selectLawsBtn">
查询
</el-button> </el-button>
<el-button <el-button
class="common-button-default" class="common-button-default"
icon="el-icon-refresh-left" v-btn-permission="'3b4223ab22aa24b8332c3d27f1e7fe32'"
round @click="resetSelect">清空</el-button>
@click="resetSelect"></el-button> <!-- <el-button class="common-button-default" round @click="cancleCollectBatch" v-btn-permission="'YEG2HVV27R'"><i class="iconfont">&#xe602;</i>取消收藏</el-button>-->
<el-button class="common-button-default" round @click="cancleCollectBatch" v-btn-permission="'YEG2HVV27R'"><i class="iconfont">&#xe602;</i>取消收藏</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
@@ -53,7 +52,7 @@
<el-col :span="4" :offset="3"> 创建时间：{{getDate(item.creationTime)}}</el-col> <el-col :span="4" :offset="3"> 创建时间：{{getDate(item.creationTime)}}</el-col>
</div> </div>
<el-col :span="4"> <el-col :span="4">
<el-button size="mini" style="margin-top: -5px; border: 1px dashed #dcdee2" @click="cancelLaws(item.id)" v-btn-permission="''">{{$t('m.cancelCollection')}}</el-button> <el-button size="mini" style="margin-top: -5px; border: 1px dashed #dcdee2" @click="cancelLaws(item.id)" v-btn-permission="'2dee468b4139ac3f26ebe8ac498b9da6'">{{$t('m.cancelCollection')}}</el-button>
<!-- <el-button size="mini" style="margin-top: -5px; border: 1px dashed #dcdee2" @click="writeLawsNotes(item,index1)">{{item.seeBtn}}</el-button>--> <!-- <el-button size="mini" style="margin-top: -5px; border: 1px dashed #dcdee2" @click="writeLawsNotes(item,index1)">{{item.seeBtn}}</el-button>-->
</el-col> </el-col>
</el-row> </el-row>
src/pages/personal/pages/my-collection/components/CollectionStandard.vue
+5 -4
View File
@@ -15,17 +15,18 @@
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
<el-button <el-button
:loading="searching" :loading="searching"
icon="el-icon-search"
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
v-btn-permission="'a0926c279e15ef0a3a2bc782f93d15fa'"
@click="selectStandardBtn"> @click="selectStandardBtn">
查询
</el-button> </el-button>
<el-button <el-button
class="common-button-default" class="common-button-default"
icon="el-icon-refresh-left"
size="mini" size="mini"
@click="resetSelect"></el-button> v-btn-permission="'63d0dbbae0bee0f0888295d6cc6ef9c3'"
@click="resetSelect">清空</el-button>
<!-- <el-button--> <!-- <el-button-->
<!-- class="common-button-default"--> <!-- class="common-button-default"-->
<!-- size="mini"--> <!-- size="mini"-->
@@ -62,7 +63,7 @@
<el-col :span="4" :offset="3">创建时间：{{getDate(item.creationTime)}}</el-col> <el-col :span="4" :offset="3">创建时间：{{getDate(item.creationTime)}}</el-col>
</div> </div>
<el-col :span="4"> <el-col :span="4">
<el-button size="mini" @click="cancelStandard(item)" style="margin-top: -5px; border: 1px dashed #dcdee2">取消收藏</el-button> <el-button size="mini" v-btn-permission="'fc2b045e1fe8a5e14feab48d3138df53'" @click="cancelStandard(item)" style="margin-top: -5px; border: 1px dashed #dcdee2">取消收藏</el-button>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
src/pages/processCenter/pages/newProcess/index.vue
+1 -1
View File
@@ -127,7 +127,7 @@
</div> </div>
</el-card> </el-card>
</el-col> </el-col>
<el-col :span="size ? 6 : 8" v-btn-permission="'9d3775db9a76f37402e3e49f3e55e77e'"> <el-col :span="size ? 6 : 8" v-btn-permission="'14f54ef4475d9210b1ee7872ab69eca8'">
<el-card shadow="hover"> <el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('11')"> <div class="card-box" @click="handleCreateProcess('11')">
<div class="card-top"> <div class="card-top">
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+1 -1
View File
@@ -88,7 +88,7 @@
icon="export" icon="export"
>导出 >导出
</el-button> </el-button>
<el-button type="primary" class="common-button-primary" size="mini" @click="selectMoreBtn"> <el-button type="primary" class="common-button-primary" size="mini" v-btn-permission="'670472f38fe27b192c7f7105847f38ce'" @click="selectMoreBtn">
<i class="iconfont">&#xe7a5;</i> <i class="iconfont">&#xe7a5;</i>
高级查询 高级查询
</el-button> </el-button>
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+312 -294
View File
@@ -184,7 +184,7 @@
fontWeight: 'bold', height: '48px'}" fontWeight: 'bold', height: '48px'}"
@selection-change="standSelectChange"> @selection-change="standSelectChange">
<el-table-column <el-table-column
v-if="isPermission('b17f1d035219c47344032e261342d87d,c09dc12531085e30e39bbdc6cb6116ba')>0" v-if="isPermission('b17f1d035219c47344032e261342d87d,c09dc12531085e30e39bbdc6cb6116ba,5aedea192a77b14c364f19bdcee3513a')>0"
type="selection" type="selection"
width="55" width="55"
align="center"> align="center">
@@ -211,6 +211,7 @@
show-overflow-tooltip show-overflow-tooltip
prop="standName" prop="standName"
label="标准名称" label="标准名称"
width="200"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a> <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
@@ -220,7 +221,7 @@
<el-table-column <el-table-column
prop="issueTime" prop="issueTime"
sortable="custom" sortable="custom"
width="110px" width="150px"
label="发布日期"> label="发布日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ formatIssueDate(scope.row.issueTime) }}</span> <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ formatIssueDate(scope.row.issueTime) }}</span>
@@ -230,7 +231,7 @@
<el-table-column <el-table-column
prop="SSRQ" prop="SSRQ"
sortable="custom" sortable="custom"
width="110px" width="150px"
label="实施日期"> label="实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- {{ formatIssueDate(scope.row.putTime) }}--> <!-- {{ formatIssueDate(scope.row.putTime) }}-->
@@ -1405,271 +1406,303 @@
:wrapperClosable="false" :wrapperClosable="false"
:visible.sync="isAdvancedSearch"> :visible.sync="isAdvancedSearch">
<div class="demo-drawer-content"> <div class="demo-drawer-content">
<el-form :model="sarStandardsSearch" :inline="true" class="label-input-form table-lattice" <el-form :model="sarStandardsSearch"
:inline="true"
class="label-input-form table-lattice"
label-width="68px"
style="display: flex;flex-wrap: wrap"> style="display: flex;flex-wrap: wrap">
<!-- 标准号--> <ProcessTitle>
<el-form-item :label="$t('m.standardNo')" class="serch-form-item"> <template slot="title">基础信息</template>
<el-input v-model="sarStandardsSearch.standNumber" :placeholder="$t('m.lookUpByStandardNumber')" clearable </ProcessTitle>
:maxlength="100" <div class="prc-content-border">
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input> <el-row :gutter="24">
</el-form-item> <el-col :span="12">
<!-- 标准名称--> <!-- 标准号-->
<el-form-item :label="$t('m.standName')" class="serch-form-item"> <el-form-item :label="$t('m.standardNo')" class="add-form-item form-item-disabled">
<el-input v-model="sarStandardsSearch.standName" :placeholder="$t('m.searchByStandardName')" clearable <el-input v-model="sarStandardsSearch.standNumber" :placeholder="$t('m.lookUpByStandardNumber')" clearable
:maxlength="500" :maxlength="100"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input> @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item> </el-form-item>
<!-- 标准英文名称--> <!-- 标准名称-->
<el-form-item :label="$t('m.standardEnglishName')" class="serch-form-item"> <el-form-item :label="$t('m.standName')" class="add-form-item form-item-disabled">
<el-input v-model="sarStandardsSearch.standEnName" <el-input v-model="sarStandardsSearch.standName" :placeholder="$t('m.searchByStandardName')" clearable
:placeholder="$t('m.searchAccordingToStandardEnglishName')" clearable :maxlength="500" :maxlength="500"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input> @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item> </el-form-item>
<!-- 标准类别--> <!-- 标准年份-->
<el-form-item :label="$t('m.standardCategory')" class="serch-form-item"> <el-form-item :label="$t('m.standardYear')" class="add-form-item form-item-disabled">
<search-select <el-input
v-model="sarStandardsSearch.standSort" v-model="sarStandardsSearch.standYear"
:placeholder="$t('m.standardCategoryTips')" placeholder="根据标准年份查找">
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)" </el-input>
:options="standSortOptions" </el-form-item>
clearable/> <!-- 文本状态-->
</el-form-item> <el-form-item :label="$t('m.standStateShow')" class="add-form-item form-item-disabled">
<!-- 代替标准号--> <el-select v-model="sarStandardsSearch.textStatus" :placeholder="$t('m.lookupByStandardStatus')" clearable
<el-form-item :label="$t('m.substituteStandardNumber')" class="serch-form-item"> @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-input v-model="sarStandardsSearch.replaceStandNum" :placeholder="$t('m.lookUpByAlternativeCriteria')" <el-option v-for="opt in standStateOptions" :value="opt.value === undefined ? '' :opt.value"
clearable :maxlength="100" :key="opt.value" :label="opt.label">{{ opt.label }}
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input> </el-option>
</el-form-item> </el-select>
<!-- 被代替标准号--> </el-form-item>
<el-form-item label="被代替标准号"> <!-- 体系类别-->
<el-input v-model="sarStandardsSearch.replacedStandNum" clearable placeholder="根据被代替标准号查找" <el-form-item label="体系类别" class="add-form-item form-item-disabled">
@keyup.enter.native="btnSearch"></el-input> <el-select v-model="advanceSearchMapping.TXLB" placeholder="根据体系类别查找" clearable
</el-form-item> @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<!-- 标准年份--> <el-option v-for="opt in txlbOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
<el-form-item :label="$t('m.standardYear')" class="serch-form-item"> :label="opt.label">{{ opt.label }}
<el-input </el-option>
v-model="sarStandardsSearch.standYear" </el-select>
placeholder="根据标准年份查找"> </el-form-item>
</el-input> </el-col>
</el-form-item> <el-col :span="12">
<!-- 标准类别-->
<!-- 标准发布日期--> <el-form-item :label="$t('m.standardCategory')" class="add-form-item form-item-disabled">
<el-form-item label="标准发布日期" class="serch-form-item"> <search-select
<el-date-picker v-model="sarStandardsSearch.standSort"
v-model="sarStandardsSearch.issueTime" :placeholder="$t('m.standardCategoryTips')"
type="date" @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"
value-format="yyyy-MM-dd" :options="standSortOptions"
placeholder="根据标准发布日期查找"> clearable/>
</el-date-picker> </el-form-item>
</el-form-item> <!-- 标准英文名称-->
<!-- 适用车型--> <el-form-item :label="$t('m.standardEnglishName')" :title="$t('m.standardEnglishName')" class="add-form-item form-item-disabled">
<el-form-item :label="$t('m.applicableModels')" class="serch-form-item"> <el-input v-model="sarStandardsSearch.standEnName"
<el-select v-model="sarStandardsSearch.applyArctic" :placeholder="$t('m.searchAccordingToStandardEnglishName')" clearable :maxlength="500"
:placeholder="$t('m.searchAccordingToThApplicableModel')" clearable @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"> </el-form-item>
<el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value" <!-- 标准发布日期-->
:key="opt.value" :label="opt.label">{{ opt.label }} <el-form-item label="标准发布日期" title="标准发布日期" class="add-form-item form-item-disabled">
</el-option> <el-date-picker
</el-select> v-model="sarStandardsSearch.issueTime"
</el-form-item> type="date"
value-format="yyyy-MM-dd"
<!-- 是否纳入标准清单--> placeholder="根据标准发布日期查找">
<el-form-item label="是否纳入标准清单" class="serch-form-item"> </el-date-picker>
<el-select v-model="sarStandardsSearch.isRelateAccess" placeholder="根据是否纳入标准清单查找"> </el-form-item>
<el-option value="1" label="是"></el-option> <!-- 标准性质-->
<el-option value="0" label="否"></el-option> <el-form-item :label="$t('m.standNatureShow')" class="add-form-item form-item-disabled">
</el-select> <el-select v-model="sarStandardsSearch.standNature" placeholder="请选择标准性质" clearable
</el-form-item> @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-form-item :label="$t('m.standStateShow')" class="serch-form-item"> </el-select>
<el-select v-model="sarStandardsSearch.textStatus" :placeholder="$t('m.lookupByStandardStatus')" clearable </el-form-item>
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"> <!-- 是否纳入标准清单-->
<el-option v-for="opt in standStateOptions" :value="opt.value === undefined ? '' :opt.value" <el-form-item label="是否纳入标准清单" class="add-form-item form-item-disabled">
:key="opt.value" :label="opt.label">{{ opt.label }} <el-select v-model="sarStandardsSearch.isRelateAccess" placeholder="根据是否纳入标准清单查找">
</el-option> <el-option value="1" label="是"></el-option>
</el-select> <el-option value="0" label="否"></el-option>
</el-form-item> </el-select>
<!-- 标准性质--> </el-form-item>
<el-form-item :label="$t('m.standNatureShow')" class="serch-form-item"> </el-col>
<el-select v-model="sarStandardsSearch.standNature" placeholder="请选择标准性质" clearable </el-row>
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"> </div>
<el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value" <ProcessTitle>
:key="opt.value" :label="opt.label">{{ opt.label }} <template slot="title">实施日期</template>
</el-option> </ProcessTitle>
</el-select> <div class="prc-content-border">
</el-form-item> <el-row :gutter="24">
<el-col :span="12">
<!-- 自定义属性--> <!-- 自定义属性-->
<!-- 实施日期--> <!-- 实施日期-->
<el-form-item label="实施日期"> <el-form-item label="实施日期" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
v-model="advanceSearchMapping.SSRQ" v-model="advanceSearchMapping.SSRQ"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="根据实施日期查找"> placeholder="根据实施日期查找">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<!-- 新车型实施日期--> <!-- 在产车实施日期-->
<el-form-item title="新车型实施日期" label="新车型实施日期"> <el-form-item title="在产车实施日期" label="在产车实施日期" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
value-format="yyyy-MM-dd" v-model="advanceSearchMapping.ZCCSSRQ"
v-model="advanceSearchMapping.XCXSSRQ" type="date"
type="date" value-format="yyyy-MM-dd"
placeholder="根据新车型实施日期查找"> placeholder="根据在产车实施日期查找">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<!-- 在产车实施日期--> </el-col>
<el-form-item title="在产车实施日期" label="在产车实施日期"> <el-col :span="12">
<el-date-picker <!-- 新车型实施日期-->
v-model="advanceSearchMapping.ZCCSSRQ" <el-form-item title="新车型实施日期" label="新车型实施日期" class="add-form-item form-item-disabled">
type="date" <el-date-picker
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="根据在产车实施日期查找"> v-model="advanceSearchMapping.XCXSSRQ"
</el-date-picker> type="date"
</el-form-item> placeholder="根据新车型实施日期查找">
<!-- 归口管理部门--> </el-date-picker>
<el-form-item label="归口管理部门"> </el-form-item>
<el-select v-model="advanceSearchMapping.GKDW" placeholder="归口管理部门" clearable </el-col>
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"> </el-row>
<el-option v-for="opt in gkglbmOptions" :value="opt.value === undefined ? '' :opt.value" </div>
:key="opt.value" :label="opt.label">{{ opt.label }} <ProcessTitle>
</el-option> <template slot="title">适用范围</template>
</el-select> </ProcessTitle>
</el-form-item> <div class="prc-content-border">
<!-- 起草单位--> <el-row :gutter="24">
<el-form-item label="起草单位"> <el-col :span="12">
<el-select v-model="advanceSearchMapping.QCDW" placeholder="根据起草单位查找" clearable <!-- 归口管理部门-->
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"> <el-form-item label="归口管理部门" class="add-form-item form-item-disabled">
<el-option v-for="opt in qcdwOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" <el-select v-model="advanceSearchMapping.GKDW" placeholder="归口管理部门" clearable
:label="opt.label">{{ opt.label }} @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
</el-option> <el-option v-for="opt in gkglbmOptions" :value="opt.value === undefined ? '' :opt.value"
</el-select> :key="opt.value" :label="opt.label">{{ opt.label }}
</el-form-item> </el-option>
<!-- 我司参与深度--> </el-select>
<el-form-item label="我司参与深度"> </el-form-item>
<el-select v-model="advanceSearchMapping.CYSD" placeholder="请选择我司参与深度" clearable <!-- 我司参与深度-->
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"> <el-form-item label="我司参与深度" class="add-form-item form-item-disabled">
<el-option v-for="opt in cysdOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" <el-select v-model="advanceSearchMapping.CYSD" placeholder="请选择我司参与深度" clearable
:label="opt.label">{{ opt.label }} @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
</el-option> <el-option v-for="opt in cysdOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
</el-select> :label="opt.label">{{ opt.label }}
</el-form-item> </el-option>
</el-select>
<!-- 能源类型--> </el-form-item>
<el-form-item label="能源类型"> <!-- 适用车型-->
<el-select v-model="advanceSearchMapping.NYLX" placeholder="请选择能源类型" clearable <el-form-item :label="$t('m.applicableModels')" class="add-form-item form-item-disabled">
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"> <el-select v-model="sarStandardsSearch.applyArctic"
<el-option v-for="opt in nylxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable
:label="opt.label">{{ opt.label }} @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
</el-option> <el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value"
</el-select> :key="opt.value" :label="opt.label">{{ opt.label }}
</el-form-item> </el-option>
<!-- 适用产品线（新增字段）--> </el-select>
<el-form-item :label="$t('m.applicableProductLine')" class="serch-form-item"> </el-form-item>
<el-select v-model="advanceSearchMapping.SYCPX" :placeholder="$t('m.searchByApplicableProductLine')" <!-- 适用认证-->
clearable <el-form-item label="适用认证" class="add-form-item form-item-disabled">
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"> <el-select v-model="advanceSearchMapping.SYRZ" placeholder="根据适用认证查找" clearable
<el-option v-for="opt in sycpxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
:label="opt.label">{{ opt.label }} <el-option v-for="opt in syrzOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
</el-option> :label="opt.label">{{ opt.label }}
</el-select> </el-option>
</el-form-item> </el-select>
<!-- 适用认证--> </el-form-item>
<el-form-item label="适用认证"> <!-- 责任工程师-->
<el-select v-model="advanceSearchMapping.SYRZ" placeholder="根据适用认证查找" clearable <el-form-item label="责任工程师" class="add-form-item form-item-disabled">
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"> <el-select v-model="advanceSearchMapping.ZRGCS" placeholder="根据责任工程师查找" clearable
<el-option v-for="opt in syrzOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
:label="opt.label">{{ opt.label }} <el-option v-for="opt in zrgcsOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
</el-option> :label="opt.label">{{ opt.label }}
</el-select> </el-option>
</el-form-item> </el-select>
<!-- 责任部门--> </el-form-item>
<el-form-item label="责任部门"> <!-- 关联模块--乘用车VPPS编码-->
<el-select v-model="advanceSearchMapping.ZRBM" placeholder="根据责任部门查找" clearable <el-form-item title="关联模块--乘用车VPPS编码" label=" 关联模块--乘用车VPPS编码" prop="standNumber" class="add-form-item form-item-disabled">
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"> <el-input v-model="advanceSearchMapping.CYCVPPSBM" clearable
<el-option v-for="opt in zrbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" placeholder=" 关联模块--乘用车VPPS编码"
:label="opt.label">{{ opt.label }} @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-option> </el-form-item>
</el-select> <!-- 关联模块--乘用车vpps中文名称-->
</el-form-item> <el-form-item title="关联模块--乘用车vpps中文名称" label="关联模块--乘用车vpps中文名称" prop="standNumber" class="add-form-item form-item-disabled">
<!-- 责任工程师--> <el-input v-model="advanceSearchMapping.CYCVPPSCN" clearable
<el-form-item label="责任工程师"> placeholder="关联模块--乘用车vpps中文名称"
<el-select v-model="advanceSearchMapping.ZRGCS" placeholder="根据责任工程师查找" clearable @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"> </el-form-item>
<el-option v-for="opt in zrgcsOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" <!--关联模块--卡车VPPS编码-->
:label="opt.label">{{ opt.label }} <el-form-item title="关联模块--卡车VPPS编码" label="关联模块--卡车VPPS编码" prop="standNumber" class="add-form-item form-item-disabled">
</el-option> <el-input v-model="advanceSearchMapping.KCCVPPSBM" clearable
</el-select> placeholder="关联模块--卡车VPPS编码"
</el-form-item> @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
<!-- 采标编号--> </el-form-item>
<el-form-item label="采标编号" prop="nameShow">
<el-input v-model="advanceSearchMapping.CBBH" clearable placeholder="根据采标编号查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!-- 采标程度-->
<el-form-item label="采标程度" prop="standNumber">
<el-input v-model="advanceSearchMapping.CBCD" clearable
placeholder="根据采标程度查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!-- 引用标准-->
<el-form-item label="引用标准">
<el-input v-model="advanceSearchMapping.YYBJ" clearable placeholder="根据引用标准查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!-- 被引用标准-->
<el-form-item label="被引用标准">
<el-input v-model="advanceSearchMapping.BYYBJ" clearable
placeholder="根据被引用标准查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!-- 体系类别-->
<el-form-item label="体系类别">
<el-select v-model="advanceSearchMapping.TXLB" placeholder="根据体系类别查找" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in txlbOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
:label="opt.label">{{ opt.label }}
</el-option>
</el-select>
</el-form-item>
<!-- 关联模块--乘用车VPPS编码-->
<el-form-item title=" 关联模块--乘用车VPPS编码" label=" 关联模块--乘用车VPPS编码" prop="standNumber">
<el-input v-model="advanceSearchMapping.CYCVPPSBM" clearable
placeholder=" 关联模块--乘用车VPPS编码"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!-- 关联模块--乘用车vpps中文名称-->
<el-form-item title="关联模块--乘用车vpps中文名称" label="关联模块--乘用车vpps中文名称" prop="standNumber">
<el-input v-model="advanceSearchMapping.CYCVPPSCN" clearable
placeholder="关联模块--乘用车vpps中文名称"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!--关联模块--卡车VPPS编码-->
<el-form-item title="关联模块--卡车VPPS编码" label="关联模块--卡车VPPS编码" prop="standNumber">
<el-input v-model="advanceSearchMapping.KCCVPPSBM" clearable
placeholder="关联模块--卡车VPPS编码"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!--关联模块--卡车vpps中文名称-->
<el-form-item title="关联模块--卡车vpps中文名称" label="关联模块--卡车vpps中文名称" prop="standNumber">
<el-input v-model="advanceSearchMapping.KCCVPPSCN" clearable
placeholder="关联模块--卡车vpps中文名称"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<!-- 起草单位-->
<el-form-item label="起草单位" class="add-form-item form-item-disabled">
<el-select v-model="advanceSearchMapping.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>
<!-- 能源类型-->
<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"
:label="opt.label">{{ opt.label }}
</el-option>
</el-select>
</el-form-item>
<!-- 适用产品线（新增字段）-->
<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)">
<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>
<!-- 责任部门-->
<el-form-item label="责任部门" class="add-form-item form-item-disabled">
<el-select v-model="advanceSearchMapping.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>
<!--关联模块--卡车vpps中文名称-->
<el-form-item title="关联模块--卡车vpps中文名称" label="关联模块--卡车vpps中文名称" prop="standNumber" class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.KCCVPPSCN" clearable
placeholder="关联模块--卡车vpps中文名称"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
<ProcessTitle>
<template slot="title">关联信息</template>
</ProcessTitle>
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="12">
<!-- 代替标准号-->
<el-form-item :label="$t('m.substituteStandardNumber')" class="add-form-item form-item-disabled">
<el-input v-model="sarStandardsSearch.replaceStandNum" :placeholder="$t('m.lookUpByAlternativeCriteria')"
clearable :maxlength="100"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
<!-- 采标编号-->
<el-form-item label="采标编号" prop="nameShow" class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.CBBH" clearable placeholder="根据采标编号查找"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
<!-- 引用标准-->
<el-form-item label="引用标准" class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.YYBJ" clearable placeholder="根据引用标准查找"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<!-- 被代替标准号-->
<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>
<!-- 被引用标准-->
<el-form-item label="被引用标准" class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.BYYBJ" clearable
placeholder="根据被引用标准查找"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
<!-- 标记--> <!-- 标记-->
<!-- 标签--> <!-- 标签-->
<el-form-item label="标签"> <!-- <el-form-item label="标签">-->
<el-input v-model="advanceSearchMapping.GXHBQ" clearable <!-- <el-input v-model="advanceSearchMapping.GXHBQ" clearable-->
placeholder="根据被标签查找" <!-- placeholder="根据被标签查找"-->
@keyup.enter.native="btnSearch"></el-input> <!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>-->
</el-form-item> <!-- </el-form-item>-->
</el-form> </el-form>
</div> </div>
<div class="demo-drawer-footer"> <div class="demo-drawer-footer">
@@ -1736,7 +1769,7 @@ import CustomDatePickWithText2 from '@/components/CustomFormComponents/DatePicke
import {interfaceUrl} from '@/sysConfig' import {interfaceUrl} from '@/sysConfig'
import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
import ProcessTitle from '@/pages/processCenter/pages/components/ProcessTitle'
export default { export default {
@@ -1760,7 +1793,8 @@ export default {
CustomDatePickWithText2, CustomDatePickWithText2,
TreeSelect, TreeSelect,
MechanismTree, MechanismTree,
TreeSelectNew TreeSelectNew,
ProcessTitle
}, },
data() { data() {
return { return {
@@ -3019,7 +3053,6 @@ export default {
getDomesticStandardTableBtn(item) { getDomesticStandardTableBtn(item) {
this.tableFlag = item this.tableFlag = item
item.page = 1 item.page = 1
item.sarStandardsSearch = ''
this.getDomesticStandardTable(item) this.getDomesticStandardTable(item)
}, },
// getDomesticStandardTableBtn (advancedSearch) { // getDomesticStandardTableBtn (advancedSearch) {
@@ -3047,10 +3080,9 @@ export default {
this.sarStandardsSearch.replacedPartStandNum = '' this.sarStandardsSearch.replacedPartStandNum = ''
this.sarStandardsSearch.synopsis = '' this.sarStandardsSearch.synopsis = ''
this.sarStandardsSearch.category = '' this.sarStandardsSearch.category = ''
this.pageChange(1) this.isAdvancedSearch = false
this.getDomesticStandardTable(this.sarStandardsSearch)
} else if (flag === 'standCommonlySearch') { } else if (flag === 'standCommonlySearch') {
this.standCommonlySearch.standSort = '' this.standCommonlySearch.standName = ''
this.standCommonlySearch.standNumber = '' this.standCommonlySearch.standNumber = ''
this.pageChange(1) this.pageChange(1)
this.getDomesticStandardTable(this.standCommonlySearch) this.getDomesticStandardTable(this.standCommonlySearch)
@@ -3075,7 +3107,7 @@ export default {
// 高级检索 // 高级检索
selectMoreBtn() { selectMoreBtn() {
this.isAdvancedSearch = true this.isAdvancedSearch = true
this.sarStandardsSearch = [] this.sarStandardsSearch = {}
}, },
treeCollapse() { treeCollapse() {
this.sideClose = !this.sideClose this.sideClose = !this.sideClose
@@ -5134,6 +5166,16 @@ export default {
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
/deep/.contentTitle{
width: 100%;
}
/deep/.el-drawer__container {
.prc-content-border {
/*border: none;*/
width: 100%;
padding: 0 20px 0;
}
}
/deep/ .icon-tree { /deep/ .icon-tree {
margin: 0 5px 0 10px; margin: 0 5px 0 10px;
position: relative; position: relative;
@@ -5368,30 +5410,6 @@ export default {
outline: none !important; outline: none !important;
} }
.label-input-form {
&.table-lattice {
/deep/ .el-form-item__label {
width: 100px;
height: 30px;
border: 1px solid #DCDFE6;
border-right: none;
line-height: 30px;
text-align: center;
margin-top: 6px;
background: #F9F9F9;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis
}
/deep/ .el-input__inner {
height: 30px;
line-height: 30px;
border-radius: 0 !important;
}
}
}
.el-date-editor.el-input, .el-date-editor.el-input__inner { .el-date-editor.el-input, .el-date-editor.el-input__inner {
width: 190px width: 190px
} }
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+7 -4
View File
@@ -22,6 +22,7 @@
:data="treeList" :data="treeList"
highlight-current highlight-current
@node-click="treeClick" @node-click="treeClick"
:filter-node-method="filterNode"
default-expand-all default-expand-all
:expand-on-click-node="false"> :expand-on-click-node="false">
<span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)"> <span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
@@ -281,7 +282,7 @@
@selection-change="standSelectChange" @selection-change="standSelectChange"
> >
<el-table-column <el-table-column
v-if="isPermission('374205ce36a859a158ca4db196d151b7,784d26f527a659eefe84d5e5a53deb96')>0" v-if="isPermission('374205ce36a859a158ca4db196d151b7,784d26f527a659eefe84d5e5a53deb96,2d41ebdb6150ba1af52fd753086d77dc')>0"
type="selection" type="selection"
width="55" width="55"
align="center"> align="center">
@@ -419,7 +420,7 @@
<el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'dd4ea796dab7a01b105ba657b1968a84'">编辑</el-dropdown-item> <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'dd4ea796dab7a01b105ba657b1968a84'">编辑</el-dropdown-item>
<!-- <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'ESPMBSD4ZP'">分享</el-dropdown-item>--> <!-- <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'ESPMBSD4ZP'">分享</el-dropdown-item>-->
<!-- <el-dropdown-item :command="[scope.row, '授权']" v-btn-permission="'CWBPST294ZH7HSKD4452'" v-if="scope.row.attrInfoMap && scope.row.attrInfoMap.QBMJ === 'ACF675Z88W'">授权</el-dropdown-item>--> <!-- <el-dropdown-item :command="[scope.row, '授权']" v-btn-permission="'CWBPST294ZH7HSKD4452'" v-if="scope.row.attrInfoMap && scope.row.attrInfoMap.QBMJ === 'ACF675Z88W'">授权</el-dropdown-item>-->
<el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="a7a38a95ea374695fc3128037f6feccf">删除</el-dropdown-item> <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'a7a38a95ea374695fc3128037f6feccf'">删除</el-dropdown-item>
<!-- <el-dropdown-item :command="[scope.row, '流程']">流程</el-dropdown-item>--> <!-- <el-dropdown-item :command="[scope.row, '流程']">流程</el-dropdown-item>-->
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
@@ -3303,6 +3304,10 @@ export default {
}) })
} }
}, },
filterNode(value, data) {
if (!value) return true;
return data.menuName.indexOf(value) !== -1;
},
treeClick (treeNode) { treeClick (treeNode) {
this.selectSarMenu = treeNode // 记录当前选中的二级菜单 this.selectSarMenu = treeNode // 记录当前选中的二级菜单
this.sarBussionessSearch.menuId = treeNode.id this.sarBussionessSearch.menuId = treeNode.id
@@ -3400,8 +3405,6 @@ export default {
this.sarBussionessSearch.VPPSBMBUSS = '' this.sarBussionessSearch.VPPSBMBUSS = ''
this.sarBussionessSearch.advanceSearchVOStr = '' this.sarBussionessSearch.advanceSearchVOStr = ''
this.sarBussionessSearch.standEnName='' this.sarBussionessSearch.standEnName=''
this.pageChange(1)
this.getBussionStandTable(this.sarBussionessSearch)
this.isAdvancedSearch = false this.isAdvancedSearch = false
} else if (flag === 2) { } else if (flag === 2) {
// 标准条目搜索 // 标准条目搜索
src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
+6 -6
View File
@@ -10,8 +10,6 @@
</el-input> </el-input>
<div class="tree"> <div class="tree">
<el-card style="height: 100%;padding-right: 120px;"> <el-card style="height: 100%;padding-right: 120px;">
<el-tree <el-tree
ref="tree" ref="tree"
node-key="id" node-key="id"
@@ -22,6 +20,7 @@
:data="treeList" :data="treeList"
highlight-current highlight-current
@node-click="treeClick" @node-click="treeClick"
:filter-node-method="filterNode"
default-expand-all default-expand-all
:expand-on-click-node="false"> :expand-on-click-node="false">
<span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)"> <span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
@@ -181,7 +180,7 @@
@selection-change="standSelectChange" @selection-change="standSelectChange"
> >
<el-table-column <el-table-column
v-if="isPermission('fd83032ae5f41a0021b00e93c88edbbj,fd83032ae5f41a0021b00e93c88edbbe')>0" v-if="isPermission('fd83032ae5f41a0021b00e93c88edbbj,fd83032ae5f41a0021b00e93c88edbbe,fd83032ae5f41a0021b00e93c88edbbd')>0"
type="selection" type="selection"
width="55" width="55"
@@ -3427,6 +3426,10 @@
}) })
} }
}, },
filterNode(value, data) {
if (!value) return true;
return data.menuName.indexOf(value) !== -1;
},
treeClick (treeNode) { treeClick (treeNode) {
this.selectSarMenu = treeNode // 记录当前选中的二级菜单 this.selectSarMenu = treeNode // 记录当前选中的二级菜单
this.lawsStandInfoSearch.menuId = treeNode.id this.lawsStandInfoSearch.menuId = treeNode.id
@@ -3540,9 +3543,6 @@
this.lawsStandInfoSearch.XGLC='' this.lawsStandInfoSearch.XGLC=''
this.lawsStandInfoSearch.CHJLLAWS='' this.lawsStandInfoSearch.CHJLLAWS=''
this.lawsStandInfoSearch.GLWJLAWS='' this.lawsStandInfoSearch.GLWJLAWS=''
this.pageChange(1)
this.lawsStandInfoSearch.page = page
this.getBussionStandTable(this.lawsStandInfoSearch)
this.isAdvancedSearch = false this.isAdvancedSearch = false
} else if (flag === 2) { } else if (flag === 2) {
// 标准条目搜索 // 标准条目搜索
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+310 -282
View File
@@ -113,7 +113,7 @@
@click="clearAllSearch('standCommonlySearch')">清空 @click="clearAllSearch('standCommonlySearch')">清空
</el-button> </el-button>
<el-button type="primary" class="common-button-primary" size="mini" @click="selectMoreBtn"> <el-button type="primary" class="common-button-primary" size="mini" @click="selectMoreBtn">
<i class="iconfont" v-btn-permission="'c9390928e5a3107956c7d43d8bde5cba'">&#xe7a5;</i>高级查询 <i class="iconfont" v-btn-permission="'cce80ba303858ee9943f17e93946c2ff'">&#xe7a5;</i>高级查询
</el-button> </el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@@ -181,7 +181,7 @@
@selection-change="standSelectChange" @selection-change="standSelectChange"
@sort-change="sortChange"> @sort-change="sortChange">
<el-table-column <el-table-column
v-if="isPermission('4d01342db0f56f01bfceaee7b46904f4,8871ed1be74cf65851659514880bb50a')>0" v-if="isPermission('4d01342db0f56f01bfceaee7b46904f4,8871ed1be74cf65851659514880bb50a,29bf24bbd156c06f136cc89b1c7b2bb0')>0"
type="selection" type="selection"
width="55" width="55"
align="center"> align="center">
@@ -457,271 +457,275 @@
:wrapperClosable="false" :wrapperClosable="false"
:visible.sync="isAdvancedSearch"> :visible.sync="isAdvancedSearch">
<div class="demo-drawer-content"> <div class="demo-drawer-content">
<el-form :model="sarStandardsSearch" :inline="true" class="label-input-form table-lattice" <el-form
style="display: flex;flex-wrap: wrap"> :model="sarStandardsSearch"
<!-- 标准号--> :inline="true"
<el-form-item :label="$t('m.standardNo')" class="serch-form-item"> label-width="68px"
<el-input v-model="sarStandardsSearch.standNumber" :placeholder="$t('m.lookUpByStandardNumber')" clearable class="label-input-form table-lattice"
:maxlength="100" style="display: flex;flex-wrap: wrap">
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input> <ProcessTitle>
</el-form-item> <template slot="title">基础信息</template>
<!-- 标准名称--> </ProcessTitle>
<el-form-item :label="$t('m.standName')" class="serch-form-item"> <div class="prc-content-border">
<el-input v-model="sarStandardsSearch.standName" :placeholder="$t('m.searchByStandardName')" clearable <el-row :gutter="24">
:maxlength="500" <el-col :span="12">
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input> <!-- 标准号-->
</el-form-item> <el-form-item :label="$t('m.standardNo')" class="add-form-item form-item-disabled">
<!-- 标准英文名称--> <el-input v-model="sarStandardsSearch.standNumber" :placeholder="$t('m.lookUpByStandardNumber')" clearable
<el-form-item :label="$t('m.standardEnglishName')" class="serch-form-item"> :maxlength="100"
<el-input v-model="sarStandardsSearch.standEnName" @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
:placeholder="$t('m.searchAccordingToStandardEnglishName')" clearable :maxlength="500" </el-form-item>
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input> <!-- 标准名称-->
</el-form-item> <el-form-item :label="$t('m.standName')" class="add-form-item form-item-disabled">
<!-- 标准类别--> <el-input v-model="sarStandardsSearch.standName" :placeholder="$t('m.searchByStandardName')" clearable
<el-form-item :label="$t('m.standardCategory')" class="serch-form-item"> :maxlength="500"
<search-select @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
v-model="sarStandardsSearch.standSort" </el-form-item>
:placeholder="$t('m.standardCategoryTips')" <!-- 标准年份-->
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)" <el-form-item :label="$t('m.standardYear')" class="add-form-item form-item-disabled">
:options="standSortOptions" <el-input
clearable/> v-model="sarStandardsSearch.standYear"
</el-form-item> placeholder="根据标准年份查找">
<!-- 代替标准号--> </el-input>
<el-form-item :label="$t('m.substituteStandardNumber')" class="serch-form-item"> </el-form-item>
<el-input v-model="sarStandardsSearch.replaceStandNum" :placeholder="$t('m.lookUpByAlternativeCriteria')" <!-- 标准发布日期-->
clearable :maxlength="100" <el-form-item label="标准发布日期" title="标准发布日期" class="add-form-item form-item-disabled">
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input> <el-date-picker
</el-form-item> v-model="sarStandardsSearch.issueTime"
<!-- 被代替标准号--> type="date"
<el-form-item label="被代替标准号"> value-format="yyyy-MM-dd"
<el-input v-model="sarStandardsSearch.replacedStandNum" clearable placeholder="根据被代替标准号查找" placeholder="根据标准发布日期查找">
@keyup.enter.native="btnSearch"></el-input> </el-date-picker>
</el-form-item> </el-form-item>
<!-- 标准年份--> <!-- 标准性质-->
<el-form-item :label="$t('m.standardYear')" class="serch-form-item"> <el-form-item :label="$t('m.standNatureShow')" class="add-form-item form-item-disabled">
<el-input <el-select v-model="sarStandardsSearch.standNature" placeholder="请选择标准性质" clearable
v-model="sarStandardsSearch.standYear" @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
placeholder="根据标准年份查找"> <el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value"
</el-input> :key="opt.value" :label="opt.label">{{ opt.label }}
</el-form-item> </el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<!-- 标准类别-->
<el-form-item :label="$t('m.standardCategory')" class="add-form-item form-item-disabled">
<search-select
v-model="sarStandardsSearch.standSort"
:placeholder="$t('m.standardCategoryTips')"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"
:options="standSortOptions"
clearable/>
</el-form-item>
<!-- 标准英文名称-->
<el-form-item :label="$t('m.standardEnglishName')" class="add-form-item form-item-disabled">
<el-input v-model="sarStandardsSearch.standEnName"
:placeholder="$t('m.searchAccordingToStandardEnglishName')" clearable :maxlength="500"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
<!-- 文本状态-->
<el-form-item :label="$t('m.standStateShow')" class="add-form-item form-item-disabled">
<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>
<!-- 是否纳入标准清单-->
<el-form-item label="是否纳入标准清单" title="是否纳入标准清单" class="add-form-item form-item-disabled">
<el-select v-model="sarStandardsSearch.isRelateAccess" placeholder="根据是否纳入标准清单查找">
<el-option value="1" label="是"></el-option>
<el-option value="0" label="否"></el-option>
</el-select>
</el-form-item>
<!-- 标记-->
<!-- 标签-->
<el-form-item label="标签" class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.GXHBQ" clearable
placeholder="根据被标签查找"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
<!-- 标准发布日期--> <ProcessTitle>
<el-form-item label="标准发布日期" class="serch-form-item"> <template slot="title">实施日期</template>
<el-date-picker </ProcessTitle>
v-model="sarStandardsSearch.issueTime" <div class="prc-content-border">
type="date" <el-row :gutter="24">
value-format="yyyy-MM-dd" <el-col :span="12">
placeholder="根据标准发布日期查找"> <!-- 自定义属性-->
</el-date-picker> <!-- 实施日期-->
</el-form-item> <el-form-item label="实施日期" class="add-form-item form-item-disabled">
<!-- 适用车型--> <el-date-picker
<el-form-item :label="$t('m.applicableModels')" class="serch-form-item"> v-model="advanceSearchMapping.SSRQ"
<el-select v-model="sarStandardsSearch.applyArctic" type="date"
:placeholder="$t('m.searchAccordingToThApplicableModel')" clearable value-format="yyyy-MM-dd"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"> placeholder="根据实施日期查找">
<el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value" </el-date-picker>
:key="opt.value" :label="opt.label">{{ opt.label }} </el-form-item>
</el-option> <!-- 在产车实施日期-->
</el-select> <el-form-item title="在产车实施日期" label="在产车实施日期" class="add-form-item form-item-disabled">
</el-form-item> <el-date-picker
v-model="advanceSearchMapping.ZCCSSRQ"
type="date"
value-format="yyyy-MM-dd"
placeholder="根据在产车实施日期查找">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<!-- 新车型实施日期-->
<el-form-item title="新车型实施日期" label="新车型实施日期" class="add-form-item form-item-disabled">
<el-date-picker
value-format="yyyy-MM-dd"
v-model="advanceSearchMapping.XCXSSRQ"
type="date"
placeholder="根据新车型实施日期查找">
</el-date-picker>
</el-form-item>
<!-- 是否纳入标准清单--> </el-col>
<el-form-item label="是否纳入标准清单" class="serch-form-item"> </el-row>
<el-select v-model="sarStandardsSearch.isRelateAccess" placeholder="根据是否纳入标准清单查找"> </div>
<el-option value="1" label="是"></el-option>
<el-option value="0" label="否"></el-option>
</el-select>
</el-form-item>
<ProcessTitle>
<template slot="title">适用范围</template>
</ProcessTitle>
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="12">
<!-- 适用车型-->
<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)">
<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>
<!-- 适用产品线（新增字段）-->
<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)">
<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>
<!-- 体系类别-->
<el-form-item label="体系类别" class="add-form-item form-item-disabled">
<el-select v-model="advanceSearchMapping.TXLB" placeholder="根据体系类别查找" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in txlbOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
:label="opt.label">{{ opt.label }}
</el-option>
</el-select>
</el-form-item>
<!-- 责任工程师-->
<el-form-item label="责任工程师" class="add-form-item form-item-disabled">
<el-select v-model="advanceSearchMapping.ZRGCS" 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>
<!-- 关联模块--乘用车vpps中文名称-->
<el-form-item title="关联模块--乘用车vpps中文名称" label="关联模块--乘用车vpps中文名称" prop="standNumber" class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.CYCVPPSCN" clearable
placeholder="关联模块--乘用车vpps中文名称"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
<!--关联模块--卡车vpps中文名称-->
<el-form-item title="关联模块--卡车vpps中文名称" label="关联模块--卡车vpps中文名称" prop="standNumber" class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.KCCVPPSCN" clearable
placeholder="关联模块--卡车vpps中文名称"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
<!-- 文本状态--> </el-col>
<el-form-item :label="$t('m.standStateShow')" class="serch-form-item"> <el-col :span="12">
<el-select v-model="sarStandardsSearch.textStatus" :placeholder="$t('m.lookupByStandardStatus')" clearable <!-- 能源类型-->
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"> <el-form-item label="能源类型" class="add-form-item form-item-disabled">
<el-option v-for="opt in standStateOptions" :value="opt.value === undefined ? '' :opt.value" <el-select v-model="advanceSearchMapping.NYLX" placeholder="请选择能源类型" clearable
:key="opt.value" :label="opt.label">{{ opt.label }} @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
</el-option> <el-option v-for="opt in nylxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
</el-select> :label="opt.label">{{ opt.label }}
</el-form-item> </el-option>
<!-- 标准性质--> </el-select>
<el-form-item :label="$t('m.standNatureShow')" class="serch-form-item"> </el-form-item>
<el-select v-model="sarStandardsSearch.standNature" placeholder="请选择标准性质" clearable <!-- 适用认证-->
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"> <el-form-item label="适用认证" class="add-form-item form-item-disabled">
<el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value" <el-select v-model="advanceSearchMapping.SYRZ" placeholder="根据适用认证查找" clearable
:key="opt.value" :label="opt.label">{{ opt.label }} @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
</el-option> <el-option v-for="opt in syrzOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
</el-select> :label="opt.label">{{ opt.label }}
</el-form-item> </el-option>
</el-select>
</el-form-item>
<!-- 责任部门-->
<el-form-item label="责任部门" class="add-form-item form-item-disabled">
<el-select v-model="advanceSearchMapping.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>
<!-- 关联模块--乘用车VPPS编码-->
<el-form-item title="关联模块--乘用车VPPS编码" label=" 关联模块--乘用车VPPS编码" prop="standNumber" class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.CYCVPPSBM" clearable
placeholder=" 关联模块--乘用车VPPS编码"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
<!--关联模块--卡车VPPS编码-->
<el-form-item title="关联模块--卡车VPPS编码" label="关联模块--卡车VPPS编码" prop="standNumber" class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.KCCVPPSBM" clearable
placeholder="关联模块--卡车VPPS编码"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
<!-- 自定义属性--> <ProcessTitle>
<!-- 实施日期--> <template slot="title">关联信息</template>
<el-form-item label="实施日期"> </ProcessTitle>
<el-date-picker <div class="prc-content-border">
v-model="advanceSearchMapping.SSRQ" <el-row :gutter="24">
type="date" <el-col :span="12">
value-format="yyyy-MM-dd" <!-- 代替标准号-->
placeholder="根据实施日期查找"> <el-form-item :label="$t('m.substituteStandardNumber')" class="add-form-item form-item-disabled">
</el-date-picker> <el-input v-model="sarStandardsSearch.replaceStandNum" :placeholder="$t('m.lookUpByAlternativeCriteria')"
</el-form-item> clearable :maxlength="100"
<!-- 新车型实施日期--> @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
<el-form-item title="新车型实施日期" label="新车型实施日期"> </el-form-item>
<el-date-picker <!-- 引用标准-->
value-format="yyyy-MM-dd" <el-form-item label="引用标准" class="add-form-item form-item-disabled">
v-model="advanceSearchMapping.XCXSSRQ" <el-input v-model="advanceSearchMapping.YYBJ" clearable placeholder="根据引用标准查找"
type="date" @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
placeholder="根据新车型实施日期查找"> </el-form-item>
</el-date-picker> </el-col>
</el-form-item> <el-col :span="12">
<!-- 在产车实施日期--> <!-- 被代替标准号-->
<el-form-item title="在产车实施日期" label="在产车实施日期"> <el-form-item label="被代替标准号" class="add-form-item form-item-disabled">
<el-date-picker <el-input v-model="sarStandardsSearch.replacedStandNum" clearable placeholder="根据被代替标准号查找"
v-model="advanceSearchMapping.ZCCSSRQ" @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
type="date" </el-form-item>
value-format="yyyy-MM-dd" <!-- 被引用标准-->
placeholder="根据在产车实施日期查找"> <el-form-item label="被引用标准" class="add-form-item form-item-disabled">
</el-date-picker> <el-input v-model="advanceSearchMapping.BYYBJ" clearable
</el-form-item> placeholder="根据被引用标准查找"
<!-- 归口管理部门--> @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
<el-form-item label="归口管理部门"> </el-form-item>
<el-select v-model="advanceSearchMapping.GKDW" placeholder="归口管理部门" clearable </el-col>
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"> </el-row>
<el-option v-for="opt in gkglbmOptions" :value="opt.value === undefined ? '' :opt.value" </div>
:key="opt.value" :label="opt.label">{{ opt.label }}
</el-option>
</el-select>
</el-form-item>
<!-- 起草单位-->
<el-form-item label="起草单位">
<el-select v-model="advanceSearchMapping.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>
<!-- 我司参与深度-->
<el-form-item label="我司参与深度">
<el-select v-model="advanceSearchMapping.CYSD" 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>
<!-- 能源类型-->
<el-form-item label="能源类型">
<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"
:label="opt.label">{{ opt.label }}
</el-option>
</el-select>
</el-form-item>
<!-- 适用产品线（新增字段）-->
<el-form-item :label="$t('m.applicableProductLine')" class="serch-form-item">
<el-select v-model="advanceSearchMapping.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>
<!-- 适用认证-->
<el-form-item label="适用认证">
<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"
:label="opt.label">{{ opt.label }}
</el-option>
</el-select>
</el-form-item>
<!-- 责任部门-->
<el-form-item label="责任部门">
<el-select v-model="advanceSearchMapping.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>
<!-- 责任工程师-->
<el-form-item label="责任工程师">
<el-select v-model="advanceSearchMapping.ZRGCS" 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>
<!-- 采标编号-->
<el-form-item label="采标编号" prop="nameShow">
<el-input v-model="advanceSearchMapping.CBBH" clearable placeholder="根据采标编号查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!-- 采标程度-->
<el-form-item label="采标程度" prop="standNumber">
<el-input v-model="advanceSearchMapping.CBCD" clearable
placeholder="根据采标程度查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!-- 引用标准-->
<el-form-item label="引用标准">
<el-input v-model="advanceSearchMapping.YYBJ" clearable placeholder="根据引用标准查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!-- 被引用标准-->
<el-form-item label="被引用标准">
<el-input v-model="advanceSearchMapping.BYYBJ" clearable
placeholder="根据被引用标准查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!-- 体系类别-->
<el-form-item label="体系类别">
<el-select v-model="advanceSearchMapping.TXLB" placeholder="根据体系类别查找" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in txlbOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
:label="opt.label">{{ opt.label }}
</el-option>
</el-select>
</el-form-item>
<!-- 关联模块--乘用车VPPS编码-->
<el-form-item title=" 关联模块--乘用车VPPS编码" label=" 关联模块--乘用车VPPS编码" prop="standNumber">
<el-input v-model="advanceSearchMapping.CYCVPPSBM" clearable
placeholder=" 关联模块--乘用车VPPS编码"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!-- 关联模块--乘用车vpps中文名称-->
<el-form-item title="关联模块--乘用车vpps中文名称" label="关联模块--乘用车vpps中文名称" prop="standNumber">
<el-input v-model="advanceSearchMapping.CYCVPPSCN" clearable
placeholder="关联模块--乘用车vpps中文名称"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!--关联模块--卡车VPPS编码-->
<el-form-item title="关联模块--卡车VPPS编码" label="关联模块--卡车VPPS编码" prop="standNumber">
<el-input v-model="advanceSearchMapping.KCCVPPSBM" clearable
placeholder="关联模块--卡车VPPS编码"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!--关联模块--卡车vpps中文名称-->
<el-form-item title="关联模块--卡车vpps中文名称" label="关联模块--卡车vpps中文名称" prop="standNumber">
<el-input v-model="advanceSearchMapping.KCCVPPSCN" clearable
placeholder="关联模块--卡车vpps中文名称"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!-- 标记-->
<!-- 标签-->
<el-form-item label="标签">
<el-input v-model="advanceSearchMapping.GXHBQ" clearable
placeholder="根据被标签查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
</el-form> </el-form>
</div> </div>
<div class="demo-drawer-footer"> <div class="demo-drawer-footer">
@@ -1318,7 +1322,7 @@
<el-button class="common-button-primary" type="primary" icon="el-icon-search" size="mini" @click="selectConfiguraStand"></el-button> <el-button class="common-button-primary" type="primary" icon="el-icon-search" size="mini" @click="selectConfiguraStand"></el-button>
</el-form-item> </el-form-item>
<el-form-item label="" class="search-item btn-box"> <el-form-item label="" class="search-item btn-box">
<el-button class="common-button-default" icon="el-icon-refresh-left" @click="clearAllSearch(3)" size="mini"></el-button> <el-button class="common-button-default" icon="el-icon-refresh-left" @click="clearAllSearch('standCommonlySearch')" size="mini"></el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
@@ -1612,6 +1616,8 @@ import {interfaceUrl} from "@/sysConfig";
import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
import store from "@/store"; import store from "@/store";
import ProcessTitle from '@/pages/processCenter/pages/components/ProcessTitle'
export default { export default {
name: 'foreignStandardsAndRegulations', name: 'foreignStandardsAndRegulations',
@@ -1634,7 +1640,8 @@ export default {
MechanismTree, MechanismTree,
CustomDatePickWithText2, CustomDatePickWithText2,
TreeSelect, TreeSelect,
TreeSelectNew TreeSelectNew,
ProcessTitle
}, },
data() { data() {
return { return {
@@ -2834,17 +2841,42 @@ export default {
clearAllSearch(flag) { clearAllSearch(flag) {
if (flag === 'standCommonlySearch') { if (flag === 'standCommonlySearch') {
this.standCommonlySearch.standNumber = ''; this.standCommonlySearch.standNumber = '';
this.standCommonlySearch.standSort = ''; this.standCommonlySearch.standName = '';
this.standCommonlySearch.page = 1; this.standCommonlySearch.page = 1;
} }
this.getDomesticStandardTable(this.standCommonlySearch)
if (flag === 'sarStandardsSearch') { if (flag === 'sarStandardsSearch') {
this.sarStandardsSearch.standSort = '' this.sarStandardsSearch.standSort = ''
this.sarStandardsSearch.standNumber = '' this.sarStandardsSearch.standNumber = ''
this.sarStandardsSearch.page = 1 this.sarStandardsSearch.page = 1
this.getDomesticStandardTable() 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) { } else if (flag === 2) {
// 标准条目搜索 // 标准条目搜索
this.standItemSearch.responsibleUnit = '' this.standItemSearch.responsibleUnit = ''
@@ -4838,6 +4870,16 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
/deep/.contentTitle{
width: 100%;
}
/deep/.el-drawer__container {
.prc-content-border {
/*border: none;*/
width: 100%;
padding: 0 20px 0;
}
}
/deep/ .icon-tree { /deep/ .icon-tree {
margin: 0 5px 0 10px; margin: 0 5px 0 10px;
position: relative; position: relative;
@@ -5155,20 +5197,6 @@ export default {
.label-input-form { .label-input-form {
&.table-lattice { &.table-lattice {
/deep/ .el-form-item__label {
width: 100px;
height: 30px;
border: 1px solid #DCDFE6;
border-right: none;
line-height: 30px;
text-align: center;
margin-top: 6px;
background: #F9F9F9;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis
}
/deep/ .el-input__inner { /deep/ .el-input__inner {
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProject.vue
+32 -5
View File
@@ -1,14 +1,14 @@
<template> <template>
<div class="wx-custom-tab"> <div class="wx-custom-tab">
<el-tabs v-model="tabValue" style="height: 100%;"> <el-tabs v-model="tabValue" style="height: 100%;">
<el-tab-pane label="项目评估结果" name="standInvolveProjectDetail"> <el-tab-pane label="项目评估结果" name="standInvolveProjectDetail" v-if="project">
<div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;"> <div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
<stand-involve-project-detail v-if="tabValue === 'standInvolveProjectDetail'"></stand-involve-project-detail> <stand-involve-project-detail ></stand-involve-project-detail>
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="技术评估结果" name="technologyInvolveProject"> <el-tab-pane label="技术评估结果" name="technologyInvolveProject" v-if="skill">
<div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;"> <div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
<technology-involve-project v-if="tabValue === 'technologyInvolveProject'"></technology-involve-project> <technology-involve-project ></technology-involve-project>
</div> </div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
@@ -28,11 +28,38 @@ export default {
}, },
data () { data () {
return { return {
tabValue: 'standInvolveProjectDetail' skill: false,
project: false,
tabValue: '',
menuName: [ "项目评估结果", "技术评估结果"]
} }
}, },
methods: {}, methods: {},
mounted () { mounted () {
const menuList = this.$store.getters.getMenuList;
let menuData = [];
let menuID = ["d64fe4a4d794921885a96c1daf5c3802", "e81f9857997cba2f5faa439201a13085"];
this.menuName.forEach(item => {
for (let i = 0; i < menuList.length; i++) {
let entity = menuList[i];
if (item != entity.menuName) continue;
if (menuID.indexOf(entity.id) >= 0 && menuData.indexOf(entity.id) == -1) {
menuData.push(entity.id);
if (entity.id === "d64fe4a4d794921885a96c1daf5c3802") {
this.project = true
} else if (entity.id === "e81f9857997cba2f5faa439201a13085") {
this.skill = true
}
}
}
});
if(this.skill === true){
this.tabValue = "technologyInvolveProject"
return;
}else if(this.project === true){
this.tabValue = "standInvolveProjectDetail"
return;
}
} }
} }
</script> </script>
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+1 -1
View File
@@ -79,7 +79,7 @@
size="mini" size="mini"
@click="exportStandard()" @click="exportStandard()"
title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项" title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
v-btn-permission="'c3c8c107fb4ca1ab089d5b4b73cfcee1'" v-btn-permission="'620e6da5808bf104e576c763546a33b6'"
><i class="iconfont">&#xe6e9;</i>导出</el-button> ><i class="iconfont">&#xe6e9;</i>导出</el-button>
<el-button <el-button
class="common-button-primary" class="common-button-primary"
src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue
+222 -56
View File
@@ -62,7 +62,8 @@
:title="addDrawerTitle" :title="addDrawerTitle"
:visible.sync="addDrawer" :visible.sync="addDrawer"
:before-close="addDrawerClose"> :before-close="addDrawerClose">
<div class="content"> <div class="demo-drawer-content">
<div class="content">
<div class="standard-table-search"> <div class="standard-table-search">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="24"> <el-col :span="24">
@@ -144,37 +145,38 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="联络人" label="联络人"
prop="joinPerson" prop="name"
align="center" align="center"
width="150"> width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.joinPerson"></el-input> <el-input v-model="scope.row.netId" style="display: none;"></el-input>
<el-input style="margin: 10px 0;" @click.native="checkRole('选择联络人', scope.$index, scope.row.netId)" v-model="scope.row.name"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="单位" label="单位"
prop="joinPersonCompany" prop="unit"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.joinPersonCompany"></el-input> <el-input style="margin: 10px 0;" disabled v-model="scope.row.unit"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="电话" label="电话"
prop="joinPersonPhone" prop="phone"
align="center" align="center"
width="150"> width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.joinPersonPhone"></el-input> <el-input style="margin: 10px 0;" disabled v-model="scope.row.phone"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="邮箱" label="邮箱"
prop="joinPersonEmail" prop="email"
align="center" align="center"
width="200"> width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.joinPersonEmail"></el-input> <el-input style="margin: 10px 0;" disabled v-model="scope.row.email"></el-input>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -212,63 +214,66 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="我司在工作组排名顺序" label="我司在工作组排名顺序"
prop="joinPm" prop="deptOrder"
align="center" align="center"
width="150"> width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.joinPm"></el-input> <el-input style="margin: 10px 0;" v-model="scope.row.deptOrder"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="我司人员" label="我司人员"
prop="joinPerson" prop="name"
align="center" align="center"
width="150"> width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.joinPerson"></el-input> <el-input v-model="scope.row.deptPeopleId" style="display: none;"></el-input>
<el-input style="margin: 10px 0;" @click.native="checkRole('选择我司人员', scope.$index, scope.row.deptPeopleId)" v-model="scope.row.name"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="单位" label="单位"
prop="joinPersonCompany" prop="unitName"
width="150"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.joinPersonCompany"></el-input> <el-input style="margin: 10px 0;" disabled v-model="scope.row.unit"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="部门" label="部门"
prop="joinDept" width="150"
prop="deptName"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.joinDept"></el-input> <el-input style="margin: 10px 0;" disabled v-model="scope.row.deptName"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="电话" label="电话"
prop="joinPersonPhone" prop="phone"
align="center" align="center"
width="150"> width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.joinPersonPhone"></el-input> <el-input style="margin: 10px 0;" disabled v-model="scope.row.phone"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="邮箱" label="邮箱"
prop="joinPersonEmail" prop="email"
align="center" align="center"
width="200"> width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.joinPersonEmail"></el-input> <el-input style="margin: 10px 0;" disabled v-model="scope.row.email"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="身份" label="身份"
prop="joinSf" prop="identity"
align="center" align="center"
width="200"> width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.joinSf"></el-input> <el-input style="margin: 10px 0;" v-model="scope.row.identity"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -328,54 +333,64 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="费用" label="费用"
prop="joinPrice" prop="price"
align="center" align="center"
width="150"> width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.joinPrice"></el-input> <el-input style="margin: 10px 0;" v-model="scope.row.price"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="年份" label="年份"
prop="joinYear" prop="year"
align="center" align="center"
width="150"> width="250">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.joinYear"></el-input> <el-date-picker
v-model="scope.row.year"
value-format="yyyy"
type="year"
placeholder="选择年">
</el-date-picker>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="状态" label="状态"
prop="joinStatus" prop="status"
width="150"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.joinStatus"></el-input> <el-input style="margin: 10px 0;" v-model="scope.row.status"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="计划内" label="计划内"
prop="joinJhn" width="150"
prop="inplan"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.joinJhn"></el-input> <el-select v-model="scope.row.inplan" placeholder="请选择">
<el-option label="计划内" value="0"></el-option>
<el-option label="计划外" value="1"></el-option>
</el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="缴费方式" label="缴费方式"
prop="joinJffs" prop="payWay"
align="center" align="center"
width="150"> width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.joinJffs"></el-input> <el-input style="margin: 10px 0;" v-model="scope.row.payWay"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="费用列支" label="费用列支"
prop="joinFylz" prop="payInfo"
align="center" align="center"
width="200"> width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.joinFylz"></el-input> <el-input style="margin: 10px 0;" v-model="scope.row.payInfo"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -433,9 +448,51 @@
width="55" width="55"
v-if="addForm.wgMeetingInfos.length"> v-if="addForm.wgMeetingInfos.length">
</el-table-column> </el-table-column>
<el-table-column
label="参会日期"
prop="meetingTime"
align="center"
width="250">
<template slot-scope="scope">
<el-date-picker
v-model="scope.row.meetingTime"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetime"
placeholder="请选择参会日期">
</el-date-picker>
</template>
</el-table-column>
<el-table-column
label="会议名称"
prop="meetingName"
align="center"
width="200">
<template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.meetingName"></el-input>
</template>
</el-table-column>
<el-table-column
label="参会人员"
prop="meetingPeople"
align="center"
width="200">
<template slot-scope="scope">
<!-- <el-input v-model="scope.row.meetingPeople" style="display: none;"></el-input>-->
<el-input style="margin: 10px 0;" @click.native="checkRoles(scope.$index, scope.row.meetingPeople)" v-model="scope.row.meetingPeopleName"></el-input>
</template>
</el-table-column>
<el-table-column
label="参会报告"
prop="meetingReport"
align="center"
width="200">
<template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.meetingReport"></el-input>
</template>
</el-table-column>
<el-table-column <el-table-column
prop="joinfile" prop="joinfile"
label="资料" label="会议资料"
width="250" width="250"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -461,6 +518,22 @@
</el-row> </el-row>
</div> </div>
</div> </div>
</div>
<div class="demo-drawer-footer">
<el-button
size="mini"
class="common-button-primary"
icon="el-icon-check"
type="primary"
:loading="submitLoading"
@click="addDrawerSubmit">提交
</el-button>
<el-button
size="mini"
class="common-button-default"
icon="el-icon-close"
@click="addDrawerClose">取消</el-button>
</div>
</el-drawer> </el-drawer>
<el-dialog width='400px' :visible.sync="fileMadel" title="上传资料"> <el-dialog width='400px' :visible.sync="fileMadel" title="上传资料">
<el-upload <el-upload
@@ -484,6 +557,19 @@
</div> </div>
</el-upload> </el-upload>
</el-dialog> </el-dialog>
<Role-tree
check-box
is-title="选择人员"
:is-visible.sync="modalshowflag"
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
<Role-tree
is-title="选择人员"
:is-visible.sync="modalshowflag2"
@checkedRole="checkedRole2"
:nodeList="nodeList2"
></Role-tree>
</div> </div>
</template> </template>
@@ -494,6 +580,11 @@
name: "workingGroup1", name: "workingGroup1",
data() { data() {
return { return {
modalshowflag2: false,
nodeList2: [],
submitLoading: false,
nodeList: [],
modalshowflag: false,
headerNo: false, headerNo: false,
addForm: { addForm: {
pName: '', pName: '',
@@ -532,9 +623,54 @@
fileMadel: false, fileMadel: false,
fileUrl: 'api/att/attFile/upload', fileUrl: 'api/att/attFile/upload',
fileType: '', fileType: '',
pIndex: '',
pType: '',
} }
}, },
methods: { methods: {
checkRole(type, index, row) {
if (row) {
this.nodeList.push(row)
} else {
this.nodeList = []
}
this.pType = type
this.pIndex = index
this.modalshowflag = true
},
checkRoles(index, row) {
this.nodeList2 = row || []
this.pIndex = index
this.modalshowflag2 = true
},
checkedRole (data) {
if (this.pType === '选择联络人') {
this.addForm.wgNetInfos[this.pIndex].name = data[0].name
this.addForm.wgNetInfos[this.pIndex].netId = data[0].id
this.addForm.wgNetInfos[this.pIndex].unit = data[0].positionName
this.addForm.wgNetInfos[this.pIndex].phone = data[0].phone
this.addForm.wgNetInfos[this.pIndex].email = data[0].email
} else if (this.pType === '选择我司人员') {
this.addForm.wgDepts[this.pIndex].name = data[0].name
this.addForm.wgDepts[this.pIndex].deptPeopleId = data[0].id
this.addForm.wgDepts[this.pIndex].phone = data[0].phone
this.addForm.wgDepts[this.pIndex].email = data[0].email
this.addForm.wgDepts[this.pIndex].deptId = data[0].institutionId
this.addForm.wgDepts[this.pIndex].deptName = data[0].institutionName
this.addForm.wgDepts[this.pIndex].unit = data[0].positionId
this.addForm.wgDepts[this.pIndex].unitName = data[0].positionName
}
},
checkedRole2 (data) {
let ids = []
let nameList = []
data.forEach(item => {
ids.push(item.id)
nameList.push(item.name)
})
this.addForm.wgMeetingInfos[this.pIndex].meetingPeople = ids
this.addForm.wgMeetingInfos[this.pIndex].meetingPeopleName = nameList
},
fileUpload(type, index) { fileUpload(type, index) {
this.fileIndex = index this.fileIndex = index
this.fileType = type this.fileType = type
@@ -637,39 +773,42 @@
var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36); var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
this.addForm.wgNetInfos.push({ this.addForm.wgNetInfos.push({
joinId: id, joinId: id,
joinPersonCompany: '', name: '',
joinPerson: '', netId: '',
joinPersonPhone: '', email: '',
joinPersonEmail: '' phone: '',
unit: ''
}) })
}, // 新增秘书处联系方式 }, // 新增秘书处联系方式
addCyItem () { addCyItem () {
var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36); var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
this.addForm.wgDepts.push({ this.addForm.wgDepts.push({
joinId: id, joinId: id,
joinPersonCompany: '', deptOrder: '',
joinPerson: '', deptPeopleId: '',
joinPersonPhone: '', identity: '',
joinPersonEmail: '',
joinDept: '',
joinSf: '',
joinfile: [], joinfile: [],
joinfileName: '', joinfileName: '',
joinPm: '' name: '',
unitName: '',
phone: '',
email: '',
deptName: '',
deptId: '',
}) })
}, // 新增集团参与情况 }, // 新增集团参与情况
addZfItem () { addZfItem () {
var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36); var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
this.addForm.wgPayInfos.push({ this.addForm.wgPayInfos.push({
joinId: id, joinId: id,
joinPrice: '', price: '',
joinYear: '', year: '',
joinStatus: '', status: '',
joinJhn: '', inplan: '0',
joinJffs: '', payWay: '',
joinfile: [], joinfile: [],
joinfileName: '', joinfileName: '',
joinFylz: '' payInfo: ''
}) })
}, // 新增支付信息 }, // 新增支付信息
addChItem () { addChItem () {
@@ -678,6 +817,11 @@
joinId: id, joinId: id,
joinfile: [], joinfile: [],
joinfileName: '', joinfileName: '',
meetingTime: '',
meetingName: '',
meetingPeople: '',
meetingPeopleName: '',
meetingReport: '',
}) })
}, // 新增参会记录 }, // 新增参会记录
delTelItem () { delTelItem () {
@@ -767,6 +911,25 @@
addItem () { addItem () {
this.addDrawer = true this.addDrawer = true
}, // 新增 }, // 新增
addDrawerSubmit () {
this.submitLoading = true
this.addForm.wgDepts.forEach(item => {
item.joinfile = JSON.stringify(item.joinfile)
})
this.addForm.wgPayInfos.forEach(item => {
item.joinfile = JSON.stringify(item.joinfile)
})
this.addForm.wgMeetingInfos.forEach(item => {
item.joinfile = JSON.stringify(item.joinfile)
})
this.$http.postData('wg_work_group/add', this.addForm, {
_this: this
}, res => {
this.submitLoading = false
this.addDrawer = false
if (res.ok) {}
})
}, // 新增提交
addDrawerClose () { addDrawerClose () {
this.addDrawer = false this.addDrawer = false
}, // drawer关闭事件 }, // drawer关闭事件
@@ -786,11 +949,15 @@
let row = node._cfg.model let row = node._cfg.model
console.log(row); console.log(row);
this.addForm = { this.addForm = {
pid: row.id,
wgNetInfos: [], wgNetInfos: [],
nature: (parseInt(row.nature) + 1).toString(),
status: '0',
wgDepts: [], wgDepts: [],
wgPayInfos: [], wgPayInfos: [],
wgMeetingInfos: [], wgMeetingInfos: [],
level: row.level, level: (parseInt(row.level) + 1).toString(),
types: row.types,
pName: row.name, pName: row.name,
itemType: row.level === '0' ? '标委会' : (row.level === '1' ? '分标委' : (row.level === '2' ? '工作组' : '标准')) itemType: row.level === '0' ? '标委会' : (row.level === '1' ? '分标委' : (row.level === '2' ? '工作组' : '标准'))
} }
@@ -1064,7 +1231,6 @@
_this: this _this: this
}, res => { }, res => {
if (res.ok) { if (res.ok) {
console.log(res);
} }
}) })
} }