commit

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

@@ -100,6 +100,27 @@ const PROPOSAL_INFO = {
                 </el-table>
             </template>
 
+
+            <template v-if="viewData.undertakeSuggestions&&viewData.undertakeSuggestions.length>0">
+                <div class="process-title">
+                    承办单位意见
+                </div>
+                <template v-for="item,index in viewData.undertakeSuggestions">
+                    <div class="process-title">
+                        {{item.unitName}}-意见{{ index + 1 }}
+                    </div>
+                    <el-descriptions :column="2" border>
+                        <el-descriptions-item label="反馈人">{{ item.userName }}</el-descriptions-item>
+                        <el-descriptions-item label="所属单位">{{ item.unitName }}</el-descriptions-item>
+                        <el-descriptions-item label="反馈时间">{{ item.time }}</el-descriptions-item>
+                        <el-descriptions-item label="反馈结果">{{ item.result }}</el-descriptions-item>
+                        <el-descriptions-item label="反馈意见">
+                            <span v-html="item.opinion"></span>
+                        </el-descriptions-item>
+                    </el-descriptions>
+                </template>
+            </template>
+
             <el-dialog title="提案详情" :visible.sync="viewDialogVisible" width="1200px" append-to-body top="5vh">
                 <div style="max-height: 80vh;overflow-y: auto">
                     <proposal-info ref="infoDialogRef"></proposal-info>

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

@@ -264,7 +264,10 @@ layout("/layouts/platform.html"){
                     cancelButtonText: "取消",
                     type: "info"
                 }).then(() => {
-                    this.$axios.post("/platform/proposal/committeeFilingUnit/revokeTask", {taskId: row.taskId}).then((res) => {
+                    this.$axios.post("/platform/proposal/committeeFilingUnit/revokeTask", {
+                        taskId: row.taskId,
+                        proposalId: row.proposalId
+                    }).then((res) => {
                         if (res.code === 0) {
                             this.$message.success(res.msg)
                             this.doSearch()