diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 632631e7c..35a773a73 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -836,7 +836,7 @@ {{ - standShowItemEO.xcxssrq ? $moment(standShowItemEO.xcxssrq).format('YYYY-MM-DD') : '' + standShowItemEO.xcxssrq ? $moment(standShowItemEO.xccssrq).format('YYYY-MM-DD') : '' }}
diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue index 8e4f32a12..fbaf6a859 100644 --- a/src/pages/localTool/standardWarning.vue +++ b/src/pages/localTool/standardWarning.vue @@ -8,52 +8,58 @@
-
实施预警
-
- - - - - - - - - - - - - - - - - - - - 查询 - - - 清空 - - - -
+ + +
实施预警
+ + +
+ + + + + + + + + + + + + + + + + + + + 查询 + + + 清空 + + + +
+ +
新车型实施日期预警 -
- - - - - -
-
基础信息
-
人员信息
-
-
-
- - - - -
- - - -
- 选择标准 -
- - - - - - - - - - - - -
- 选择附件 -
- - - -
-
{{ item.fileName }}
-
- - - -
- -
- - -
- - -
- - -
-
-
- - - - - -

流程发起人

-
- - -
- - - - - - -

责任部门对接人

-
- - - -
- - - - - - -

标准法规部部长

-
- - -
- - - - - - -

技术管理中心主任

-
- - -
- - - - - - -

工程研究总院院长

-
- - -
- - - - - -
-
- - - -
-
- - -
-
- - - - - - - {{ opt.label }} - - - - - - - - - - - 查询 - 清空 - - -
-
- -
-
- - - - - - - - - -
-
-
- - 数据加载中…… -
- 取消 - 带入 -
-
- - - - -
-
-
-
- - - - -
-
-
- 数据加载中…… -
- 取消 - 带入 -
-
- +
+ + + + + +
+
基础信息
+
人员信息
+
+
+ + + + +
+ + + +
+ 选择标准 +
+ + + + + + + + + + + + +
+ 选择附件 +
+ + + +
+
+ {{ item.fileName }} +
+
+ + + +
+ +
+ + +
+ + +
+ + +
+
+
+ + + + + +

流程发起人

+
+ + +
+ + + + + + +

责任部门对接人

+
+ + + +
+ + + + + + +

标准法规部部长

+
+ + +
+ + + + + + +

技术管理中心主任

+
+ + +
+ + + + + + +

工程研究总院院长

+
+ + +
+ + + + + +
+
+ + + +
+
+ + +
+
+ + + + + + + + {{ opt.label }} + + + + + + + + + + + 查询 + + 清空 + + + +
+
+ +
+
+ + + + + + + + + +
+
+
+ + 数据加载中…… +
+ 取消 + 带入 +
+
+ + + + +
+
+
+
+ + + + +
+
+
+ 数据加载中…… +
+ 取消 + 带入 +
+
+ +
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/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 @@