提案整改

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

@@ -20,9 +20,9 @@ const PROPOSAL_INFO = {
                     <van-cell title="提案类别">
                         {{viewData.typeName}}
                     </van-cell>
-                    <van-cell title="建议承办单位">
+                    <!--<van-cell title="建议承办单位">
                         {{viewData.suggestUnits}}
-                    </van-cell>
+                    </van-cell>-->
                     <van-cell title="立案结果">
                         <dict-tag :options="dict.type.PROPOSAL_CASE_FILING_RESULT"
                                   :value="viewData.caseFilingResult"></dict-tag>
@@ -123,7 +123,7 @@ const PROPOSAL_INFO = {
 
                     <!--提案委员会立案-->
                     <van-cell-group :title="task.displayName"
-                                    v-else-if="task.taskName === 'committee'">
+                                    v-else-if="task.taskName === 'committee'||task.taskName === 'committeeFilingUnit'">
                         <van-cell title="办理用户">{{ task.taskFormData.userName }}({{task.taskFormData.loginName}})
                         </van-cell>
                         <van-cell title="办理时间">{{ task.finishTime }}</van-cell>
@@ -140,12 +140,20 @@ const PROPOSAL_INFO = {
                                 </template>
                             </div>
                         </van-cell>
-                        <van-cell title="主办单位">{{ task.ext.tf_masterUnitName }}</van-cell>
-                        <van-cell title="协办单位">{{ task?.ext?.tf_slaveUnitNameStr }}</van-cell>
+                        <template v-if="['CONFIRM_FILING','SUGGESTION'].includes(task.ext.tf_caseFilingResult)">
+                            <van-cell v-if="task.ext.tf_caseFilingResult === 'SUGGESTION'" title="承办单位">{{ task?.ext?.tf_masterUnitNameStr || task?.ext?.tf_slaveUnitNameStr }}</van-cell>
+                            <template v-else>
+                                <van-cell title="主办单位">{{ task?.ext?.tf_masterUnitNameStr }}</van-cell>
+                                <van-cell title="协办单位">{{ task?.ext?.tf_slaveUnitNameStr }}</van-cell>
+                            </template>
+                        </template>
+                        <van-cell title="办理意见" v-if="task.taskFormData.tf_opinion" class="direction-column-cell">
+                            <div v-html="task.taskFormData.tf_opinion"></div>
+                        </van-cell>
                     </van-cell-group>
 
                     <van-cell-group :title="task.displayName" v-else>
-                        <van-cell title="办理单位" v-if="['master_reply','slave_reply'].includes(task.taskName)">
+                        <van-cell title="办理单位" v-if="['opinion_unit_reply','unit_reply','two_unit_reply','master_reply','slave_reply'].includes(task.taskName)">
                             {{task.ext.underTakeName}}
                         </van-cell>
 

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

@@ -151,7 +151,7 @@ layout("/layouts/platform_h5.html"){
                         delete formData.taskName
 
 
-                        this.$axios.post("/flow/common/executeTask", {
+                        this.$axios.post("/platform/proposal/schoolLeaderApproval/executeTask", {
                             data: JSON.stringify(formData)
                         }).then((res) => {
                             if (res.code === 0) {

src/main/resources/views/platform/zhghh5/sys/home/todo.js

@@ -177,7 +177,7 @@ const todo = {
         onView(task) {
             const {taskId, taskKey, instanceId, businessNo, formKey, h5FormKey} = task;
             if (!h5FormKey) {
-                this.$toast("当前流程没有配置地址");
+                this.$toast("当前流程暂不支持手机端审核，请前往PC端页面审核！");
                 return;
             }
             this.$pjaxReplace(h5FormKey + "?taskId=" + taskId + "bizId=" + businessNo + "taskKey=" + taskKey+ "&tab=" + this.activeTab)