-
-
- 标准征求意见流程
- 申请人发起流程
-
-
-
-
-
-
- 基础信息
-
-
-
-
-
-
- 选择标准
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 选择附件
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 流程发起人
-
-
-
-
-
-
-
-
-
-
- 责任部门对接人
-
-
-
-
-
-
-
-
-
-
-
- 标准法规部部长
-
-
-
-
-
-
-
-
-
-
- 技术管理中心主任
-
-
-
-
-
-
-
-
-
-
- 工程研究总院院长
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ 标准征求意见流程
+ 申请人发起流程
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+ 选择标准
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选择附件
+
+
+
+
+
+
+ {{ item.fileName }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 流程发起人
+
+
+
+
+
+
+
+
+
+
+ 责任部门对接人
+
+
+
+
+
+
+
+
+
+
+
+ 标准法规部部长
+
+
+
+
+
+
+
+
+
+
+ 技术管理中心主任
+
+
+
+
+
+
+
+
+
+
+ 工程研究总院院长
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
index bf5ddd7f1..dd9019148 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
@@ -334,6 +334,7 @@ export default {
standType: '',
standId: '',
fjList: [],
+ fjListName: '',
fjListId: ''
},
formRules: {
@@ -438,7 +439,11 @@ export default {
this.fzlistModel = true
},
handleSelection2 (data) {
- this.addFjList = data
+ if(data.length > 5) {
+ this.$message.warning('最多选择5条附件')
+ } else {
+ this.addFjList = data
+ }
},
closeDrawer2 () {
this.fzlistModel = false
@@ -447,11 +452,14 @@ export default {
enterDrawer2 () {
this.fzlistModel = false
this.form.fjList = this.addFjList
- let idList
- this.addFjList.forEach( item => {
- idList += item.id + ','
+ let idList = []
+ let nameList = []
+ this.addFjList.forEach(item => {
+ idList.push(item.id)
+ nameList.push(item.fileName)
})
- this.form.fjListId = idList
+ this.form.fjListName = nameList.join(',')
+ this.form.fjListId = idList.join(',')
},
// 点击查看
handlePreview (item) {
@@ -633,6 +641,8 @@ export default {
if (res.ok) {
var json = Object.assign(this.form, this.roleForm)
json.commentText = this.commentText
+ json.filesId = this.addFjList
+ json.filesName = this.form.fjListName
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: res.data,
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 26120ae91..1cc0226a8 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -2790,7 +2790,7 @@ export default {
this.selectChildMenu(data)
this.productModal = true
// 取消所有的选中效果
- this.productTitle = '编辑信息'
+ this.productTitle = '编辑体系'
// const newChild = { id: this.id++, label: 'testtest', children: [] };
// if (!data.children) {
// this.$set(data, 'children', []);
@@ -2803,7 +2803,7 @@ export default {
this.selectChildMenu(data)
this.productModal = true
// 取消所有的选中效果
- this.productTitle = '新增下级菜单信息'
+ this.productTitle = '新增体系'
this.productModelAdd.dicTypeCode = ''
// const newChild = { id: this.id++, label: 'testtest', children: [] };
// if (!data.children) {
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index e83474531..be68e0695 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -2042,8 +2042,9 @@ export default {
},
// 查询二级菜单
selectMenuList () {
- this.$http.get('sarResource/ts-resource', {
- sorDivide: 'BUSINESS_STAND'
+ this.$http.get('sarResource/ts-resource/getList', {
+ sorDivide: 'BUSINESS_STAND',
+ userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.ok) {
this.treeList = res.data
@@ -2082,7 +2083,7 @@ export default {
this.modalType = 2
this.selectChildMenu(data)
this.productModal = true
- this.productTitle = '编辑信息'
+ this.productTitle = '编辑体系'
// const newChild = { id: this.id++, label: 'testtest', children: [] };
// if (!data.children) {
// this.$set(data, 'children', []);
@@ -2094,7 +2095,7 @@ export default {
this.modalType = 1
this.selectChildMenu(data)
this.productModal = true
- this.productTitle = '新增下级菜单信息'
+ this.productTitle = '新增体系'
this.productModelAdd.dicTypeCode = ''
// const newChild = { id: this.id++, label: 'testtest', children: [] };
// if (!data.children) {
@@ -2383,6 +2384,7 @@ export default {
this.personCollect.collectResId = item.id
this.personCollect.collectTitle = item.standName + ' ( 编号:' + item.standSort + ' ' + item.standCode + ' )'
this.personCollect.collectType = 'BUSINESS_STAND'
+ this.personCollect.userId = this.$store.getters.userInfo.userId
this.$http.postData('person/personCollect', this.personCollect, {
_this: this
}, res => {
@@ -3410,8 +3412,8 @@ export default {
}
// 处理我的收藏和个性化标签传参
if (this.selectSarMenu.id === 'qbwdsc') {
- this.sarBussionessSearch.menuId = undefined
this.sarBussionessSearch.labelMenuId = undefined
+ this.sarBussionessSearch.menuId = 'qbwdsc'
this.sarBussionessSearch.collectMenuId = 'qbwdsc'
} else if (this.selectSarMenu.id === 'gxhbq' || this.selectSarMenu.pId === 'gxhbq') {
this.sarBussionessSearch.menuId = undefined
diff --git a/src/pages/regulatoryRepository/standardForComments/index.vue b/src/pages/regulatoryRepository/standardForComments/index.vue
index a52dee2d8..59d4a3b3b 100644
--- a/src/pages/regulatoryRepository/standardForComments/index.vue
+++ b/src/pages/regulatoryRepository/standardForComments/index.vue
@@ -139,11 +139,18 @@ export default {
this.splitInfoPage = 1;
this.sarStandCompareHis();
},
+// getTime(time){
+// let date = new Date(time + 8 * 3600 * 1000); // 增加8小时
+// console.log(date.toJSON().substr(0, 19).replace('T', ' '));
+// return date.toJSON().substr(0, 19).replace('T', ' ');
+// },
// 查询表格
sarStandCompareHis() {
this.spinShow = true;
+ this.standCommonlySearch.start = new Date(this.standCommonlySearch.start).getTime() //转换为毫秒时间戳
this.standCommonlySearch.type = 1;
var form = this.standCommonlySearch;
+ console.log(form);
this.$http.get("slrs/sar-public-idea/SelectAllPage", form, {
_this: this
}, res => {
diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
index 37267af2f..9f421b5d9 100644
--- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
@@ -1,480 +1,537 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
{{ this.$route.query.item.cid }}
-
-
-
-
+
+
+
+
{{ this.$route.query.item.cname || '-' }}
-
-
-
- {{ this.$route.query.item.startTime || '-' }}
-
-
-
- {{ this.$route.query.item.startTime + ' ~ ' + this.$route.query.item.endTime}}
- -
-
-
-
- 添加
- 导出
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 编辑
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
数据加载中……
+
+
+
+
+
+ {{ file.name }}
+
+
+ -
+
+
+
+ {{ this.$route.query.item.startTime || '-' }}
+
+
+
+ {{ this.$route.query.item.startTime + ' ~ ' + this.$route.query.item.endTime }}
+ -
+
+
+
+ 添加
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+