+
diff --git a/src/pages/processCenter/pages/components/ProcessMixin.vue b/src/pages/processCenter/pages/components/ProcessMixin.vue
index 150749f60..bd5db2fb6 100644
--- a/src/pages/processCenter/pages/components/ProcessMixin.vue
+++ b/src/pages/processCenter/pages/components/ProcessMixin.vue
@@ -9,13 +9,33 @@ export default {
return {
processTypeList: [
{
- label: '标准入库流程',
+ label: '标准调研流程',
+ value: '2'
+ },
+ {
+ label:'标准入库流程',
value: '1'
},
- {
- label:'标准清单发布流程',
- value: '3'
- },
+ {
+ label:'标准征求意见流程',
+ value: '3'
+ },
+ {
+ label:'标准清单发布/更新流程',
+ value: '6'
+ },
+ {
+ label: '项目合规评估流程',
+ value: '7'
+ },
+ {
+ label: '未符合项整改流程',
+ value: '8'
+ },
+ {
+ label: '标准解读流程',
+ value: '9'
+ },
],
formDisableFlag: false,
pickerOptions: {
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
index fd4a84a06..c6005f448 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
@@ -343,11 +343,11 @@ export default {
var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式
- if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+ if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
return true
} else {
this.spinShow = false
- this.$message.error('文件' + file.name + '格式不正确,请上传ZIP/DOCX或XLS文件')
+ this.$message.error('文件' + file.name + '格式不正确,请上传PPT,DOCX,XLS,PDF文件或图片')
return false
}
// 判断文件上传大小
@@ -441,11 +441,12 @@ export default {
this.$message.success('流程发起成功')
this.$router.push('/processCenter')
}
+ this.isSubmit = false
})
} else {
+ this.isSubmit = false
this.$message.warning('流程启动失败')
}
- this.isSubmit = false
})
} else {
return this.$message.warning('请完善人员信息')
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
index 14af91974..b12708de0 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
@@ -169,11 +169,11 @@
var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式
- if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+ if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
return true
} else {
this.spinShow = false
- this.$message.error('文件' + file.name + '格式不正确,请上传ZIP/DOCX或XLS文件')
+ this.$message.error('文件' + file.name + '格式不正确,请上传PPT,DOCX,XLS,PDF文件或图片')
return false
}
// 判断文件上传大小
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
index 00b5d764b..d4156d554 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
@@ -193,11 +193,11 @@
var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式
- if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+ if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
return true
} else {
this.spinShow = false
- this.$message.error('文件' + file.name + '格式不正确,请上传ZIP/DOCX或XLS文件')
+ this.$message.error('文件' + file.name + '格式不正确,请上传PPT,DOCX,XLS,PDF文件或图片')
return false
}
// 判断文件上传大小
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
index 13cb22e11..76ab545cb 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
@@ -191,11 +191,11 @@
var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式
- if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+ if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
return true
} else {
this.spinShow = false
- this.$message.error('文件' + file.name + '格式不正确,请上传ZIP/DOCX或XLS文件')
+ this.$message.error('文件' + file.name + '格式不正确,请上传PPT,DOCX,XLS,PDF文件或图片')
return false
}
// 判断文件上传大小
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
index e8cf6fc3e..a9fb712bb 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
@@ -191,11 +191,11 @@
var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式
- if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+ if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
return true
} else {
this.spinShow = false
- this.$message.error('文件' + file.name + '格式不正确,请上传ZIP/DOCX或XLS文件')
+ this.$message.error('文件' + file.name + '格式不正确,请上传PPT,DOCX,XLS,PDF文件或图片')
return false
}
// 判断文件上传大小
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
index e7c97df17..2dcffae27 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
@@ -191,11 +191,11 @@
var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式
- if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+ if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
return true
} else {
this.spinShow = false
- this.$message.error('文件' + file.name + '格式不正确,请上传ZIP/DOCX或XLS文件')
+ this.$message.error('文件' + file.name + '格式不正确,请上传PPT,DOCX,XLS,PDF文件或图片')
return false
}
// 判断文件上传大小
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
index 4d56b7895..9d5374da9 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
@@ -191,11 +191,11 @@
var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式
- if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+ if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
return true
} else {
this.spinShow = false
- this.$message.error('文件' + file.name + '格式不正确,请上传ZIP/DOCX或XLS文件')
+ this.$message.error('文件' + file.name + '格式不正确,请上传PPT,DOCX,XLS,PDF文件或图片')
return false
}
// 判断文件上传大小
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
index de3c10b13..4189c2423 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
@@ -26,7 +26,7 @@
- 选择征求意见
+ 选择标准
-
@@ -332,10 +332,9 @@ export default {
},
// 标准征求意见数据可库
standCommonlySearch: {
- // categorg: '',
- // cname: '',
- // start: '',
- // end: '',
+ standSort: '',
+ standNumber: '',
+ standType: '',
page: 1,
pageSize: this.$store.getters.userInfo.configContent
},
@@ -383,6 +382,7 @@ export default {
label: 'name'
},
roleRow: {},
+ standSortOptions: [],
}
},
components: {
@@ -393,6 +393,12 @@ export default {
mounted () {
this.getTree()
this.sarStandCompareHis()
+ this.$http.get('sys/dictype/getDicTypeListCode', '', {
+ _this: this
+ }, res => {
+ this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
+ }, e => {
+ })
this.tableHeight = $('.content').height() - 44
window.onresize = () => {
this.tableHeight = $('.content').height() - 44
@@ -408,15 +414,14 @@ export default {
// 清空
clearSearchStand () {
this.standCommonlySearch.page = 1
- this.standCommonlySearch.start = ''
- this.standCommonlySearch.end = ''
- this.standCommonlySearch.categorg = ''
- this.standCommonlySearch.cname = ''
+ this.standCommonlySearch.standSort = ''
+ this.standCommonlySearch.standNumber = ''
+ this.standCommonlySearch.standType = ''
this.sarStandCompareHis()
},
// 搜索
sarStandCompareHisInfo() {
- this.splitInfoPage = 1
+ this.standCommonlySearch.page = 1
this.sarStandCompareHis()
},
// 查询表格
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
index 137f08c2b..793a68287 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
@@ -234,7 +234,7 @@
handleSave() {},
handleSubmit() {
if (this.data.length < 1) {
- this.$message.warning('请输入征求意见搞')
+ this.$message.warning('请输入征求意见')
} else {
var a = 0
var b = 0
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
index 5b85f6e87..4b003a4c5 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
@@ -209,9 +209,6 @@
return '处理后上报'
}
},
- upload (row) {
- console.log(row);
- },
handleTabs(name) {
this.active = name
},
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
index 755e59d0b..4a2cd66fd 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
@@ -209,9 +209,6 @@
return '处理后上报'
}
},
- upload (row) {
- console.log(row);
- },
handleTabs(name) {
this.active = name
},
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
index c1af9cd25..f7756a3c9 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
@@ -209,9 +209,6 @@
return '处理后上报'
}
},
- upload (row) {
- console.log(row);
- },
handleTabs(name) {
this.active = name
},
diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue
index e67bc49f0..709ebe063 100644
--- a/src/pages/processCenter/pages/newProcess/index.vue
+++ b/src/pages/processCenter/pages/newProcess/index.vue
@@ -7,8 +7,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ {{ opt.label }}
+
+
+
+
+
+
+
+
+
+
+ 查询 -->
-
-
-
-
-
-
+ @click="sarStandCompareHisInfo">查询
+ 清空
+
+
标准调研流程
标准入库流程
标准征求意见流程
- 标准需求(翻译)申请流程
- 标准发放申请流程
+
+
标准清单发布/更新流程
项目合规评估流程
未符合项整改流程
diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
index 2be14000d..1167efc10 100644
--- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
@@ -42,20 +42,24 @@