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

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

Browse Source
This commit is contained in:
super_liu
2022-04-13 19:31:58 +08:00
parent faf7fea3b2 eaf137859e
commit b983ffca5f
235 changed files with 9139 additions and 7447 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
+3 -3
View File
@@ -8,9 +8,9 @@
<el-tab-pane label="车型类别清单" name="listProject" v-if="project">
<list-project></list-project>
</el-tab-pane>
<el-tab-pane label="重点标准跟踪清单" name="listTracking" v-if="tracking">
<list-tracking></list-tracking>
</el-tab-pane>
<!-- <el-tab-pane label="重点标准跟踪清单" name="listTracking" v-if="tracking">-->
<!-- <list-tracking></list-tracking>-->
<!-- </el-tab-pane>-->
<el-tab-pane label="其他清单" name="listOther" v-if="other">
<list-other></list-other>
</el-tab-pane>
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+8 -4
View File
@@ -32,7 +32,7 @@
class="common-button-primary"
size="small"
v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
@click="searchSarAccess">
@click="searchSarAccessPage1">
查询
</el-button>
</el-form-item>
@@ -263,8 +263,8 @@ export default {
searchSarAccess() {
this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
sortKey: 1,
page: 1,
pageSize: 10,
page: this.sarSarAccessEOSearch.page,
pageSize: this.sarSarAccessEOSearch.pageSize,
...this.sarSarAccessEOSearch
}, {
_this: this
@@ -286,7 +286,7 @@ export default {
});
this.tableLoading = false;
this.sarAccessListDatas = arr;
this.sarSarAccessEOSearch.page = 1;
// this.sarSarAccessEOSearch.page = 1;
this.sarAccessListTotal = res.data.total;
}, e => {
@@ -300,6 +300,10 @@ export default {
this.sarSarAccessEOSearch.pageSize = this.$store.getters.userInfo.configContent;
this.searchSarAccess();
},
searchSarAccessPage1() {
this.sarSarAccessEOSearch.page = 1
this.searchSarAccess();
},
clearSearch() {
this.sarSarAccessEOSearch.countryArea = "";
this.sarSarAccessEOSearch.detailedListName = "";
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
+47 -2
View File
@@ -83,13 +83,18 @@
width="250"
label="标准编号/政策编号"
align="center">
<template slot-scope="scope">
<a @click="handlePreviewAA(scope.row)" style="cursor: pointer">{{ scope.row.lawCode }}</a>
</template>
</el-table-column>
<el-table-column
prop="lawName"
label="标准名称/政策名称"
align="center"
width="300px"
>
width="300px">
<template slot-scope="scope">
<a @click="handlePreviewAA(scope.row)" style="cursor: pointer">{{ scope.row.lawName }}</a>
</template>
</el-table-column>
<el-table-column
prop="productType"
@@ -893,6 +898,46 @@ export default {
}
},
methods: {
handlePreviewAA(item) {
if (item.dataSource === "INLAND"){
let routeUrlINLAND = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.lawId,
pageType: 'INLAND_STAND'
}
})
window.open(routeUrlINLAND.href, '_blank')
}else if (item.dataSource === "FOREIGN"){
let routeUrlFOREIGN = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.lawId,
pageType: 'FOREIGN_STAND'
}
})
window.open(routeUrlFOREIGN.href, '_blank')
} else if (item.dataSource !== undefined){
let routeUrlLAWS = this.$router.resolve({
name: 'OtherLawsStandDetails',
params: {
id: item.lawId,
pageType: 'LAWS_STAND'
}
})
window.open(routeUrlLAWS.href, '_blank')
}else {
let routeUrlBUSINESS = this.$router.resolve({
name: 'OtherBussStandardDetails',
params: {
id: item.lawId,
pageType: 'BUSINESS_STAND'
}
})
window.open(routeUrlBUSINESS.href, '_blank')
}
},
reImplRequire(row, column, cellValue, index) {
let str = ''
this.attrTypeOptions.forEach((item, index) => {
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+16 -2
View File
@@ -748,6 +748,7 @@ export default {
},
data() {
return {
seniorQueryFlag: false,
textStatusMap: {},
countryAreaMap: {},
// 编辑抽屉状态
@@ -1036,7 +1037,9 @@ export default {
// formData.issueTime = formData.issueTime ? formData.issueTime[1] : null
}*/
this.sarAccessInfo = formData
this.sarAccessInfo.page = 1
this.showQueryMore = false
this.seniorQueryFlag = true
this.selectLawsStands(1)
},
@@ -1100,6 +1103,7 @@ export default {
},
// 点数据搜索 查询按钮 事件
searchLawsStands() {
this.seniorQueryFlag = false
this.showTableFlag = false
this.sarAccessInfo.page = 1
this.selectLawsStands()
@@ -1437,6 +1441,7 @@ export default {
rowlist2 = rowlist2.join(';')
rowlist3 = rowlist3.join(';')
let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
sarAccessEO.reNewPeople = this.$store.getters.userInfo.userId
sarAccessEO.inforlist = rowlist
sarAccessEO.inforlist1 = rowlist1
sarAccessEO.inforlist2 = rowlist2
@@ -1639,12 +1644,21 @@ export default {
drawerPageChange(page) {
this.drawerPage = page
this.sarAccessInfo.page = this.drawerPage
this.selectLawsStands()
if (this.seniorQueryFlag) {
this.selectLawsStands(1)
} else {
this.selectLawsStands()
}
},
// 数据搜索table分页条数改变回调
drawerPageSizeChange() {
this.sarAccessInfo.pageSize = this.$store.getters.userInfo.configContent
this.selectLawsStands()
if (this.seniorQueryFlag) {
this.selectLawsStands(1)
} else {
this.selectLawsStands()
}
},
// 点击 导出、全部导出按钮事件
exportAccessInfo(type) {
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+45 -11
View File
@@ -162,7 +162,6 @@
</el-table-column>
<el-table-column
prop="ssrq"
sortable
align="center"
width="210px"
label="标准实施日期">
@@ -170,14 +169,12 @@
<el-table-column
show-overflow-tooltip
prop="zccssrqgj"
sortable
width="210px"
align="center"
label="在产车实施日期">
</el-table-column>
<el-table-column
prop="xcxssrqgj"
sortable
align="center"
width="210px"
label="新车型实施日期">
@@ -458,7 +455,7 @@
import { interfaceUrl } from "@/sysConfig";
import ProcessTitle from '@/pages/processCenter/pages/components/ProcessTitle'
import CustomSelectArray from "@/components/CustomFormComponents/SelectArray";
import { StandardsInfoPage } from "api/unqualProcess";
import { StandardsInfoPage, selectHighLawsById } from "api/unqualProcess";
export default {
name: "AccessStandardDetails",
@@ -648,24 +645,61 @@ export default {
}*/
this.sarAccessInfo = formData
this.showQueryMore = false
this.selectLawsStands()
this.selectLawsStands(1)
},
// 查询数据搜索 table 数据
selectLawsStands() {
selectLawsStands(type) {
if (this.sarAccessInfo.dataSource === 'INLAND_STAND') {
this.sarAccessInfo.standType = 'INLAND'
this.pageInfo()
if (type === 1) {
this.seniorPageInfo()
} else {
this.pageInfo()
}
} else if (this.sarAccessInfo.dataSource === 'FOREIGN_STAND') {
this.sarAccessInfo.standType = 'FOREIGN'
this.pageInfo()
if (type === 1) {
this.seniorPageInfo()
} else {
this.pageInfo()
}
} else if (this.sarAccessInfo.dataSource === 'FOREIGN_LAWS') {
this.sarAccessInfo.standType = 'LAWS'
this.pageInfo()
if (type === 1) {
this.seniorPageInfo()
} else {
this.pageInfo()
}
} else if (this.sarAccessInfo.dataSource === 'BUSINESS') {
this.sarAccessInfo.standType = 'BUSINESS'
this.pageInfo()
if (type === 1) {
this.seniorPageInfo()
} else {
this.pageInfo()
}
}
},
seniorPageInfo() {
this.sarAccessInfo.standType = ''
this.sarAccessInfo.qdFlag = '1'
this.sarAccessInfo.qdid = this.$route.params.id
selectHighLawsById((this.sarAccessInfo)).then(res => {
this.standinfoList = res.data.list
this.standinfoList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
item.zrbm = item.attrInfoCaseMap.zrbm
item.sycpx = item.attrInfoCaseMap.sycpx
item.typeApplicable = item.attrInfoMap.CLLX
item.nylx = item.attrInfoMap.NYLX
})
this.total = res.data.count
}, e => {
})
},
pageInfo() {
if (this.sarAccessInfo.dataSource === 'INLAND_STAND' || this.sarAccessInfo.dataSource === 'FOREIGN_STAND') {
StandardsInfoPage((this.sarAccessInfo)).then(res => {
@@ -1027,7 +1061,7 @@ export default {
name: "OtherStandardDetails",
params: {
id: data.id,
pageType: data.standType,
pageType: data.standType === 'INLAND' ? 'INLAND_STAND' : data.standType,
}
});
window.open(routeUrl.href, "_blank");
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+34 -23
View File
@@ -106,7 +106,7 @@
size="mini"
class="common-button-primary"
v-btn-permission="'967c8b1402459951b5f75fcd1c548665'"
@click="searchBtnClick(standCommonlySearch)">
@click="searchBtnClick(standCommonlySearch, 1)">
查询
</el-button>
<el-button
@@ -829,17 +829,18 @@
>
<template slot="label">起草单位</template>
<div style="display: flex;justify-content: space-between;align-items: center;">
<el-tooltip v-if="sarStandardsInfoEO['QCDW']" class="item" effect="dark" :content="sarStandardsInfoEO['QCDW']" placement="top-start">
<el-input
:config="field"
clearable
@input="change($event)"
v-model="sarStandardsInfoEO['QCDW']"
:disabled="formdisableflag" placeholder="选择或输入起草单位">
</el-input>
</el-tooltip>
<div v-else>
<!-- <el-tooltip v-if="sarStandardsInfoEO['QCDW']" :class="sarStandardsInfoEO['QCDW'] ? 'item' : ''" effect="dark" :content="sarStandardsInfoEO['QCDW']" placement="top-start">-->
<!-- <el-input-->
<!-- :config="field"-->
<!-- clearable-->
<!-- @input="change($event)"-->
<!-- v-model="sarStandardsInfoEO['QCDW']"-->
<!-- :disabled="formdisableflag" placeholder="选择或输入起草单位">-->
<!-- </el-input>-->
<!-- </el-tooltip>-->
<div>
<el-input
:title="sarStandardsInfoEO['QCDW']"
:config="field"
clearable
@input="change($event)"
@@ -1636,7 +1637,7 @@
</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')"
<el-select v-model="sarStandardsSearch.textStatus" :placeholder="$t('m.lookupByStandardStatusText')"
clearable>
<el-option v-for="opt in standStateOptions" :value="opt.value === undefined ? '' :opt.value"
:key="opt.value" :label="opt.label">{{ opt.label }}
@@ -1978,6 +1979,10 @@
:placeholder="$t('m.lookUpByAlternativeCriteria')"
clearable :maxlength="100"></el-input>
</el-form-item>
<!-- 部分代替标准号-->
<el-form-item label="部分代替标准号" class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.BFDTBZ" clearable placeholder="根据部分代替标准号查找"></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="根据采标编号查找"></el-input>
@@ -2424,6 +2429,7 @@ export default {
//高级搜索映射
advanceSearchMapping: {
BFDTBZ: '',
txlbOption: '', //标准体系
GXHBQ: '', //标签
CYSD: '', //我司参与深度
@@ -3718,9 +3724,9 @@ export default {
this.getDomesticStandardTable(this.standCommonlySearch)
},
// 点击搜索按钮
searchBtnClick(standCommonlySearch) {
searchBtnClick(standCommonlySearch, type) {
let item = this.standCommonlySearch
this.getDomesticStandardTable(item)
this.getDomesticStandardTable(item, type)
},
// 搜索
getDomesticStandardTableBtn(item) {
@@ -3818,7 +3824,7 @@ export default {
// 高级检索
selectMoreBtn() {
this.isAdvancedSearch = true
this.sarStandardsSearch = {}
// this.sarStandardsSearch = {}
},
treeCollapse() {
this.sideClose = !this.sideClose
@@ -4542,7 +4548,7 @@ export default {
// 此处需要调用接口，修改个人配置
},
// 分页查询国内标准
getDomesticStandardTable(item) {
getDomesticStandardTable(item, type) {
if (item !== '' && item !== null && item !== undefined) {
item.pageSize = this.$store.getters.userInfo.configContent
}
@@ -4619,13 +4625,15 @@ export default {
}
}
if(item){
if(item.advanceSearchVOStr.length){
advanceSearchVOList.push({
connect: item.advanceSearchVOStr[0].connect,
field: item.advanceSearchVOStr[0].field,
type: item.advanceSearchVOStr[0].type,
value: item.advanceSearchVOStr[0].value,
})
if(item.advanceSearchVOStr){
if(item.advanceSearchVOStr.length){
advanceSearchVOList.push({
connect: item.advanceSearchVOStr[0].connect,
field: item.advanceSearchVOStr[0].field,
type: item.advanceSearchVOStr[0].type,
value: item.advanceSearchVOStr[0].value,
})
}
}
}
formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList)
@@ -4663,6 +4671,9 @@ export default {
if ((this.stahndinfoList.length === 0 || this.stahndinfoList === []) && this.sarStandardsSearch.page !== 1) {
this.pageChange(1)
}
if (type === 1) {
this.sarStandardsSearch = {}
}
} else {
this.$message.error(res.message)
}
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+50 -5
View File
@@ -764,6 +764,17 @@
:disabled="true"
></custom-input>
</template>
<template v-else-if="field.attrField === 'WJSCRYBUSS'">
<el-form-item
prop="WJSCRYBUSS"
label-width="150px"
class="add-form-item"
>
<template slot="label">文件上传人员</template>
<el-input v-model="sarBussionessStandEO[field.attrField]" :title="sarBussionessStandEO[field.attrField]" placeholder="选择文件上传人员" @click.native="choiceWJSCRY('WJSCRYBUSS', '选择文件上传人员', sarBussionessStandEO[field.attrField])">
</el-input>
</el-form-item>
</template>
<template v-else>
<custom-input
:config="field"
@@ -1475,7 +1486,12 @@
@checkedRole="checkedRole2"
:nodeList="nodeList2"
></Role-tree>
<Role-tree
:is-title="drawerTitle"
:is-visible.sync="modalShowRoleFlag1"
@checkedRole="checkedRole2"
:nodeList="nodeList3"
></Role-tree>
<Mechanism-tree
is-title="选择部门信息"
:is-visible.sync="modalshowflagZRBM"
@@ -2358,8 +2374,10 @@ export default {
drawerTitle4: '',
drawerTitle2: '',
modalShowRoleFlag: false,
modalShowRoleFlag1: false,
nodeList: [],
nodeList2: [],
nodeList3: [],
nodeListZRBM: [],
modalshowflagZRBM: false,
addOrUPdateFlag: 1, // 新增：1， 修改：2
@@ -3625,6 +3643,24 @@ export default {
this.drawerTitle = title
this.modalShowRoleFlag = true
},
choiceWJSCRY(type, title, nameId) {
this.nodeList3 = []
if (nameId) {
let nameId1 = nameId.split(',')
let idList = []
nameId1.forEach(item => {
let a, b
a = item.substring(item.indexOf('(') +1)
b = a.substring(0, a.lastIndexOf(')'))
idList.push(b)
})
idList = idList.join(',')
this.nodeList3 = idList.split(',')
}
this.userType = type
this.drawerTitle = title
this.modalShowRoleFlag1 = true
},
checkedRole2(data) {
let idList = ''
let nameList = ''
@@ -3645,10 +3681,19 @@ export default {
if (this.drawerTitle === '查询起草人') {
this.sarBussionessSearch['QCRBUSS'] = nameList
}
this.$set(this.sarBussionessStandEO, 'QCRBUSS', nameList)
if (this.sarBussionessStandEO.QCRBUSS) {
this.$refs.sarBussionessStandForm.validateField('QCRBUSS')
if (this.drawerTitle === '选择起草人') {
this.$set(this.sarBussionessStandEO, 'QCRBUSS', nameList)
if (this.sarBussionessStandEO.QCRBUSS) {
this.$refs.sarBussionessStandForm.validateField('QCRBUSS')
}
}
if (this.drawerTitle === '选择文件上传人员') {
this.$set(this.sarBussionessStandEO, 'WJSCRYBUSS', nameList)
if (this.sarBussionessStandEO.WJSCRYBUSS) {
this.$refs.sarBussionessStandForm.validateField('WJSCRYBUSS')
}
}
// this.sarBussionessStandEO['QCRBUSS'] = nameList
},
choiceQCDW(type, title, id) {
@@ -4603,7 +4648,7 @@ export default {
this.OCRData = res.data
} else {
this.$message.warning('当前标准没有' + text + '文件')
this.this.OCRData = []
this.OCRData = []
}
}
})
src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
+170 -113
View File
@@ -155,13 +155,13 @@
round
@click="configurationStandard"
v-btn-permission="'fd83032ae5f41a0021b00e93c88edbbf'"
><i class="iconfont">&#xe669;</i>配置标准</el-button>
><i class="iconfont">&#xe669;</i>配置政策</el-button>
<el-button
class="common-button-default"
round
@click="deleteEnterStandFromKind(2)"
v-btn-permission="'fd83032ae5f41a0021b00e93c88edbbd'"
><i class="iconfont">&#xe611;</i>移除标准</el-button>
><i class="iconfont">&#xe611;</i>移除政策</el-button>
</div>
<!--表格-->
<div class="content">
@@ -250,9 +250,9 @@
width="150"
>
<template slot-scope="scope">
<span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
<span v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
<span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{scope.row.XCXSSRQLAWS ? scope.row.XCXSSRQLAWS.slice(0, 10) : ''}}</span>
<span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" :title="arr(scope.row.XCXSSRQLAWS)">{{ arr(scope.row.XCXSSRQLAWS) | ''}}</span>
<span v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C" :title="arr(scope.row.XCXSSRQLAWS)">{{arr(scope.row.XCXSSRQLAWS) | ''}}</span>
<span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" :title="arr(scope.row.XCXSSRQLAWS)">{{arr(scope.row.XCXSSRQLAWS) | ''}}</span>
</template>
</el-table-column>
<el-table-column
@@ -417,14 +417,14 @@
placeholder="请输入发文单位"
clearable></el-input>
</el-form-item>
<el-form-item label="征集意见周期" prop="commentCycleDate" label-width="150px" class="add-form-item">
<el-form-item label="征集意见周期" prop="commentCycleDate2" label-width="150px" class="add-form-item">
<el-date-picker
v-model="sarLawsStandEO.commentCycleDate"
type="datetimerange"
v-model="commentCycleDate2"
:picker-options="pickerOptions"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
start-placeholder="起始时间"
end-placeholder="结束时间"
value-format="yyyy-MM-dd"
align="right">
</el-date-picker>
@@ -477,17 +477,16 @@
<el-option value="2" label="否" key="2"></el-option>
</el-select>
</el-form-item>
<el-form-item prop="lawsYear" label-width="150px" class="add-form-item">
<template slot="label">年度</template>
<el-select v-model="sarLawsStandEO.lawsYear"
<el-form-item label="年度" prop="lawsYear" label-width="150px" class="add-form-item">
<el-select v-model="sarLawsStandEO.lawsYear" value-key="id"
placeholder="请选择年度"
clearable>
<el-option
v-for="opt in lawsYearOptions"
:key="opt.value"
:value="opt.label === undefined ? '' :opt.label" :label="opt.label"
:value="opt.value === undefined ? '' :opt.value" :label="opt.label"
>
{{ opt.label }}
{{ opt.label }}|
</el-option>
</el-select>
</el-form-item>
@@ -517,7 +516,7 @@
</el-form-item>
<el-form-item label="备注（最终政策发布）" prop="lawsRemark" label-width="150px" class="add-form-item">
<el-input v-model="sarLawsStandEO.lawsRemark"
placeholder="请输入备注"
placeholder="请输入备注（最终政策发布）"
clearable></el-input>
</el-form-item>
</template>
@@ -575,7 +574,7 @@
></el-input>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'DTWJHLAWS'">
<template v-else-if="field.attrField === 'DTWJHLAWS' || field.attrField === 'YYBZZCLAWS'">
<custom-input-for-standards
:key="field.attrField"
:config="field"
@@ -610,6 +609,14 @@
></custom-input>
</template>
</template>
<template v-else-if="field.attrField === 'SSRQLAWS' || field.attrField === 'XCXSSRQLAWS' || field.attrField === 'ZCXSSRQLAWS'">
<cus-tom-data-picker-group
:key="field.attrField"
:config="field"
v-model="sarLawsStandEO[field.attrField]"
:disabled="formdisableflag"
></cus-tom-data-picker-group>
</template>
<template v-else-if="field.attrType === 'DATE_PICKER'">
<custom-date-pick
:key="field.attrField"
@@ -707,7 +714,7 @@
</el-dialog>
<!-- 配置标准 -->
<el-drawer
title="配置标准"
title="配置政策"
:wrapperClosable="false"
:visible.sync="configStandFlag"
size="1200px"
@@ -735,24 +742,24 @@
<el-formItem label="政策名称" prop="numberName" class="search-item">
<el-input v-model="sarConfigStandSearch.numberName" @keyup.enter.native="searchConfiguraStand" placeholder="根据政策名称查找" clearable :maxlength="100"/>
</el-formItem>
<el-form-item class="search-item btn-box">
<el-button
icon="el-icon-search"
type="primary"
class="common-button-primary"
round
:loading="searching"
@click="searchConfiguraStand"></el-button>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
class="common-button-default"
icon="el-icon-refresh-left"
round
@click="clearAllSearch(3)"
></el-button>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
type="primary"
class="common-button-primary"
size="small"
:loading="searching"
@click="searchConfiguraStand">
查询
</el-button>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
class="common-button-default"
size="small"
@click="clearAllSearch(3)"
>清空
</el-button>
</el-form-item>
</el-form>
</div>
</div>
@@ -782,7 +789,7 @@
</el-table-column>
<el-table-column
prop="lawsName"
label="中文名称"
label="政策名称"
align="center">
</el-table-column>
<el-table-column
@@ -1030,11 +1037,11 @@
<el-form-item label="征集意见周期" title="征集意见周期" class="add-form-item form-item-disabled">
<el-date-picker
v-model="commentCycleDate"
type="datetimerange"
:picker-options="pickerOptions"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
start-placeholder="起始时间"
end-placeholder="结束时间"
value-format="yyyy-MM-dd"
align="right">
</el-date-picker>
@@ -1130,9 +1137,9 @@
</el-select>
</el-form-item>
<el-form-item label="投稿单位" class="add-form-item form-item-disabled">
<el-select v-model="lawsStandInfoSearch.CYSDLAWS" filterable clearable>
<el-select v-model="lawsStandInfoSearch.TGDWLAWS" filterable clearable>
<el-option
v-for="item in CYSDLAWSOptions"
v-for="item in TGDWLAWSOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
@@ -1321,7 +1328,8 @@
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
import ProcessTitle from '@/pages/processCenter/pages/components/ProcessTitle'
import CusTomDataPickerGroup
from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup";
import {mapGetters} from 'vuex'
import store from "@/store";
export default {
@@ -1339,7 +1347,8 @@
CustomSVPPS,
TreeSelect,
TreeSelectNew,
ProcessTitle
ProcessTitle,
CusTomDataPickerGroup
},
props: {
},
@@ -1921,6 +1930,7 @@
goSearch: '',
SarExportSearchEo: {},
commentCycleDate:'',
commentCycleDate2:'',
lawsStandInfoSearch: {
orgName: '', // 部门名称
page: 1,
@@ -2145,6 +2155,21 @@
}
},
methods: {
arr(data){
if(data){
if(data.indexOf(",") !== -1){
let arr = data.split(",");
let list = []
arr.forEach(item =>{
list.push(item.slice(0, 10));
})
return list.join(",");
}else {
return data.slice(0, 10)
}
}
return ""
},
// 左右拖动事件
dragControllerLR: function() {
var resize = document.getElementById("resize");
@@ -2590,7 +2615,7 @@
this.visibleShare = true
this.resPk = JSON.parse(JSON.stringify(command[0]))
break
case '移除标准':
case '移除政策':
this.deleteEnterStandFromKind(1, command[0].id)
break
case '删除':
@@ -2855,77 +2880,101 @@
})
window.open(routeUrl.href, '_blank')
},
filterObj(obj){
if(obj && obj !== ''){
if(obj instanceof Array){
return obj;
}else {
return obj.split(",")
}
}
return "";
},
// 编辑
selectStandardPro (row, state) {
this.$http.get('lawss/sarLawsInfo/getStandInfoUpdateById', {id: row.id}, {
_this: this
}, res => {
const item = res.data || {}
this.sarLawsStandEO = JSON.parse(JSON.stringify(item))
console.log(this.sarLawsStandEO)
this.sarLawsStandEO["XCSJBUSS"] = this.dateFormatter()
let subClass = item.standSubclass
this.sarLawsStandEO.standSubclass = subClass
if (this.sarLawsStandEO.issueTime != null && this.sarLawsStandEO.issueTime !== '') {
this.sarLawsStandEO.issueTime = new Date(this.sarLawsStandEO.issueTime)
}
if (this.sarLawsStandEO.putTime != null && this.sarLawsStandEO.putTime !== '') {
this.sarLawsStandEO.putTime = new Date(this.sarLawsStandEO.putTime)
}
Object.keys(item.attrInfoMap || {}).forEach((key) => {
if (item.attrInfoMap[key]) {
// this.sarStandardsInfoEO[key] = item.attrInfoMap[key]
this.$set(this.sarLawsStandEO, key, item.attrInfoMap[key])
}
})
this.sarLawsStandEO['id'] = item.id
this.drawerTitle = '修改政策标准'
this.modalshowflag = true
this.resolveFormFieldList(true)
this.$nextTick(() => {
Promise.all([this.queryDisplayLocation()]).then((values) => {
const [displayLocation] = values
const dynamicFormField = this.sarLawsStandEO
const formFieldList = this.formFieldList
formFieldList.forEach((field) => {
displayLocation.forEach((location) => {
let value = dynamicFormField[field.attrField]
let valueName = ''
if (value && typeof value === 'number') {
value = this.$dateFormat(value, 'yyyy-MM-dd')
if(res.data){
const item = res.data || {}
this.sarLawsStandEO = JSON.parse(JSON.stringify(item))
this.sarLawsStandEO['lawsSyqy'] = this.filterObj(this.sarLawsStandEO['lawsSyqy'])
this.sarLawsStandEO['lawsSycx'] = this.filterObj(this.sarLawsStandEO['lawsSycx'])
this.sarLawsStandEO['lawsLabel'] = this.filterObj(this.sarLawsStandEO['lawsLabel'])
this.sarLawsStandEO['YYRZLAWS'] = this.filterObj(this.sarLawsStandEO['YYRZLAWS'])
this.sarLawsStandEO['NYLXLAWS'] = this.filterObj(this.sarLawsStandEO['NYLXLAWS'])
this.sarLawsStandEO['TGRLAWS'] = this.filterObj(this.sarLawsStandEO['TGRLAWS'])
this.sarLawsStandEO['ZRBMLAWS'] = this.filterObj(this.sarLawsStandEO['ZRBMLAWS'])
this.sarLawsStandEO['TGDWLAWS'] = this.filterObj(this.sarLawsStandEO['TGDWLAWS'])
const dateArr = []
if(this.sarLawsStandEO.commentCycleStart && this.sarLawsStandEO.commentCycleEnd){
dateArr[0] = this.sarLawsStandEO.commentCycleStart
dateArr[1] = this.sarLawsStandEO.commentCycleEnd
this.commentCycleDate2 = dateArr
}
this.sarLawsStandEO["XCSJBUSS"] = this.dateFormatter()
let subClass = item.standSubclass
this.sarLawsStandEO.standSubclass = subClass
if (this.sarLawsStandEO.issueTime != null && this.sarLawsStandEO.issueTime !== '') {
this.sarLawsStandEO.issueTime = new Date(this.sarLawsStandEO.issueTime)
}
if (this.sarLawsStandEO.putTime != null && this.sarLawsStandEO.putTime !== '') {
this.sarLawsStandEO.putTime = new Date(this.sarLawsStandEO.putTime)
}
Object.keys(item.attrInfoMap || {}).forEach((key) => {
if (item.attrInfoMap[key]) {
// this.sarStandardsInfoEO[key] = item.attrInfoMap[key]
this.$set(this.sarLawsStandEO, key, item.attrInfoMap[key])
}
field['value'] = value
// 追加用户名称和部门名称
if (field.selVal === 'ORGLIST' || field.selVal === 'USERLIST' || field.attrField === 'SVPPS') {
let attrFieldName = field.attrField + 'Name'
valueName = dynamicFormField[attrFieldName]
}
field['valueName'] = valueName
if (field.showRegionId === location.value) {
if (!location.child) {
location['child'] = []
}
location['child'].push(field)
}
})
})
this.dynamicFormField = displayLocation
this.loading = false
})
if (state === 'show') {
this.formdisableflag = true
} else {
// this.standGeneraSelectChange() // 负责细类初始化
// this.getOrgTreeSource()
this.addOrUPdateFlag = 2
this.formdisableflag = false
this.saveOldNum = item.standCode // 记录修改之前的标准编号
this.saveOldReplaceNum = item.replaceStandNum // 记录修改之前的代替标准编号
// let selectNode = this.getTreeNameByid(this.sarLawsStandEO.responsibleUnit)
this.sarLawsStandEO.orgName = item.responsibleUnitShow
}
})
console.log(this.sarLawsStandEO)
this.sarLawsStandEO['id'] = item.id
this.drawerTitle = '修改政策标准'
this.modalshowflag = true
this.resolveFormFieldList(true)
this.$nextTick(() => {
Promise.all([this.queryDisplayLocation()]).then((values) => {
const [displayLocation] = values
const dynamicFormField = this.sarLawsStandEO
const formFieldList = this.formFieldList
formFieldList.forEach((field) => {
displayLocation.forEach((location) => {
let value = dynamicFormField[field.attrField]
let valueName = ''
if (value && typeof value === 'number') {
value = this.$dateFormat(value, 'yyyy-MM-dd')
}
field['value'] = value
// 追加用户名称和部门名称
if (field.selVal === 'ORGLIST' || field.selVal === 'USERLIST' || field.attrField === 'SVPPS') {
let attrFieldName = field.attrField + 'Name'
valueName = dynamicFormField[attrFieldName]
}
field['valueName'] = valueName
if (field.showRegionId === location.value) {
if (!location.child) {
location['child'] = []
}
location['child'].push(field)
}
})
})
this.dynamicFormField = displayLocation
this.loading = false
})
if (state === 'show') {
this.formdisableflag = true
} else {
// this.standGeneraSelectChange() // 负责细类初始化
// this.getOrgTreeSource()
this.addOrUPdateFlag = 2
this.formdisableflag = false
this.saveOldNum = item.standCode // 记录修改之前的标准编号
this.saveOldReplaceNum = item.replaceStandNum // 记录修改之前的代替标准编号
// let selectNode = this.getTreeNameByid(this.sarLawsStandEO.responsibleUnit)
this.sarLawsStandEO.orgName = item.responsibleUnitShow
}
})
}
})
},
// 部门树结构，通过id，查出对应的树节点
@@ -3024,6 +3073,10 @@
}else {
nowstandinfo["lawsLabel"] = "";
}
if(this.commentCycleDate2 && this.commentCycleDate2.length > 0){
nowstandinfo.commentCycleStart = this.commentCycleDate2[0]
nowstandinfo.commentCycleEnd = this.commentCycleDate2[1]
}
this.$http.postData('lawss/sarLawsInfo/updateSarLawsStandInfo', nowstandinfo, {
_this: this,
loading: 'isSubmit'
@@ -3061,6 +3114,10 @@
}else {
nowstandinfo["lawsLabel"] = "";
}
if(this.commentCycleDate2 && this.commentCycleDate2.length > 0){
nowstandinfo.commentCycleStart = this.commentCycleDate2[0]
nowstandinfo.commentCycleEnd = this.commentCycleDate2[1]
}
this.$http.postData('lawss/sarLawsInfo/updateSarLawsStandInfo', nowstandinfo, {
_this: this,
loading: 'isSubmit'
@@ -3653,10 +3710,10 @@
formData.menuId = this.selectSarMenu.id
}
// 处理我的收藏和个性化标签传参
if (this.selectSarMenu.id === 'qbwdsc') {
formData.labelMenuId = undefined
formData.menuId = 'qbwdsc'
formData.collectMenuId = 'qbwdsc'
if (this.selectSarMenu.menuName === '我的收藏') {
formData.menuId = undefined
formData.labelMenuId = undefined
formData.collectMenuId = 'zcwdsc'
} else if (this.selectSarMenu.id === 'gxhbq' || this.selectSarMenu.pId === 'gxhbq') {
formData.menuId = undefined
formData.labelMenuId = this.selectSarMenu.id
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+37 -14
View File
@@ -1812,6 +1812,8 @@ export default {
},
data() {
return {
seniorQuery: false, // 是否为高级查询
seniorQueryForm: {},
// 人员树形和部门树形参数
nodeList: [],
nodeList2: [],
@@ -3146,6 +3148,13 @@ export default {
},
// 点击搜索按钮
searchBtnClick() {
if (this.seniorQuery === true) {
this.standCommonlySearch.page = 1
this.seniorQuery = false
}
for (let key in this.sarStandardsSearch) {
this.sarStandardsSearch[key] = ''
}
this.getDomesticStandardTable()
},
// 搜索
@@ -3160,7 +3169,7 @@ export default {
connect: "and",
field: key || '',
type: 'regexp',
value: value.join(',')
value: Array.isArray(value) ? value.join(',') : [value]
});
} else if (value !== null && value !== '' && (key === 'SSRQ' || key === 'XCXSSRQ' || key === 'ZCCSSRQ')) {
advanceSearchVOList.push({
@@ -3190,6 +3199,8 @@ export default {
item.page = 1
this.standCommonlySearch.page = 1
this.standCommonlySearch.sarStandardsSearch = JSON.stringify(item) || ''
this.seniorQuery = true
this.seniorQueryForm = item
this.getDomesticStandardTable(item)
},
// 清空搜索框
@@ -3883,13 +3894,23 @@ export default {
// 分页点击后方法
pageChange(page) {
this.standCommonlySearch.page = page
this.getDomesticStandardTable()
if (this.seniorQuery === false) {
this.getDomesticStandardTable()
} else {
this.seniorQueryForm.page = page
this.getDomesticStandardTable(this.seniorQueryForm)
}
},
// 分页每页显示数改变后方法
pageSizeChange(pageSize) {
this.standCommonlySearch.pageSize = pageSize
this.standCommonlySearch.page = 1
this.getDomesticStandardTable()
if (this.seniorQuery === false) {
this.getDomesticStandardTable()
} else {
this.seniorQueryForm.page = page
this.getDomesticStandardTable(this.seniorQueryForm)
}
},
/**
* // 分页查询标准
@@ -3949,7 +3970,7 @@ export default {
connect: "and",
field: key || '',
type: 'regexp',
value: value.join(',')
value: Array.isArray(value) ? value.join(',') : [value]
});
} else if (value !== null && value !== '' && (key === 'SSRQ' || key === 'XCXSSRQ' || key === 'ZCCSSRQ')) {
advanceSearchVOList.push({
@@ -3976,13 +3997,15 @@ export default {
}
if(item){
if(item.advanceSearchVOStr.length){
advanceSearchVOList.push({
connect: item.advanceSearchVOStr[0].connect,
field: item.advanceSearchVOStr[0].field,
type: item.advanceSearchVOStr[0].type,
value: item.advanceSearchVOStr[0].value,
})
if(item.advanceSearchVOStr){
if(item.advanceSearchVOStr.length){
advanceSearchVOList.push({
connect: item.advanceSearchVOStr[0].connect,
field: item.advanceSearchVOStr[0].field,
type: item.advanceSearchVOStr[0].type,
value: item.advanceSearchVOStr[0].value,
})
}
}
}
formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList)
@@ -4029,9 +4052,9 @@ export default {
this.advanceSearchMapping[key] = ''
}
//情况基本字段
for (let key in this.sarStandardsSearch) {
this.sarStandardsSearch[key] = ''
}
// for (let key in this.sarStandardsSearch) {
// this.sarStandardsSearch[key] = ''
// }
},
// 查询处于游离态的标准
selectConfiguraStand() {
src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+15 -3
View File
@@ -801,6 +801,7 @@ export default {
orgTableValName: "",
// 高级检索
isAdvancedSearch: false,
isAdvancedSearchFlag: false,
targetMarketOptions: {},
twoOptions: [
{
@@ -932,6 +933,7 @@ export default {
},
// 切换tabs
handleClick(tab, event) {
this.page = 1
this.localProEO.prodectCode = this.ifMaintaince;
this.insideHandleClick();
},
@@ -1203,8 +1205,9 @@ export default {
},
// 条件分页查询
getLocalProductTableBtn() {
this.page = 1
this.projectLibrarySearch.page = 1;
this.isAdvancedSearch = false;
this.isAdvancedSearchFlag = true;
this.getLocalProductTable();
},
// 查询本地产品
@@ -1236,6 +1239,7 @@ export default {
},
getLocalProductTableBtns() {
this.page = 1
this.projectLibrarySearch.page = 1;
this.isAdvancedSearch = false;
this.getLocalProductTables();
@@ -1415,12 +1419,20 @@ export default {
// 分页点击后方法
pageChange(page) {
this.page = page;
this.getLocalProductTable();
if (this.isAdvancedSearchFlag === true) {
this.getLocalProductTable()
} else {
this.getLocalProductTables()
}
},
// 分页每页显示数改变后方法
pageSizeChange(pageSize) {
this.pageSize = pageSize;
this.getLocalProductTable();
if (this.isAdvancedSearchFlag === true) {
this.getLocalProductTable()
} else {
this.getLocalProductTables()
}
// 此处需要调用接口，修改个人配置
},
/**
src/pages/regulatoryRepository/nonConfomity/index.vue
+3 -3
View File
@@ -6,9 +6,9 @@
<el-tab-pane label="未符合项整改数据库" name="database" v-if="database">
<rectification-database></rectification-database>
</el-tab-pane>
<el-tab-pane label="重点问题项管控" name="keynote" v-if="keynote">
<key-issues :keynoteActiveName="keynoteActiveName"></key-issues>
</el-tab-pane>
<!-- <el-tab-pane label="重点问题项管控" name="keynote" v-if="keynote">-->
<!-- <key-issues :keynoteActiveName="keynoteActiveName"></key-issues>-->
<!-- </el-tab-pane>-->
</el-tabs>
</div>
</div>
src/pages/regulatoryRepository/nonConfomity/pages/productDepartment.vue
+48 -48
View File
@@ -10,41 +10,13 @@
clearable
:maxlength="100"></el-input>
</el-form-item>
<el-form-item label="产品类型" class="search-item">
<el-select filterable clearable v-model="nonConformitySearch.productName">
<el-option v-for="item1 in productNameList"
:key="item1.value"
:label="item1.label"
:value="item1.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="责任部门" class="search-item">
<el-input v-model="nonConformitySearch.responseUnit" v-show="false" />
<el-popover
placement="bottom"
popper-class="user-dept-popper"
trigger="click"
:value="false"
>
<el-input
slot="reference"
v-model="nonConformitySearch.responseUnitShow"
placeholder="根据责任部门查找"
readonly
clearable
id="searchResp"
/>
<div class="api">
<laws-tree
:zNodes="zNodesSItem"
treeDivId="zNodesSItemSearch"
deptSelect
showRMenu
@treeDblClick="(treeId, treeNode) => treeClickSearch(treeId, treeNode)"
class="ztree" style="width: 200px;height: 400px;overflow: auto">
</laws-tree>
</div>
</el-popover>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
@@ -108,62 +80,71 @@
align="center">
</el-table-column>
<el-table-column
prop="standNum"
prop="productBusiness"
fixed="left"
width="180"
label="业务">
<template slot-scope="scope">
<a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.standNum }}</a>
</template>
<!-- <template slot-scope="scope">-->
<!-- <a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.standNum }}</a>-->
<!-- </template>-->
</el-table-column>
<el-table-column
prop="standName"
prop="platform"
fixed="left"
width="180"
label="平台">
<template slot-scope="scope">
<a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
<!-- <template slot-scope="scope">-->
<!-- <a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.standName }}</a>-->
<!-- </template>-->
</el-table-column>
<el-table-column
prop="productNameShow"
prop="pojName"
width="180"
label="项目">
</el-table-column>
<el-table-column
prop="productNameShow"
prop="currentNode"
width="180"
label="当前节点">
</el-table-column>
<el-table-column
prop="standName"
prop="lawsName"
fixed="left"
width="180"
label="标准编号/政策编号">
<template slot-scope="scope">
{{ scope.row.lawsName + '/' + scope.row.lawsNumber }}
</template>
</el-table-column>
<el-table-column
prop="planCloseTime"
prop="conceptualState"
width="150"
sortable="custom"
label="实施时间">
label="概念状态">
</el-table-column>
<el-table-column
prop="responseEnginShow"
prop="scheduledIssuanceTime"
width="200"
sortable="custom"
label="概念计划下发时间">
</el-table-column>
<el-table-column
prop="revisedPlan"
width="150"
label="实施要求">
label="概念修订计划">
</el-table-column>
<el-table-column
prop="responseEnginShow"
prop="explanation"
width="150"
label="符合性状态">
label="其他说明">
</el-table-column>
<el-table-column
prop="responseUnitShow"
prop="responseInsName"
width="180"
label="责任部门">
</el-table-column>
<el-table-column
prop="responseEnginShow"
prop="responseUserName"
width="150"
label="责任工程师">
</el-table-column>
@@ -188,6 +169,7 @@
</template>
<script>
import { productDeptIssue } from "api/process";
export default {
name: "productDepartment",
data() {
@@ -197,18 +179,36 @@ export default {
total: 0,
// 当前页数
pageNo: 1,
pageSize: 20,
causeList: [], //事业部数据
nonConformitySearch: {
standNumOrName: '', // 编号/名称
productName: '', // 产品类型
responseUnit: '' // 责任部门
responseUnitShow: '' // 责任部门
},
// 产品类型下拉列表数据
productNameList: [],
zNodesSItem: [],//责任部门
}
},
mounted() {
this.getTableByPage()
},
methods: {
getTableByPage() {
const params = {
lawsNumber: this.nonConformitySearch.standNumOrName,
lawsName: this.nonConformitySearch.standNumOrName,
responseInsName: this.nonConformitySearch.responseUnitShow,
isClose: '0',
page: this.pageNo,
pageSize: this.pageSize
}
productDeptIssue(params).then(res => {
this.causeList = res.data.records
this.total = res.data.total
})
},
//点击批量关闭按钮事件
userCloAll() {
console.log('至少选择一条数据');
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+1
View File
@@ -423,6 +423,7 @@ export default {
if (type === 'edit') {
this.id = row.id
this.opiniontitle = '编辑意见内容'
this.opinionContent.chapterName = row.chapterName
this.opinionContent.partCode = row.partCode
this.opinionContent.reason = row.reason
this.opinionContent.oldText = row.oldText
src/pages/regulatoryRepository/workingGroup/index.vue
+4 -4
View File
@@ -9,10 +9,10 @@
<span slot="label"><i class="el-icon-s-order"></i> 标准法规工作组</span>
<workingGroup1 v-if="activeName === 'workingGroup1'"></workingGroup1>
</el-tab-pane>
<el-tab-pane name="workingGroup2">
<span slot="label"><i class="el-icon-s-promotion"></i> 政策工作组</span>
<workingGroup2 v-if="activeName === 'workingGroup2'"></workingGroup2>
</el-tab-pane>
<!-- <el-tab-pane name="workingGroup2">-->
<!-- <span slot="label"><i class="el-icon-s-promotion"></i> 政策工作组</span>-->
<!-- <workingGroup2 v-if="activeName === 'workingGroup2'"></workingGroup2>-->
<!-- </el-tab-pane>-->
</el-tabs>
<el-button size="mini" type="primary" @click="statisticsBtn" v-btn-permission="'2331baafd7d298b87ab3c0b5430d608d'" class="statistics">工作组统计</el-button>
</div>