diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/common/info.js b/src/main/resources/views/platform/zhgh/democratic/proposal/common/info.js
index 083309a..97fa23c 100644
--- a/src/main/resources/views/platform/zhgh/democratic/proposal/common/info.js
+++ b/src/main/resources/views/platform/zhgh/democratic/proposal/common/info.js
@@ -195,8 +195,8 @@ const PROPOSAL_INFO = {
{{getBranchSchoolLeaderName(task)}}
-
-
+
+
@@ -215,8 +215,8 @@ const PROPOSAL_INFO = {
{{getBranchSchoolLeaderName(task)}}
-
-
+
+
diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/index.html
index 2f1b590..b50e474 100644
--- a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/index.html
+++ b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/index.html
@@ -172,9 +172,10 @@ layout("/layouts/platform.html"){
>
-
+
-
+
@@ -222,6 +223,7 @@ layout("/layouts/platform.html"){
approval: false
},
formData: {
+ tf_opinion: null,
tf_masterUnitId: null,
tf_slaveUnitIds: []
},
@@ -229,7 +231,7 @@ layout("/layouts/platform.html"){
tf_caseFilingResult: [{ required: true, message: "请选择立案结果", trigger: ["blur", "change"] }],
tf_caseFilingType: [{ required: true, message: "请选择立案类型", trigger: ["blur", "change"] }],
tf_masterUnitId: [{ required: true, message: "请选择主办单位", trigger: "blur" }],
- approvalOpinion: [{ required: true, message: "请填写审核意见", trigger: "blur" }]
+ tf_opinion: [{ required: true, message: "请填写审核意见", trigger: "blur" }]
},
showApprovalForm: false,
sessionOptions: [],
@@ -263,6 +265,7 @@ layout("/layouts/platform.html"){
taskKey: row.taskKey,
taskName: row.curTaskName,
userId: null,
+ tf_opinion: null,
tf_masterUnitId: null,
tf_slaveUnitIds: []
})
@@ -344,6 +347,7 @@ layout("/layouts/platform.html"){
taskKey: selection[0].taskKey,
taskName: selection[0].curTaskName,
userId: null,
+ tf_opinion: null,
tf_masterUnitId: null,
tf_slaveUnitIds: []
})
diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/merge.js b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/merge.js
index 30afdfe..7f5fd51 100644
--- a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/merge.js
+++ b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/merge.js
@@ -95,9 +95,10 @@ const merge = {
>
-
+
-
+
@@ -113,6 +114,7 @@ const merge = {
return {
selection: [],
formData: {
+ tf_opinion: null,
tf_masterUnitId: null,
tf_slaveUnitIds: []
},
@@ -120,7 +122,7 @@ const merge = {
tf_caseFilingResult: [{ required: true, message: "请选择立案结果", trigger: ["blur", "change"] }],
tf_caseFilingType: [{ required: true, message: "请选择立案类型", trigger: ["blur", "change"] }],
tf_masterUnitId: [{ required: true, message: "请选择主办单位", trigger: "blur" }],
- approvalOpinion: [{ required: true, message: "请填写审核意见", trigger: "blur" }],
+ tf_opinion: [{ required: true, message: "请填写审核意见", trigger: "blur" }],
},
underTakeOptions: [],
branchSchoolLeaderOptions: [],
diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/common/info.js b/src/main/resources/views/platform/zhghh5/democratic/proposal/common/info.js
index adba9f0..d4adaea 100644
--- a/src/main/resources/views/platform/zhghh5/democratic/proposal/common/info.js
+++ b/src/main/resources/views/platform/zhghh5/democratic/proposal/common/info.js
@@ -167,8 +167,8 @@ const PROPOSAL_INFO = {
{{ getBranchSchoolLeaderName(task) }}
-
-
+
+
@@ -185,8 +185,8 @@ const PROPOSAL_INFO = {
{{ getBranchSchoolLeaderName(task) }}
-
-
+
+
diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/committeeFiling/index.html b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/committeeFiling/index.html
index dfd397f..91dd1cf 100644
--- a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/committeeFiling/index.html
+++ b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/committeeFiling/index.html
@@ -169,9 +169,10 @@ layout("/layouts/platform_h5.html"){
>
+