diff --git a/src/api/process.js b/src/api/process.js index 873a4600a..b582172ae 100644 --- a/src/api/process.js +++ b/src/api/process.js @@ -804,3 +804,223 @@ export function upFile(data) { data }) } +// 工作组协会信息数据统计导出 +export function exportAssocInfos(params) { + return axios({ + url: '/api/wgdCensusZ/wgd-assoc-info/exportAllAssocInfos', + params, + method: 'get', + responseType: 'blob', + header: { + 'content-type': 'application/x-www-form-urlencoded' + } + }) +} +// 工作组参与外部标准制修订信息统计导出 +export function exportAllWbxds(params) { + return axios({ + url: '/api/wgdCensusLeo/wgd-wbxd/exportAllWbxds', + params, + method: 'get', + responseType: 'blob', + header: { + 'content-type': 'application/x-www-form-urlencoded' + } + }) +} +// 工作组委员信息数据统计导出 +export function exportAllCommiInfos(params) { + return axios({ + url: '/api/wgdCensusZ/wgd-commi-info/exportAllCommiInfos', + params, + method: 'get', + responseType: 'blob', + header: { + 'content-type': 'application/x-www-form-urlencoded' + } + }) +} +// 工作组协会费用信息统计导出 +export function exportAllAssocCosts(params) { + return axios({ + url: '/api/wgdCensusZ/wgd-assoc-cost/exportAllAssocCosts', + params, + method: 'get', + responseType: 'blob', + header: { + 'content-type': 'application/x-www-form-urlencoded' + } + }) +} +// 工作组参与外部协会会议统计导出 +export function exportAllWbtjs(params) { + return axios({ + url: '/api/wgdCensusLeo/wgd-wbtj/exportAllWbtjs', + params, + method: 'get', + responseType: 'blob', + header: { + 'content-type': 'application/x-www-form-urlencoded' + } + }) +} +// 工作组参会费用信息统计导出 +export function exportAllMeetCosts(params) { + return axios({ + url: '/api/wgdCensusZ/wgd-meet-cost/exportAllMeetCosts', + params, + method: 'get', + responseType: 'blob', + header: { + 'content-type': 'application/x-www-form-urlencoded' + } + }) +} +// 工作组采购费用信息统计导出 +export function exportAllCgfys(params) { + return axios({ + url: '/api/wgdCensusLeo/wgd-cgfy/exportAllCgfys', + params, + method: 'get', + responseType: 'blob', + header: { + 'content-type': 'application/x-www-form-urlencoded' + } + }) +} +// 工作组参与外部标准制修订费用统计导出 +export function exportAllExReviseCost(params) { + return axios({ + url: '/api/wgdCensusZ/wgd-ex-revise-cost/exportAllExReviseCost', + params, + method: 'get', + responseType: 'blob', + header: { + 'content-type': 'application/x-www-form-urlencoded' + } + }) +} +// 工作组翻译费用信息统计导出 +export function exportAllFyfys(params) { + return axios({ + url: '/api/wgdCensusLeo/wgd-fyfy/exportAllFyfys', + params, + method: 'get', + responseType: 'blob', + header: { + 'content-type': 'application/x-www-form-urlencoded' + } + }) +} +// 工作组标准制修订补助资金收支统计收入表导出 +export function exportAllSrbs(params) { + return axios({ + url: '/api/wgdCensusLeo/wgd-srb/exportAllSrbs', + params, + method: 'get', + responseType: 'blob', + header: { + 'content-type': 'application/x-www-form-urlencoded' + } + }) +} +// 工作组标准制修订补助资金收支统计支出表导出 +export function exportAllZcbs(params) { + return axios({ + url: '/api/wgdCensusLeo/wgd-zcb/exportAllZcbs', + params, + method: 'get', + responseType: 'blob', + header: { + 'content-type': 'application/x-www-form-urlencoded' + } + }) +} +// 协会信息数据统计导入 +export function importAllAssocInfos(data) { + return axios({ + url: '/api/wgdCensusZ/wgd-assoc-info/importAllAssocInfos', + method: 'post', + data + }) +} +// 委员信息数据统计导入 +export function importAllCommiInfos(data) { + return axios({ + url: '/api/wgdCensusZ/wgd-commi-info/importAllCommiInfos', + method: 'post', + data + }) +} +// 参与外部协会会议统计导入 +export function importAllAllWbtjs(data) { + return axios({ + url: '/api/wgdCensusLeo/wgd-wbtj/importAllAllWbtjs', + method: 'post', + data + }) +} +// 参与外部标准制修订信息统计导入 +export function importAllWbxds(data) { + return axios({ + url: '/api/wgdCensusLeo/wgd-wbxd/importAllWbxds', + method: 'post', + data + }) +} +// 协会费用信息统计导入 +export function importAssocCosts(data) { + return axios({ + url: '/api/wgdCensusZ/wgd-assoc-cost/importAssocCosts', + method: 'post', + data + }) +} +//参会费用信息统计导入 +export function importMeetCost(data) { + return axios({ + url: '/api/wgdCensusZ/wgd-meet-cost/importMeetCost', + method: 'post', + data + }) +} +//参与外部标准制修订费用统计导入 +export function importExReviseCost(data) { + return axios({ + url: '/api/wgdCensusZ/wgd-ex-revise-cost/importExReviseCost', + method: 'post', + data + }) +} +//采购费用信息统计导入 +export function importAllCgfys(data) { + return axios({ + url: '/api/wgdCensusLeo/wgd-cgfy/importAllCgfys', + method: 'post', + data + }) +} +//翻译费用信息统计导入 +export function importAllFyfys(data) { + return axios({ + url: '/api/wgdCensusLeo/wgd-fyfy/importAllFyfys', + method: 'post', + data + }) +} +//标准制修订补助资金收支统计收入表导入 +export function importAllSrbs(data) { + return axios({ + url: '/api/wgdCensusLeo/wgd-srb/importAllSrbs', + method: 'post', + data + }) +} +//标准制修订补助资金收支统计支出表导入 +export function importAllZcbs(data) { + return axios({ + url: '/api/wgdCensusLeo/wgd-zcb/importAllZcbs', + method: 'post', + data + }) +} diff --git a/src/components/CustomFormComponents/Input.vue b/src/components/CustomFormComponents/Input.vue index aa3e5a3ba..ceeaa8391 100644 --- a/src/components/CustomFormComponents/Input.vue +++ b/src/components/CustomFormComponents/Input.vue @@ -62,6 +62,9 @@ export default { const value = event this.$emit('input', value) } + }, + mounted() { + console.log(this.config); } } diff --git a/src/components/CustomFormComponents/InputForStandardsForForeign.vue b/src/components/CustomFormComponents/InputForStandardsForForeign.vue index 2a6ee0d94..97e82af5c 100644 --- a/src/components/CustomFormComponents/InputForStandardsForForeign.vue +++ b/src/components/CustomFormComponents/InputForStandardsForForeign.vue @@ -254,7 +254,7 @@ export default { this.quoteIdList1 = [] this.replaceLawsNumForm.quoteIdList = '' } - this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, { + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1', this.replaceLawsNumForm, { _this: this, loading: 'replaceLoading' }, res => { diff --git a/src/components/mechanismTree/index.vue b/src/components/mechanismTree/index.vue index fca2173aa..30cbb6b07 100644 --- a/src/components/mechanismTree/index.vue +++ b/src/components/mechanismTree/index.vue @@ -49,7 +49,6 @@ 确定 - 取消 @@ -103,15 +102,13 @@ export default { } }, methods: { - treeClass() { - - }, handleTreeDrawerCancel() { this.filterText = '' this.isVisible2 = false }, saveUserInfo() { let arr = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); + this.filterText = '' this.isVisible2 = false this.$emit('checkedRole', arr) }, diff --git a/src/components/phoneHistortTable/index.vue b/src/components/phoneHistortTable/index.vue index 66c24d901..798ac4b3a 100644 --- a/src/components/phoneHistortTable/index.vue +++ b/src/components/phoneHistortTable/index.vue @@ -88,6 +88,8 @@ } - diff --git a/src/components/roleTree/index.vue b/src/components/roleTree/index.vue index b01facf1c..6bfcb1889 100644 --- a/src/components/roleTree/index.vue +++ b/src/components/roleTree/index.vue @@ -1,11 +1,11 @@ + + diff --git a/src/pages/config/pages/mechanismManage/pages/mechanism.vue b/src/pages/config/pages/mechanismManage/pages/mechanism.vue index ec4d5f16b..a0a277786 100644 --- a/src/pages/config/pages/mechanismManage/pages/mechanism.vue +++ b/src/pages/config/pages/mechanismManage/pages/mechanism.vue @@ -249,6 +249,7 @@ export default { name: 'mechanism', data() { return { + formLoading: true, peopleType: '', //1为树结构 2 为全机构 nodeKeyId: '', searchForm: { @@ -327,6 +328,7 @@ export default { searchPostName() { this.page = 1; this.getTree2(); + this.sarPost.name = ""; }, // 查询 resetSelect() { this.sarPost.name = ""; @@ -531,12 +533,17 @@ export default { }, selectEdit() { - this.userId = [] - this.manageData.forEach(item=>{ - this.userId.push(item.userId) - }) - this.drawerTitle = '批量配置岗位' - this.modalPost = true + this.getTree2() + if(this.manageData.length){ + this.userId = [] + this.manageData.forEach(item=>{ + this.userId.push(item.userId) + }) + this.drawerTitle = '批量配置岗位' + this.modalPost = true + }else{ + this.$message.warning('请选择需要批量配置岗位的角色') + } }, }, computed: {}, diff --git a/src/pages/config/pages/mechanismManage/pages/workgroup.vue b/src/pages/config/pages/mechanismManage/pages/workgroup.vue index 70e06c64a..02d62b7f0 100644 --- a/src/pages/config/pages/mechanismManage/pages/workgroup.vue +++ b/src/pages/config/pages/mechanismManage/pages/workgroup.vue @@ -244,7 +244,9 @@ export default { }, { _this: this }, res => { - res.data.records.map(item => { + this.workData = res.data.records + let work = res.data.records + work.map(item => { item.workLeaderGroup = []; item.workPeopleGroup = []; var workLeaderArray = item.workLeader.split(","); @@ -258,8 +260,8 @@ export default { item.workPeopleGroup.push({ name: workPeopleArray[j], id: workPeopleIdArray[j] }); } }); - this.workData = res.data.records; this.total = res.data.total; + this.Loading = false }, e => { }); }, @@ -268,7 +270,7 @@ export default { }, //查询 searchPostName() { - this.page = 1; + this.workSearch.page = 1; this.getWorkData(); }, //清空 @@ -340,11 +342,14 @@ export default { }, //取消新增 cancelModel() { + this.Loading = true this.addForm = { workGroup: "", workPeopleGroup: [], workLeaderGroup: [] }; + this.getWorkData(); + this.$refs.workGroup.clearSelection() this.addModel = false; }, //确定新增 @@ -357,6 +362,7 @@ export default { } else if (!this.addForm.workPeopleGroup.length) { this.$message.warning("请选择工作组组员"); } else { + this.Loading = true let workLeader = "", workLeaderId = ""; this.addForm.workLeaderGroup.map(item => { workLeader += item.name; @@ -390,41 +396,47 @@ export default { this.nodeList2 = []; } } else { - let workLeader = ""; - let workLeaderId = ""; - this.addForm.workLeaderGroup.map(item => { - workLeader += item.name; - workLeader += ","; - workLeaderId += item.id; - workLeaderId += ","; - }); - - let workPeople = ""; - let workPeopleId = ""; - this.addForm.workPeopleGroup.map(item => { - workPeople += item.name; - workPeople += ","; - workPeopleId += item.id; - workPeopleId += ","; - }); - this.$http.put("workGroup/work-group", { - id: this.addForm.id, - workGroup: this.addForm.workGroup, - workLeader: workLeader, - workLeaderId: workLeaderId, - workPeople: workPeople, - workPeopleId: workPeopleId - }, { - _this: this - }, res => { - if (res.ok) { - } else { - this.$message.warning(res.message); - } - this.getWorkData(); - }); - this.addModel = false; - this.$refs.workGroup.clearSelection(); + if (!this.addForm.workLeaderGroup.length) { + this.$message.warning("请选择工作组组长"); + } else if (!this.addForm.workPeopleGroup.length) { + this.$message.warning("请选择工作组组员"); + } else { + this.Loading = true + let workLeader = ""; + let workLeaderId = ""; + this.addForm.workLeaderGroup.map(item => { + workLeader += item.name; + workLeader += ","; + workLeaderId += item.id; + workLeaderId += ","; + }); + let workPeople = ""; + let workPeopleId = ""; + this.addForm.workPeopleGroup.map(item => { + workPeople += item.name; + workPeople += ","; + workPeopleId += item.id; + workPeopleId += ","; + }); + this.$http.put("workGroup/work-group", { + id: this.addForm.id, + workGroup: this.addForm.workGroup, + workLeader: workLeader, + workLeaderId: workLeaderId, + workPeople: workPeople, + workPeopleId: workPeopleId + }, { + _this: this + }, res => { + if (res.ok) { + } else { + this.$message.warning(res.message); + } + this.getWorkData(); + }); + this.addModel = false; + this.$refs.workGroup.clearSelection(); + } } } else { this.$message.warning("请填写整信息"); @@ -448,6 +460,7 @@ export default { }, checkedRole(data) { this.addForm = { + id: this.addForm.id, workGroup: this.addForm.workGroup || "", workPeopleGroup: this.addForm.workPeopleGroup || [], workLeaderGroup: this.addForm.workLeaderGroup || [] @@ -463,9 +476,11 @@ export default { } }); this.roleModal = false + this.nodeList = [] }, checkedRole2(data) { this.addForm = { + id: this.addForm.id, workGroup: this.addForm.workGroup || "", workPeopleGroup: this.addForm.workPeopleGroup || [], workLeaderGroup: this.addForm.workLeaderGroup || [] @@ -481,6 +496,7 @@ export default { } }); this.roleModal2 = false + this.nodeList = [] }, pageChange(page) { this.workSearch.page = page diff --git a/src/pages/config/pages/operationLog/index.vue b/src/pages/config/pages/operationLog/index.vue index 88a0a3959..f8a6f1c2f 100644 --- a/src/pages/config/pages/operationLog/index.vue +++ b/src/pages/config/pages/operationLog/index.vue @@ -167,8 +167,11 @@ loading: 'dataLoading' }, res => { if (res.ok) { - this.total = res.data.total - this.data = res.data.records + this.total = res.data.total; + res.data.records.forEach(item => { + item.account = "(" + item.account + ")" + item.accountName; + }); + this.data = res.data.records; } }) }, diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue index 87d126f6c..595f0bca7 100644 --- a/src/pages/config/pages/roleManage/index.vue +++ b/src/pages/config/pages/roleManage/index.vue @@ -40,6 +40,12 @@ v-btn-permission="'bb2571b08179edb36880aae169cb2e54'" size="mini">配置法规库权限 + 配置法规库数据权限 + + +
+ + +
+
+ 取消 + + + 确定 + +
+
0){ this.treeData3 = this.sortByKey(list1,"displaySeq") + this.treeData4 = this.sortByKey(list1,"displaySeq") } @@ -651,9 +692,27 @@ export default { } }) }, + //配置数据确定按钮 + confirmDialogData2(){ + let menuIds = this.$refs.tree4.getCheckedKeys().join(',') + this.$http.postData('tsRoleMeunData/ts-role-menu-data/saveBatch', { + menuIds: menuIds, + roleId: this.id + }, {}, res => { + if (res.ok) { + this.$message.success('设置权限成功') + this.modalflag2 = false + }else{ + this.$message.warning(res.message) + } + }) + }, closeDialogData() { this.modalflag = false }, + closeDialogData2() { + this.modalflag2 = false + }, /** 父子节点的级联 */ nodeClick(currentObj, treeStatus) { // 用于:父子节点严格互不关联时,父节点勾选变化时通知子节点同步变化,实现单向关联。 @@ -671,6 +730,30 @@ export default { } } }, + /** 父子节点的级联 */ + nodeClick3(currentObj, treeStatus) { + // 用于:父子节点严格互不关联时,父节点勾选变化时通知子节点同步变化,实现单向关联。 + let selected = treeStatus.checkedKeys.indexOf(currentObj.id) // -1未选中 + // 选中 + if (selected !== -1) { + // 子节点只要被选中父节点就被选中 + this.selectedParent4(currentObj) + // 统一处理子节点为相同的勾选状态 + this.uniteChildSame4(currentObj, true) + } else { + // 未选中 处理子节点全部未选中 + if (currentObj.children.length !== 0) { + this.uniteChildSame4(currentObj, false) + } + } + }, + // 统一处理子节点为相同的勾选状态 + uniteChildSame4(treeList, isSelected) { + this.$refs.tree4.setChecked(treeList.id, isSelected) + for (let i = 0; i < treeList.children.length; i++) { + this.uniteChildSame4(treeList.children[i], isSelected) + } + }, // 统一处理子节点为相同的勾选状态 uniteChildSame(treeList, isSelected) { this.$refs.tree3.setChecked(treeList.id, isSelected) @@ -686,6 +769,14 @@ export default { this.selectedParent(currentNode.parent) } }, + // 统一处理父节点为选中 + selectedParent4(currentObj) { + let currentNode = this.$refs.tree4.getNode(currentObj) + if (currentNode.parent.key !== undefined) { + this.$refs.tree4.setChecked(currentNode.parent, true) + this.selectedParent4(currentNode.parent) + } + }, nodeClick2(currentObj, treeStatus) { // 用于:父子节点严格互不关联时,父节点勾选变化时通知子节点同步变化,实现单向关联。 let selected = treeStatus.checkedKeys.indexOf(currentObj.id) // -1未选中 @@ -726,6 +817,16 @@ export default { } }) }, + roleDataAdd(){ + this.$http.get('tsRoleMeunData/ts-role-menu-data/list', { + ids: this.id + }, {}, res => { + if (res.ok) { + this.nodeList4 = res.data + this.modalflag2 = true + } + }) + }, closeDialog() { this.treeData2 = [] this.modalshowflag = false diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index 1b8d0e88c..f06032758 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -363,14 +363,14 @@ title="下载" @click="downloadFile(file.id)" class="icon-download" - v-btn-permission="QFTP ? '9d42af4ee6d03b028eaa0c417532d79e' : '9882f477aad895ec56a7464f3e9c0b11'" + v-btn-permission="QFTP ? '7f13a22a53f9f76f56f5193f9a04389d' : '9882f477aad895ec56a7464f3e9c0b11'" /> @@ -384,13 +384,13 @@ title="下载" @click="downloadFile(file.id)" class="icon-download" - v-btn-permission="QFTP ? '9d42af4ee6d03b028eaa0c417532d79e' : '9882f477aad895ec56a7464f3e9c0b11'" + v-btn-permission="QFTP ? '7f13a22a53f9f76f56f5193f9a04389d' : '9882f477aad895ec56a7464f3e9c0b11'" /> @@ -902,7 +902,7 @@ - 更新LOG + 更新记录 知识点分享 符合性状态
- 更新LOG + 更新记录
@@ -57,7 +56,7 @@

