..

2025-10-16 18:25:14 +08:00
parent 45ee9b7285
commit fbcee4d894
48 changed files with 2559 additions and 326 deletions
@@ -112,7 +112,7 @@ const PROPOSAL_INFO = {
                                      :value="task.ext.caseFilingResult"></dict-tag>
                        </van-cell>
                        <van-cell title="主办单位">{{ task.ext.tf_hostUnitName }}</van-cell>
-                        <van-cell title="协办单位">{{ task?.ext?.tf_helpUnitNames.join('、') }}</van-cell>
+                        <van-cell title="协办单位">{{ task?.ext?.tf_helpUnitNames?.join('、') }}</van-cell>
                    </van-cell-group>

                    <van-cell-group :title="task.displayName" v-else>
@@ -0,0 +1,232 @@
+<!--#
+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/commissioner/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.taskName}}</table-column>
+            <table-column label="委员意见">
+                <van-tag type="primary">立案：{{row.CONFIRM_FILING_COUNT}}</van-tag>
+                <van-tag type="warning">建议：{{row.SUGGESTION_COUNT}}</van-tag>
+                <van-tag>不予立案：{{row.NOT_COUNT}}</van-tag>
+            </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.pcoId" @click="onApproval(row)">
+                <i class="fa fa-edit"></i>
+                <span>审核</span>
+            </div>
+        </template>
+    </table-list>
+
+    <proposal-info ref="proposalInfoRef">
+        <div v-if="showApprovalForm">
+            <div class="process-title">提案委员会成员意见</div>
+            <van-form ref="formRef">
+                <van-field
+                        v-model="formData.caseFilingResultName"
+                        name="caseFilingResultName"
+                        label="立案结果"
+                        placeholder="请选择立案结果"
+                        :rules="[{ required: true, message: '请选择立案结果' }]"
+                        required
+                        is-link
+                        @click="showCaseFilingResultPicker = true"
+                ></van-field>
+                <van-popup v-model="showCaseFilingResultPicker" position="bottom">
+                    <van-picker
+                            show-toolbar
+                            :columns="dict.type.PROPOSAL_CASE_FILING_RESULT.map(item => ({text: item.label, value: item.code}))"
+                            @confirm="onCaseFilingResultConfirm"
+                            @cancel="showCaseFilingResultPicker = false"
+                    ></van-picker>
+                </van-popup>
+
+                <template v-if="['CONFIRM_FILING'].includes(formData.caseFilingResult)">
+                    <van-field
+                            v-model="formData.caseFilingTypeName"
+                            name="caseFilingTypeName"
+                            label="立案结果"
+                            placeholder="请选择立案类型"
+                            :rules="[{ required: true, message: '请选择立案类型' }]"
+                            required
+                            is-link
+                            @click="showCaseFilingTypePicker = true"
+                    ></van-field>
+                    <van-popup v-model="showCaseFilingTypePicker" position="bottom">
+                        <van-picker
+                                show-toolbar
+                                :columns="dict.type.PROPOSAL_CASE_FILING_TYPE.map(item => ({text: item.label, value: item.code}))"
+                                @confirm="onCaseFilingTypeConfirm"
+                                @cancel="showCaseFilingTypePicker = false"
+                        ></van-picker>
+                    </van-popup>
+                </template>
+
+                <van-field
+                        v-model="formData.opinion"
+                        name="opinion"
+                        label="审批意见"
+                        placeholder="请输入审批意见"
+                        :rules="[{ required: true, message: '请填写审批意见' }]"
+                        required
+                        maxlength="100"
+                        show-word-limit
+                ></van-field>
+            </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="doSubmit">提交</van-button>
+            </div>
+        </div>
+    </proposal-info>
+
+</div>
+<script>
+    <!--#include("../../common/info.js"){}#-->
+
+    const vue = new Vue({
+        el: "#app",
+        store,
+        dicts: ["PROPOSAL_CASE_FILING_RESULT", "PROPOSAL_CASE_FILING_TYPE"],
+        data() {
+            return {
+                pageForm: {
+                    pageNumber: 1,
+                    pageSize: 10,
+                    totalCount: 0,
+                    name: null,
+                    sessionId: null,
+                    approvalText: "0",
+                    approval: false
+                },
+
+                sessionOptions: [],
+                formData: {},
+                showApprovalForm: false,
+
+                showCaseFilingResultPicker: false,
+                showCaseFilingTypePicker: 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)
+            },
+
+            // 确定立案类型
+            onCaseFilingResultConfirm(value) {
+                this.$set(this.formData, "caseFilingResultName", value.text)
+                this.$set(this.formData, "caseFilingResult", value.value)
+                this.showCaseFilingResultPicker = false
+            },
+
+            // 确定立案类型
+            onCaseFilingTypeConfirm(value) {
+                this.$set(this.formData, "caseFilingTypeName", value.text)
+                this.$set(this.formData, "caseFilingType", value.value)
+                this.showCaseFilingTypePicker = false
+            },
+
+            onApproval(row) {
+                this.showApprovalForm = true
+                this.$refs.proposalInfoRef.onOpen(row)
+                this.formData = {
+                    proposalId: row.id,
+                    caseFilingResult: null,
+                    caseFilingType: null,
+                    opinion: null
+                }
+            },
+
+            async doSubmit() {
+                try {
+                    await this.$refs.formRef.validate();
+                    this.$dialog.confirm({
+                        title: '提示',
+                        message: "您确定要提交吗？",
+                    }).then(() => {
+                        this.$axios.post('/platform/proposal/commissioner/doApproval', this.formData).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>
+<!--#
+}
+#-->
@@ -17,7 +17,7 @@ const PROPOSAL_INVITE_SECONDER_COMPONENT = {
                        <van-cell
                              v-for="(item, index) in tableData"
                              clickable
-                              :key="pageForm.isInvite +':'+ item.loginName"
+                              :key="item.loginName"
                              @click="tableRowToggle(index)"
                            >
                                <span slot="title">
@@ -29,7 +29,7 @@ const PROPOSAL_INVITE_SECONDER_COMPONENT = {
                                </span>
                              <van-checkbox 
                                    :name="item" 
-                                    ref="checkboxes" 
+                                    :ref="'checkboxes'+item.loginName" 
                                    slot="right-icon"
                                    v-if="!pageForm.isInvite"></van-checkbox>
                            </van-cell>  
@@ -82,8 +82,10 @@ const PROPOSAL_INVITE_SECONDER_COMPONENT = {
                return
            }

-            const loginNames = this.tableSelection.map((s) => s.loginName)
-            const userName = this.tableSelection.map((s) => s.userName)
+            const loginNames = [...new Set(this.tableSelection.map((s) => s.loginName))]
+            const userName = [...new Set(this.tableSelection.map((s) => s.userName))]
+
+            console.log(this.tableSelection)

            this.$dialog.confirm({
                title: '提示',
@@ -115,10 +117,23 @@ const PROPOSAL_INVITE_SECONDER_COMPONENT = {
                    if (res.code === 0) {
                        this.tableData = res.data.list
                        this.pageForm.totalCount = res.data.totalCount
+                        this.echoCheckBox()
                    }
                })
        },

+        // 翻页回显勾选
+        echoCheckBox() {
+            this.$nextTick(() => {
+                this.tableData.forEach((item) => {
+                    const checkboxRef = this.$refs['checkboxes' + item.loginName]
+                    if (checkboxRef && this.tableSelection.map((s) => s.loginName).includes(item.loginName)) {
+                        checkboxRef[0].toggle()
+                    }
+                })
+            })
+        },
+
        doSearch() {
            this.pageForm.pageNumber = 1
            this.pageData()
@@ -32,7 +32,8 @@ layout("/layouts/platform_h5.html"){
            <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.underTakeName}}（{{row.underTakeIsMaster ? '主办' : '协办'}}）
+            </table-column>
            <table-column label="当前节点">{{row.curTaskName}}</table-column>
        </template>
        <template #actions="{index,row}">
@@ -48,6 +49,13 @@ layout("/layouts/platform_h5.html"){
                <i class="fa fa-reply"></i>
                <span>撤回</span>
            </div>
+
+            <!--承办单位领导、超级管理员才能转办-->
+            <div class="action-btn" v-if="!pageForm.approval && $auth.hasRoleOr('SYSADMIN,PROPOSAL_UNIT_LEADER')"
+                 @click="openTransfer(row)">
+                <i class="fa fa-arrow-right"></i>
+                <span>转办</span>
+            </div>
        </template>
    </table-list>

@@ -55,7 +63,7 @@ layout("/layouts/platform_h5.html"){
        <div v-if="showApprovalForm">
            <div class="process-title">{{formData.taskName}}</div>
            <van-form ref="formRef">
-                <van-field :value="formData.taskUnitName"
+                <van-field :value="formData.underTakeName"
                           label="承办单位"
                           readonly></van-field>

@@ -90,7 +98,7 @@ layout("/layouts/platform_h5.html"){
                ></van-field>

                <van-field
-                        v-if="supportCandidate && formData.taskIsMaster"
+                        v-if="supportCandidate && formData.underTakeIsMaster"
                        v-model="formData.tf_nextNodeOperatorName"
                        name="tf_nextNodeOperatorName"
                        label="校领导"
@@ -117,9 +125,11 @@ layout("/layouts/platform_h5.html"){
        </div>
    </proposal-info>

+    <transfer ref="transferRef"></transfer>
 </div>
 <script>
    <!--#include("../../common/info.js"){}#-->
+    <!--#include("transfer.js"){}#-->

    const vue = new Vue({
        el: "#app",
@@ -145,12 +155,13 @@ layout("/layouts/platform_h5.html"){

                supportCandidate: false,
                candidates: [],
-                showCandidatesPicker: false
+                showCandidatesPicker: false,

            }
        },
        components: {
-            "proposal-info": PROPOSAL_INFO
+            "proposal-info": PROPOSAL_INFO,
+            "transfer": transfer
        },
        methods: {
            onReady() {
@@ -187,6 +198,7 @@ layout("/layouts/platform_h5.html"){
                    processTaskId: row.taskId,
                    taskKey: row.taskKey,
                    taskName: row.taskName,
+                    proposalId: row.id,
                    underTakeName: row.underTakeName,
                    underTakeIsMaster: row.underTakeIsMaster
                }
@@ -243,7 +255,7 @@ layout("/layouts/platform_h5.html"){
                }
            },

-            onRevoke(row){
+            onRevoke(row) {
                this.$dialog.confirm({
                    title: "提示",
                    message: "您确定要撤回吗？"
@@ -257,6 +269,11 @@ layout("/layouts/platform_h5.html"){
                })
            },

+            // 打开转办
+            openTransfer(row){
+                this.$refs.transferRef.openTransfer(row)
+            },
+
            doSearch() {
                this.$nextTick(() => {
                    this.pageForm.pageNumber = 1
@@ -0,0 +1,147 @@
+const transfer = {
+    template: /*language=HTML*/ `
+        <van-action-sheet v-model="showTransferDialog" title="提案转办">
+            <div class="transfer-dialog">
+                <!-- 提案信息 -->
+                <div class="proposal-info-card">
+                    <div class="info-item"><label>提案编号：</label><span>{{transferForm.code}}</span></div>
+                    <div class="info-item"><label>提案名称：</label><span>{{transferForm.name}}</span></div>
+                    <div class="info-item"><label>代表团：</label><span>{{transferForm.delegationName}}</span></div>
+                </div>
+
+                <!-- 用户选择 -->
+                <van-field v-model="searchKeyword" label="转交给" placeholder="搜索用户" required readonly @click="showUserList=true"></van-field>
+                <van-popup v-model="showUserList" position="bottom">
+                    <van-search v-model="keyword" placeholder="搜索用户" @search="selectTransferUser(keyword)" @cancel="showUserList=false"></van-search>
+                    <van-empty v-if="transferUserOptions.length === 0" class="empty-tip">请搜索需要转办的用户</van-empty>
+                    <van-cell v-for="item in transferUserOptions" :key="item.id" :title="item.username" @click="selectUser(item)"></van-cell>
+                </van-popup>
+
+                <!-- 底部按钮 -->
+                <div class="button-group">
+                    <van-button block plain @click="showTransferDialog = false" class="cancel-btn">取消</van-button>
+                    <van-button block type="info" @click="handleTransfer" class="submit-btn">提交</van-button>
+                </div>
+            </div>
+        </van-action-sheet>
+    `,
+    data() {
+        return {
+            showTransferDialog: false,
+            transferForm: {},
+            transferUserOptions: [],
+            searchKeyword: '',
+            showUserList: false,
+            keyword: ''
+        }
+    },
+    methods: {
+        openTransfer(row) {
+            this.showTransferDialog = true
+            this.transferForm = { taskId: row.taskId, name: row.name, code: row.code, delegationName: row.delegationName }
+            this.searchKeyword = ''
+        },
+        selectUser(item) {
+            this.transferForm.userId = item.id
+            this.searchKeyword = item.username
+            this.showUserList = false
+        },
+        selectTransferUser(keyword) {
+            this.$axios.post("/platform/proposal/unitReply/selectViceUser", {keyword}).then(res => {
+                if (res.code === 0) this.transferUserOptions = res.data
+            })
+        },
+
+        // 转办
+        handleTransfer() {
+            if (!this.transferForm.userId) {
+                this.$toast('请选择转交用户')
+                return
+            }
+
+            const transferUserName = this.transferUserOptions.find(item => item.id === this.transferForm.userId)?.username
+            const name = this.transferForm.name
+
+            this.$dialog.confirm({
+                title: '提示',
+                message: `您确定要将` + name + `提案转交给` + transferUserName + `办理吗？`,
+                confirmButtonText: '确定',
+                cancelButtonText: '取消'
+            }).then(() => {
+                this.$axios.post('/platform/proposal/unitReply/transfer', this.transferForm).then(res => {
+                    if (res.code === 0) {
+                        this.$toast.success(res.msg)
+                        this.showTransferDialog = false
+                        this.doSearch()
+                    }
+                })
+            }).catch(() => {
+                // 取消操作
+            })
+        }
+    },
+    style: /*language=CSS*/ `
+        .transfer-dialog {
+            height: 100%;
+            background: #fff;
+            padding: 16px 16px 65px;
+        }
+
+        .proposal-info-card {
+            background: #f8f9fa;
+            border-radius: 8px;
+            padding: 16px;
+            margin-bottom: 16px;
+        }
+
+        .proposal-info-content {
+            display: flex;
+            flex-direction: column;
+            gap: 12px;
+        }
+
+        .info-item {
+            display: flex;
+            flex-direction: column;
+            gap: 4px;
+        }
+
+        .info-item label {
+            font-size: 12px;
+            color: #969799;
+        }
+
+        .info-item span {
+            font-size: 14px;
+            color: #323233;
+            font-weight: 500;
+        }
+
+        .button-group {
+            position: fixed;
+            bottom: 0;
+            left: 0;
+            right: 0;
+            padding: 16px;
+            background: #fff;
+            border-top: 1px solid #ebedf0;
+            z-index: 10;
+            display: flex;
+            justify-content: space-between;
+            column-gap: 10px;
+            padding: 10px
+        }
+
+        .cancel-btn,
+        .submit-btn {
+
+        }
+
+        .empty-tip {
+            text-align: center;
+            padding: 50px 16px;
+            color: #969799;
+            font-size: 14px;
+        }
+    `
+}
@@ -16,14 +16,14 @@ layout("/layouts/platform_h5.html"){
            <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-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/delegation/pageData" :page_form.sync="pageForm" @ready="onReady"
+    <table-list api="/platform/proposal/vice/delegation/pageData" :page_form.sync="pageForm" @ready="onReady"
                ref="tableListRef"
                title="name">
        <template v-slot="{index,row}">