+
@@ -265,25 +266,26 @@
}
})
},
- getData() {
- return new Promise((resolve, reject) => {
- inboundLiaisonDetail({
- taskIds: this.taskIds,
- pId: this.pId
- }).then(res => {
- let data = JSON.parse(res.mesg)
- this.form.fjList = data.fjList || data.form.fjList
- this.form.modelList = data.modelList || data.form.modelList
- this.form.title = data.title || data.form.title
- this.form.date = data.date || data.form.date
- this.json = data || data.form
- this.form.responUserList = data.form? data.form.responUserList : ''
- this.form.responUserListName = data.form? data.form.responUserListName : ''
- this.commentText2 = data.commentText2 || ''
- }).catch(e => {
- })
- })
- },
+ getData() {
+ return new Promise((resolve, reject) => {
+ inboundLiaisonDetail({
+ taskIds: this.taskIds,
+ pId: this.pId
+ }).then(res => {
+ let data = JSON.parse(res.mesg)
+ this.form.fjList = data.fjList || data.form.fjList
+ this.form.modelList = data.modelList || data.form.modelList
+ this.form.title = data.title || data.form.title
+ this.form.processName = data.processName || data.form.processName
+ this.form.date = data.date || data.form.date
+ this.json = data || data.form
+ this.form.responUserList = data.form? data.form.responUserList : ''
+ this.form.responUserListName = data.form? data.form.responUserListName : ''
+ this.commentText2 = data.commentText2 || ''
+ }).catch(e => {
+ })
+ })
+ },
},
mounted () {
this.getData()
diff --git a/src/pages/processCenter/pages/phone/bzdy/step4.vue b/src/pages/processCenter/pages/phone/bzdy/step4.vue
index 262f1f350..26990a8cf 100644
--- a/src/pages/processCenter/pages/phone/bzdy/step4.vue
+++ b/src/pages/processCenter/pages/phone/bzdy/step4.vue
@@ -24,6 +24,7 @@
+
@@ -94,7 +95,6 @@
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
- @save="handleSave"
@submit="handleSubmit"
show-back
@back="handleSubmitNo"
@@ -268,6 +268,7 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
+ this.form.processName = data.form ? data.form.processName : data.processName
this.form.dyhz = data.form ? data.form.dyhz : data.dyhz
this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date
diff --git a/src/pages/processCenter/pages/phone/bzdy/step6.vue b/src/pages/processCenter/pages/phone/bzdy/step6.vue
index 8d06711e7..90d7ae54a 100644
--- a/src/pages/processCenter/pages/phone/bzdy/step6.vue
+++ b/src/pages/processCenter/pages/phone/bzdy/step6.vue
@@ -24,6 +24,7 @@
+
@@ -324,6 +325,7 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
+ this.form.processName = data.form ? data.form.processName : data.processName
this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date
this.json = data || data.form
diff --git a/src/pages/processCenter/pages/phone/bzdy/step7.vue b/src/pages/processCenter/pages/phone/bzdy/step7.vue
index fd0c0504a..d31948e15 100644
--- a/src/pages/processCenter/pages/phone/bzdy/step7.vue
+++ b/src/pages/processCenter/pages/phone/bzdy/step7.vue
@@ -23,6 +23,7 @@
+
@@ -286,6 +287,7 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
+ this.form.processName = data.form ? data.form.processName : data.processName
this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date
this.json = data || data.form
diff --git a/src/pages/processCenter/pages/phone/bzdy/step8.vue b/src/pages/processCenter/pages/phone/bzdy/step8.vue
index a7546b022..d384fa013 100644
--- a/src/pages/processCenter/pages/phone/bzdy/step8.vue
+++ b/src/pages/processCenter/pages/phone/bzdy/step8.vue
@@ -23,6 +23,7 @@
+
@@ -286,6 +287,7 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
+ this.form.processName = data.form ? data.form.processName : data.processName
this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date
this.json = data || data.form
diff --git a/src/pages/processCenter/pages/phone/bzdy/step9.vue b/src/pages/processCenter/pages/phone/bzdy/step9.vue
index 2b5e8548e..284c9978a 100644
--- a/src/pages/processCenter/pages/phone/bzdy/step9.vue
+++ b/src/pages/processCenter/pages/phone/bzdy/step9.vue
@@ -23,6 +23,7 @@
+
@@ -288,6 +289,7 @@
}).then(res => {
let data = JSON.parse(res.mesg)
this.commentText9 = data.commentText9 || ''
+ this.form.processName = data.form ? data.form.processName : data.processName
this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date
this.json = data || data.form
diff --git a/src/pages/processCenter/pages/phone/bzrk/step2.vue b/src/pages/processCenter/pages/phone/bzrk/step2.vue
index ba636badf..c6de1f965 100644
--- a/src/pages/processCenter/pages/phone/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/phone/bzrk/step2.vue
@@ -39,7 +39,7 @@
>
-
+
否
-
+
+
+
+
+
+
+
+
+
+
+
实施日期
@@ -252,12 +274,25 @@
>
+
+
+
+
+
-
-
+
+
+
+
@@ -274,28 +309,17 @@
>
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
+
+
@@ -426,6 +441,7 @@ export default {
name: "phoneBzrkStep2",
data() {
return {
+ commentText: '',
textStatusMap: {}, // 文本状态id与name对应
xgdFileMap: [],
fbgbjbdFileMap: [],
@@ -788,6 +804,8 @@ export default {
// jdwjFileMap: {},
this.kwjFileMap = this.assemble(processForm.kwj, processForm.kwjName);
// kwjFileMap: {},
+ this.xdbFileMap = this.assemble(processForm.xdb, processForm.xdbName);
+ // xdbFileMap: {},
this.glwjFileMap = this.assemble(processForm.glwj, processForm.glwjName);
// glwjFileMap: {},
this.caFileMap = this.assemble(processForm.ca, processForm.caName);
@@ -806,14 +824,19 @@ export default {
getFormFieldList(item) {
this.$nextTick(() => {
this.form = JSON.parse(JSON.stringify(item))
-/* console.log(this.form)
+ let wssmrName = this.form.wssmrname || this.form.wssmr
+ this.form.wssmr = wssmrName
+ this.form.sycpx = this.form.sycpx && this.form.sycpx !== [] ? this.form.sycpx : ''
+ this.form.nylx = this.form.nylx && this.form.nylx !== [] ? this.form.nylx : ''
+ this.form.cllx = this.form.cllx && this.form.cllx !== [] ? this.form.cllx: ''
+ this.form.syrz = this.form.syrz && this.form.syrz !== [] ? this.form.syrz : ''
this.defaultCheckedKeys = [this.form.standSystem]
this.defaultCheckedKeys1 = [this.form.cycvppsbm]
this.defaultCheckedKeys2 = [this.form.kccvppsbm]
- this.defaultCheckedKeys3 = [this.form.dybxh]*/
+ this.defaultCheckedKeys3 = [this.form.dybxh]
this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
- this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : ''
- if (this.form.country !== undefined && this.form.country !== null && this.form.country !== '') {
+ this.form.standYear = this.form.standYear ? this.form.standYear : ''
+ if (this.form.country) {
this.form.country = this.form.country.split(",");
}
this.form.prcNum = this.prcNum
@@ -845,7 +868,7 @@ export default {
handleSave() {
},
handle1() {
- if(this.formTongGuo.commentText){
+ if(this.commentText){
this.formTongGuo.approvalOpinion = 1
this.handleSubmit()
}else{
@@ -857,16 +880,6 @@ export default {
this.handleSubmit()
},
handleSubmit() {
- const val = this.form.country;
- if (val !== "" && val !== null && typeof (val) !== "undefined") {
- if (val instanceof Array) {
- this.form.country = val.join(",");
- } else {
- this.form.country = val;
- }
- } else if (val === "") {
- this.form.country = [];
- }
this.isSubmit = true;
this.form.commentText = this.commentText;
this.form.approvalOpinion = this.formTongGuo.approvalOpinion;
diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
index 2388596ef..e6aed9d79 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
@@ -621,7 +621,7 @@ export default {
// 法规入库及评估流程
case '2':
this.$router.push({
- name: 'bzdyStep1-1',
+ name: 'bzdyStep1',
query: {
type: '2',
processName: '标准调研流程',
diff --git a/src/pages/regulatoryRepository/workingGroup/index.vue b/src/pages/regulatoryRepository/workingGroup/index.vue
index e99e5b298..cb22f3ab5 100644
--- a/src/pages/regulatoryRepository/workingGroup/index.vue
+++ b/src/pages/regulatoryRepository/workingGroup/index.vue
@@ -14,7 +14,10 @@
- 工作组统计
+
+ 标准化活动日历
+ 工作组统计
+