From 821bf08141781f03e5efb85410231b626d506343 Mon Sep 17 00:00:00 2001
From: zhouhefeng <zhouhefeng915@163.com>
Date: Thu, 16 Apr 2026 14:22:47 +0800
Subject: [PATCH] commit

---
 .../zhgh/democratic/proposal/common/info.js   | 28 ++++++++++++++-----
 .../proposal/transact/delegation/index.html   |  4 +++
 .../proposal/transact/write/index.html        |  8 +++---
 .../zhghh5/democratic/proposal/common/info.js | 22 +++++++++++----
 .../proposal/transact/delegation/index.html   | 14 +++++++++-
 .../proposal/transact/seconded/index.html     |  7 ++++-
 .../proposal/transact/write/index.html        | 10 ++++++-
 7 files changed, 73 insertions(+), 20 deletions(-)

diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/common/info.js b/src/main/resources/views/platform/zhgh/democratic/proposal/common/info.js
index 6b5a56b..0c00f3a 100644
--- a/src/main/resources/views/platform/zhgh/democratic/proposal/common/info.js
+++ b/src/main/resources/views/platform/zhgh/democratic/proposal/common/info.js
@@ -41,13 +41,14 @@ const PROPOSAL_INFO = {
                 <el-descriptions-item label="附件" :span="3">
                     <file-preview :files="viewData.files" complete_result></file-preview>
                 </el-descriptions-item>
-                <!--                <el-descriptions-item label="签字" :span="3">-->
-                <!--                    <el-image :src="viewData.signature" class="signature-image">-->
-                <!--                         <div slot="error" class="image-slot">-->
-                <!--                            <i class="el-icon-picture-outline"></i>-->
-                <!--                         </div>-->
-                <!--                    </el-image>-->
-                <!--                </el-descriptions-item>-->
+                <el-descriptions-item label="签字" :span="3">
+                    <el-image :src="viewData.signature" class="signature-image" v-if="viewData.signature">
+                        <div slot="error" class="image-slot">
+                            <i class="el-icon-picture-outline"></i>
+                        </div>
+                    </el-image>
+                    <span v-else>暂无签字</span>
+                </el-descriptions-item>
             </el-descriptions>
 
             <!--并案信息-->
@@ -222,6 +223,13 @@ const PROPOSAL_INFO = {
                         <el-descriptions-item label="办理意见" :span="3" v-if="!task.ext.isFirstTaskNode">
                             <div v-html="task.taskFormData.tf_opinion"></div>
                         </el-descriptions-item>
+                        <el-descriptions-item label="签字" :span="3" v-if="task.taskFormData.tf_signature">
+                            <el-image :src="task.taskFormData.tf_signature" class="signature-image">
+                                <div slot="error" class="image-slot">
+                                    <i class="el-icon-picture-outline"></i>
+                                </div>
+                            </el-image>
+                        </el-descriptions-item>
                     </el-descriptions>
                 </div>
             </template>
@@ -287,5 +295,11 @@ const PROPOSAL_INFO = {
             .proposal-info .el-descriptions__body .el-descriptions__table .el-descriptions-item__cell {
 
             }
+
+            .proposal-info .signature-image {
+                max-width: 100%;
+                height: 120px;
+                width: auto;
+            }
         `
 }
diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/delegation/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/delegation/index.html
index 367a609..78a79b1 100644
--- a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/delegation/index.html
+++ b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/delegation/index.html
@@ -79,6 +79,10 @@ layout("/layouts/platform.html"){
                                       :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
                             <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
                         </el-form-item>
+                        <el-form-item label="电子签名" prop="tf_signature"
+                                      :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                            <pc-signature v-model="formData.tf_signature"></pc-signature>
+                        </el-form-item>
                     </el-form>
                     <el-row type="flex" justify="end">
                         <el-button @click="$refs.guava.index()" size="small">取消</el-button>
diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/write/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/write/index.html
index 528bbff..15d48fe 100644
--- a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/write/index.html
+++ b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/write/index.html
@@ -149,9 +149,9 @@ layout("/layouts/platform.html"){
                         ></file-upload>
                     </el-form-item>
 
-                    <!--                    <el-form-item label="电子签名" prop="signature">-->
-                    <!--                        <pc-signature v-model="formData.signature"></pc-signature>-->
-                    <!--                    </el-form-item>-->
+                    <el-form-item label="电子签名" prop="signature">
+                        <pc-signature v-model="formData.signature"></pc-signature>
+                    </el-form-item>
                 </el-form>
                 <template slot="footer">
                     <el-row v-if="isWriteTime">
@@ -206,7 +206,7 @@ layout("/layouts/platform.html"){
                     measures: [{required: true, message: "请填写", trigger: ["blur", "change"]}],
                     unitName: [{required: true, message: "请填写", trigger: ["blur", "change"]}],
                     mobile: [{required: true, message: "请填写", trigger: ["blur", "change"]}],
-                    signature: [{required: false, message: "请扫描二维码进行签字", trigger: ["blur", "change"]}]
+                    signature: [{required: true, message: "请扫描二维码进行签字", trigger: ["blur", "change"]}]
                 },
                 proposalConfig: {},
                 noticeDialogVisible: false,
diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/common/info.js b/src/main/resources/views/platform/zhghh5/democratic/proposal/common/info.js
index bac6286..c972167 100644
--- a/src/main/resources/views/platform/zhghh5/democratic/proposal/common/info.js
+++ b/src/main/resources/views/platform/zhghh5/democratic/proposal/common/info.js
@@ -39,12 +39,15 @@ const PROPOSAL_INFO = {
                     <van-cell title="附件" class="direction-column-cell">
                         <file-preview :files="viewData.files" complete_result></file-preview>
                     </van-cell>
-                    <!--                <van-cell title="签字">-->
-                    <!--                    <div slot="label">-->
-                    <!--                        <van-image :src="viewData.signature"-->
-                    <!--                                   style="width: 100%;height: 150px;border: 1px dashed"></van-image>-->
-                    <!--                    </div>-->
-                    <!--                </van-cell>-->
+                    <van-cell title="签字" class="direction-column-cell">
+                        <div slot="label">
+                            <van-image :src="viewData.signature"
+                                       v-if="viewData.signature"
+                                       style="width: 100%;height: 150px;border: 1px dashed"
+                                       class="signature-image"></van-image>
+                            <span v-else>暂无签字</span>
+                        </div>
+                    </van-cell>
                 </van-cell-group>
 
                 <!--并案信息-->
@@ -186,6 +189,13 @@ const PROPOSAL_INFO = {
                         <van-cell title="办理意见" v-if="!task.ext.isFirstTaskNode" class="direction-column-cell">
                             <div v-html="task.taskFormData.tf_opinion"></div>
                         </van-cell>
+                        <van-cell title="签字" v-if="task.taskFormData.tf_signature" class="direction-column-cell">
+                            <div slot="label">
+                                <van-image :src="task.taskFormData.tf_signature"
+                                           style="width: 100%;height: 150px;border: 1px dashed"
+                                           class="signature-image"></van-image>
+                            </div>
+                        </van-cell>
                     </van-cell-group>
                 </template>
             </div>
diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/delegation/index.html b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/delegation/index.html
index b3475db..c76a26a 100644
--- a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/delegation/index.html
+++ b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/delegation/index.html
@@ -63,6 +63,11 @@ layout("/layouts/platform_h5.html"){
                         maxlength="100"
                         show-word-limit
                 ></van-field>
+                <van-field label="签字" name="tf_signature" v-model="formData.tf_signature" required
+                           class="direction-column-field"
+                           :rules="[{ required: true, message: '请签字' }]">
+                    <h5-signature v-model="formData.tf_signature" slot="input"></h5-signature>
+                </van-field>
             </van-form>
             <div style="display: flex; justify-content: space-between; column-gap: 10px; padding: 10px">
                 <van-button type="danger" block @click="handleTaskAction(6)">退回</van-button>
@@ -130,13 +135,20 @@ layout("/layouts/platform_h5.html"){
                 this.$refs.proposalInfoRef.onOpen(row)
                 this.formData = {
                     processTaskId: row.taskId,
-                    taskName: row.curTaskName
+                    taskName: row.curTaskName,
+                    tf_opinion: "",
+                    tf_signature: ""
                 }
             },
 
             async handleTaskAction(val) {
                 try {
+                    if (!this.formData.tf_signature) {
+                        this.$toast("请签字")
+                        return
+                    }
                     await this.$refs.formRef.validate();
+
                     this.$dialog.confirm({
                         title: "提示",
                         message: "您确定要提交吗？"
diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/seconded/index.html b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/seconded/index.html
index c145d4f..3ef6407 100644
--- a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/seconded/index.html
+++ b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/seconded/index.html
@@ -137,12 +137,17 @@ layout("/layouts/platform_h5.html"){
                 this.formData = {
                     processTaskId: row.taskId,
                     taskName: row.curTaskName,
-                    tf_opinion: "同意该提案"
+                    tf_opinion: "同意该提案",
+                    tf_signature: ""
                 }
             },
 
             async handleTaskAction(val) {
                 try {
+                    if (!this.formData.tf_signature) {
+                        this.$toast("请签字")
+                        return
+                    }
                     await this.$refs.formRef.validate();
                     this.$dialog.confirm({
                         title: "提示",
diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/write/index.html b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/write/index.html
index d1f3336..e062eaa 100644
--- a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/write/index.html
+++ b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/write/index.html
@@ -335,6 +335,13 @@ layout("/layouts/platform_h5.html"){
                 </van-field>
             </van-cell-group>
 
+            <van-cell-group title="电子签名" class="form-group">
+                <van-field v-model="formData.signature" label="签字" name="signature" class="direction-column-field"
+                           :rules="[{ required: true, message: '请签字' }]">
+                    <h5-signature v-model="formData.signature" slot="input"></h5-signature>
+                </van-field>
+            </van-cell-group>
+
             <!-- 按钮区域 -->
             <div class="form-actions" v-if="isWriteTime">
                 <van-button plain type="info" @click="onSave">保存</van-button>
@@ -363,7 +370,8 @@ layout("/layouts/platform_h5.html"){
                 taskId: GetQueryString("taskId"),
 
                 formData: {
-                    suggestUnits: []
+                    suggestUnits: [],
+                    signature: ""
                 },
                 sessionOptions: [],
                 sourceOptions: [],