diff --git a/src/pages/home1/components/empennage/index.vue b/src/pages/home1/components/empennage/index.vue
index fc4e71fc0..f330a0010 100644
--- a/src/pages/home1/components/empennage/index.vue
+++ b/src/pages/home1/components/empennage/index.vue
@@ -3,7 +3,10 @@
-
-
+
+
+
+
-
更多链接>
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
new file mode 100644
index 000000000..ee4045a82
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
@@ -0,0 +1,406 @@
+
+
+
+
+ 标准征求意见流程
+ 工程研究总院院长批准
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 征求意见列表
+
+
+ 导出汇总单
+ 导出征求意见搞
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ stateText(scope.row.state) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ 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/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
index a974c66a6..286b3a83d 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
@@ -380,7 +380,10 @@ export default {
},
// 批量删除按钮table,选择数据
selectedDelete(val) {
- this.deleteDataList = val
+ this.deleteDataList = []
+ for (let i = 0; i < val.length; i++) {
+ this.deleteDataList.push(val[i].id);
+ }
},
// 点击批量删除事件
deleteList() {
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
index 1e94a8294..58698f842 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
@@ -308,11 +308,12 @@ export default {
},
getFormFieldList (item) {
this.$nextTick(() => {
- let listJSON = JSON.parse(JSON.stringify(item.responUserList))
- if (listJSON.length !== undefined) {
- this.dataList = listJSON[0].standardInfoList
- } else {
+ if (item.responUserList !== undefined) {
+ let listJSON = JSON.parse(JSON.stringify(item.responUserList))
this.dataList = [listJSON][0].standardInfoList
+ } else {
+ let listJSONInfo = item.info
+ this.dataList = [listJSONInfo]
}
this.dataList.forEach(item => {
if (item.fileText.length !== 0) {
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
index 19ce38b54..49fecb77b 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
@@ -196,6 +196,7 @@
{
if (valid) {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
index 65545af80..7ad7547ab 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
@@ -570,7 +570,7 @@ export default {
this.listForm.commentText = this.commentText;
var json = Object.assign(this.listForm, this.roleForm);
json.prcCreateUser = this.$store.getters.userInfo.userId;
- json.prcCreateUserName = this.$store.getters.userInfo.uName;
+ json.prcCreateUserName = this.$store.getters.userInfo.userName;
json.standId = this.listForm.standId;
this.$refs["listForm"].validate((valid) => {
if (valid) {
diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue
index 61c5784cd..ec904a42a 100644
--- a/src/pages/processCenter/pages/processDetail/index.vue
+++ b/src/pages/processCenter/pages/processDetail/index.vue
@@ -225,6 +225,9 @@ export default {
//标准调研流程
}else if(prcType === '2'){
this.toProcessDetail('bzdyStep1-9',row)
+ }else if(prcType === '3'){
+ //标准征求意见
+ this.toProcessDetail('bzzqyjStep1-9',row)
}
} else {
this.$message.warning('当前流程未全部办理完成,无法查看')
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index b7e8c8ef4..40c7f5a42 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -75,6 +75,9 @@
align="center"
width="150"
>
+
+ {{ scope.row.prcNum }}
+
- {{ getPrcName(scope.row.prcType) }}
+ {{ getPrcName(scope.row.prcType) }}
+
+ {{ scope.row.prcName }}
+
import('@/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue'),
+ meta: {
+ requireAuth: true,
+ title: '标准调研流程'
+ }
+ },
{
path: '/bzdyStep4',
name: 'bzdyStep4',