diff --git a/src/pages/config/pages/linkManage/index.vue b/src/pages/config/pages/linkManage/index.vue
index d240cc882..f23611502 100644
--- a/src/pages/config/pages/linkManage/index.vue
+++ b/src/pages/config/pages/linkManage/index.vue
@@ -1,342 +1,356 @@
-
-
-
- 新增
- 顺序调整
- 删除
-
-
-
-
+
+
+ 新增
+
+
+
+
+
+ 删除
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 删除
- 编辑
-
-
-
-
-
-
-
- 加载中...
-
-
-
-
-
-
-
-
-
-
-
+
+
加载中...
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index 379ce8cf2..b6bf495c3 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -1,785 +1,709 @@
-
-
- 标准清单发布/更新流程
- 申请人发起流程
-
-
-
-
-
-
-
-
-
-
- 标准/政策法规工程师
-
-
-
-
-
-
-
-
-
-
- 会签人
-
-
-
-
-
-
-
-
-
-
-
- 会签人
-
-
-
-
-
-
-
-
-
-
-
- 标准/政策法规工程师
-
-
-
-
-
-
-
-
-
-
- 业务经理
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
-
-
-
- 清空
-
-
-
-
-
-
-
-
-
-
-
- {{
- scope.row.detailedListName }}
-
-
-
-
- 未发布
- 已发布
- 审核中
-
-
-
-
- {{ scope.row.detailedListVision
- }}
-
-
-
-
- {{ scope.row.applicationScope
- }}
-
-
-
-
-
- {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD
- hh:mm:ss") : scope.row.updateTime
- }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{
- scope.row.detailedListName }}
-
-
-
-
- 未发布
- 已发布
- 审核中
-
-
-
-
- {{ scope.row.detailedListVision
- }}
-
-
-
-
- {{ scope.row.applicationScope
- }}
-
-
-
-
-
- {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD
- hh:mm:ss") : scope.row.updateTime
- }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{
- scope.row.detailedListName }}
-
-
-
-
- 未发布
- 已发布
- 审核中
-
-
-
-
- {{ scope.row.detailedListVision
- }}
-
-
-
-
- {{ scope.row.applicationScope
- }}
-
-
-
-
-
- {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD
- hh:mm:ss") : scope.row.updateTime
- }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ 标准清单发布/更新流程
+ 申请人发起流程
+
+
+
+
+
+
+
+
+
+
+ 标准/政策法规工程师
+
+
+
+
+
+
+
+
+
+
+ 会签人
+
+
+
+
+
+
+
+
+
+
+
+ 会签人
+
+
+
+
+
+
+
+
+
+
+
+ 标准/政策法规工程师
+
+
+
+
+
+
+
+
+
+
+ 业务经理
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+ 清空
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ scope.row.detailedListName }}
+
+
+
+
+ 未发布
+ 已发布
+ 审核中
+
+
+
+
+ {{ scope.row.detailedListVision
+ }}
+
+
+
+
+ {{ scope.row.applicationScope
+ }}
+
+
+
+
+
+ {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD hh:mm:ss") : scope.row.updateTime
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ scope.row.detailedListName }}
+
+
+
+
+ 未发布
+ 已发布
+ 审核中
+
+
+
+
+ {{ scope.row.detailedListVision
+ }}
+
+
+
+
+ {{ scope.row.applicationScope
+ }}
+
+
+
+
+
+ {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-D hh:mm:ss") : scope.row.updateTime
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ scope.row.detailedListName }}
+
+
+
+
+ 未发布
+ 已发布
+ 审核中
+
+
+
+
+ {{ scope.row.detailedListVision
+ }}
+
+
+
+
+ {{ scope.row.applicationScope
+ }}
+
+
+
+
+
+ {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD hh:mm:ss") : scope.row.updateTime
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
index d06cd4287..37e8159fe 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
@@ -336,34 +336,13 @@
>
-
-
-
-
-
+
@@ -507,25 +486,25 @@ export default {
};
},
methods: {
- saveUserInfo() {
+ checkedRole(data) {
if (this.type === "dockUser") {
- this.roleForm.dockUser = this.roleRow.id;
- this.roleForm.dockUserName = this.roleRow.name;
+ this.roleForm.dockUser = data[0].id;
+ this.roleForm.dockUserName = data[0].name;
} else if (this.type === "ministerUser") {
- this.roleForm.ministerUser = this.roleRow.id;
- this.roleForm.ministerUserName = this.roleRow.name;
+ this.roleForm.ministerUser = data[0].id;
+ this.roleForm.ministerUserName = data[0].name;
} else if (this.type === "qualityEngineer") {
- this.roleForm.qualityEngineer = this.roleRow.id;
- this.roleForm.qualityEngineerName = this.roleRow.name;
+ this.roleForm.qualityEngineer = data[0].id;
+ this.roleForm.qualityEngineerName = data[0].name;
this.listForm.qualityEngineer = this.roleForm.qualityEngineer;
this.listForm.qualityEngineerName = this.roleForm.qualityEngineerName;
} else if (this.type === "certifiedEngineer") {
- this.roleForm.certifiedEngineer = this.roleRow.id;
- this.roleForm.certifiedEngineerName = this.roleRow.name;
+ this.roleForm.certifiedEngineer = data[0].id;
+ this.roleForm.certifiedEngineerName = data[0].name;
this.listForm.certifiedEngineer = this.roleForm.certifiedEngineer;
this.listForm.certifiedEngineerName = this.roleForm.certifiedEngineerName;
} else if (this.type === "distributePerson") {
- this.listForm.distributePerson = this.roleRow.name;
+ this.listForm.distributePerson = data[0].name;
this.listForm.dataList[this.dsadadadsada].distributePersonId=this.roleRow.id
this.listForm.dataList[this.dsadadadsada].distributePerson=this.roleRow.name
this.showColumn = false;
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
index 21631e4b2..0158e60ac 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
@@ -51,8 +51,6 @@
row-key= "id"
height="70%"
border
- lazy
- :load="load"
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@@ -224,13 +222,6 @@ export default {
};
},
methods: {
- load(tree, treeNode, resolve) {
- setTimeout(() => {
- resolve(
- this.listForm.children
- )
- }, 1000)
- },
processTable() {
this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum,
@@ -266,32 +257,50 @@ export default {
},
//动态表单读取
getFormFieldList(item) {
- this.$nextTick(() => {
- this.listForm = JSON.parse(JSON.stringify(item));
- item.dataList.forEach(item => {
- item.hasChildren = true
- })
- this.listForm.prcNum = this.prcNum;
- this.listForm.prcName = this.prcName;
- this.listForm["id"] = item.id;
- this.listForm.dataList = item.dataList;
- this.dataList = item.dataList;
- this.dataList.distributePerson = item.dataList[0].distributePerson;
- this.listForm.breakdownList = item.breakdownList;
- this.listForm.children = item.breakdownList;
- let children = []
- item.breakdownList.forEach(
- item=>{
- let aa = {
- id:item.id,
- standId:'条款号: '+ item.itemsNum,
- standName:'条款名称: '+ item.itemsName,
+ const listForm = JSON.parse(JSON.stringify(item));
+ const { breakdownList, dataList } = listForm
+ listForm.prcNum = this.prcNum;
+ listForm.prcName = this.prcName;
+ this.listForm = listForm
+ listForm["id"] = item.id;
+ listForm.dataList = item.dataList;
+ dataList.forEach(stand => {
+ stand.hasChildren = true
+ console.log(stand);
+ const children = []
+ breakdownList.forEach(childItem => {
+ if (stand.standId === childItem.standId) {
+ const childItemData = {
+ id: childItem.id,
+ standId: '条款号: '+ childItem.itemsNum,
+ standName: '条款名称: '+ childItem.itemsName
}
- children.push(aa)
+ children.push(childItemData)
}
- )
- this.listForm.children = children;
- });
+ })
+ if (children.length) {
+ stand.children = children
+ stand.hasChildren = true
+ }
+ })
+
+ // dataList.distributePerson = item.dataList[0].distributePerson;
+ // listForm.breakdownList = item.breakdownList;
+ // listForm.children = item.breakdownList;
+ // let children = []
+ // item.breakdownList.forEach(
+ // item=>{
+ // let aa = {
+ // id:item.id,
+ // standId:'条款号: '+ item.itemsNum,
+ // standName:'条款名称: '+ item.itemsName,
+ // }
+ // children.push(aa)
+ // }
+ // )
+ // this.listForm.children = children;
+ this.dataList = dataList
+ console.log(this.dataList)
},
//保存事件
handleSave() {
@@ -377,7 +386,8 @@ export default {
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
}
},
- mounted() {
+ async mounted() {
+ // const res = await xx()
this.processTable();
this.getData();
this.getTree();
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
index 60a93e5dc..5ba515f15 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
@@ -1,13 +1,586 @@
-
+
+
+ 项目合规评估流程-项目
+ 责任人填写评估反馈
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 填写信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format("YYYY-MM-DD") : "" }}
+
+
+
+
+ {{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format("YYYY-MM-DD") : "" }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+
+
+
+
+ {{ scope.row.commentText }}
+
+
+
+
+ {{ scope.row.endTime ? "已完成" : "未完成" }}
+
+
+
+ 流程列表加载中
+
+
+
+
+
+
+
-
+
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 385a6e235..69bb4a9e0 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -658,6 +658,7 @@ import CustomRoleTree from '@/components/CustomFormComponents/roleTree'
import stand from "../../../config/pages/attributeCustom/components/stand";
import { mapGetters } from 'vuex'
import { editDataInfo } from '@/api/unqualProcess'
+import {interfaceUrl} from "@/sysConfig";
export default {
name: 'ListOfStandardsAndRegulationsDetails',
components: {
@@ -1512,7 +1513,6 @@ export default {
// 数据搜索 table select事件
sarAccessInfoSearchSelect (val) {
this.selectedAccInfoSearchList = val
- console.log(val)
},
// 数据搜索 清单类型 table select事件
accessSarTypeSelect (selectData) {
@@ -1531,8 +1531,13 @@ export default {
},
// 点击 导出、全部导出按钮事件
exportAccessInfo (type) {
- this.exportTestItemNameFlag = true
- this.exportName = ''
+ if (this.sarAccessInfoListArry.length > 0) {
+ this.exportTestItemNameFlag = true
+ this.exportName = ''
+ }else {
+ this.$message.warning('请选择数据进行导出')
+ }
+
},
// 导出确定功能
exportTestItem () {
@@ -1548,10 +1553,9 @@ export default {
for (var accessInfo in exportList) {
accIdAndrestype.push(exportList[accessInfo].id)
}
- window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames
+ const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
+ window.open(exportURL)
this.$message.success('导出信息成功')
- } else {
- this.$message.warning('当前没有需要导出的数据')
}
this.exportTestItemNameFlag = false
},
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index bac9b5b5a..0ab7a1a5d 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -488,6 +488,7 @@ import CustomInputForPolicy from '@/components/CustomFormComponents/InputForPoli
import CustomRoleTree from '@/components/CustomFormComponents/roleTree'
import stand from "../../../config/pages/attributeCustom/components/stand";
import { mapGetters } from 'vuex'
+import {interfaceUrl} from "@/sysConfig";
export default {
name: 'OtherAddEit',
components: {
@@ -1284,8 +1285,12 @@ export default {
},
// 点击 导出、全部导出按钮事件
exportAccessInfo (type) {
- this.exportTestItemNameFlag = true
- this.exportName = ''
+ if (this.sarAccessInfoListArry.length > 0) {
+ this.exportTestItemNameFlag = true
+ this.exportName = ''
+ }else {
+ this.$message.warning('请选择数据进行导出')
+ }
},
// 导出确定功能
exportTestItem () {
@@ -1301,10 +1306,10 @@ export default {
for (var accessInfo in exportList) {
accIdAndrestype.push(exportList[accessInfo].id)
}
- window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames
+ const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
+ window.open(exportURL)
+ // window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames
this.$message.success('导出信息成功')
- } else {
- this.$message.warning('当前没有需要导出的数据')
}
this.exportTestItemNameFlag = false
},
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index 1825f39ed..d4970e303 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -488,6 +488,7 @@ import CustomInputForPolicy from '@/components/CustomFormComponents/InputForPoli
import CustomRoleTree from '@/components/CustomFormComponents/roleTree'
import stand from "../../../config/pages/attributeCustom/components/stand";
import { mapGetters } from 'vuex'
+import {interfaceUrl} from "@/sysConfig";
export default {
name: 'OtherAddEit',
components: {
@@ -1285,8 +1286,12 @@ export default {
},
// 点击 导出、全部导出按钮事件
exportAccessInfo (type) {
- this.exportTestItemNameFlag = true
- this.exportName = ''
+ if (this.sarAccessInfoListArry.length > 0) {
+ this.exportTestItemNameFlag = true
+ this.exportName = ''
+ }else {
+ this.$message.warning('请选择数据进行导出')
+ }
},
// 导出确定功能
exportTestItem () {
@@ -1302,7 +1307,9 @@ export default {
for (var accessInfo in exportList) {
accIdAndrestype.push(exportList[accessInfo].id)
}
- window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames
+ const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
+ window.open(exportURL)
+ // window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames
this.$message.success('导出信息成功')
} else {
this.$message.warning('当前没有需要导出的数据')
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index ba58aec42..6ab697efe 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -30,10 +30,11 @@
- 调取
- 批量删除
+ 调取
+ 批量删除
导出