提案委主任的办理意见展示修正

src/main/resources/views/platform/zhgh/democratic/proposal/common/info.js

@@ -195,8 +195,8 @@ const PROPOSAL_INFO = {
                             {{getBranchSchoolLeaderName(task)}}
                         </el-descriptions-item>
                         <el-descriptions-item label="办理意见" :span="3">
-                            <!-- 主任提交的办理意见保存在 approvalOpinion；历史记录未保存该字段时沿用 tf_opinion。 -->
+                            <!-- 主任意见统一读取本节点提交的 tf_opinion；历史意见由专项 SQL 修正。 -->
-                            <div v-html="task.ext.approvalOpinion || task.taskFormData.tf_opinion"></div>
+                            <div v-html="task.taskFormData.tf_opinion"></div>
                         </el-descriptions-item>
                     </el-descriptions>
 
@@ -215,8 +215,8 @@ const PROPOSAL_INFO = {
                             {{getBranchSchoolLeaderName(task)}}
                         </el-descriptions-item>
                         <el-descriptions-item label="办理意见" :span="3">
-                            <!-- 主任审核意见读取本次提交的 approvalOpinion；历史记录缺少该意见时回退 tf_opinion。 -->
+                            <!-- 主任审核统一读取本节点提交的 tf_opinion，避免展示前序单位的答复。 -->
-                            <div v-html="task.ext.approvalOpinion || task.taskFormData.tf_opinion"></div>
+                            <div v-html="task.taskFormData.tf_opinion"></div>
                         </el-descriptions-item>
                     </el-descriptions>
 

src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/index.html

@@ -172,9 +172,10 @@ layout("/layouts/platform.html"){
                                 ></el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="审核意见" prop="approvalOpinion"
+                        <!-- 本节点本人填写的审核意见统一提交为 tf_opinion，覆盖流程继承的前序意见。 -->
+                        <el-form-item label="审核意见" prop="tf_opinion"
                                       :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
-                            <user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea>
+                            <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
                         </el-form-item>
                     </el-form>
                     <el-row type="flex" justify="end">
@@ -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: []
                     })

src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/merge.js

@@ -95,9 +95,10 @@ const merge = {
                             ></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="审核意见" prop="approvalOpinion"
+                    <!-- 本节点本人填写的审核意见统一提交为 tf_opinion，覆盖流程继承的前序意见。 -->
+                    <el-form-item label="审核意见" prop="tf_opinion"
                                   :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
-                        <user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea>
+                        <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
                     </el-form-item>
                 </el-form>
                 <el-row type="flex" justify="end">
@@ -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: [],

src/main/resources/views/platform/zhghh5/democratic/proposal/common/info.js

@@ -167,8 +167,8 @@ const PROPOSAL_INFO = {
                             {{ getBranchSchoolLeaderName(task) }}
                         </van-cell>
                         <van-cell title="办理意见" class="direction-column-cell">
-                            <!-- 主任提交的办理意见保存在 approvalOpinion；历史记录未保存该字段时沿用 tf_opinion。 -->
+                            <!-- 主任意见统一读取本节点提交的 tf_opinion；历史意见由专项 SQL 修正。 -->
-                            <div v-html="task.ext.approvalOpinion || task.taskFormData.tf_opinion"></div>
+                            <div v-html="task.taskFormData.tf_opinion"></div>
                         </van-cell>
                     </van-cell-group>
 
@@ -185,8 +185,8 @@ const PROPOSAL_INFO = {
                             {{ getBranchSchoolLeaderName(task) }}
                         </van-cell>
                         <van-cell title="办理意见" class="direction-column-cell">
-                            <!-- 主任审核意见读取本次提交的 approvalOpinion；历史记录缺少该意见时回退 tf_opinion。 -->
+                            <!-- 主任审核统一读取本节点提交的 tf_opinion，避免展示前序单位的答复。 -->
-                            <div v-html="task.ext.approvalOpinion || task.taskFormData.tf_opinion"></div>
+                            <div v-html="task.taskFormData.tf_opinion"></div>
                         </van-cell>
                     </van-cell-group>
 

src/main/resources/views/platform/zhghh5/democratic/proposal/transact/committeeFiling/index.html

@@ -169,9 +169,10 @@ layout("/layouts/platform_h5.html"){
                     ></van-picker>
                 </van-popup>
 
+                <!-- 本节点本人填写的审核意见统一提交为 tf_opinion，覆盖流程继承的前序意见。 -->
                 <van-field
-                        v-model="formData.approvalOpinion"
+                        v-model="formData.tf_opinion"
-                        name="approvalOpinion"
+                        name="tf_opinion"
                         label="审核意见"
                         placeholder="请输入审核意见"
                         :rules="[{ required: true, message: '请填写审核意见' }]"
@@ -305,7 +306,7 @@ layout("/layouts/platform_h5.html"){
                     tf_slaveUnitIds: [],
                     tf_slaveUnitNames: [],
                     tf_slaveUnitNameStr: null,
-                    approvalOpinion: null
+                    tf_opinion: null
                 })
                 this.$refs.proposalInfoRef.onOpen(row)
             },