..

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalDelegationController.java

@@ -59,6 +59,13 @@ public class ProposalDelegationController {
     public void index() {
     }
 
+    @At("/platform/h5/proposal/delegation")
+    @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/delegation/index.html")
+    @SaCheckPermission("proposal.delegation")
+    public void h5Index() {
+    }
+
+
     @At
     @SaCheckPermission("proposal.delegation")
     @ApiOperation("分页列表")

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSecondedController.java

@@ -68,13 +68,6 @@ public class ProposalSecondedController {
     public void h5Index() {
     }
 
-    @At(value = "/platform/h5/proposal/seconded/approval",top = true)
-    @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/seconded/approval.html")
-    @SaCheckPermission("proposal.seconded")
-    public void h5Approval(){
-
-    }
-
     @At
     @SaCheckPermission("proposal.seconded")
     public Result pageData(@Valid ProposalSearchParam pageForm, boolean approval) {

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalUnderTakeReplyController.java

@@ -25,6 +25,7 @@ import org.nutz.mvc.annotation.Ok;
 
 import javax.validation.Valid;
 import java.util.List;
+import java.util.stream.Stream;
 
 @IocBean
 @At("/platform/proposal/unitReply")
@@ -44,6 +45,12 @@ public class ProposalUnderTakeReplyController {
     public void index() {
     }
 
+    @At(value = "/platform/h5/proposal/unitReply",top = true)
+    @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/unitReply/index.html")
+    @SaCheckPermission("proposal.unitReply")
+    public void h5Index() {
+    }
+
     @At
     @SaCheckPermission("proposal.unitReply")
     @ApiOperation("分页列表")
@@ -105,10 +112,13 @@ public class ProposalUnderTakeReplyController {
 
         List<NutMap> list = pagination.getList();
         for (NutMap row : list) {
-            if (row.getInt("taskIsMaster") == 0) {
+            if (row.getInt("taskIsMaster") == 1) {
-                boolean b = List.of("85cf23da-2dd5-4007-a1e9-bd9bfddc68f0", "c9a1586e-272b-41b8-b438-0be9f9e3781d", "04ecf80c-a9d0-4986-8aac-231758d6a7af").stream()
+                boolean b = Stream.of("85cf23da-2dd5-4007-a1e9-bd9bfddc68f0", "c9a1586e-272b-41b8-b438-0be9f9e3781d", "04ecf80c-a9d0-4986-8aac-231758d6a7af")
                         .anyMatch(a -> row.getString("curTaskKey").contains(a));
-                row.setv("canRevoke",b);
+                row.setv("canRevoke",b && row.getInt("taskState") == ProcessTaskStateEnum.FINISHED.getCode());
+            }else{
+                boolean b = Stream.of("85cf23da-2dd5-4007-a1e9-bd9bfddc68f0", "c9a1586e-272b-41b8-b438-0be9f9e3781d").anyMatch(a -> row.getString("curTaskKey").contains(a));
+                row.setv("canRevoke",b && row.getInt("taskState") == ProcessTaskStateEnum.FINISHED.getCode());
             }
         }
         pagination.setList(list);

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

@@ -1,7 +1,7 @@
-const H5_PROPOSAL_INFO_COMPONENT = {
+const PROPOSAL_INFO = {
     name: "ProposalInfo",
     template: /*language=HTML*/ `
-        <div>
+        <van-action-sheet v-model="visible" title="查看详情">
             <div class="process-title">基本信息</div>
             <van-cell-group>
                 <van-cell title="提案名称">
@@ -80,15 +80,16 @@ const H5_PROPOSAL_INFO_COMPONENT = {
             </van-cell-group>
 
             <slot></slot>
-        </div>
+        </van-action-sheet>
     `,
     dicts: ["PROPOSAL_TYPE", "PROPOSAL_CASE_FILING_RESULT","PROCESS_TASK_SUBMIT_TYPE"],
     data() {
         return {
+            visible:false,
+
             viewData: {},
             doneTasks: [],
             row: null,
-            viewDialogVisible: false
         }
     },
     methods: {
@@ -99,6 +100,12 @@ const H5_PROPOSAL_INFO_COMPONENT = {
             this.getInfo()
             this.getDoneTasks()
         },
+
+        // 关闭
+        onClose(){
+          this.visible = false
+        },
+
         // 获取申请信息
         getInfo() {
             this.$axios.post("/platform/proposal/common/proposalInfo", {id: this.row.id}).then((res) => {
@@ -110,7 +117,6 @@ const H5_PROPOSAL_INFO_COMPONENT = {
 
         // 查看提案
         openView(id) {
-            this.viewDialogVisible = true
             this.$nextTick(() => {
                 this.$refs.infoDialogRef.onOpen(id)
             })

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

@@ -5,86 +5,73 @@ layout("/layouts/platform_h5.html"){
     <van-nav-bar @click-left="historyBack" left-arrow left-text="返回" title="团长审核" placeholder fixed></van-nav-bar>
     <van-sticky offset-top="46px">
         <van-search
-            :reverse-color="false"
+                v-model="pageForm.name"
-            :show-action="false"
+                :show-action="false"
-            @search="doSearch"
+                :reverse-color="false"
-            input-align="left"
+                input-align="left"
-            placeholder="请输入提案名称搜索"
+                placeholder="请输入提案名称搜索"
-            v-model="pageForm.name"
+                @search="doSearch"
         ></van-search>
         <van-dropdown-menu :close-on-click-outside="false" :close-on-click-overlay="false">
-            <van-dropdown-item :options="sessionOptions" @change="sessionChange" v-model="pageForm.sessionId"></van-dropdown-item>
+            <van-dropdown-item v-model="pageForm.sessionId" :options="sessionOptions" :multiple="false"
+                               @change="doSearch"></van-dropdown-item>
         </van-dropdown-menu>
-        <van-tabs @change="(val)=>{this.pageForm.approval = val==='1';this.doSearch();}" v-model="pageForm.approvalText">
+        <van-tabs v-model="pageForm.approvalText"
-            <van-tab name="1" title="已审核"></van-tab>
+                  @change="(val)=>{this.pageForm.approval = val==='1';this.doSearch();}">
-            <van-tab name="0" title="未审核"></van-tab>
+            <van-tab title="已审核" name="1"></van-tab>
+            <van-tab title="未审核" name="0"></van-tab>
         </van-tabs>
     </van-sticky>
 
-    <van-pull-refresh v-model="tableRefreshing" @refresh="doSearch" style="min-height: calc(100vh - 90px)">
+    <table-list api="/platform/proposal/delegation/pageData" :page_form.sync="pageForm" @ready="onReady"
-        <van-list :finished="tableFinished" @load="pageData" finished-text="没有更多了" v-if="tableData.length>0" v-model="tableLoading">
+                ref="tableListRef"
-            <div class="table-list">
+                title="name">
-                <div :key="row.id+row.processTaskId" class="table-card" v-for="row in tableData">
+        <template v-slot="{index,row}">
-                    <van-cell>
+            <table-column label="提案编号">{{row.code}}</table-column>
-                        <template slot="title">
+            <table-column label="提案类别">{{row.typeName}}</table-column>
-                            <div class="flex-align">
+            <table-column label="提案人">{{row.createUserName}}</table-column>
-                                <span class="font-size3 bold">{{row.name}}</span>
+            <table-column label="代表团">{{row.delegationName}}</table-column>
-                            </div>
+            <table-column label="当前节点">{{row.taskName}}</table-column>
-                        </template>
+        </template>
-                    </van-cell>
+        <template #actions="{index,row}">
-                    <van-cell :value="row.code" title="提案编号"></van-cell>
+            <div class="action-btn" @click="onView(row)">
-                    <van-cell :value="row.createUserName" title="提案人"></van-cell>
+                <i class="fa fa-eye"></i>
-                    <van-cell :value="row.typeName" title="提案类型"></van-cell>
+                <span>查看</span>
-                    <van-cell :value="row.sessionName" title="届次"></van-cell>
-                    <van-cell :value="row.delegationName" title="代表团"></van-cell>
-                    <van-cell :value="row.processInstanceNodeName" title="当前节点"></van-cell>
-                    <van-cell class="table-card-footer">
-                        <van-button @click="openView(row)" size="small">查看</van-button>
-                        <van-button v-if="row.processInstanceTaskStatus==='ACTIVE'" @click="openApproval(row)" size="small" type="primary">
-                            审核
-                        </van-button>
-                        <van-button
-                            v-if="row.processInstanceTaskStatus==='COMPLETE' && !row.nextTaskIsComplete"
-                            @click="openRevoke(row.processInstanceTaskId)"
-                            size="small"
-                            type="danger"
-                        >
-                            撤回
-                        </van-button>
-                    </van-cell>
-                </div>
             </div>
-        </van-list>
+            <div class="action-btn" v-if="row.taskState === 10" @click="onApproval(row)">
-        <van-empty
+                <i class="fa fa-edit"></i>
-            v-if="tableData.length===0"
+                <span>审核</span>
-            image="/assets/platform/plugins/vant-green/images/nodata/nodata.png"
+            </div>
-            description="暂无数据"
+            <div class="action-btn delete" v-if="row.canRevoke" @click="onRevoke(row)">
-            v-else
+                <i class="fa fa-reply"></i>
-        ></van-empty>
+                <span>撤回</span>
-    </van-pull-refresh>
+            </div>
+        </template>
+    </table-list>
 
-    <van-popup :style="{ height: '100%', width: '100%' }" position="right" safe-area-inset-bottom v-model="infoShow">
+    <proposal-info ref="proposalInfoRef">
-        <van-sticky>
+        <div v-if="showApprovalForm">
-            <van-nav-bar @click-left="infoShow=false" left-arrow left-text="返回" title="提案信息"></van-nav-bar>
+            <div class="process-title">{{formData.taskName}}</div>
-        </van-sticky>
+            <van-form ref="formRef">
-        <div style="height: calc(100vh - 44px); overflow-y: auto">
+                <van-field
-            <info ref="infoRef"></info>
+                        v-model="formData.tf_opinion"
-            <div v-if="showApprovalForm">
+                        name="tf_opinion"
-                <div class="process-title">{{formData.processInstanceNodeName}}</div>
+                        label="审批意见"
-                <form @submit.prevent="">
+                        placeholder="请输入审批意见"
-                    <van-field label="审核意见" name="approvalOpinion" v-model="formData.approvalOpinion" required></van-field>
+                        :rules="[{ required: true, message: '请填写审批意见' }]"
-                    <van-field label="签字" name="signature" v-model="formData.approvalSignature" required class="direction-column-field">
+                        required
-                        <h5-signature v-model="formData.approvalSignature" slot="input"></h5-signature>
+                        maxlength="100"
-                    </van-field>
+                        show-word-limit
-                </form>
+                ></van-field>
-                <div style="display: flex; justify-content: space-between; column-gap: 10px; padding: 10px">
+            </van-form>
-                    <van-button type="danger" block @click.submit="doApproval('BACK')">退回重新填写</van-button>
+            <div style="display: flex; justify-content: space-between; column-gap: 10px; padding: 10px">
-                    <van-button type="danger" block @click.submit="doApproval('REJECT')">建议撤销</van-button>
+                <van-button type="danger" block @click="handleTaskAction(6)">退回</van-button>
-                    <van-button type="primary" block @click.submit="doApproval('PASS')">同意</van-button>
+                <van-button type="danger" block @click="handleTaskAction(20)">不同意</van-button>
-                </div>
+                <van-button type="primary" block @click="handleTaskAction(1)">同意</van-button>
             </div>
         </div>
-    </van-popup>
+    </proposal-info>
+
 </div>
 <script>
     <!--#include("../../common/info.js"){}#-->
@@ -103,81 +90,18 @@ layout("/layouts/platform_h5.html"){
                     approvalText: "0",
                     approval: false
                 },
-                tableData: [],
-                tableLoading: false,
-                tableFinished: false,
-                tableRefreshing: false,
 
                 sessionOptions: [],
-                infoShow: false,
+                formData: {},
-                formData: {
+                showApprovalForm: false
-                    comment: ""
-                },
-                showApprovalForm: false,
-                rules: {
-                    approvalSignature: [{ required: true, message: "请签字" }],
-                    approvalOpinion: [{ required: true, message: "请填写意见" }]
-                }
             }
         },
         components: {
-            info: H5_PROPOSAL_INFO_COMPONENT
+            "proposal-info": PROPOSAL_INFO
         },
         methods: {
-            historyBack,
+            onReady() {
-            openView(row) {
+                this.listSession()
-                this.infoShow = true
-                this.showApprovalForm = false
-                this.$nextTick(() => {
-                    this.$refs.infoRef.onOpen(row.id)
-                })
-            },
-            openApproval(row) {
-                this.infoShow = true
-                this.$nextTick(() => {
-                    this.$refs.infoRef.onOpen(row.id)
-                    this.formData = row.approvalParam
-                    this.showApprovalForm = true
-                })
-            },
-            doApproval(approvalType) {
-                this.formData.bpmTaskApprovalType = approvalType
-                formRules(this.rules, this.formData, (valid) => {
-                    if (valid) {
-                        this.$axios
-                            .post("/platform/proposal/delegation/approval", {
-                                approval: JSON.stringify(this.formData)
-                            })
-                            .then((res) => {
-                                if (res.code === 0) {
-                                    this.infoShow = false
-                                    this.$toast.success(res.msg)
-                                    this.doSearch()
-                                }
-                            })
-                    }
-                })
-            },
-            openRevoke(taskId) {
-                this.$dialog
-                    .confirm({
-                        title: "撤回",
-                        message: "您确定要撤回吗？",
-                        confirmButtonText: "确定",
-                        cancelButtonText: "取消"
-                    })
-                    .then(() => {
-                        this.$axios.post("/platform/proposal/delegation/revoke", { taskId }).then((res) => {
-                            if (res.code === 0) {
-                                this.$toast.success(res.msg)
-                                this.doSearch()
-                            }
-                        })
-                    })
-            },
-
-            sessionChange(val) {
-                this.doSearch()
             },
             listSession() {
                 this.$axios.post("/platform/proposal/common/listSession").then((res) => {
@@ -187,42 +111,63 @@ layout("/layouts/platform_h5.html"){
                                 text: "全部届次",
                                 value: null
                             }
-                        ].concat(res.data.map((v) => ({ text: v.fullName, value: v.id })))
+                        ].concat(res.data.map((v) => ({text: v.fullName, value: v.id})))
+                        if (this.sessionOptions.length > 0) {
+                            this.pageForm.sessionId = this.sessionOptions[0].value
+                            this.doSearch()
+                        }
                     }
                 })
             },
 
-            pageData() {
+            onView(row) {
-                this.tableLoading = true
+                this.showApprovalForm = false
-                const loading = createListLoading()
+                this.$refs.proposalInfoRef.onOpen(row)
-                this.$axios
-                    .post("/platform/proposal/delegation/pageData", this.pageForm)
-                    .then((res) => {
-                        if (res.code === 0) {
-                            this.tableData = this.tableData.concat(res.data.list)
-                            this.pageForm.totalCount = res.data.totalCount
-                            if (this.tableData.length >= this.pageForm.totalCount) {
-                                this.tableFinished = true
-                            }
-                            this.pageForm.pageNumber++
-                        }
-                    })
-                    .finally(() => {
-                        loading.close()
-                        this.tableLoading = false
-                        this.tableRefreshing = false
-                    })
             },
+
+            onApproval(row) {
+                this.showApprovalForm = true
+                this.$refs.proposalInfoRef.onOpen(row)
+                this.formData = {
+                    processTaskId: row.taskId,
+                    taskName: row.curTaskName
+                }
+            },
+
+            async handleTaskAction(val) {
+                try {
+                    await this.$refs.formRef.validate();
+                    this.$dialog.confirm({
+                        title: "提示",
+                        message: "您确定要提交吗？"
+                    }).then(() => {
+                        this.$axios.post("/flow/common/executeTask", {
+                            data: JSON.stringify({
+                                ...this.formData,
+                                submitType: val
+                            })
+                        }).then((res) => {
+                            if (res.code === 0) {
+                                this.$refs.proposalInfoRef.onClose()
+                                this.$toast.success(res.msg)
+                                this.doSearch()
+                            }
+                        })
+                    }).catch(() => {
+
+                    })
+                } catch (error) {
+
+                }
+            },
+
             doSearch() {
-                this.pageForm.pageNumber = 1
+                this.$nextTick(() => {
-                this.pageForm.totalCount = 0
+                    this.pageForm.pageNumber = 1
-                this.tableData = []
+                    this.pageForm.totalCount = 0
-                this.pageData()
+                    this.$refs.tableListRef.doSearch()
-            }
+                })
-        },
+            },
-        created() {
-            this.pageData()
-            this.listSession()
         }
     })
 </script>

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

@@ -57,14 +57,8 @@ layout("/layouts/platform_h5.html"){
 
     <invite-seconder @refresh="doSearch" ref="inviteSeconderRef"></invite-seconder>
 
-    <van-popup :style="{ height: '100%', width: '100%' }" position="right" safe-area-inset-bottom v-model="infoShow">
+    <proposal-info ref="proposalInfoRef"></proposal-info>
-        <van-sticky>
+
-            <van-nav-bar @click-left="infoShow=false" left-arrow left-text="返回" title="提案信息"></van-nav-bar>
-        </van-sticky>
-        <div style="height: calc(100vh - 44px); overflow-y: auto">
-            <info ref="infoRef"></info>
-        </div>
-    </van-popup>
 </div>
 <script>
     <!--#include("../../common/info.js"){}#-->
@@ -75,7 +69,7 @@ layout("/layouts/platform_h5.html"){
         store,
         components: {
             "invite-seconder": PROPOSAL_INVITE_SECONDER_COMPONENT,
-            info: H5_PROPOSAL_INFO_COMPONENT
+            "proposal-info": PROPOSAL_INFO
         },
         data() {
             return {
@@ -110,10 +104,8 @@ layout("/layouts/platform_h5.html"){
             },
 
             onView(row) {
-                this.infoShow = true
+                this.showApprovalForm = false
-                this.$nextTick(() => {
+                this.$refs.proposalInfoRef.onOpen(row)
-                    this.$refs.infoRef.onOpen(row.id)
-                })
             },
 
             onEdit(row) {

src/main/resources/views/platform/zhghh5/democratic/proposal/transact/seconded/approval.html

@@ -1,34 +0,0 @@
-<!--#
-layout("/layouts/platform_h5.html"){
-#-->
-
-<div id="app" v-cloak>
-    <info></info>
-</div>
-
-<script>
-    <!--#include("../../common/info.js"){}#-->
-
-    const vue = new Vue({
-        el: "#app",
-        store,
-        components: {
-            info: H5_PROPOSAL_INFO_COMPONENT
-        },
-        data() {
-            return {
-
-            }
-        },
-        methods:{
-
-        },
-        created(){
-
-        }
-    })
-</script>
-
-<!--#
-}
-#-->

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

@@ -5,23 +5,26 @@ layout("/layouts/platform_h5.html"){
     <van-nav-bar @click-left="historyBack" left-arrow left-text="返回" title="附议提案" placeholder fixed></van-nav-bar>
     <van-sticky offset-top="46px">
         <van-search
-            v-model="pageForm.name"
+                v-model="pageForm.name"
-            :show-action="false"
+                :show-action="false"
-            :reverse-color="false"
+                :reverse-color="false"
-            input-align="left"
+                input-align="left"
-            placeholder="请输入提案名称搜索"
+                placeholder="请输入提案名称搜索"
-            @search="doSearch"
+                @search="doSearch"
         ></van-search>
         <van-dropdown-menu :close-on-click-outside="false" :close-on-click-overlay="false">
-            <van-dropdown-item v-model="pageForm.sessionId" :options="sessionOptions" :multiple="false" @change="sessionChange"></van-dropdown-item>
+            <van-dropdown-item v-model="pageForm.sessionId" :options="sessionOptions" :multiple="false"
+                               @change="doSearch"></van-dropdown-item>
         </van-dropdown-menu>
-        <van-tabs v-model="pageForm.approvalText" @change="(val)=>{this.pageForm.approval = val==='1';this.doSearch();}">
+        <van-tabs v-model="pageForm.approvalText"
+                  @change="(val)=>{this.pageForm.approval = val==='1';this.doSearch();}">
             <van-tab title="已附议" name="1"></van-tab>
             <van-tab title="未附议" name="0"></van-tab>
         </van-tabs>
     </van-sticky>
 
-    <table-list api="/platform/proposal/seconded" :page_form.sync="pageForm" @ready="onReady" ref="tableListRef"
+    <table-list api="/platform/proposal/seconded/pageData" :page_form.sync="pageForm" @ready="onReady"
+                ref="tableListRef"
                 title="name">
         <template v-slot="{index,row}">
             <table-column label="提案编号">{{row.code}}</table-column>
@@ -39,33 +42,38 @@ layout("/layouts/platform_h5.html"){
                 <i class="fa fa-edit"></i>
                 <span>审核</span>
             </div>
-            <div class="action-btn" v-if="row.taskState === 10" @click="onRevoke(row)">
+            <div class="action-btn delete" v-if="row.taskState === 10" @click="onRevoke(row)">
                 <i class="fa fa-reply"></i>
                 <span>撤回</span>
             </div>
         </template>
     </table-list>
 
-    <van-popup :style="{ height: '100%', width: '100%' }" position="right" safe-area-inset-bottom v-model="infoShow">
+    <proposal-info ref="proposalInfoRef">
-        <van-sticky>
+        <div v-if="showApprovalForm">
-            <van-nav-bar @click-left="infoShow=false" left-arrow left-text="返回" title="提案信息"></van-nav-bar>
+            <div class="process-title">{{formData.taskName}}</div>
-        </van-sticky>
+            <van-form ref="formRef">
-        <div style="height: calc(100vh - 44px); overflow-y: auto">
+                <van-field
-            <info ref="infoRef"></info>
+                        v-model="formData.tf_opinion"
-            <div v-if="showApprovalForm">
+                        name="tf_opinion"
-                <div class="process-title">{{formData.processInstanceNodeName}}</div>
+                        label="审批意见"
-                <form @submit.prevent="">
+                        placeholder="请输入审批意见"
-                    <van-field label="签字" name="approvalSignature" v-model="formData.signature" required class="direction-column-field">
+                        :rules="[{ required: true, message: '请填写审批意见' }]"
-                        <h5-signature v-model="formData.approvalSignature" slot="input"></h5-signature>
+                        required
-                    </van-field>
+                        maxlength="100"
-                </form>
+                        show-word-limit
-                <div style="display: flex; justify-content: space-between; column-gap: 10px; padding: 10px">
+                ></van-field>
-                    <van-button type="danger" block @click.submit="doApproval('REJECT')">拒绝</van-button>
+                <!--                <van-field label="签字" name="approvalSignature" v-model="formData.signature" required class="direction-column-field">-->
-                    <van-button type="primary" block @click.submit="doApproval('PASS')">同意</van-button>
+                <!--                    <h5-signature v-model="formData.approvalSignature" slot="input"></h5-signature>-->
-                </div>
+                <!--                </van-field>-->
+            </van-form>
+            <div style="display: flex; justify-content: space-between; column-gap: 10px; padding: 10px">
+                <van-button type="danger" block @click="handleTaskAction(20)">不同意</van-button>
+                <van-button type="primary" block @click="handleTaskAction(1)">同意</van-button>
             </div>
         </div>
-    </van-popup>
+    </proposal-info>
+
 </div>
 <script>
     <!--#include("../../common/info.js"){}#-->
@@ -86,57 +94,19 @@ layout("/layouts/platform_h5.html"){
                 },
 
                 sessionOptions: [],
-                infoShow: false,
                 formData: {},
                 showApprovalForm: false,
                 rules: {
-                    approvalSignature: [{ required: true, message: "请签字" }]
+                    approvalSignature: [{required: true, message: "请签字"}]
                 }
             }
         },
         components: {
-            info: H5_PROPOSAL_INFO_COMPONENT
+            "proposal-info": PROPOSAL_INFO
         },
         methods: {
-            openView(row) {
+            onReady() {
-                this.infoShow = true
+                this.listSession()
-                this.showApprovalForm = false
-                this.$nextTick(() => {
-                    this.$refs.infoRef.onOpen(row.id)
-                })
-            },
-            openApproval(row) {
-                this.infoShow = true
-                this.$nextTick(() => {
-                    this.showApprovalForm = true
-                    this.$refs.infoRef.onOpen(row.id)
-                    this.formData = {
-                        processTaskId: row.taskId,
-                        taskName: row.curTaskName
-                    }
-                })
-            },
-            doApproval(approvalType) {
-                this.formData.bpmTaskApprovalType = approvalType
-                formRules(this.rules, this.formData, (valid) => {
-                    if (valid) {
-                        this.$axios
-                            .post("/platform/proposal/seconded/approval", {
-                                approval: JSON.stringify(this.formData)
-                            })
-                            .then((res) => {
-                                if (res.code === 0) {
-                                    this.infoShow = false
-                                    this.$toast.success(res.msg)
-                                    this.doSearch()
-                                }
-                            })
-                    }
-                })
-            },
-
-            sessionChange(options) {
-                this.doSearch()
             },
             listSession() {
                 this.$axios.post("/platform/proposal/common/listSession").then((res) => {
@@ -146,42 +116,63 @@ layout("/layouts/platform_h5.html"){
                                 text: "全部届次",
                                 value: null
                             }
-                        ].concat(res.data.map((v) => ({ text: v.fullName, value: v.id })))
+                        ].concat(res.data.map((v) => ({text: v.fullName, value: v.id})))
+                        if (this.sessionOptions.length > 0) {
+                            this.pageForm.sessionId = this.sessionOptions[0].value
+                            this.doSearch()
+                        }
                     }
                 })
             },
 
-            pageData() {
+            onView(row) {
-                this.tableLoading = true
+                this.showApprovalForm = false
-                const loading = createListLoading()
+                this.$refs.proposalInfoRef.onOpen(row)
-                this.$axios
-                    .post("/platform/proposal/seconded/pageData", this.pageForm)
-                    .then((res) => {
-                        if (res.code === 0) {
-                            this.tableData = this.tableData.concat(res.data.list)
-                            this.pageForm.totalCount = res.data.totalCount
-                            if (this.tableData.length >= this.pageForm.totalCount) {
-                                this.tableFinished = true
-                            }
-                            this.pageForm.pageNumber++
-                        }
-                    })
-                    .finally(() => {
-                        loading.close()
-                        this.tableLoading = false
-                        this.tableRefreshing = false
-                    })
             },
+
+            onApproval(row) {
+                this.showApprovalForm = true
+                this.$refs.proposalInfoRef.onOpen(row)
+                this.formData = {
+                    processTaskId: row.taskId,
+                    taskName: row.curTaskName
+                }
+            },
+
+            async handleTaskAction(val) {
+                try {
+                    await this.$refs.formRef.validate();
+                    this.$dialog.confirm({
+                        title: "提示",
+                        message: "您确定要提交吗？"
+                    }).then(() => {
+                        this.$axios.post("/flow/common/executeTask", {
+                            data: JSON.stringify({
+                                ...this.formData,
+                                submitType: val
+                            })
+                        }).then((res) => {
+                            if (res.code === 0) {
+                                this.$refs.proposalInfoRef.onClose()
+                                this.$toast.success(res.msg)
+                                this.doSearch()
+                            }
+                        })
+                    }).catch(() => {
+
+                    })
+                } catch (error) {
+
+                }
+            },
+
             doSearch() {
-                this.pageForm.pageNumber = 1
+                this.$nextTick(() => {
-                this.pageForm.totalCount = 0
+                    this.pageForm.pageNumber = 1
-                this.tableData = []
+                    this.pageForm.totalCount = 0
-                this.pageData()
+                    this.$refs.tableListRef.doSearch()
-            }
+                })
-        },
+            },
-        created() {
-            this.pageData()
-            this.listSession()
         }
     })
 </script>

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

@@ -0,0 +1,257 @@
+<!--#
+layout("/layouts/platform_h5.html"){
+#-->
+<div id="app" v-cloak>
+    <van-nav-bar @click-left="historyBack" left-arrow left-text="返回" title="承办单位答复" placeholder
+                 fixed></van-nav-bar>
+    <van-sticky offset-top="46px">
+        <van-search
+                v-model="pageForm.name"
+                :show-action="false"
+                :reverse-color="false"
+                input-align="left"
+                placeholder="请输入提案名称搜索"
+                @search="doSearch"
+        ></van-search>
+        <van-dropdown-menu :close-on-click-outside="false" :close-on-click-overlay="false">
+            <van-dropdown-item v-model="pageForm.sessionId" :options="sessionOptions" :multiple="false"
+                               @change="doSearch"></van-dropdown-item>
+        </van-dropdown-menu>
+        <van-tabs v-model="pageForm.approvalText"
+                  @change="(val)=>{this.pageForm.approval = val==='1';this.doSearch();}">
+            <van-tab title="已审核" name="1"></van-tab>
+            <van-tab title="未审核" name="0"></van-tab>
+        </van-tabs>
+    </van-sticky>
+
+    <table-list api="/platform/proposal/unitReply/pageData" :page_form.sync="pageForm" @ready="onReady"
+                ref="tableListRef"
+                title="name">
+        <template v-slot="{index,row}">
+            <table-column label="提案编号">{{row.code}}</table-column>
+            <table-column label="提案类别">{{row.typeName}}</table-column>
+            <table-column label="提案人">{{row.createUserName}}</table-column>
+            <table-column label="代表团">{{row.delegationName}}</table-column>
+            <table-column label="承办单位">{{row.taskUnitName}}（{{row.taskIsMaster ? '主办' : '协办'}}）</table-column>
+            <table-column label="当前节点">{{row.taskName}}</table-column>
+        </template>
+        <template #actions="{index,row}">
+            <div class="action-btn" @click="onView(row)">
+                <i class="fa fa-eye"></i>
+                <span>查看</span>
+            </div>
+            <div class="action-btn" v-if="row.taskState === 10" @click="onApproval(row)">
+                <i class="fa fa-edit"></i>
+                <span>答复</span>
+            </div>
+            <div class="action-btn delete" v-if="row.canRevoke" @click="onRevoke(row)">
+                <i class="fa fa-reply"></i>
+                <span>撤回</span>
+            </div>
+        </template>
+    </table-list>
+
+    <proposal-info ref="proposalInfoRef">
+        <div v-if="showApprovalForm">
+            <div class="process-title">{{formData.taskName}}</div>
+            <van-form ref="formRef">
+                <van-field :value="formData.taskUnitName"
+                           label="承办单位"
+                           readonly></van-field>
+
+                <van-field
+                        v-model="formData.tf_implementStateName"
+                        name="tf_implementStateName"
+                        label="落实情况"
+                        placeholder="请选择落实情况"
+                        :rules="[{ required: true, message: '请选择落实情况' }]"
+                        required
+                        is-link
+                        @click="showImplementPicker = true"
+                ></van-field>
+                <van-popup v-model="showImplementPicker" position="bottom">
+                    <van-picker
+                            show-toolbar
+                            :columns="dict.type.PROPOSAL_REPLY_IMPLEMENT.map(item => ({text: item.label, value: item.code}))"
+                            @confirm="onImplementConfirm"
+                            @cancel="showImplementPicker = false"
+                    ></van-picker>
+                </van-popup>
+
+                <van-field
+                        v-model="formData.tf_opinion"
+                        name="tf_opinion"
+                        label="答复内容"
+                        placeholder="请输入答复内容"
+                        :rules="[{ required: true, message: '请填写答复内容' }]"
+                        required
+                        maxlength="100"
+                        show-word-limit
+                ></van-field>
+
+                <van-field
+                        v-if="supportCandidate && formData.taskIsMaster"
+                        v-model="formData.tf_nextNodeOperatorName"
+                        name="tf_nextNodeOperatorName"
+                        label="校领导"
+                        placeholder="校领导"
+                        :rules="[{ required: true, message: '请选择校领导' }]"
+                        required
+                        is-link
+                        @click="showCandidatesPicker = true"
+                ></van-field>
+                <van-popup v-model="showCandidatesPicker" position="bottom">
+                    <van-picker
+                            show-toolbar
+                            :columns="candidates.map(item => ({text: item.userName, value: item.userId}))"
+                            @confirm="onCandidatesConfirm"
+                            @cancel="showCandidatesPicker = false"
+                    ></van-picker>
+                </van-popup>
+
+            </van-form>
+            <div style="display: flex; justify-content: space-between; column-gap: 10px; padding: 10px">
+                <van-button block @click="$refs.proposalInfoRef.onClose()">取消</van-button>
+                <van-button type="primary" block @click="handleTaskAction(1)">提交</van-button>
+            </div>
+        </div>
+    </proposal-info>
+
+</div>
+<script>
+    <!--#include("../../common/info.js"){}#-->
+
+    const vue = new Vue({
+        el: "#app",
+        store,
+        dicts: ['PROPOSAL_REPLY_IMPLEMENT'],
+        data() {
+            return {
+                pageForm: {
+                    pageNumber: 1,
+                    pageSize: 10,
+                    totalCount: 0,
+                    name: null,
+                    sessionId: null,
+                    approvalText: "0",
+                    approval: false
+                },
+
+                sessionOptions: [],
+                formData: {},
+                showApprovalForm: false,
+
+                showImplementPicker: false,
+
+                supportCandidate: false,
+                candidates: [],
+                showCandidatesPicker: false
+
+            }
+        },
+        components: {
+            "proposal-info": PROPOSAL_INFO
+        },
+        methods: {
+            onReady() {
+                this.listSession()
+            },
+            listSession() {
+                this.$axios.post("/platform/proposal/common/listSession").then((res) => {
+                    if (res.code === 0) {
+                        this.sessionOptions = [
+                            {
+                                text: "全部届次",
+                                value: null
+                            }
+                        ].concat(res.data.map((v) => ({text: v.fullName, value: v.id})))
+                        if (this.sessionOptions.length > 0) {
+                            this.pageForm.sessionId = this.sessionOptions[0].value
+                            this.doSearch()
+                        }
+                    }
+                })
+            },
+
+            onView(row) {
+                this.showApprovalForm = false
+                this.$refs.proposalInfoRef.onOpen(row)
+            },
+
+            onApproval(row) {
+                this.loadCandidates(row.taskId)
+
+                this.showApprovalForm = true
+                this.$refs.proposalInfoRef.onOpen(row)
+                this.formData = {
+                    processTaskId: row.taskId,
+                    taskKey: row.taskKey,
+                    taskName: row.taskName,
+                    taskUnitName: row.taskUnitName,
+                    taskIsMaster: row.taskIsMaster
+                }
+            },
+
+            // 加载候选人列表
+            loadCandidates(taskId) {
+                $.get("/flow/common/candidate", {taskId}).then((res) => {
+                    if (res.code === 0) {
+                        this.candidates = res.data.candidates
+                        this.supportCandidate = res.data.support
+                    }
+                })
+            },
+
+            onImplementConfirm(value) {
+                this.$set(this.formData, "tf_implementStateName", value.text)
+                this.$set(this.formData, "tf_implementState", value.value)
+                this.showImplementPicker = false
+            },
+
+            onCandidatesConfirm(value) {
+                debugger
+                this.$set(this.formData, "tf_nextNodeOperatorName", value.text)
+                this.$set(this.formData, "tf_nextNodeOperator", value.value)
+                this.showCandidatesPicker = false
+            },
+
+            async handleTaskAction(val) {
+                try {
+                    await this.$refs.formRef.validate();
+                    this.$dialog.confirm({
+                        title: "提示",
+                        message: "您确定要提交吗？"
+                    }).then(() => {
+                        this.$axios.post("/flow/common/executeTask", {
+                            data: JSON.stringify({
+                                ...this.formData,
+                                submitType: val
+                            })
+                        }).then((res) => {
+                            if (res.code === 0) {
+                                this.$refs.proposalInfoRef.onClose()
+                                this.$toast.success(res.msg)
+                                this.doSearch()
+                            }
+                        })
+                    }).catch(() => {
+
+                    })
+                } catch (error) {
+
+                }
+            },
+
+            doSearch() {
+                this.$nextTick(() => {
+                    this.pageForm.pageNumber = 1
+                    this.pageForm.totalCount = 0
+                    this.$refs.tableListRef.doSearch()
+                })
+            },
+        }
+    })
+</script>
+<!--#
+}
+#-->