-
+
+
@@ -934,6 +924,11 @@ export default {
},
data () {
return {
+ treeList: [],
+ props: {
+ label: 'menuName',
+ children: 'children'
+ },
menuTreeLoading: true,
orderBy:'',
nowOrder:'',
@@ -1644,101 +1639,11 @@ export default {
})
})
},
- // 二级菜单新建，编辑，删除
- clickDropMenu (name, treeNode) {
- this.selectSarMenu = JSON.parse(JSON.stringify(treeNode))
- if (undefined !== this.selectSarMenu.id) { // 当前有选中节点
- if (name === 'newMenu') {
- this.menuModalTitle = '新增目录'
- this.menuModalFlag = true
- this.menuAddOrUpdateFlag = 1
- this.sarMenu = {
- id: '',
- parentId: '',
- menuName: '',
- sorDivide: 'FOREIGN_STAND',
- displaySeq: '',
- parentIds: '',
- remarks: ''
- }
- } else if (name === 'editMenu') {
- this.menuModalTitle = '编辑目录'
- this.menuModalFlag = true
- this.menuAddOrUpdateFlag = 2
- this.sarMenu.id = treeNode.id
- this.sarMenu.parentId = treeNode.pId
- this.sarMenu.menuName = treeNode.oldname || treeNode.name
- this.sarMenu.displaySeq = treeNode.displaySeq
- if (treeNode.remarks == null || treeNode.remarks === '' || treeNode.remarks === 'null') {
- this.sarMenu.remarks = ''
- } else {
- this.sarMenu.remarks = treeNode.remarks
- }
- } else {
- if (this.selectSarMenu.parentId == null) { // 如果父id为null 说明是根目录
- this.$message({
- title: '提示',
- content: '根目录不可删除！'
- })
- } else {
- // deleteMenu 删除二级菜单，先判断是否选中，选中项目，然后调用删除方法
- // 先判断目录下是否有菜单
- this.$http.post('lawss/sarMenu/judgequeryMenuByPid', this.selectSarMenu, {
- _this: this, loading: 'loading'
- }, res => {
- if (res.data) {
- // this.deleteMenuModal = true
- this.$confirm('该节点下有记录，确定删除？', '提示', {
- confirmButtonText: '确定',
- confirmButtonClass: 'common-button-primary',
- cancelButtonText: '取消',
- type: 'warning',
- roundButton: false
- }).then(() => {
- this.$http.post('lawss/sarMenu/deleteMenuAndChildren', this.selectSarMenu, {
- _this: this, loading: 'loading'
- }, res => {
- this.selectMenu() // 删除成功后，更新二级菜单
- // 获取下一个节点
- let currentNode = this.$refs.domesticTree.getNextNode()
- let nodeId = ''
- // 如果这个节点为null, 本次删除了最后一个节点
- if (currentNode === null) {
- // 选中根节点
- this.$refs.domesticTree.selectRootNode()
- } else {
- nodeId = currentNode.id
- }
- this.getDomesticStandardTable()
- }, e => {
- })
- }).catch(() => {
- // 取消删除，清空选择
- // this.$refs.selections.clearSelection()
- })
- } else {
- this.sureDeleteSarMenu()
- }
- }, e => {
- })
- }
- }
- } else {
- this.$Modal.info({
- title: '提示',
- content: '请选择节点！'
- })
- }
- },
treeClick (treeNode) {
- this.selectSarMenu = treeNode // 记录当前选中的二级菜单
+ this.selectSarMenu = treeNode
this.standCommonlySearch.menuId = treeNode.id
this.standCommonlySearch.page = 1
- this.getDomesticStandardTable() // 根据选中的二级菜单查询对应的标准列表
- },
- treeRightClick (treeNode) {
- this.selectSarMenu = treeNode // 记录当前选中的二级菜单
- this.standCommonlySearch.menuId = treeNode.id
+ this.getDomesticStandardTable()
},
// 点击搜索按钮
searchBtnClick () {
@@ -1828,40 +1733,12 @@ export default {
},
// 查询二级菜单
selectMenu () {
- return new Promise((resolve, reject) => {
- this.$http.get('lawss/sarMenu/selectMenuByRole', {sorDivide: 'FOREIGN_STAND'}, {
- _this: this
- }, res => {
- let treeNode = []
- this.parentNode = {}
- res.data.forEach((item, index) => {
- let treeItem = {}
- for (let key in item) {
- if (key === 'parentId') {
- treeItem.pId = item[key]
- treeItem.parentId = item[key]
- } else if (key === 'menuName') {
- treeItem.name = item[key]
- } else {
- treeItem[key] = item[key]
- }
- if (this.initZNode === '' && item.id === '64df1d5522bb49c09af2') { this.initZNode = treeItem }
- }
- treeNode[index] = treeItem
- // 记录最外层父节点
- if (treeItem.parentId === '' || treeItem.parentId == null) {
- this.parentNode = treeItem
- }
- })
- this.zNodes = treeNode
- // 查完左侧目录后，如果没有选中的，设置最外层选中
- if (JSON.stringify(this.selectSarMenu) === '{}' || !this.selectSarMenu) {
- this.selectSarMenu = JSON.parse(JSON.stringify(this.parentNode))
- }
- resolve(res)
- }, e => {
- reject(e)
- })
+ this.$http.get('sarResource/ts-resource', {
+ sorDivide: 'FOREIGN_STAND'
+ }, {}, res => {
+ if (res.ok) {
+ this.treeList = res.data
+ }
})
},
// 树-删除
@@ -2416,7 +2293,11 @@ export default {
data.sarStandardsSearch = ''
}
const formData = {...data}
- formData.menuId = this.selectSarMenu.id
+ if (!item) {
+ formData.menuId = this.selectSarMenu.id
+ } else {
+ formData.menuId = this.standCommonlySearch.menuId
+ }
formData.nowOrderBy = this.nowOrder ? this.orderBy : ''
formData.nowOrder = this.nowOrder
// 处理我的收藏和个性化标签传参
@@ -2437,7 +2318,6 @@ export default {
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {
_this: this, loading: 'loading'
}, res => {
- console.log('2441',formData);
this.isAdvancedSearch = false
if (res.ok) {
for (let i = 0; i < res.data.list.length; i++) {
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
index fe62cd53e..c373347b0 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
@@ -1211,13 +1211,13 @@ export default {
handlePreview (row) {
this.$store.commit('setDetailMap', this.$route.path)
this.$store.commit('setLocalProData', JSON.stringify(row))
- if (!this.$hasPermission('XTR2AJYDAN4J7GALXDW9')){
- this.$message({
- message: '无权访问',
- type: 'warning'
- })
- return
- }
+ // if (!this.$hasPermission('XTR2AJYDAN4J7GALXDW9')){
+ // this.$message({
+ // message: '无权访问',
+ // type: 'warning'
+ // })
+ // return
+ // }
this.$http.get('sarStandProjectLibrary/queryById', {
id: row.id
}, {
diff --git a/src/pages/regulatoryRepository/nonConfomity/index.vue b/src/pages/regulatoryRepository/nonConfomity/index.vue
index 63cc3c8dd..725176438 100644
--- a/src/pages/regulatoryRepository/nonConfomity/index.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/index.vue
@@ -42,6 +42,7 @@ export default {
flex-direction: column;
background-color: #FFFFFF;
.non-content {
+ padding: 0 10px;
height: 100%;
/deep/ .el-tabs {
display: flex;
diff --git a/src/router/index.js b/src/router/index.js
index 95bc69384..5c0a65d68 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -258,6 +258,69 @@ const routes = [
title: '标准清单发布/更新流程'
}
},
+ {
+ path: '/bzqdfbStep3',
+ name: 'bzqdfbStep3',
+ component: () => import('@/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue'),
+ meta: {
+ requireAuth: true,
+ title: '标准清单发布/更新流程'
+ }
+ },
+ {
+ path: '/bzqdfbStep4',
+ name: 'bzqdfbStep4',
+ component: () => import('@/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue'),
+ meta: {
+ requireAuth: true,
+ title: '标准清单发布/更新流程'
+ }
+ },
+ {
+ path: '/wfhxzgStep1',
+ name: 'wfhxzgStep1',
+ component: () => import('@/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue'),
+ meta: {
+ requireAuth: true,
+ title: '未符合项整改流程'
+ }
+ },
+ {
+ path: '/wfhxzgStep2',
+ name: 'wfhxzgStep2',
+ component: () => import('@/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue'),
+ meta: {
+ requireAuth: true,
+ title: '未符合项整改发布/更新流程'
+ }
+ },
+ {
+ path: '/wfhxzgStep3',
+ name: 'wfhxzgStep3',
+ component: () => import('@/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue'),
+ meta: {
+ requireAuth: true,
+ title: '未符合项整改/更新流程'
+ }
+ },
+ {
+ path: '/wfhxzgStep4',
+ name: 'wfhxzgStep4',
+ component: () => import('@/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue'),
+ meta: {
+ requireAuth: true,
+ title: '未符合项整改/更新流程'
+ }
+ },
+ {
+ path: '/wfhxzgStep5',
+ name: 'wfhxzgStep5',
+ component: () => import('@/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue'),
+ meta: {
+ requireAuth: true,
+ title: '未符合项整改/更新流程'
+ }
+ },
{
path: '/bzrkStep1',
name: 'bzrkStep1',
@@ -312,6 +375,24 @@ const routes = [
title: '标准调研流程'
}
},
+ {
+ path: '/bzdyStep2',
+ name: 'bzdyStep2',
+ component: () => import('@/pages/processCenter/pages/creatProcess/bzdy/step2.vue'),
+ meta: {
+ requireAuth: true,
+ title: '标准调研流程'
+ }
+ },
+ {
+ path: '/bzdyStep3',
+ name: 'bzdyStep3',
+ component: () => import('@/pages/processCenter/pages/creatProcess/bzdy/step3.vue'),
+ meta: {
+ requireAuth: true,
+ title: '标准调研流程'
+ }
+ },
{
path: '/zqyjStep1',
name: 'zqyjStep1',
diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index 167e13033..1b190f484 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -6,7 +6,7 @@
// 服务器地址
// const devIp = '39.98.140.126'
// const devInterfacePORT = '10005'
-const devIp = '192.168.10.53'
+const devIp = '192.168.10.248'
const devInterfacePORT = '9999'
// 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777'