diff --git a/src/api/flow/index.js b/src/api/flow/index.js index 33ad55b3a..0e03639d9 100644 --- a/src/api/flow/index.js +++ b/src/api/flow/index.js @@ -1,7 +1,22 @@ import axios from '@/common/axios' // 根据企标编号查找文件 -export function selectByIdAtt(id){ - return axios._getData('/lawss/sarBussionessStand/selectByIdAtt', { id }) +function selectByIdAtt(id){ + return axios._getData('lawss/sarBussionessStand/selectByIdAtt', { id }) } +// 企业标准树 +function getMenuListOne(sorDivide, userId){ + return axios._getData('sarResource/ts-resource/getListStandLimitData', { sorDivide, userId }) +} + +// 技术体系树 +function getMenuListTwo(dicId){ + return axios._getData('lawss/sarMenuStandardLimit/getListStandLimit', { dicId }) +} + +export { + selectByIdAtt, + getMenuListOne, + getMenuListTwo +} diff --git a/src/common/myFun.js b/src/common/myFun.js new file mode 100644 index 000000000..68df75b1b --- /dev/null +++ b/src/common/myFun.js @@ -0,0 +1,37 @@ +function getTreeItem(tree, id){ + // 方法1 返回数组 + // let result = [] + // tree.forEach(item => { + // if(item.id === id){ + // result.push(item) + // }else{ + // if(item.children.length > 0){ + // // 内部函数返回值需要传递给最外层函数 + // let res = getTreeItem(item.children, id) + // result = result.concat(res) + // } + // } + // }) + // return result + // 方法2 返回对象 + let result = null + tree.forEach(item => { + if(item.id === id){ + result = item + // result.push(item) + }else{ + if(item.children.length > 0){ + // 内部函数返回值需要传递给最外层函数 + let res = getTreeItem(item.children, id) + if(res !== null){ + result = res + } + } + } + }) + return result +} + +export { + getTreeItem +} diff --git a/src/components/abc/selectTree/selectTree.vue b/src/components/abc/selectTree/selectTree.vue new file mode 100644 index 000000000..ccca7a5eb --- /dev/null +++ b/src/components/abc/selectTree/selectTree.vue @@ -0,0 +1,215 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue index ade3fe271..636c840c1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue @@ -533,13 +533,14 @@ clearable :maxlength="100"> - - - + + 0){ this.replaceLawsNumForm.issueTimeStart = this.replaceLawsNumForm.issueTimeArr[0] || null this.replaceLawsNumForm.issueTimeEnd = this.replaceLawsNumForm.issueTimeArr[1] || null @@ -978,6 +991,11 @@ export default { }) }, getReplaceLawsNumRowFirst () { + this.replaceLawsNumForm.userId = this.$store.getters.userInfo.userId + let currentTreeItem = getTreeItem(this.selectTreeList, this.replaceLawsNumForm.menuId) + if(currentTreeItem && currentTreeItem.treeType) + this.replaceLawsNumForm.treeType = currentTreeItem.treeType + this.replaceLawsNumForm.page = 1 this.replacePage = 1 if(this.replaceLawsNumForm.issueTimeArr && this.replaceLawsNumForm.issueTimeArr.length > 0){ @@ -1058,9 +1076,31 @@ export default { handleTabs(name) { this.active = name; }, - choiceShow(){ + async choiceShow(){ this.getReplaceLawsNumRow() this.replaceLawsNumModel = true; + // 标准类别树 + const list1 = await this.getMenuListOne() + const list2 = await this.getMenuListTwo() + this.selectTreeList = list1.concat(list2) + }, + // 企业标准树 + getMenuListOne() { + return new Promise((resolve, reject) => { + getMenuListOne('BUSINESS_STAND', this.$store.getters.userInfo.userId).then(res=>{ + if(res && res.data) + resolve(res.data) + }).catch(e => reject(e)) + }) + }, + // 技术体系树 + getMenuListTwo() { + return new Promise((resolve, reject) => { + getMenuListTwo('9m4qqqaansxmox5e82zm').then(res=>{ + if(res && res.data) + resolve(res.data) + }).catch(e => reject(e)) + }) }, getStandDataBtns(){ this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage',{ diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 6f649b5b1..db99ba5c4 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -1466,7 +1466,7 @@ @@ -1509,13 +1509,14 @@ clearable :maxlength="100"> - - - + + {{ filterOp(scope.row.reviewResults) }} + + + + + + {{$t('m.dataAcquisition')}} @@ -1769,6 +1788,9 @@ import TreeSelect from "@/components/treeSelect/treeSelect.vue"; import TreeSelectNew from "@/components/treeSelect/treeSelectNew.vue"; import ProcessTitle from "@/pages/processCenter/pages/components/ProcessTitle"; import treeSelectModule from "@/components/treeSelect/treeSelectModule.vue"; +import selectTree from "@/components/abc/selectTree/selectTree" +import { getTreeItem } from "@/common/myFun.js" +import { getMenuListOne, getMenuListTwo } from "@/api/flow" import {mapGetters} from "vuex"; import store from "@/store"; @@ -1789,7 +1811,8 @@ export default { TreeSelect, TreeSelectNew, treeSelectModule, - ProcessTitle + ProcessTitle, + selectTree }, props: {}, data() { @@ -2563,6 +2586,7 @@ export default { url: '', urlChild: '', modelType:'', + selectTreeList: [], } }, methods: { @@ -2654,9 +2678,31 @@ export default { map.set(3,"继续有效"); return map.get(data) }, - selectBuss(){ + async selectBuss(){ this.replaceLawsNumModel = true this.getReplaceLawsNumRow() + // 标准类别树 + const list1 = await this.getMenuListOne() + const list2 = await this.getMenuListTwo() + this.selectTreeList = list1.concat(list2) + }, + // 企业标准树 + getMenuListOne() { + return new Promise((resolve, reject) => { + getMenuListOne('BUSINESS_STAND', this.$store.getters.userInfo.userId).then(res=>{ + if(res && res.data) + resolve(res.data) + }).catch(e => reject(e)) + }) + }, + // 技术体系树 + getMenuListTwo() { + return new Promise((resolve, reject) => { + getMenuListTwo('9m4qqqaansxmox5e82zm').then(res=>{ + if(res && res.data) + resolve(res.data) + }).catch(e => reject(e)) + }) }, replaceLawsNumModelCancel () { // this.replaceLawsNumModel = false @@ -2690,11 +2736,17 @@ export default { total: 0, validFlag: '0', QCDW: '', - menuId: '' + // menuId: '' } + this.$refs.selectTreeRef.clear() this.getReplaceLawsNumRow() }, getReplaceLawsNumRow () { + this.replaceLawsNumForm.userId = this.$store.getters.userInfo.userId + let currentTreeItem = getTreeItem(this.selectTreeList, this.replaceLawsNumForm.menuId) + if(currentTreeItem && currentTreeItem.treeType) + this.replaceLawsNumForm.treeType = currentTreeItem.treeType + if(this.replaceLawsNumForm.issueTimeArr && this.replaceLawsNumForm.issueTimeArr.length > 0){ this.replaceLawsNumForm.issueTimeStart = this.replaceLawsNumForm.issueTimeArr[0] || null this.replaceLawsNumForm.issueTimeEnd = this.replaceLawsNumForm.issueTimeArr[1] || null @@ -2728,6 +2780,11 @@ export default { }) }, getReplaceLawsNumRowFirst () { + this.replaceLawsNumForm.userId = this.$store.getters.userInfo.userId + let currentTreeItem = getTreeItem(this.selectTreeList, this.replaceLawsNumForm.menuId) + if(currentTreeItem && currentTreeItem.treeType) + this.replaceLawsNumForm.treeType = currentTreeItem.treeType + this.replaceLawsNumForm.page = 1 this.replacePage = 1 if(this.replaceLawsNumForm.issueTimeArr && this.replaceLawsNumForm.issueTimeArr.length > 0){ @@ -5456,6 +5513,9 @@ export default { } }, watch: { + // selectTreeFilterText (val) { + // this.$refs.selectTree.filter(val); + // }, 'sarBussionessStandEO.standSort':{ handler:function(val){ this.QCBFC = !!(val && val.indexOf("QCBFC") !== -1); @@ -5850,4 +5910,23 @@ export default { /deep/.el-table__fixed-body-wrapper .el-table__body { padding-bottom: 20px; } +// +//.sel-input { +// width: 96%; +// margin: 5px; +// height: 30px; +// /deep/ .el-input__inner{ +// height: 30px; +// line-height: 30px; +// } +//} +//.sel-option { +// width: 100%; +// height: 200px; +// overflow: auto; +// background-color: #fff; +// cursor: pointer; +// font-weight: normal!important; +// padding: 0 5px; +//}