{{ sarStandardsInfoEO.lawsBulletin || '-' }}

{{ sarStandardsInfoEO.lawsSyqy || '-' }}

{{ sarStandardsInfoEO.lawsSycx || '-' }}

-

{{ sarStandardsInfoEO.isRelateAccess || '-' }}

+

{{ sarStandardsInfoEO.isRelateAccess === '1' ? '是' : (sarStandardsInfoEO.isRelateAccess ? '否':'-')}}

{{ sarStandardsInfoEO.lawsNotisyncNum || '-' }}

{{ sarStandardsInfoEO.lawsYear || '-' }}

{{ sarStandardsInfoEO.lawsLabel || '-' }}

@@ -151,7 +150,6 @@ {{ file.oldFileName }} - 上传时间:{{ dateFormat(file.modifyTime) }}

@@ -167,7 +165,7 @@
-
更多
+ { // 动态属性字段-SYRZ 单独添加至基础信息 @@ -2158,17 +2158,9 @@ export default { if (!list2[0].child) { location['child2'] = [] }else { - const childList = list2[0].child.filter ( item => item.attrField === 'YYRZLAWS'); - location['child2'] = childList - } - } - - for (let i = 0; i < displayLocation.length; i++) { - // sss - if(displayLocation[i].label !== '基础信息' && displayLocation[i].label !== '过程稿件'){ - const childList = displayLocation[i].child.filter ( item => item.value !== null && item.value !== ''); - if(childList.length === 0){ - displayLocation.splice(i,1) + if(list2[0].child){ + const childList = list2[0].child.filter ( item => item.attrField === 'YYRZLAWS'); + location['child2'] = childList } } } @@ -2183,8 +2175,24 @@ export default { }) location.child = [...fieldOthers, ...fieldsIsTextAreaOrFile].sort(this.compare('orderNum')) }) - + for (let i = 0; i < displayLocation.length; i++) { + // sss + if(displayLocation[i].label !== '基础信息' && displayLocation[i].label !== '过程稿件'){ + if(displayLocation[i].child !== undefined){ + let childList = displayLocation[i].child.filter ( item => item.value !== null && item.value !== ''); + if(childList.length === 0){ + displayLocation.splice(i,1) + i -= 1 + } + }else { + displayLocation.splice(i,1) + i -= 1 + } + } + } + console.log(displayLocation) this.dynamicFormField = displayLocation + console.log(this.dynamicFormField) sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation)) this.loading = false }) @@ -2395,7 +2403,7 @@ export default { display: inline-block; width: calc(~'100% - 225px'); & > .files-title{ - width: calc(~'100% - 120px'); + /*width: calc(~'100% - 120px');*/ min-height: 50px; line-height: 50px; font-size: 16px; diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 6965de85b..035e015d2 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -65,32 +65,32 @@ }}