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

左边树菜单调整

Browse Source
This commit is contained in:
shenyanpei
2021-09-15 13:59:24 +08:00
parent b44f476c39
commit 9b457ba7f4
2 changed files with 1537 additions and 1454 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+18 -33
View File
@@ -182,30 +182,23 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="标准号" label="标准号"
width="130"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" class="table-jump" style="color: #F56C6C" <a v-if="scope.row.standYear" class="table-jump"
@click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
scope.row.standNumber scope.row.standNumber
}}-{{ scope.row.standYear }}</a> }}-{{ scope.row.standYear }}</a>
<a v-else-if="scope.row.standYear" class="table-jump" style="color: #333333" <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
@click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
scope.row.standNumber
}}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump" style="color: #333333">
{{ scope.row.standSortShow }}
{{ scope.row.standNumber }}</a> {{ scope.row.standNumber }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip
prop="standName" prop="standName"
label="标准名称" label="标准名称"
width="210"
> >
<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 @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
<a v-else @click="handlePreview(scope.row)" style="color: #333333" class="table-jump">{{ scope.row.standName }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -214,19 +207,17 @@
width="110px" width="110px"
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> {{ formatIssueDate(scope.row.issueTime) }}
<span v-else>{{ formatIssueDate(scope.row.issueTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<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) }}-->
<span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span> <span>{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
<span v-else>{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
</template> </template>
</el-table-column> </el-table-column>
@@ -237,8 +228,7 @@
width="150px" 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">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span> <span>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
<span v-else>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -247,8 +237,7 @@
width="150px" 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">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span> <span>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
<span v-else>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -262,8 +251,7 @@
<!-- </el-tooltip>--> <!-- </el-tooltip>-->
<!-- </template>--> <!-- </template>-->
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ textStatusMap[scope.row.textStatus] }}</span> <span>{{ textStatusMap[scope.row.textStatus] }}</span>
<span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="50" fixed="right"> <el-table-column label="操作" align="center" width="50" fixed="right">
@@ -1859,7 +1847,6 @@ export default {
synopsis: '', // 内容摘要 synopsis: '', // 内容摘要
}, // 分页查询过程中用到的对象 }, // 分页查询过程中用到的对象
//高级搜索映射 //高级搜索映射
@@ -2394,7 +2381,6 @@ export default {
}, },
popoverHideQuery(ids, attrField) { popoverHideQuery(ids, attrField) {
console.log(ids) console.log(ids)
console.log("-----------------------------")
console.log(attrField) console.log(attrField)
}, },
popoverHide(checkedIds, checkedData, isShow, isLoadChild, topId) { popoverHide(checkedIds, checkedData, isShow, isLoadChild, topId) {
@@ -2699,8 +2685,6 @@ export default {
this.$nextTick(() => { this.$nextTick(() => {
Promise.all([this.queryDisplayLocation()]).then((values) => { Promise.all([this.queryDisplayLocation()]).then((values) => {
const [displayLocation] = values const [displayLocation] = values
console.log(this.formFieldList, 'assssssssssss')
console.log(item, 'itemitemitemitem')
const formFieldList = this.formFieldList const formFieldList = this.formFieldList
this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item)) this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
if (this.sarStandardsInfoEO.standSystem) { if (this.sarStandardsInfoEO.standSystem) {
@@ -2752,7 +2736,6 @@ export default {
}) })
}) })
this.dynamicFormField = displayLocation this.dynamicFormField = displayLocation
console.log(this.dynamicFormField)
this.loading = false this.loading = false
}) })
}) })
@@ -3005,8 +2988,12 @@ export default {
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.userId
}, {}, res => { }, {}, res => {
if (res.ok) { if (res.ok) {
for (let i in res.data) {
let arr = res.data[i].children
arr.push(arr.shift())
this.treeList = res.data this.treeList = res.data
} }
}
}) })
}, },
// 查询所有菜单 // 查询所有菜单
@@ -3140,8 +3127,6 @@ export default {
}, },
// 表格排序 // 表格排序
sortChange(sortObj) { sortChange(sortObj) {
console.log(sortObj.column.order + "======" + sortObj.column.property)
console.log(sortObj, '升降序')
if (sortObj.column.order !== 'normal') { if (sortObj.column.order !== 'normal') {
this.nowOrder = '' this.nowOrder = ''
this.orderBy = '' this.orderBy = ''
@@ -3553,7 +3538,6 @@ export default {
sarStandAttrObj[item.attrField] = nowstandinfo[item.attrField] sarStandAttrObj[item.attrField] = nowstandinfo[item.attrField]
}) })
nowstandinfo['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'") nowstandinfo['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'")
console.log(nowstandinfo, '提交参数')
this.$http.postData(this.addOrUPdateFlag === 1 ? 'sarStandardsInfo/sar-standards-info/addarStandardsInfo' : 'sarStandardsInfo/sar-standards-info/updateSarStandardsInfo', nowstandinfo, { this.$http.postData(this.addOrUPdateFlag === 1 ? 'sarStandardsInfo/sar-standards-info/addarStandardsInfo' : 'sarStandardsInfo/sar-standards-info/updateSarStandardsInfo', nowstandinfo, {
_this: this _this: this
}, res => { }, res => {
@@ -3631,7 +3615,6 @@ export default {
formData.nowOrderBy = this.nowOrder ? this.orderBy : '' formData.nowOrderBy = this.nowOrder ? this.orderBy : ''
formData.nowOrder = this.nowOrder formData.nowOrder = this.nowOrder
// formData.orderBy = this.orderBy // formData.orderBy = this.orderBy
console.log(this.selectSarMenu.id)
// 处理我的收藏和个性化标签传参 // 处理我的收藏和个性化标签传参
if (this.selectSarMenu.menuName === '我的收藏') { if (this.selectSarMenu.menuName === '我的收藏') {
formData.menuId = undefined formData.menuId = undefined
@@ -3690,7 +3673,6 @@ export default {
} }
if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.SSRQ) { if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.SSRQ) {
res.data.list[i].SSRQ = res.data.list[i].attrInfoMap.SSRQ res.data.list[i].SSRQ = res.data.list[i].attrInfoMap.SSRQ
console.log(res.data.list[i].SSRQ);
} }
} }
this.stahndinfoList = res.data.list this.stahndinfoList = res.data.list
@@ -4878,7 +4860,6 @@ export default {
data.forEach(item => { data.forEach(item => {
this.$set(this.textStatusMap, item.value, item.label) this.$set(this.textStatusMap, item.value, item.label)
}) })
console.log(this.textStatusMap, '文本状态的值')
} }
}, },
computed: { computed: {
@@ -5004,6 +4985,7 @@ export default {
background: url('~@/assets/images/shangqi/img/tree.png'); background: url('~@/assets/images/shangqi/img/tree.png');
background-size: 100% 100%; background-size: 100% 100%;
} }
/deep/ .tree-line { /deep/ .tree-line {
.el-tree-node { .el-tree-node {
position: relative; position: relative;
@@ -5084,9 +5066,11 @@ export default {
/deep/ .el-card__body { /deep/ .el-card__body {
padding: 0 !important; padding: 0 !important;
} }
.el-card { .el-card {
min-width: min-content; min-width: min-content;
} }
height: 95%; height: 95%;
width: calc(~'100% - 15px'); width: calc(~'100% - 15px');
position: absolute; position: absolute;
@@ -5135,6 +5119,7 @@ export default {
.tree { .tree {
left: -200px !important; left: -200px !important;
} }
.tree-right { .tree-right {
width: calc(~'100% - 15px') !important; width: calc(~'100% - 15px') !important;
} }
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+167 -69
View File
@@ -102,8 +102,11 @@
class="common-button-default" class="common-button-default"
size="mini" size="mini"
v-btn-permission="'31ac9f600d8a3072ba088f1c106df359'" v-btn-permission="'31ac9f600d8a3072ba088f1c106df359'"
@click="clearAllSearch('standCommonlySearch')">清空</el-button> @click="clearAllSearch('standCommonlySearch')">清空
<el-button type="primary" class="common-button-primary" size="mini" @click="selectMoreBtn"><i class="iconfont" v-btn-permission="'c9390928e5a3107956c7d43d8bde5cba'">&#xe7a5;</i>高级查询</el-button> </el-button>
<el-button type="primary" class="common-button-primary" size="mini" @click="selectMoreBtn">
<i class="iconfont" v-btn-permission="'c9390928e5a3107956c7d43d8bde5cba'">&#xe7a5;</i>高级查询
</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
@@ -119,33 +122,40 @@
size="mini" size="mini"
@click="addModal" @click="addModal"
v-btn-permission="'ceb5fb1e00'" v-btn-permission="'ceb5fb1e00'"
:disabled="addBtnDisabled"><i class="iconfont">&#xe84e;</i>新增</el-button> :disabled="addBtnDisabled"><i class="iconfont">&#xe84e;</i>新增
</el-button>
<el-button class="common-button-default in-button" <el-button class="common-button-default in-button"
size="mini" size="mini"
:loading="searching" :loading="searching"
@click="addImportModal(1)" @click="addImportModal(1)"
v-btn-permission="'FQ5ECZ286K'"><i class="iconfont">&#xe6de;</i>导入</el-button> v-btn-permission="'FQ5ECZ286K'"><i class="iconfont">&#xe6de;</i>导入
</el-button>
<el-button class="common-button-default export-button" <el-button class="common-button-default export-button"
size="mini" size="mini"
@click="exportStandard()" @click="exportStandard()"
title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项" title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
v-btn-permission="'8871ed1be74cf65851659514880bb50a'"><i class="iconfont">&#xe6e9;</i>导出</el-button> v-btn-permission="'8871ed1be74cf65851659514880bb50a'"><i class="iconfont">&#xe6e9;</i>导出
</el-button>
<el-button class="common-button-default delete-button" <el-button class="common-button-default delete-button"
:loading="delLoading" :loading="delLoading"
size="mini" size="mini"
@click="deleteStand(2)" @click="deleteStand(2)"
v-btn-permission="'4d01342db0f56f01bfceaee7b46904f4'"><i class="iconfont">&#xe61b;</i>批量删除</el-button> v-btn-permission="'4d01342db0f56f01bfceaee7b46904f4'"><i class="iconfont">&#xe61b;</i>批量删除
</el-button>
<el-button class="common-button-default" <el-button class="common-button-default"
size="mini" size="mini"
@click="deleteStandFromKind(2)" @click="deleteStandFromKind(2)"
v-btn-permission="'29bf24bbd156c06f136cc89b1c7b2bb0'"><i class="iconfont">&#xe611;</i>移除标准</el-button> v-btn-permission="'29bf24bbd156c06f136cc89b1c7b2bb0'"><i class="iconfont">&#xe611;</i>移除标准
</el-button>
<el-button class="common-button-default" <el-button class="common-button-default"
size="mini" :loading="searching" size="mini" :loading="searching"
@click="uploadImportModal(1)" @click="uploadImportModal(1)"
v-btn-permission="'4mFaJU3fTS'"><i class="iconfont">&#xe825;</i>模板下载</el-button> v-btn-permission="'4mFaJU3fTS'"><i class="iconfont">&#xe825;</i>模板下载
</el-button>
<el-button class="common-button-default" <el-button class="common-button-default"
size="mini" @click="configurationStandard" size="mini" @click="configurationStandard"
v-btn-permission="'590049684c0af005c6b3d1f0ebcf897e'"><i class="iconfont">&#xe669;</i>配置标准</el-button> v-btn-permission="'590049684c0af005c6b3d1f0ebcf897e'"><i class="iconfont">&#xe669;</i>配置标准
</el-button>
</div> </div>
<div class="content"> <div class="content">
<div class="table-wrap"> <div class="table-wrap">
@@ -169,17 +179,19 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="标准号" label="标准号"
width="130"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a> <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a> scope.row.standSortShow
}} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
{{ scope.row.standNumber }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip
prop="standName" prop="standName"
label="标准名称" label="标准名称"
width="210"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a> <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
@@ -188,34 +200,30 @@
<el-table-column <el-table-column
prop="issueTime" prop="issueTime"
sortable="custom" sortable="custom"
width="110" width="110px"
label="发布日期"> label="发布日期">
<template slot-scope="scope"> <template slot-scope="scope">
<div>
<a>
{{ formatIssueDate(scope.row.issueTime) }} {{ formatIssueDate(scope.row.issueTime) }}
</a>
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="SSRQ" prop="SSRQ"
sortable="custom" sortable="custom"
width="110" width="150px"
label="实施日期"> label="实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- {{ formatIssueDate(scope.row.putTime) }}--> <!-- {{ formatIssueDate(scope.row.putTime) }}-->
<a>{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0,10) : '-' }}</a> <span>{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="XCXSSRQ" prop="XCXSSRQ"
sortable="custom" sortable="custom"
width="150" width="150px"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<a>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</a> <span>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -224,7 +232,7 @@
width="150px" width="150px"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<a>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</a> <span>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -238,7 +246,7 @@
<!-- </el-tooltip>--> <!-- </el-tooltip>-->
<!-- </template>--> <!-- </template>-->
<template slot-scope="scope"> <template slot-scope="scope">
<a>{{ textStatusMap[scope.row.textStatus] }}</a> <span>{{ textStatusMap[scope.row.textStatus] }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="50" fixed="right"> <el-table-column label="操作" align="center" width="50" fixed="right">
@@ -261,9 +269,13 @@
> >
取消收藏 取消收藏
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'e8d690904ee1895dd0d17d9c794fbcd7'">编辑</el-dropdown-item> <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'e8d690904ee1895dd0d17d9c794fbcd7'">
编辑
</el-dropdown-item>
<!-- <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'413e676a155d6eb2dfbe08df8cbcf682'">分享</el-dropdown-item>--> <!-- <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'413e676a155d6eb2dfbe08df8cbcf682'">分享</el-dropdown-item>-->
<el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'dbaf9df2990a595c8abea28e68b1a681'">删除</el-dropdown-item> <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'dbaf9df2990a595c8abea28e68b1a681'">
删除
</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div>
@@ -958,8 +970,12 @@
</div> </div>
<!-- 提交/取消--> <!-- 提交/取消-->
<div class="demo-drawer-footer"> <div class="demo-drawer-footer">
<el-button v-show="modalshowtitle === '新增海外标准'" type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="saveBt">保存</el-button> <el-button v-show="modalshowtitle === '新增海外标准'" type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="saveBt">
<el-button size="mini" class="common-button-primary" icon="el-icon-check" type="primary" @click="saveOrUpdateStands" :loading="isSubmit">提交</el-button> 保存
</el-button>
<el-button size="mini" class="common-button-primary" icon="el-icon-check" type="primary" @click="saveOrUpdateStands" :loading="isSubmit">
提交
</el-button>
<el-button size="mini" class="common-button-default" icon="el-icon-close" @click="resetForm">取消</el-button> <el-button size="mini" class="common-button-default" icon="el-icon-close" @click="resetForm">取消</el-button>
</div> </div>
</el-drawer> </el-drawer>
@@ -978,7 +994,8 @@
class="newSearchBtn" class="newSearchBtn"
@click="getLawsExplainQuoteRow(1,lawsExplainQuoteForm.pageSize, 'search')"> @click="getLawsExplainQuoteRow(1,lawsExplainQuoteForm.pageSize, 'search')">
</el-button> </el-button>
<el-button type="primary" @click="getLawsExplainQuoteRow('')" size="mini" class="searchAngNewBtn">清空查询</el-button> <el-button type="primary" @click="getLawsExplainQuoteRow('')" size="mini" class="searchAngNewBtn">清空查询
</el-button>
</el-form> </el-form>
<el-table <el-table
ref="selections" ref="selections"
@@ -1122,8 +1139,11 @@
@pageChange="pageChangeItems" @pageChange="pageChangeItems"
@pageSizeChange="pageSizeChangeItems"></pagination> @pageSizeChange="pageSizeChangeItems"></pagination>
<div slot="footer" class="demo-drawer-footer"> <div slot="footer" class="demo-drawer-footer">
<el-button size="mini" class="common-button-primary" icon="el-icon-check" @click="testItemsModel=false">取消</el-button> <el-button size="mini" class="common-button-primary" icon="el-icon-check" @click="testItemsModel=false">取消
<el-button type="primary" size="mini" class="common-button-default" icon="el-icon-close" @click="testItemsModellBt">提交</el-button> </el-button>
<el-button type="primary" size="mini" class="common-button-default" icon="el-icon-close" @click="testItemsModellBt">
提交
</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!-- 导入模态窗----失败有弹框 --> <!-- 导入模态窗----失败有弹框 -->
@@ -1157,7 +1177,8 @@
<el-formItem label="标准类别" prop="standSort" class="search-item"> <el-formItem label="标准类别" prop="standSort" class="search-item">
<el-select v-model="sarConfigStandSearch.standSort" placeholder="根据标准类别查找" <el-select v-model="sarConfigStandSearch.standSort" placeholder="根据标准类别查找"
@keyup.enter.native="searchConfiguraStand" clearable> @keyup.enter.native="searchConfiguraStand" clearable>
<el-option v-for="opt in standSortOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label }} <el-option v-for="opt in standSortOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">
{{ opt.label }}
</el-option> </el-option>
</el-select> </el-select>
</el-formItem> </el-formItem>
@@ -1244,8 +1265,11 @@
@pageSizeChange="configuraPageSizeChange"></pagination> @pageSizeChange="configuraPageSizeChange"></pagination>
</div> </div>
<div class="demo-drawer-footer"> <div class="demo-drawer-footer">
<el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" :loading="isSubmit" @click="saveConfigStand">提交</el-button> <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" :loading="isSubmit" @click="saveConfigStand">
<el-button size="mini" class="common-button-default" icon="el-icon-close" @click="cancelConfigStand">取消</el-button> 提交
</el-button>
<el-button size="mini" class="common-button-default" icon="el-icon-close" @click="cancelConfigStand">取消
</el-button>
</div> </div>
</el-drawer> </el-drawer>
<!-- 树---新增二级菜单模态窗 --> <!-- 树---新增二级菜单模态窗 -->
@@ -1276,8 +1300,10 @@
icon="el-icon-check" icon="el-icon-check"
:loading="isSubmit" :loading="isSubmit"
@click="newMenu" @click="newMenu"
>提交</el-button> >提交
<el-button size="mini" class="common-button-default" icon="el-icon-close" @click="resetTreeDialog">取消</el-button> </el-button>
<el-button size="mini" class="common-button-default" icon="el-icon-close" @click="resetTreeDialog">取消
</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!-- 分享 --> <!-- 分享 -->
@@ -1294,7 +1320,9 @@
</dept-tree> </dept-tree>
</div> </div>
<div class="demo-drawer-footer"> <div class="demo-drawer-footer">
<el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="shareStandardBt">提交</el-button> <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="shareStandardBt">
提交
</el-button>
<el-button size="mini" class="common-button-default" icon="el-icon-close" @click="treeCancel">取消</el-button> <el-button size="mini" class="common-button-default" icon="el-icon-close" @click="treeCancel">取消</el-button>
</div> </div>
</el-drawer> </el-drawer>
@@ -1349,11 +1377,13 @@
class="common-button-primary" class="common-button-primary"
icon="el-icon-check" icon="el-icon-check"
type="primary" type="primary"
@click="saveProduct('productModelAdd')">提交</el-button> @click="saveProduct('productModelAdd')">提交
</el-button>
<el-button <el-button
class="common-button-default" class="common-button-default"
icon="el-icon-close" icon="el-icon-close"
@click="closeModal">取消</el-button> @click="closeModal">取消
</el-button>
</div> </div>
</el-drawer> </el-drawer>
<!-- 组件树--> <!-- 组件树-->
@@ -1399,7 +1429,9 @@
<p v-html="importForm.content"></p> <p v-html="importForm.content"></p>
</div> </div>
<div slot="footer" class="demo-drawer-footer"> <div slot="footer" class="demo-drawer-footer">
<el-button type="primary" size="mini" class="common-button-default" icon="el-icon-check" @click="importFailed = false">确认</el-button> <el-button type="primary" size="mini" class="common-button-default" icon="el-icon-check" @click="importFailed = false">
确认
</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
@@ -2113,8 +2145,7 @@ export default {
filterText: '' filterText: ''
} }
}, },
props: { props: {},
},
watch: { watch: {
'sarStandardsInfoEO.country': { 'sarStandardsInfoEO.country': {
handler(val) { handler(val) {
@@ -2164,7 +2195,6 @@ export default {
this.urlChild = "sarModelTree/childByList" this.urlChild = "sarModelTree/childByList"
}, },
popoverHideBusVs(checkedIds, checkedData, isShow, isLoadChild, topId) { popoverHideBusVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
console.log(checkedData)
debugger debugger
if (checkedData) { if (checkedData) {
if (checkedData.length > 0) { if (checkedData.length > 0) {
@@ -2209,7 +2239,6 @@ export default {
data.forEach(item => { data.forEach(item => {
this.$set(this.textStatusMap, item.value, item.label) this.$set(this.textStatusMap, item.value, item.label)
}) })
console.log(this.textStatusMap, '外面的文本状态的值')
}, },
busVsFunc() { busVsFunc() {
this.$http.get('sarVppsTree/list', '', { this.$http.get('sarVppsTree/list', '', {
@@ -2257,7 +2286,8 @@ export default {
} else { } else {
this.productModal = true this.productModal = true
} }
}, e => {}) }, e => {
})
} else if (this.modalType === 2) { } else if (this.modalType === 2) {
this.$http.putData('sarResource/ts-resource', this.productModelAdd, { this.$http.putData('sarResource/ts-resource', this.productModelAdd, {
_this: this _this: this
@@ -2408,7 +2438,6 @@ export default {
}, },
// 点击查看 // 点击查看
handlePreview(item) { handlePreview(item) {
console.log(item);
let routeUrl = this.$router.resolve({ let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails', name: 'OtherStandardDetails',
params: { params: {
@@ -2442,7 +2471,6 @@ export default {
Promise.all([this.queryDisplayLocation()]).then((values) => { Promise.all([this.queryDisplayLocation()]).then((values) => {
const [displayLocation] = values const [displayLocation] = values
const formFieldList = this.formFieldList const formFieldList = this.formFieldList
console.log(formFieldList, 'AAAAAAAAAAAAAAAAAAAAA')
this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item)) this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem]; this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem];
if (item.country !== undefined && item.country !== null && item.country !== '') { if (item.country !== undefined && item.country !== null && item.country !== '') {
@@ -2715,8 +2743,12 @@ export default {
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.userId
}, {}, res => { }, {}, res => {
if (res.ok) { if (res.ok) {
for (let i in res.data) {
let arr = res.data[i].children
arr.push(arr.shift())
this.treeList = res.data this.treeList = res.data
} }
}
}) })
}, },
// 树-删除 // 树-删除
@@ -3090,7 +3122,8 @@ export default {
.then(_ => { .then(_ => {
done() done()
}) })
.catch(_ => {}) .catch(_ => {
})
}, },
// 表单清空 // 表单清空
resetForm() { resetForm() {
@@ -3164,8 +3197,6 @@ export default {
nowstandinfo['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'") nowstandinfo['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'")
console.log("nowstandinfo");
console.log(nowstandinfo);
this.$http.postData(this.addOrUPdateFlag === 1 ? 'sarStandardsInfo/sar-standards-info/addarStandardsInfo' : 'sarStandardsInfo/sar-standards-info/updateSarStandardsInfo', nowstandinfo, { this.$http.postData(this.addOrUPdateFlag === 1 ? 'sarStandardsInfo/sar-standards-info/addarStandardsInfo' : 'sarStandardsInfo/sar-standards-info/updateSarStandardsInfo', nowstandinfo, {
_this: this _this: this
}, res => { }, res => {
@@ -3177,38 +3208,36 @@ export default {
sessionStorage.removeItem('STAND_INLAND') sessionStorage.removeItem('STAND_INLAND')
} }
console.log("hello") let standardToLawsInfo = {
console.log(formFieldList); 'countryArea': '',
let standardToLawsInfo={'countryArea':'','standId':'','ssrq':'','zccssrqgj':'','xcxssrqgj':''} 'standId': '',
'ssrq': '',
'zccssrqgj': '',
'xcxssrqgj': ''
}
standardToLawsInfo.countryArea = nowstandinfo.country; standardToLawsInfo.countryArea = nowstandinfo.country;
standardToLawsInfo.standId = nowstandinfo.id; standardToLawsInfo.standId = nowstandinfo.id;
standardToLawsInfo.ssrq = nowstandinfo.SSRQ; standardToLawsInfo.ssrq = nowstandinfo.SSRQ;
standardToLawsInfo.zccssrqgj = nowstandinfo.ZCCSSRQ; standardToLawsInfo.zccssrqgj = nowstandinfo.ZCCSSRQ;
standardToLawsInfo.xcxssrqgj = nowstandinfo.XCXSSRQ; standardToLawsInfo.xcxssrqgj = nowstandinfo.XCXSSRQ;
console.log("country")
console.log(standardToLawsInfo);
this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/standardToLaws', this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/standardToLaws',
standardToLawsInfo, standardToLawsInfo,
{_this: this} {_this: this}
) )
} }
}, e => { }, e => {
this.isSubmit = false this.isSubmit = false
}) })
} else { } else {
this.isSubmit = false this.isSubmit = false
} }
}, e => {}) }, e => {
})
} else { } else {
this.isSubmit = false this.isSubmit = false
this.$message({ this.$message({
@@ -3376,7 +3405,6 @@ export default {
} }
if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.SSRQ) { if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.SSRQ) {
res.data.list[i].SSRQ = res.data.list[i].attrInfoMap.SSRQ res.data.list[i].SSRQ = res.data.list[i].attrInfoMap.SSRQ
console.log(res.data.list[i].SSRQ);
} }
} }
this.stahndinfoList = res.data.list this.stahndinfoList = res.data.list
@@ -3441,7 +3469,8 @@ export default {
this.zNodesSItem = JSON.parse(JSON.stringify(treeNode)) this.zNodesSItem = JSON.parse(JSON.stringify(treeNode))
this.searchInlandNodes = JSON.parse(JSON.stringify(treeNode)) this.searchInlandNodes = JSON.parse(JSON.stringify(treeNode))
} }
}, e => {}) }, e => {
})
}, },
// 所属部门选取 // 所属部门选取
treeDblClick(treeId, treeNode) { treeDblClick(treeId, treeNode) {
@@ -4117,7 +4146,8 @@ export default {
this.twoOptions = twoOptions this.twoOptions = twoOptions
// this.resolveFormFieldList() // this.resolveFormFieldList()
} }
}, e => {}) }, e => {
})
}, },
/** /**
* 展示位置 * 展示位置
@@ -4265,8 +4295,14 @@ export default {
if (item.attrField === 'DTBJH' || item.attrField === 'YYBJ') { if (item.attrField === 'DTBJH' || item.attrField === 'YYBJ') {
rule.push({type: 'string', max: 100, message: `${item.attrName}不能超过100个字符`, trigger: 'blur'}) rule.push({type: 'string', max: 100, message: `${item.attrName}不能超过100个字符`, trigger: 'blur'})
} else { } else {
rule.push({type: 'string', max: item.attrLen, message: `${item.attrName}不能超过${item.attrLen}个字符`, trigger: 'blur'}) rule.push({
} } type: 'string',
max: item.attrLen,
message: `${item.attrName}不能超过${item.attrLen}个字符`,
trigger: 'blur'
})
}
}
if (item.attrField === 'DTBJH' || item.attrField === 'YYBJ' || item.attrField === 'BYYBJ' || item.attrField === 'CBBH' || item.attrField === 'DXBZ') { if (item.attrField === 'DTBJH' || item.attrField === 'YYBJ' || item.attrField === 'BYYBJ' || item.attrField === 'CBBH' || item.attrField === 'DXBZ') {
if (item.attrField === 'CBBH') { if (item.attrField === 'CBBH') {
rule.push({type: 'string', validator: this.verify.validateStandardItemNoRepeat, trigger: 'blur'}) rule.push({type: 'string', validator: this.verify.validateStandardItemNoRepeat, trigger: 'blur'})
@@ -4313,7 +4349,12 @@ export default {
} }
} }
if (item.attrLen && item.attrType !== 'INPUT_NUM' && item.attrType !== 'DATE_PICKER' && item.attrType !== 'SEL_OPTION' && item.attrType !== 'SEL_OPTS' && item.attrType !== 'DATE_PIC_OPTS') { if (item.attrLen && item.attrType !== 'INPUT_NUM' && item.attrType !== 'DATE_PICKER' && item.attrType !== 'SEL_OPTION' && item.attrType !== 'SEL_OPTS' && item.attrType !== 'DATE_PIC_OPTS') {
rule.push({type: 'string', max: item.attrLen, message: `${item.attrName}不能超过${item.attrLen}个字符`, trigger: 'change'}) rule.push({
type: 'string',
max: item.attrLen,
message: `${item.attrName}不能超过${item.attrLen}个字符`,
trigger: 'change'
})
} }
if (rule.length > 0) { if (rule.length > 0) {
rules[item.attrField] = rule rules[item.attrField] = rule
@@ -4346,7 +4387,12 @@ export default {
} }
} }
if (item.attrLen && item.attrType !== 'INPUT_NUM' && item.attrType !== 'DATE_PICKER' && item.attrType !== 'SEL_OPTION' && item.attrType !== 'SEL_OPTS' && item.attrType !== 'DATE_PIC_OPTS') { if (item.attrLen && item.attrType !== 'INPUT_NUM' && item.attrType !== 'DATE_PICKER' && item.attrType !== 'SEL_OPTION' && item.attrType !== 'SEL_OPTS' && item.attrType !== 'DATE_PIC_OPTS') {
rule.push({type: 'string', max: item.attrLen, message: `${item.attrName}不能超过${item.attrLen}个字符`, trigger: 'change'}) rule.push({
type: 'string',
max: item.attrLen,
message: `${item.attrName}不能超过${item.attrLen}个字符`,
trigger: 'change'
})
} }
if (rule.length > 0) { if (rule.length > 0) {
rules[item.attrField] = rule rules[item.attrField] = rule
@@ -4577,14 +4623,17 @@ export default {
background: url('~@/assets/images/shangqi/img/tree-add.png'); background: url('~@/assets/images/shangqi/img/tree-add.png');
background-size: 100% 100%; background-size: 100% 100%;
} }
/deep/ .expanded { /deep/ .expanded {
background: url('~@/assets/images/shangqi/img/tree-sub.png'); background: url('~@/assets/images/shangqi/img/tree-sub.png');
background-size: 100% 100%; background-size: 100% 100%;
} }
/deep/ .is-leaf { /deep/ .is-leaf {
background-image: none; background-image: none;
background-size: 100% 100%; background-size: 100% 100%;
} }
/deep/ .is-leaf-none { /deep/ .is-leaf-none {
position: relative; position: relative;
display: inline-block; display: inline-block;
@@ -4593,6 +4642,7 @@ export default {
background: url('~@/assets/images/shangqi/img/none-file.png'); background: url('~@/assets/images/shangqi/img/none-file.png');
background-size: 100% 100%; background-size: 100% 100%;
} }
/deep/ .is-show { /deep/ .is-show {
position: relative; position: relative;
display: inline-block; display: inline-block;
@@ -4601,11 +4651,13 @@ export default {
background: url('~@/assets/images/shangqi/img/tree.png'); background: url('~@/assets/images/shangqi/img/tree.png');
background-size: 100% 100%; background-size: 100% 100%;
} }
/deep/ .tree-line { /deep/ .tree-line {
.el-tree-node { .el-tree-node {
position: relative; position: relative;
padding-left: 0px; // 缩进量 padding-left: 0px; // 缩进量
} }
.el-tree-node__children { .el-tree-node__children {
padding-left: 16px; // 缩进量 padding-left: 16px; // 缩进量
} }
@@ -4621,6 +4673,7 @@ export default {
border-width: 1px; border-width: 1px;
border-left: 1px dashed #858990e0; border-left: 1px dashed #858990e0;
} }
// 当前层最后一个节点的竖线高度固定 // 当前层最后一个节点的竖线高度固定
.el-tree-node:last-child::before { .el-tree-node:last-child::before {
height: 38px; // 可以自己调节到合适数值 height: 38px; // 可以自己调节到合适数值
@@ -4642,6 +4695,7 @@ export default {
& > .el-tree-node::after { & > .el-tree-node::after {
border-top: none; border-top: none;
} }
& > .el-tree-node::before { & > .el-tree-node::before {
border-left: none; border-left: none;
} }
@@ -4660,31 +4714,38 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/mixins'; @import '~@/assets/styles/mixins';
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
#foreignStandardsAndRegulations { #foreignStandardsAndRegulations {
//background: #fff; //background: #fff;
display: flex; display: flex;
height: 100%; height: 100%;
position: relative; position: relative;
.tree-content { .tree-content {
background: #fff; background: #fff;
width: 20%; width: 20%;
position: relative; position: relative;
.tree { .tree {
/deep/ .el-card__body { /deep/ .el-card__body {
padding: 0 !important; padding: 0 !important;
} }
.el-card { .el-card {
min-width: min-content; min-width: min-content;
} }
width: calc(~'100% - 15px'); width: calc(~'100% - 15px');
position: absolute; position: absolute;
left: 0; left: 0;
} }
.tree-collapse { .tree-collapse {
position: absolute; position: absolute;
right: 0; right: 0;
} }
} }
.tree-right { .tree-right {
overflow-y: hidden; overflow-y: hidden;
padding: 0; padding: 0;
@@ -4693,51 +4754,63 @@ export default {
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.content { .content {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
position: relative; position: relative;
flex: auto; flex: auto;
.table-wrap { .table-wrap {
flex: auto; flex: auto;
overflow: hidden; overflow: hidden;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
.pagination { .pagination {
position: static; position: static;
/deep/ .pagination-slot { /deep/ .pagination-slot {
padding: 0; padding: 0;
} }
} }
} }
} }
.tree-close { .tree-close {
.tree { .tree {
left: -200px !important; left: -200px !important;
} }
.tree-right { .tree-right {
width: calc(~'100% - 15px') !important; width: calc(~'100% - 15px') !important;
} }
.side-bar-collapse { .side-bar-collapse {
background: #5596CC !important; background: #5596CC !important;
color: #FFF; color: #FFF;
} }
} }
.tree-closed { .tree-closed {
width: 15px !important; width: 15px !important;
} }
.el-popover { .el-popover {
height: 200px; height: 200px;
} }
.el-col-12 { .el-col-12 {
//width: 50%; //width: 50%;
//white-space: nowrap; //white-space: nowrap;
} }
.form-upload-btn { .form-upload-btn {
width: 224px; width: 224px;
//line-height: 20px; //line-height: 20px;
} }
.el-drawer__wrapper { .el-drawer__wrapper {
.demo-drawer-content { .demo-drawer-content {
.drawer-content { .drawer-content {
@@ -4749,9 +4822,11 @@ export default {
} }
} }
} }
.el-textarea__inner { .el-textarea__inner {
line-height: 28px !important; line-height: 28px !important;
} }
.btn-col { .btn-col {
padding-top: 11px; padding-top: 11px;
} }
@@ -4759,47 +4834,61 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
#foreignStandardsAndRegulations { #foreignStandardsAndRegulations {
height: 100%; height: 100%;
.tools-bar-wrapper { .tools-bar-wrapper {
align-items: start; align-items: start;
margin-bottom: 5px; margin-bottom: 5px;
} }
.content { .content {
height: calc(~'100% - 53px - 56px'); height: calc(~'100% - 53px - 56px');
background-color: #fff; background-color: #fff;
padding: 0 10px; padding: 0 10px;
.table{}
.table {
} }
}
.draw-form-item { .draw-form-item {
/deep/ .el-form-item__content { /deep/ .el-form-item__content {
//width: 220px; //width: 220px;
} }
} }
.config-stands { .config-stands {
/deep/ .el-form-item { /deep/ .el-form-item {
margin-bottom: 0; margin-bottom: 0;
} }
.pagination { .pagination {
bottom: 50px; bottom: 50px;
} }
} }
.config-drawer { .config-drawer {
margin-top: 5px; margin-top: 5px;
.content { .content {
padding: 15px 0 0 0px; padding: 15px 0 0 0px;
.el-table { .el-table {
overflow-y: auto; overflow-y: auto;
} }
} }
} }
.advanced-class { .advanced-class {
visibility: hidden; visibility: hidden;
} }
.advanced-one { .advanced-one {
width: 80px; width: 80px;
} }
.advanced-two { .advanced-two {
// //
} }
.advancedSearch-btn { .advancedSearch-btn {
padding: 12px 12px; padding: 12px 12px;
color: #ffffff; color: #ffffff;
@@ -4807,6 +4896,7 @@ export default {
border: none; border: none;
border-radius: 20px; border-radius: 20px;
} }
.advancedSearch-btn-reduce { .advancedSearch-btn-reduce {
padding: 12px 12px; padding: 12px 12px;
color: #999; color: #999;
@@ -4814,9 +4904,11 @@ export default {
border: 1px solid #DCDFE6; border: 1px solid #DCDFE6;
border-radius: 20px; border-radius: 20px;
} }
button.el-button.advancedSearch-btn-reduce.el-button--default { button.el-button.advancedSearch-btn-reduce.el-button--default {
margin-left: 0; margin-left: 0;
} }
.advance-dialog { .advance-dialog {
.advance-dialog-form { .advance-dialog-form {
/deep/ input.el-input__inner { /deep/ input.el-input__inner {
@@ -4825,14 +4917,17 @@ export default {
} }
} }
} }
::v-deep .el-drawer__header { ::v-deep .el-drawer__header {
& > span:first-child { & > span:first-child {
outline: none !important; outline: none !important;
} }
} }
::v-deep .el-drawer { ::v-deep .el-drawer {
outline: none !important; outline: none !important;
} }
.label-input-form { .label-input-form {
&.table-lattice { &.table-lattice {
/deep/ .el-form-item__label { /deep/ .el-form-item__label {
@@ -4848,15 +4943,18 @@ export default {
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis text-overflow: ellipsis
} }
/deep/ .el-input__inner { /deep/ .el-input__inner {
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
border-radius: 0 !important; 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
} }
.classDisplay { .classDisplay {
display: none; display: none;
} }