c-zhouhf1/zhgh_ncu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

..

Browse Source
This commit is contained in:
那些花儿
2025-09-25 13:42:37 +08:00
parent 37e23100e1
commit 271b5837c8
78 changed files with 2197 additions and 1164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/platform/zhghh5/democratic/proposal/common/info.js
+17 -5
View File
@@ -20,6 +20,9 @@ const PROPOSAL_INFO = {
<van-cell title="提案类别">
{{viewData.typeName}}
</van-cell>
<van-cell title="建议承办单位">
{{viewData.suggestUnits}}
</van-cell>
<van-cell title="立案结果">
<dict-tag :options="dict.type.PROPOSAL_CASE_FILING_RESULT"
:value="viewData.caseFilingResult"></dict-tag>
@@ -57,11 +60,11 @@ const PROPOSAL_INFO = {
<!--邀请附议人-->
<van-cell-group :title="task.displayName"
v-else-if="task.taskName === '85b7b9bd-d706-48cb-99a1-ef1370fb1819'">
v-else-if="task.taskName === 'invite'">
<van-cell title="办理用户">{{ task.taskFormData.userName }}({{task.taskFormData.loginName}})
</van-cell>
<van-cell title="办理时间">{{ task.finishTime }}</van-cell>
<van-cell title="附议人" v-if="task.taskName === '85b7b9bd-d706-48cb-99a1-ef1370fb1819'"
<van-cell title="附议人" v-if="task.taskName === 'invite'"
class="direction-column-cell">
<el-table :data="task?.taskFormData?.seconder">
<el-table-column label="姓名" prop="userName"></el-table-column>
@@ -100,7 +103,7 @@ const PROPOSAL_INFO = {
<!--提案委员会立案-->
<van-cell-group :title="task.displayName"
v-else-if="task.taskName === '9846ab38-40c5-4093-bafc-a9b3b443338b'">
v-else-if="task.taskName === 'committee'">
<van-cell title="办理用户">{{ task.taskFormData.userName }}({{task.taskFormData.loginName}})
</van-cell>
<van-cell title="办理时间">{{ task.finishTime }}</van-cell>
@@ -113,10 +116,19 @@ const PROPOSAL_INFO = {
</van-cell-group>
<van-cell-group :title="task.displayName" v-else>
<van-cell title="办理单位" v-if="['master_reply','slave_reply'].includes(task.taskName)">
{{task.ext.underTakeName}}
</van-cell>
<van-cell title="办理用户">{{ task.taskFormData.userName }}({{task.taskFormData.loginName}})
</van-cell>
<van-cell title="办理时间">{{ task.finishTime }}</van-cell>
<van-cell title="办理结果">
<van-cell title="办理评价" v-if="['feedback'].includes(task.taskName)">
<dict-tag :options="dict.type.PROPOSAL_FEEDBACK"
:value="task.ext.tf_feedback"></dict-tag>
</van-cell>
<van-cell title="办理结果" v-else>
<dict-tag :options="dict.type.PROPOSAL_CASE_FILING_RESULT"
:value="task.ext.caseFilingResult"></dict-tag>
</van-cell>
@@ -130,7 +142,7 @@ const PROPOSAL_INFO = {
<slot></slot>
</van-action-sheet>
`,
dicts: ["PROPOSAL_TYPE", "PROPOSAL_CASE_FILING_RESULT","PROCESS_TASK_SUBMIT_TYPE"],
dicts: ["PROPOSAL_TYPE", "PROPOSAL_CASE_FILING_RESULT", "PROPOSAL_CASE_FILING_TYPE", "PROCESS_TASK_SUBMIT_TYPE", "PROPOSAL_FEEDBACK"],
data() {
return {
visible:false,
src/main/resources/views/platform/zhghh5/democratic/proposal/transact/mine/index.html
+1 -1
View File
@@ -38,7 +38,7 @@ layout("/layouts/platform_h5.html"){
<span>编辑</span>
</div>
<div class="action-btn"
v-if="row.taskKey === '85b7b9bd-d706-48cb-99a1-ef1370fb1819' || row.taskKey === '74458b33-ad6e-46c4-b8d9-1aa897142b25'"
v-if="row.taskKey === 'invite' || row.taskKey === 'second'"
@click="onInvite(row)">
<i class="fa fa-user-plus"></i>
<span>邀请附议人</span>
src/main/resources/views/platform/zhghh5/democratic/proposal/transact/seconded/index.html
+6 -5
View File
@@ -42,10 +42,10 @@ layout("/layouts/platform_h5.html"){
<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>
<!-- <div class="action-btn delete" v-if="row.canRevoke" @click="onRevoke(row)">-->
<!-- <i class="fa fa-reply"></i>-->
<!-- <span>撤回</span>-->
<!-- </div>-->
</template>
</table-list>
@@ -135,7 +135,8 @@ layout("/layouts/platform_h5.html"){
this.$refs.proposalInfoRef.onOpen(row)
this.formData = {
processTaskId: row.taskId,
taskName: row.curTaskName
taskName: row.curTaskName,
tf_opinion: "同意该提案"
}
},
src/main/resources/views/platform/zhghh5/democratic/proposal/transact/unitReply/index.html
+4 -3
View File
@@ -187,8 +187,8 @@ layout("/layouts/platform_h5.html"){
processTaskId: row.taskId,
taskKey: row.taskKey,
taskName: row.taskName,
taskUnitName: row.taskUnitName,
taskIsMaster: row.taskIsMaster
underTakeName: row.underTakeName,
underTakeIsMaster: row.underTakeIsMaster
}
},
@@ -209,7 +209,6 @@ layout("/layouts/platform_h5.html"){
},
onCandidatesConfirm(value) {
debugger
this.$set(this.formData, "tf_nextNodeOperatorName", value.text)
this.$set(this.formData, "tf_nextNodeOperator", value.value)
this.showCandidatesPicker = false
@@ -222,6 +221,8 @@ layout("/layouts/platform_h5.html"){
title: "提示",
message: "您确定要提交吗？"
}).then(() => {
delete this.formData.underTakeIsMaster
delete this.formData.underTakeName
this.$axios.post("/flow/common/executeTask", {
data: JSON.stringify({
...this.formData,