commit

src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/service/TeacherCongressDelegatePushServiceImpl.java

@@ -195,6 +195,7 @@ public class TeacherCongressDelegatePushServiceImpl extends BaseServiceImpl<Teac
 //        cnd.andEX("info.schoolLeader", "!=", 1);
         SqlExpressionGroup group = new SqlExpressionGroup();
         group.or("t.taskName", "=", "c9227a2f-7b73-4549-b1f7-aa4779b31378");
+        group.or("t.taskName", "=", "900217e4-4332-4a21-90dd-363b8be17801");
         group.or("t.taskName", "is", null);
         cnd.and(group);
         cnd.and("ins.state", "!=", ProcessInstanceStateEnum.REJECT.getCode());

src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/dwSjAudit.html

@@ -100,12 +100,12 @@ layout("/layouts/platform.html"){
                         <span v-else>否</span>
                     </template>
                 </el-table-column>
-                <!--                <el-table-column label="工代会代表" prop="isGdh">-->
-                <!--                    <template v-slot="{row}">-->
-                <!--                        <span v-if="row.isGdh" style="color:#0037ff;">是</span>-->
-                <!--                        <span v-else>否</span>-->
-                <!--                    </template>-->
-                <!--                </el-table-column>-->
+                <el-table-column label="工代会代表" prop="isGdh">
+                    <template v-slot="{row}">
+                        <span v-if="row.isGdh" style="color:#0037ff;">是</span>
+                        <span v-else>否</span>
+                    </template>
+                </el-table-column>
                 <el-table-column label="代表类型" prop="representativeType"></el-table-column>
                 <el-table-column prop="curTaskName" label="当前节点"></el-table-column>
                 <el-table-column prop="instanceState" label="流程状态">

src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html

@@ -188,7 +188,9 @@ layout("/layouts/platform.html"){
                             <el-button
                                     v-else-if="row.taskKey === 'startTask'
                                 || row.taskKey==='53ff0c2a-ba93-45e9-a9fd-db51cdab3080'
-                                || row.taskKey==='0cacd1e7-7bb2-47dd-818b-6a73062e0c62' || !row.instanceId"
+                                || row.taskKey==='0cacd1e7-7bb2-47dd-818b-6a73062e0c62'
+                                || !row.instanceId
+                                || row.instanceState===45"
                                     @click="onDelete(row.id)"
                                     size="mini" type="danger">删除
                             </el-button>
@@ -262,7 +264,7 @@ layout("/layouts/platform.html"){
         },
         methods: {
             doPushFormal() {
-                if (this.tableData.length >= this.maxPush) {
+                if (this.pageForm.totalCount >= this.maxPush) {
                     this.$message.warning("当前正式代表已超过最大推选人员数，如需调整请在表格数据列中选中【删除】按钮")
                     return
                 }
@@ -276,7 +278,7 @@ layout("/layouts/platform.html"){
 	            await this.pageData()
                 const fullName = this.sessionOptions.find(v => v.id === this.pageForm.sessionId)?.fullName;
                 await this.$refs.pushProgressRef.refreshData(this.pageForm.sessionId, fullName, this.pageForm.unionId)
-	            this.formalPush = this.maxPush - this.tableData.length
+	            this.formalPush = this.maxPush - this.pageForm.totalCount
             },
             onView(row) {
                 this.$refs.guava.view(() => {
@@ -326,7 +328,7 @@ layout("/layouts/platform.html"){
                     if (resp.code === 0) {
                         this.tableData = resp.data.list
                         this.pageForm.totalCount = resp.data.totalCount
-                       
+
                     }
                 } catch (e) {
                     console.log(e)