This commit is contained in:
=
2026-07-08 17:09:39 +08:00
parent f76041c608
commit 4d9f22096b
147 changed files with 448 additions and 405 deletions
@@ -146,9 +146,9 @@
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="签字" :span="2">
<el-descriptions-item v-if="false" label="签字" :span="2">
<el-form-item prop="sign">
<pc-signature v-model="formData.sign"></pc-signature>
<pc-signature v-if="false" v-model="formData.sign"></pc-signature>
</el-form-item>
</el-descriptions-item>
</el-descriptions>
@@ -177,7 +177,7 @@
budgets: [{required: true, message: '必填', trigger: ['blur', 'change']}],
clubId: [{required: true, message: '必填', trigger: ['blur', 'change']}],
mobile: [{required: true, message: '必填', trigger: ['blur', 'change']}],
sign: [{required: true, message: '必填', trigger: ['blur', 'change']}],
sign: [{required: false, message: '必填', trigger: ['blur', 'change']}],
},
activityDeclareReimbursementList: [],
@@ -180,9 +180,9 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="签字" :span="2">
<el-descriptions-item v-if="false" label="签字" :span="2">
<el-form-item prop="sign">
<pc-signature v-model="formData.sign"></pc-signature>
<pc-signature v-if="false" v-model="formData.sign"></pc-signature>
</el-form-item>
</el-descriptions-item>
</el-descriptions>
@@ -218,7 +218,7 @@ layout("/layouts/platform.html"){
budgets: [{required: true, message: '必填', trigger: ['blur', 'change']}],
clubId: [{required: true, message: '必填', trigger: ['blur', 'change']}],
mobile: [{required: true, message: '必填', trigger: ['blur', 'change']}],
// sign: [{required: true, message: '必填', trigger: ['blur', 'change']}],
// sign: [{required: false, message: '必填', trigger: ['blur', 'change']}],
deductionBudgetId: [{required: true, message: '必填', trigger: ['blur', 'change']}],
},
activityDeclareReimbursementList: [],
@@ -31,7 +31,7 @@
<span v-else>暂无</span>
</el-descriptions-item>
<el-descriptions-item label="签字" :span="2">
<el-descriptions-item label="签字" :span="2" v-if="false">
<el-image v-if="viewData.sign"
:src="viewData.sign"
class="signature-image"></el-image>
@@ -43,7 +43,7 @@ const INFO = {
<span v-else>暂无</span>
</el-descriptions-item>
<el-descriptions-item label="签字" :span="2">
<el-descriptions-item label="签字" :span="2" v-if="false">
<el-image v-if="viewData.sign"
:src="viewData.sign"
class="signature-image"></el-image>
@@ -152,9 +152,9 @@
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="签字" :span="2">
<el-descriptions-item v-if="false" label="签字" :span="2">
<el-form-item prop="sign">
<pc-signature v-model="formData.sign"></pc-signature>
<pc-signature v-if="false" v-model="formData.sign"></pc-signature>
</el-form-item>
</el-descriptions-item>
</el-descriptions>
@@ -275,9 +275,9 @@ layout("/layouts/platform.html"){
</el-descriptions-item>
</template>
<el-descriptions-item label="签字" :span="2">
<el-form-item prop="sign" label="签字">
<pc-signature v-model="formData.sign"></pc-signature>
<el-descriptions-item v-if="false" label="签字" :span="2">
<el-form-item prop="sign" label="签字" v-if="false">
<pc-signature v-if="false" v-model="formData.sign"></pc-signature>
</el-form-item>
</el-descriptions-item>
</el-descriptions>
@@ -324,7 +324,7 @@ layout("/layouts/platform.html"){
},
formRules: {
id: [{required: true, message: "必填", trigger: ['change', 'blur']}],
sign: [{required: true, message: "必填", trigger: ['change', 'blur']}]
sign: [{required: false, message: "必填", trigger: ['change', 'blur']}]
},
activityOptions: [],
@@ -53,7 +53,7 @@
<span v-else>暂无</span>
</el-descriptions-item>
<el-descriptions-item label="签字" :span="2">
<el-descriptions-item label="签字" :span="2" v-if="false">
<el-image v-if="viewData.sign"
:src="viewData.sign"
class="signature-image"></el-image>
@@ -120,9 +120,9 @@ 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_userSign"
<el-form-item v-if="false" label="电子签名" prop="tf_userSign"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.tf_userSign"></pc-signature>
<pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
@@ -111,9 +111,9 @@ 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_userSign"
<el-form-item v-if="false" label="电子签名" prop="tf_userSign"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.tf_userSign"></pc-signature>
<pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
@@ -85,7 +85,7 @@ const INFO = {
</el-descriptions-item>
</template>
<el-descriptions-item label="签字" :span="2">
<el-descriptions-item v-if="false" label="签字" :span="2">
<el-image v-if="viewData.sign"
:src="viewData.sign"
class="signature-image"></el-image>
@@ -120,7 +120,7 @@ const INFO = {
<el-descriptions-item label="办理意见" :span="3" v-if="!task.ext.isFirstTaskNode">{{
task.taskFormData.opinion }}
</el-descriptions-item>
<el-descriptions-item label="签字" :span="3">
<el-descriptions-item v-if="false" label="签字" :span="3">
<el-image v-if="task.ext.tf_userSign"
:src="task.ext.tf_userSign"
class="signature-image"></el-image>
@@ -124,9 +124,9 @@ 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_userSign"
<el-form-item v-if="false" label="电子签名" prop="tf_userSign"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.tf_userSign"></pc-signature>
<pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
@@ -124,9 +124,9 @@ 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_userSign"
<el-form-item v-if="false" label="电子签名" prop="tf_userSign"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.tf_userSign"></pc-signature>
<pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
@@ -125,9 +125,9 @@ 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_userSign"
<el-form-item v-if="false" label="电子签名" prop="tf_userSign"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.tf_userSign"></pc-signature>
<pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
@@ -123,9 +123,9 @@ 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_userSign"
<el-form-item v-if="false" label="电子签名" prop="tf_userSign"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.tf_userSign"></pc-signature>
<pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
@@ -124,7 +124,6 @@ layout("/layouts/platform.html"){
{ prop: "startChoiceTime", label: "选择开始时间" },
{ prop: "endChoiceTime", label: "选择结束时间" },
{ prop: "provideMode", label: "发放形式" },
{ prop: "signMode", label: "是否电子签字" }
]
}
},
@@ -38,7 +38,7 @@ let BENEFIT_PROJECT_FORM = {
</el-descriptions-item>
<el-descriptions-item label="是否电子签字" span="1.5">
<el-descriptions-item v-if="false" label="是否电子签字" span="1.5">
<el-form-item label="" prop="signMode">
<el-radio-group size="medium" v-model="formData.signMode">
<el-radio-button :key="item.code" :label="item.code"
@@ -284,7 +284,7 @@ let BENEFIT_PROJECT_FORM = {
},
async open() {
this.formData = {
signMode: "BENEFIT_SIGN_MODE_ONE",
signMode: "BENEFIT_SIGN_MODE_TWO",
provideMode: "BENEFIT_PROVIDE_MODE_ONE",
benefitGoodsIds: []
}
@@ -17,7 +17,7 @@ let BENEFIT_PROJECT_INFO = {
<el-descriptions-item label="选择时间" span="2">
{{viewData.startChoiceTime}}至{{viewData.endChoiceTime}}
</el-descriptions-item>
<el-descriptions-item label="是否电子签字" span="1.5">
<el-descriptions-item v-if="false" label="是否电子签字" span="1.5">
<dict-tag :options="dict.type.BENEFIT_SIGN_MODE"
:value="viewData.signMode"></dict-tag>
</el-descriptions-item>
@@ -70,7 +70,6 @@ layout("/layouts/platform.html"){
{ prop: "benefitName", label: "福利名称" },
{ prop: "startChoiceTime", label: "选择开始时间" },
{ prop: "endChoiceTime", label: "选择结束时间" },
{ prop: "signMode", label: "是否电子签字" },
{ prop: "provideMode", label: "发放形式" },
{ prop: "isChoice", label: "是否选择" }
]
@@ -25,7 +25,7 @@ let SELECTION_BENEFIT = {
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否电子签字">
<el-form-item v-if="false" label="是否电子签字">
<dict-tag :options="dict.type.BENEFIT_SIGN_MODE"
:value="viewData.signMode"></dict-tag>
</el-form-item>
@@ -99,11 +99,10 @@ let SELECTION_BENEFIT = {
</el-col>
</el-row>
<el-card v-if="viewData.provideMode==='BENEFIT_PROVIDE_MODE_ONE'
&&viewData.signMode==='BENEFIT_SIGN_MODE_ONE'">
<el-card v-if="false">
<el-row :gutter="20">
<el-col :span="24">
<pc-signature v-model="formData.userSign"></pc-signature>
<pc-signature v-if="false" v-model="formData.userSign"></pc-signature>
</el-col>
</el-row>
</el-card>
@@ -199,10 +198,10 @@ let SELECTION_BENEFIT = {
</el-row>
</el-card>
<el-card v-if="viewData.signMode==='BENEFIT_SIGN_MODE_ONE'">
<el-card v-if="false">
<el-row :gutter="20">
<el-col :span="24">
<pc-signature v-model="formData.userSign"></pc-signature>
<pc-signature v-if="false" v-model="formData.userSign"></pc-signature>
</el-col>
</el-row>
</el-card>
@@ -248,11 +247,7 @@ let SELECTION_BENEFIT = {
this.$forceUpdate()
},
submit() {
if (this.viewData.signMode === "BENEFIT_SIGN_MODE_ONE" && !this.formData.userSign) {
this.$message.warning("请签字后再提交!")
return
}
let flag = false
let flag = false
let msg = ""
this.formData.benefitGoodsList.some(b => {
if (b.goodsProvideMode === "GOODS_PROVIDE_MODE_POST" && !b.receiveAddress) {
@@ -346,11 +341,7 @@ let SELECTION_BENEFIT = {
this.addressOptions = resp.data
},
provideModeOneDoSubmit() {
if (!this.formData.userSign) {
this.$message.warning("请签字后再提交!")
return
}
this.$confirm("确定要提交吗?", "提示", {
this.$confirm("确定要提交吗?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
@@ -369,7 +360,7 @@ let SELECTION_BENEFIT = {
},
openSubmit() {
if (this.viewData.provideMode === "BENEFIT_PROVIDE_MODE_ONE"
&& this.viewData.signMode === "BENEFIT_SIGN_MODE_ONE") {
&& false) {
//如果是统一发放并且需要签字
this.provideModeOneDoSubmit()
return
@@ -113,7 +113,7 @@ layout("/layouts/platform.html"){
show-overflow-tooltip
v-if="pageFormProvideMode==='BENEFIT_PROVIDE_MODE_TWO'"
></el-table-column>
<el-table-column label="签字" prop="userSign" show-overflow-tooltip v-if="pageFormSignMode==='BENEFIT_SIGN_MODE_ONE'">
<el-table-column label="签字" prop="userSign" show-overflow-tooltip v-if="false">
<template slot-scope="{row}">
<el-image :src="row.userSign" fit="cover" style="height: 60px" v-if="row.userSign"></el-image>
<el-tag effect="dark" type="info" v-else>暂无</el-tag>
@@ -78,7 +78,6 @@ layout("/layouts/platform.html"){
{ prop: "benefitName", label: "福利名称" },
{ prop: "startChoiceTime", label: "选择开始时间" },
{ prop: "endChoiceTime", label: "选择结束时间" },
{ prop: "signMode", label: "是否电子签字" },
{ prop: "provideMode", label: "发放形式" },
{ prop: "giftName", label: "所选礼品" },
{ prop: "isChoice", label: "是否选择/签字" }
@@ -23,7 +23,7 @@ let SELECTION_BENEFIT_INFO = {
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否电子签字">
<el-form-item v-if="false" label="是否电子签字">
<dict-tag :options="dict.type.BENEFIT_SIGN_MODE"
:value="viewData.signMode"></dict-tag>
</el-form-item>
@@ -53,7 +53,7 @@ const clubUserJoin = {
<el-descriptions-item label="照片" :span="3">
<img :src="viewData.avatar" alt="" style="width: 120px;height: 150px" v-if="viewData.avatar">
</el-descriptions-item>
<el-descriptions-item label="签字" :span="3">
<el-descriptions-item label="签字" :span="3" v-if="false">
<el-image v-if="viewData.signature"
:src="viewData.signature"
class="signature-image"></el-image>
@@ -108,9 +108,9 @@ layout("/layouts/platform.html"){
></file-upload>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="电子签名" :span="3">
<el-form-item label="电子签名" prop="signature" :rules="[{required:false,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.signature"></pc-signature>
<el-descriptions-item label="电子签名" :span="3" v-if="false">
<el-form-item v-if="false" label="电子签名" prop="signature" :rules="[{required:false,message:'必填',trigger:['change','blur']}]">
<pc-signature v-if="false" v-model="formData.signature"></pc-signature>
</el-form-item>
</el-descriptions-item>
</el-descriptions>
@@ -4,8 +4,8 @@
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea>
</el-form-item>
<!-- <el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">-->
<!-- <pc-signature v-model="formData.approvalSignature"></pc-signature>-->
<!-- <el-form-item v-if="false" label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">-->
<!-- <pc-signature v-if="false" v-model="formData.approvalSignature"></pc-signature>-->
<!-- </el-form-item>-->
</el-form>
<snaker-flow-task-form-action @task-action="handleTaskAction"
@@ -51,7 +51,7 @@ const cadreTrainingInfo = {
<el-descriptions-item label="办理意见" :span="3" v-if="!task.ext.isFirstTaskNode">{{
task.taskFormData.opinion }}
</el-descriptions-item>
<el-descriptions-item label="签字" :span="3" v-if="!task.ext.isFirstTaskNode">
<el-descriptions-item label="签字" :span="3" v-if="false">
<el-image :src="task.ext.tf_userSign"
v-if="task.ext.tf_userSign"
class="signature-image"></el-image>
@@ -103,8 +103,8 @@ 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_userSign" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.tf_userSign"></pc-signature>
<el-form-item v-if="false" label="电子签名" prop="tf_userSign" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
@@ -82,7 +82,7 @@ const ENROLLMENT_REGISTRATION_INFO = {
task.taskFormData.opinion
}}
</el-descriptions-item>
<el-descriptions-item label="签字" v-if="!task.ext.isFirstTaskNode" :span="3">
<el-descriptions-item label="签字" v-if="false" :span="3">
<el-image :src="task.ext.tf_userSign" fit="cover" style="height: 60px"
v-if="task.ext.tf_userSign"></el-image>
</el-descriptions-item>
@@ -101,9 +101,9 @@ layout("/layouts/platform.html"){
</el-form-item>
<!--
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"-->
<el-form-item label="签字" prop="tf_userSign"
<el-form-item v-if="false" label="签字" prop="tf_userSign"
>
<pc-signature v-model="formData.tf_userSign"></pc-signature>
<pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
@@ -85,9 +85,9 @@ layout("/layouts/platform.html"){
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item>
<el-form-item label="签字" prop="tf_userSign"
<el-form-item v-if="false" label="签字" prop="tf_userSign"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.tf_userSign"></pc-signature>
<pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
@@ -76,9 +76,9 @@ layout("/layouts/platform.html"){
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item>
<!--:rules="[{required:true,message:'必填',trigger:['change','blur']}]"-->
<el-form-item label="签字" prop="tf_userSign"
<el-form-item v-if="false" label="签字" prop="tf_userSign"
>
<pc-signature v-model="formData.tf_userSign"></pc-signature>
<pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
@@ -68,7 +68,7 @@ const info = {
task.taskFormData.opinion
}}
</el-descriptions-item>
<el-descriptions-item label="签字" v-if="!task.ext.isFirstTaskNode" :span="3">
<el-descriptions-item label="签字" v-if="false" :span="3">
<el-image :src="task.ext.tf_userSign" fit="cover" style="height: 60px"
v-if="task.ext.tf_userSign"></el-image>
</el-descriptions-item>
@@ -84,9 +84,9 @@ layout("/layouts/platform.html"){
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item>
<!--:rules="[{required:true,message:'必填',trigger:['change','blur']}]"-->
<el-form-item label="签字" prop="tf_userSign"
<el-form-item v-if="false" label="签字" prop="tf_userSign"
>
<pc-signature v-model="formData.tf_userSign"></pc-signature>
<pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
@@ -114,10 +114,10 @@ layout("/layouts/platform.html"){
upload_result_category="array"></file-upload>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="签字" :span="2">
<el-descriptions-item v-if="false" label="签字" :span="2">
<!-- :rules="[{required:true,message:'必填',trigger:['change','blur']}]"-->
<el-form-item label="签字" prop="userSign">
<pc-signature v-model="formData.userSign"></pc-signature>
<el-form-item v-if="false" label="签字" prop="userSign">
<pc-signature v-if="false" v-model="formData.userSign"></pc-signature>
</el-form-item>
</el-descriptions-item>
</el-descriptions>
@@ -85,9 +85,9 @@ layout("/layouts/platform.html"){
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item>
<!--:rules="[{required:true,message:'必填',trigger:['change','blur']}]"-->
<el-form-item label="签字" prop="tf_userSign"
<el-form-item v-if="false" label="签字" prop="tf_userSign"
>
<pc-signature v-model="formData.tf_userSign"></pc-signature>
<pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
@@ -85,9 +85,9 @@ layout("/layouts/platform.html"){
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item>
<!--:rules="[{required:true,message:'必填',trigger:['change','blur']}]"-->
<el-form-item label="签字" prop="tf_userSign"
<el-form-item v-if="false" label="签字" prop="tf_userSign"
>
<pc-signature v-model="formData.tf_userSign"></pc-signature>
<pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
@@ -30,7 +30,7 @@ const OUTLAY_REIMBURSE_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-descriptions-item v-if="false" label="签字" :span="3">
<el-image :src="viewData.userSign" fit="cover" style="height: 60px"
v-if="viewData.userSign"></el-image>
</el-descriptions-item>
@@ -71,7 +71,7 @@ const OUTLAY_REIMBURSE_INFO = {
task.taskFormData.opinion
}}
</el-descriptions-item>
<el-descriptions-item label="签字" v-if="!task.ext.isFirstTaskNode" :span="3">
<el-descriptions-item label="签字" v-if="false" :span="3">
<el-image :src="task.ext.tf_userSign" fit="cover" style="height: 60px"
v-if="task.ext.tf_userSign"></el-image>
</el-descriptions-item>
@@ -99,9 +99,9 @@ layout("/layouts/platform.html"){
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item>
<!-- :rules="[{required:true,message:'必填',trigger:['change','blur']}]"-->
<el-form-item label="签字" prop="tf_userSign"
<el-form-item v-if="false" label="签字" prop="tf_userSign"
>
<pc-signature v-model="formData.tf_userSign"></pc-signature>
<pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
@@ -117,9 +117,9 @@ layout("/layouts/platform.html"){
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item>
<!-- :rules="[{required:true,message:'必填',trigger:['change','blur']}]"-->
<el-form-item label="签字" prop="tf_userSign"
<el-form-item v-if="false" label="签字" prop="tf_userSign"
>
<pc-signature v-model="formData.tf_userSign"></pc-signature>
<pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
@@ -117,9 +117,9 @@ layout("/layouts/platform.html"){
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item>
<!-- :rules="[{required:true,message:'必填',trigger:['change','blur']}]"-->
<el-form-item label="签字" prop="tf_userSign"
<el-form-item v-if="false" label="签字" prop="tf_userSign"
>
<pc-signature v-model="formData.tf_userSign"></pc-signature>
<pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
@@ -85,9 +85,9 @@ layout("/layouts/platform.html"){
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item>
<!--:rules="[{required:true,message:'必填',trigger:['change','blur']}]"-->
<el-form-item label="签字" prop="tf_userSign"
<el-form-item v-if="false" label="签字" prop="tf_userSign"
>
<pc-signature v-model="formData.tf_userSign"></pc-signature>
<pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
@@ -165,9 +165,9 @@ layout("/layouts/platform.html"){
></file-upload>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="签字" :span="2">
<el-form-item label="签字" prop="userSign">
<pc-signature v-model="formData.userSign"></pc-signature>
<el-descriptions-item v-if="false" label="签字" :span="2">
<el-form-item v-if="false" label="签字" prop="userSign">
<pc-signature v-if="false" v-model="formData.userSign"></pc-signature>
</el-form-item>
</el-descriptions-item>
</el-descriptions>
@@ -214,7 +214,7 @@ layout("/layouts/platform.html"){
money: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
mobile: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
files: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
userSign: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
userSign: [{ required: false, message: "必填", trigger: ["change", "blur"] }],
certifierUserId: [{ required: true, message: "必填", trigger: ["change", "blur"] }]
},
chooseType: {},
@@ -110,9 +110,9 @@ 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_userSign"
<el-form-item v-if="false" label="签字" prop="tf_userSign"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.tf_userSign"></pc-signature>
<pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
@@ -36,7 +36,7 @@ const unionReimburseInfo = {
<el-descriptions-item label="报销金额">{{viewData.money}}</el-descriptions-item>
<!-- <el-descriptions-item label="发票张数">{{viewData.invoiceNumber}}</el-descriptions-item>-->
<el-descriptions-item label="支付内容" :span="2">{{viewData.paymentNotes}}</el-descriptions-item>
<el-descriptions-item label="签字" :span="2">
<el-descriptions-item v-if="false" label="签字" :span="2">
<el-image :src="viewData.userSign" fit="cover" style="height: 60px"
v-if="viewData.userSign"></el-image>
<span v-else>暂无附件</span>
@@ -75,7 +75,7 @@ const unionReimburseInfo = {
<el-descriptions-item label="办理意见" v-if="!task.ext.isFirstTaskNode" :span="3">{{
task.taskFormData.opinion }}
</el-descriptions-item>
<el-descriptions-item label="签字" :span="3">
<el-descriptions-item v-if="false" label="签字" :span="3">
<el-image v-if="task.ext.tf_userSign"
:src="task.ext.tf_userSign"
class="signature-image"></el-image>
@@ -110,9 +110,9 @@ 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_userSign"
<el-form-item v-if="false" label="签字" prop="tf_userSign"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.tf_userSign"></pc-signature>
<pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
@@ -142,8 +142,8 @@ layout("/layouts/platform.html"){
<el-form-item label="审核意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea>
</el-form-item>
<!-- <el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">-->
<!-- <pc-signature v-model="formData.approvalSignature"></pc-signature>-->
<!-- <el-form-item v-if="false" label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">-->
<!-- <pc-signature v-if="false" v-model="formData.approvalSignature"></pc-signature>-->
<!-- </el-form-item>-->
</el-form>
<el-row type="flex" justify="end">
@@ -215,8 +215,8 @@ layout("/layouts/platform.html"){
<el-form-item label="审核意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="consolidationFormData.approvalOpinion"></user-opinion-textarea>
</el-form-item>
<el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="consolidationFormData.approvalSignature"></pc-signature>
<el-form-item v-if="false" label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-if="false" v-model="consolidationFormData.approvalSignature"></pc-signature>
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
@@ -123,8 +123,8 @@ layout("/layouts/platform.html"){
placeholder="请输入初步阅览意见"
></el-input>
</el-form-item>
<!-- <el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">-->
<!-- <pc-signature v-model="formData.approvalSignature"></pc-signature>-->
<!-- <el-form-item v-if="false" label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">-->
<!-- <pc-signature v-if="false" v-model="formData.approvalSignature"></pc-signature>-->
<!-- </el-form-item>-->
</el-form>
<el-row type="flex" justify="end">
@@ -148,8 +148,8 @@ 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 v-if="false" label="电子签名" prop="signature">-->
<!-- <pc-signature v-if="false" v-model="formData.signature"></pc-signature>-->
<!-- </el-form-item>-->
</el-form>
@@ -195,14 +195,14 @@ layout("/layouts/platform.html"){
committeeId: [{required: true, message: "请选择所属委员会", trigger: ["blur", "change"]}],
typeId: [{required: true, message: "请选择提案类别", trigger: ["blur", "change"]}],
suggestUnits: [{required: true, message: "请选择建议承办单位", trigger: ["blur", "change"]}],
sign: [{required: true, message: "请扫描二维码进行签字", trigger: ["blur", "change"]}],
sign: [{required: false, message: "非必填", trigger: ["blur", "change"]}],
excerpt: [{required: true, message: "请填写", trigger: ["blur", "change"]}],
researchFindings: [{required: true, message: "请填写", trigger: ["blur", "change"]}],
brief: [{required: true, message: "请填写", trigger: ["blur", "change"]}],
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: false, message: "非必填", trigger: ["blur", "change"]}]
},
proposalConfig: {},
noticeDialogVisible: false,
@@ -109,7 +109,7 @@ const SUGGESTION_INFO_COMPONENT = {
</el-descriptions-item>
<el-descriptions-item label="审核意见" :span="3">{{ task.extVariable.approvalOpinion}}
</el-descriptions-item>
<!-- <el-descriptions-item label="签字" :span="3">-->
<!-- <el-descriptions-item v-if="false" label="签字" :span="3">-->
<!-- <el-image :src="task.extVariable.approvalSignature"-->
<!-- v-if="task.extVariable && task.extVariable.approvalSignature"-->
<!-- class="signature-image"></el-image>-->
@@ -137,7 +137,7 @@ const SUGGESTION_INFO_COMPONENT = {
</template>
<el-descriptions-item label="审核意见" :span="3">{{ task.extVariable.approvalOpinion}}
</el-descriptions-item>
<!-- <el-descriptions-item label="签字">-->
<!-- <el-descriptions-item v-if="false" label="签字">-->
<!-- <el-image :src="task.extVariable.approvalSignature"-->
<!-- v-if="task.extVariable && task.extVariable.approvalSignature"-->
<!-- class="signature-image"></el-image>-->
@@ -184,7 +184,7 @@ const SUGGESTION_INFO_COMPONENT = {
</template>
<el-descriptions-item label="审核意见" :span="3">{{ task.extVariable.approvalOpinion}}
</el-descriptions-item>
<!-- <el-descriptions-item label="签字">-->
<!-- <el-descriptions-item v-if="false" label="签字">-->
<!-- <el-image :src="task.extVariable.approvalSignature"-->
<!-- v-if="task.extVariable && task.extVariable.approvalSignature"-->
<!-- class="signature-image"></el-image>-->
@@ -248,7 +248,7 @@ const SUGGESTION_INFO_COMPONENT = {
<el-descriptions-item label="审批意见" :span="3">
{{ task.extVariable.approvalOpinion}}
</el-descriptions-item>
<!-- <el-descriptions-item label="签字">-->
<!-- <el-descriptions-item v-if="false" label="签字">-->
<!-- <el-image :src="task.extVariable.approvalSignature"-->
<!-- v-if="task.extVariable && task.extVariable.approvalSignature"-->
<!-- class="signature-image"></el-image>-->
@@ -265,7 +265,7 @@ const SUGGESTION_INFO_COMPONENT = {
</el-descriptions-item>
<el-descriptions-item label="反馈意见" :span="3">{{ task.extVariable.approvalOpinion}}
</el-descriptions-item>
<!-- <el-descriptions-item label="签字">-->
<!-- <el-descriptions-item v-if="false" label="签字">-->
<!-- <el-image :src="task.extVariable.approvalSignature"-->
<!-- v-if="task.extVariable && task.extVariable.approvalSignature"-->
<!-- class="signature-image"></el-image>-->
@@ -138,8 +138,8 @@ layout("/layouts/platform.html"){
<el-form-item label="审核意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea>
</el-form-item>
<!-- <el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">-->
<!-- <pc-signature v-model="formData.approvalSignature"></pc-signature>-->
<!-- <el-form-item v-if="false" label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">-->
<!-- <pc-signature v-if="false" v-model="formData.approvalSignature"></pc-signature>-->
<!-- </el-form-item>-->
</el-form>
<el-row type="flex" justify="end">
@@ -212,8 +212,8 @@ layout("/layouts/platform.html"){
<el-form-item label="审核意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="consolidationFormData.approvalOpinion"></user-opinion-textarea>
</el-form-item>
<el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="consolidationFormData.approvalSignature"></pc-signature>
<el-form-item v-if="false" label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-if="false" v-model="consolidationFormData.approvalSignature"></pc-signature>
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
@@ -146,8 +146,8 @@ layout("/layouts/platform.html"){
<el-form-item label="审核意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea>
</el-form-item>
<!-- <el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">-->
<!-- <pc-signature v-model="formData.approvalSignature"></pc-signature>-->
<!-- <el-form-item v-if="false" label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">-->
<!-- <pc-signature v-if="false" v-model="formData.approvalSignature"></pc-signature>-->
<!-- </el-form-item>-->
</el-form>
<el-row type="flex" justify="end">
@@ -219,8 +219,8 @@ layout("/layouts/platform.html"){
<el-form-item label="审核意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="consolidationFormData.approvalOpinion"></user-opinion-textarea>
</el-form-item>
<!-- <el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">-->
<!-- <pc-signature v-model="consolidationFormData.approvalSignature"></pc-signature>-->
<!-- <el-form-item v-if="false" label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">-->
<!-- <pc-signature v-if="false" v-model="consolidationFormData.approvalSignature"></pc-signature>-->
<!-- </el-form-item>-->
</el-form>
<el-row type="flex" justify="end">
@@ -96,7 +96,7 @@ layout("/layouts/platform.html"){
<!-- prop="approvalSignature"-->
<!-- :rules="[{required:true,message:'必填',trigger:['change','blur']}]"-->
<!-- >-->
<!-- <pc-signature v-model="formData.approvalSignature"></pc-signature>-->
<!-- <pc-signature v-if="false" v-model="formData.approvalSignature"></pc-signature>-->
<!-- </el-form-item>-->
</el-form>
<el-row type="flex" justify="end">
@@ -122,8 +122,8 @@ layout("/layouts/platform.html"){
<el-form-item label="审批意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea>
</el-form-item>
<!-- <el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">-->
<!-- <pc-signature v-model="formData.approvalSignature"></pc-signature>-->
<!-- <el-form-item v-if="false" label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">-->
<!-- <pc-signature v-if="false" v-model="formData.approvalSignature"></pc-signature>-->
<!-- </el-form-item>-->
</el-form>
<el-row type="flex" justify="end">
@@ -91,7 +91,7 @@ layout("/layouts/platform.html"){
<!-- <user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]" v-if="formData.processInstanceTaskId !== 'd3a53d97c2ce441083c973fdb798352b' && formData.processInstanceTaskId !== '70989be6710c4a599db297d85dd82928'">-->
<!-- <pc-signature v-model="formData.approvalSignature"></pc-signature>-->
<!-- <pc-signature v-if="false" v-model="formData.approvalSignature"></pc-signature>-->
<!-- </el-form-item>-->
</el-form>
<el-row type="flex" justify="end">
@@ -127,8 +127,8 @@ layout("/layouts/platform.html"){
placeholder="请输入初步阅览意见"
></el-input>
</el-form-item>
<!-- <el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">-->
<!-- <pc-signature v-model="formData.approvalSignature"></pc-signature>-->
<!-- <el-form-item v-if="false" label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">-->
<!-- <pc-signature v-if="false" v-model="formData.approvalSignature"></pc-signature>-->
<!-- </el-form-item>-->
</el-form>
<el-row type="flex" justify="end">
@@ -144,8 +144,8 @@ layout("/layouts/platform.html"){
<el-form-item label="答复内容" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<text-editor v-model="formData.approvalOpinion"></text-editor>
</el-form-item>
<!-- <el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">-->
<!-- <pc-signature v-model="formData.approvalSignature"></pc-signature>-->
<!-- <el-form-item v-if="false" label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">-->
<!-- <pc-signature v-if="false" v-model="formData.approvalSignature"></pc-signature>-->
<!-- </el-form-item>-->
</el-form>
<el-row type="flex" justify="end">
@@ -151,13 +151,13 @@ layout("/layouts/platform.html"){
sessionId: [{ required: true, message: "请选择所属教代会", trigger: ["blur", "change"] }],
typeId: [{ required: true, message: "请选择意见类别", trigger: ["blur", "change"] }],
implementUnitId: [{ required: false, message: "请选择建以落实部门", trigger: ["blur", "change"] }],
sign: [{ required: true, message: "请扫描二维码进行签字", trigger: ["blur", "change"] }],
sign: [{ required: false, message: "非必填", trigger: ["blur", "change"] }],
excerpt: [{ required: true, message: "请填写", trigger: ["blur", "change"] }],
brief: [{ required: true, message: "请填写", trigger: ["blur", "change"] }],
measures: [{ required: true, message: "请填写", trigger: ["blur", "change"] }],
unitName: [{ required: true, message: "请填写", trigger: ["blur", "change"] }],
mobile: [{ required: true, message: "请填写", trigger: ["blur", "change"] }],
signature: [{ required: true, message: "请扫描二维码进行签字", trigger: ["blur", "change"] }]
signature: [{ required: false, message: "非必填", trigger: ["blur", "change"] }]
},
suggestionConfig: {},
noticeDialogVisible: false
@@ -110,7 +110,7 @@ const SUGGESTION_INFO_COMPONENT = {
</el-descriptions-item>
<el-descriptions-item label="审核意见" :span="3">{{ task.extVariable.approvalOpinion}}
</el-descriptions-item>
<!-- <el-descriptions-item label="签字" :span="3">-->
<!-- <el-descriptions-item v-if="false" label="签字" :span="3">-->
<!-- <el-image :src="task.extVariable.approvalSignature"-->
<!-- v-if="task.extVariable && task.extVariable.approvalSignature"-->
<!-- class="signature-image"></el-image>-->
@@ -138,7 +138,7 @@ const SUGGESTION_INFO_COMPONENT = {
</template>
<el-descriptions-item label="审核意见" :span="3">{{ task.extVariable.approvalOpinion}}
</el-descriptions-item>
<!-- <el-descriptions-item label="签字">-->
<!-- <el-descriptions-item v-if="false" label="签字">-->
<!-- <el-image :src="task.extVariable.approvalSignature"-->
<!-- v-if="task.extVariable && task.extVariable.approvalSignature"-->
<!-- class="signature-image"></el-image>-->
@@ -187,7 +187,7 @@ const SUGGESTION_INFO_COMPONENT = {
</template>
<el-descriptions-item label="审核意见" :span="3">{{ task.extVariable.approvalOpinion}}
</el-descriptions-item>
<!-- <el-descriptions-item label="签字">-->
<!-- <el-descriptions-item v-if="false" label="签字">-->
<!-- <el-image :src="task.extVariable.approvalSignature"-->
<!-- v-if="task.extVariable && task.extVariable.approvalSignature"-->
<!-- class="signature-image"></el-image>-->
@@ -252,7 +252,7 @@ const SUGGESTION_INFO_COMPONENT = {
<el-descriptions-item label="审批意见" :span="3">
{{ task.extVariable.approvalOpinion}}
</el-descriptions-item>
<!-- <el-descriptions-item label="签字">-->
<!-- <el-descriptions-item v-if="false" label="签字">-->
<!-- <el-image :src="task.extVariable.approvalSignature"-->
<!-- v-if="task.extVariable && task.extVariable.approvalSignature"-->
<!-- class="signature-image"></el-image>-->
@@ -269,7 +269,7 @@ const SUGGESTION_INFO_COMPONENT = {
</el-descriptions-item>
<el-descriptions-item label="反馈意见" :span="3">{{ task.extVariable.approvalOpinion}}
</el-descriptions-item>
<!-- <el-descriptions-item label="签字">-->
<!-- <el-descriptions-item v-if="false" label="签字">-->
<!-- <el-image :src="task.extVariable.approvalSignature"-->
<!-- v-if="task.extVariable && task.extVariable.approvalSignature"-->
<!-- class="signature-image"></el-image>-->
@@ -138,8 +138,8 @@ layout("/layouts/platform.html"){
<el-form-item label="审核意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea>
</el-form-item>
<!-- <el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.approvalSignature"></pc-signature>
<!-- <el-form-item v-if="false" label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-if="false" v-model="formData.approvalSignature"></pc-signature>
</el-form-item>-->
</el-form>
<el-row type="flex" justify="end">
@@ -212,8 +212,8 @@ layout("/layouts/platform.html"){
<el-form-item label="审核意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="consolidationFormData.approvalOpinion"></user-opinion-textarea>
</el-form-item>
<!--<el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="consolidationFormData.approvalSignature"></pc-signature>
<!--<el-form-item v-if="false" label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-if="false" v-model="consolidationFormData.approvalSignature"></pc-signature>
</el-form-item>-->
</el-form>
<el-row type="flex" justify="end">
@@ -146,8 +146,8 @@ layout("/layouts/platform.html"){
<el-form-item label="审核意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea>
</el-form-item>
<!-- <el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.approvalSignature"></pc-signature>
<!-- <el-form-item v-if="false" label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-if="false" v-model="formData.approvalSignature"></pc-signature>
</el-form-item>-->
</el-form>
<el-row type="flex" justify="end">
@@ -219,8 +219,8 @@ layout("/layouts/platform.html"){
<el-form-item label="审核意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="consolidationFormData.approvalOpinion"></user-opinion-textarea>
</el-form-item>
<!-- <el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="consolidationFormData.approvalSignature"></pc-signature>
<!-- <el-form-item v-if="false" label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-if="false" v-model="consolidationFormData.approvalSignature"></pc-signature>
</el-form-item>-->
</el-form>
<el-row type="flex" justify="end">
@@ -96,7 +96,7 @@ layout("/layouts/platform.html"){
<!-- prop="approvalSignature"-->
<!-- :rules="[{required:true,message:'必填',trigger:['change','blur']}]"-->
<!-- >-->
<!-- <pc-signature v-model="formData.approvalSignature"></pc-signature>-->
<!-- <pc-signature v-if="false" v-model="formData.approvalSignature"></pc-signature>-->
<!-- </el-form-item>-->
</el-form>
<el-row type="flex" justify="end">
@@ -122,8 +122,8 @@ layout("/layouts/platform.html"){
<el-form-item label="审批意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea>
</el-form-item>
<!--<el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.approvalSignature"></pc-signature>
<!--<el-form-item v-if="false" label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-if="false" v-model="formData.approvalSignature"></pc-signature>
</el-form-item>-->
</el-form>
<el-row type="flex" justify="end">
@@ -90,7 +90,7 @@ layout("/layouts/platform.html"){
<!-- <user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]" v-if="formData.processInstanceTaskId !== 'd3a53d97c2ce441083c973fdb798352b' && formData.processInstanceTaskId !== '70989be6710c4a599db297d85dd82928'">-->
<!-- <pc-signature v-model="formData.approvalSignature"></pc-signature>-->
<!-- <pc-signature v-if="false" v-model="formData.approvalSignature"></pc-signature>-->
<!-- </el-form-item>-->
</el-form>
<el-row type="flex" justify="end">
@@ -127,8 +127,8 @@ layout("/layouts/platform.html"){
placeholder="请输入初步阅览意见"
></el-input>
</el-form-item>
<!-- <el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">-->
<!-- <pc-signature v-model="formData.approvalSignature"></pc-signature>-->
<!-- <el-form-item v-if="false" label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">-->
<!-- <pc-signature v-if="false" v-model="formData.approvalSignature"></pc-signature>-->
<!-- </el-form-item>-->
</el-form>
<el-row type="flex" justify="end">
@@ -144,8 +144,8 @@ layout("/layouts/platform.html"){
<el-form-item label="答复内容" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<text-editor v-model="formData.approvalOpinion"></text-editor>
</el-form-item>
<!-- <el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.approvalSignature"></pc-signature>
<!-- <el-form-item v-if="false" label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-if="false" v-model="formData.approvalSignature"></pc-signature>
</el-form-item>-->
</el-form>
<el-row type="flex" justify="end">
@@ -152,13 +152,13 @@ layout("/layouts/platform.html"){
sessionId: [{ required: true, message: "请选择所属工代会", trigger: ["blur", "change"] }],
typeId: [{ required: true, message: "请选择意见建议类别", trigger: ["blur", "change"] }],
implementUnitId: [{ required: false, message: "请选择建以落实部门", trigger: ["blur", "change"] }],
sign: [{ required: true, message: "请扫描二维码进行签字", trigger: ["blur", "change"] }],
sign: [{ required: false, message: "非必填", trigger: ["blur", "change"] }],
excerpt: [{ required: true, message: "请填写", trigger: ["blur", "change"] }],
brief: [{ required: true, message: "请填写", trigger: ["blur", "change"] }],
measures: [{ required: true, message: "请填写", trigger: ["blur", "change"] }],
unitName: [{ required: true, message: "请填写", trigger: ["blur", "change"] }],
mobile: [{ required: true, message: "请填写", trigger: ["blur", "change"] }],
signature: [{ required: true, message: "请扫描二维码进行签字", trigger: ["blur", "change"] }]
signature: [{ required: false, message: "非必填", trigger: ["blur", "change"] }]
},
suggestionConfig: {},
noticeDialogVisible: false
@@ -232,9 +232,9 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="签字" :span="3">
<el-form-item prop="signature" label="签字">
<pc-signature v-model="formData.signature"></pc-signature>
<el-descriptions-item v-if="false" label="签字" :span="3">
<el-form-item prop="signature" label="签字" v-if="false">
<pc-signature v-if="false" v-model="formData.signature"></pc-signature>
</el-form-item>
</el-descriptions-item>
</el-descriptions>
@@ -280,7 +280,7 @@ layout("/layouts/platform.html"){
deadImmediateFamily: [{required: true, message: "必填", trigger: ["change", "blur"]}],
remark: [{required: true, message: "必填", trigger: ["change", "blur"]}],
files: [{required: true, message: "必填", trigger: ["change", "blur"]}],
signature: [{required: true, message: "必填", trigger: ["change", "blur"]}],
signature: [{required: false, message: "必填", trigger: ["change", "blur"]}],
handlerUserId: [{required: true, message: "必填", trigger: ["change", "blur"]}],
certifierUserId: [{required: true, message: "必填", trigger: ["change", "blur"]}],
bankCardNumber: [{required: true, message: "必填", trigger: ["change", "blur"]}],
@@ -81,9 +81,9 @@ 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_sign"
<el-form-item v-if="false" label="电子签名" prop="tf_sign"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.tf_sign"></pc-signature>
<pc-signature v-if="false" v-model="formData.tf_sign"></pc-signature>
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
@@ -37,7 +37,7 @@ const condolenceInfo = {
complete_result></file-preview>
<span v-else>暂无附件</span>
</el-descriptions-item>
<el-descriptions-item label="签字" :span="3">
<el-descriptions-item v-if="false" label="签字" :span="3">
<el-image :src="viewData.signature"
v-if="viewData.signature"
class="signature-image"></el-image>
@@ -72,7 +72,7 @@ const condolenceInfo = {
<el-descriptions-item label="办理意见" v-if="!task.ext.isFirstTaskNode">{{
task.taskFormData.opinion }}
</el-descriptions-item>
<el-descriptions-item label="签字" :span="3" v-if="!task.ext.isFirstTaskNode">
<el-descriptions-item label="签字" :span="3" v-if="false">
<el-image :src="task.taskFormData.tf_sign"
v-if="task.taskFormData.tf_sign"
class="signature-image"></el-image>
@@ -101,9 +101,9 @@ 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_sign"
<el-form-item v-if="false" label="电子签名" prop="tf_sign"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.tf_sign"></pc-signature>
<pc-signature v-if="false" v-model="formData.tf_sign"></pc-signature>
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
@@ -101,9 +101,9 @@ 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_sign"
<el-form-item v-if="false" label="电子签名" prop="tf_sign"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.tf_sign"></pc-signature>
<pc-signature v-if="false" v-model="formData.tf_sign"></pc-signature>
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
@@ -210,9 +210,9 @@
</el-descriptions-item>
<el-descriptions-item label="签字" :span="3">
<el-descriptions-item v-if="false" label="签字" :span="3">
<el-form-item prop="sign">
<pc-signature v-model="formData.sign"></pc-signature>
<pc-signature v-if="false" v-model="formData.sign"></pc-signature>
</el-form-item>
</el-descriptions-item>
</el-descriptions>
@@ -253,7 +253,7 @@
officialCapacity: [{required: true, message: '必填', trigger: ['blur', 'change']}],
subsidyStandards: [{required: true, message: '必填', trigger: ['blur', 'change']}],
reason: [{required: true, message: '必填', trigger: ['blur', 'change']}],
sign: [{required: true, message: '必填', trigger: ['blur', 'change']}]
sign: [{required: false, message: '必填', trigger: ['blur', 'change']}]
},
// 替他人申请相关
@@ -226,9 +226,9 @@ layout("/layouts/platform.html"){
</el-descriptions-item>
<el-descriptions-item label="签字" :span="3">
<el-descriptions-item v-if="false" label="签字" :span="3">
<el-form-item prop="sign">
<pc-signature v-model="formData.sign"></pc-signature>
<pc-signature v-if="false" v-model="formData.sign"></pc-signature>
</el-form-item>
</el-descriptions-item>
</el-descriptions>
@@ -278,7 +278,7 @@ layout("/layouts/platform.html"){
officialCapacity: [{required: true, message: '请填写职务职称', trigger: ['blur', 'change']}],
subsidyStandards: [{required: true, message: '请选择困难类型', trigger: ['blur', 'change']}],
reason: [{required: true, message: '请填写申请原因', trigger: ['blur', 'change']}],
sign: [{required: true, message: '请签字', trigger: ['blur', 'change']}]
sign: [{required: false, message: '非必填', trigger: ['blur', 'change']}]
},
// 替他人申请相关
@@ -49,7 +49,7 @@ const INFO = {
<span v-else>暂无</span>
</el-descriptions-item>
<el-descriptions-item label="签字" :span="3">
<el-descriptions-item label="签字" :span="3" v-if="false">
<el-image v-if="viewData.sign"
:src="viewData.sign"
class="signature-image"></el-image>
@@ -37,7 +37,7 @@
<span v-else>暂无</span>
</el-descriptions-item>
<el-descriptions-item label="签字" :span="3">
<el-descriptions-item label="签字" :span="3" v-if="false">
<el-image v-if="viewData.sign"
:src="viewData.sign"
class="signature-image"></el-image>
@@ -138,8 +138,8 @@ layout("/layouts/platform.html"){
complete_result upload_mode="drag"
upload_result_category="array"></file-upload>
</el-form-item>
<el-form-item prop="sign" label="签字">
<pc-signature v-model="formData.sign"></pc-signature>
<el-form-item v-if="false" prop="sign" label="签字">
<pc-signature v-if="false" v-model="formData.sign"></pc-signature>
</el-form-item>
<el-form-item prop="declarationAgreed">
<el-checkbox v-model="formData.declarationAgreed">
@@ -184,7 +184,7 @@ layout("/layouts/platform.html"){
office: [{ required: true, message: '请输入办证机关', trigger: 'blur' }],
honorFiles: [{ required: true, message: '请上传独生子女父母光荣证', trigger: 'change' }],
retireFiles: [{ required: true, message: '请上传退休证', trigger: 'change' }],
//sign: [{ required: true, message: '请签字', trigger: 'change' }],
//sign: [{ required: false, message: '非必填', trigger: 'change' }],
declarationAgreed: [{ required: true, message: '请勾选申报理由', trigger: 'change', type: 'enum', enum: [true] }]
},
}
@@ -28,7 +28,7 @@ const DSZNFMTX_INFO = {
<el-descriptions-item :span="3" label="退休证">
<file-preview :files="viewData.retireFiles" complete_result></file-preview>
</el-descriptions-item>
<el-descriptions-item label="签字" :span="3">
<el-descriptions-item v-if="false" label="签字" :span="3">
<el-image v-if="viewData.sign"
:src="viewData.sign"
class="signature-image"></el-image>
@@ -63,7 +63,7 @@ const DSZNFMTX_INFO = {
<el-descriptions-item label="办理意见" v-if="!task.ext.isFirstTaskNode">{{
task.taskFormData.opinion }}
</el-descriptions-item>
<el-descriptions-item label="签字" :span="3" v-if="!task.ext.isFirstTaskNode">
<el-descriptions-item label="签字" :span="3" v-if="false">
<el-image :src="task.ext.tf_userSign"
v-if="task.ext.tf_userSign"
class="signature-image"></el-image>
@@ -89,8 +89,8 @@ 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_userSign" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.tf_userSign"></pc-signature>
<el-form-item v-if="false" label="电子签名" prop="tf_userSign" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
@@ -89,8 +89,8 @@ 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_userSign" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.tf_userSign"></pc-signature>
<el-form-item v-if="false" label="电子签名" prop="tf_userSign" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
@@ -75,7 +75,7 @@ const maternityLeaveInfo = {
<el-descriptions-item label="办理意见" :span="3" v-if="!task.ext.isFirstTaskNode">{{
task.taskFormData.opinion }}
</el-descriptions-item>
<el-descriptions-item label="签字" :span="3" v-if="!task.ext.isFirstTaskNode">
<el-descriptions-item label="签字" :span="3" v-if="false">
<el-image :src="task.ext.tf_userSign"
v-if="task.ext.tf_userSign"
class="signature-image"></el-image>
@@ -88,8 +88,8 @@ 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_userSign" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.tf_userSign"></pc-signature>
<el-form-item v-if="false" label="电子签名" prop="tf_userSign" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
@@ -89,8 +89,8 @@ 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_userSign" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.tf_userSign"></pc-signature>
<el-form-item v-if="false" label="电子签名" prop="tf_userSign" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
@@ -217,8 +217,8 @@ layout("/layouts/platform.html"){
accept=".doc, .docx, .xls, .xlsx, .pdf, .ppt, .jpg, .jpeg, .png"
complete_result></file-upload>
</el-form-item>
<el-form-item prop="sign" label="签字">
<pc-signature v-model="formData.sign"></pc-signature>
<el-form-item prop="sign" label="签字" v-if="false">
<pc-signature v-if="false" v-model="formData.sign"></pc-signature>
</el-form-item>
</el-form>
<el-row type="flex" justify="end" class="mt20">
@@ -30,7 +30,7 @@ const userInfo = {
<el-descriptions-item :span="3" label="附件">
<file-preview :files="viewData.files" complete_result></file-preview>
</el-descriptions-item>
<el-descriptions-item label="签字" >
<el-descriptions-item label="签字" v-if="false">
<el-image v-if="viewData.sign"
:src="viewData.sign"
class="signature-image"
@@ -49,7 +49,7 @@ const MEMBER_APPLY_AUDIT_INFO = {
<el-tag type="warning" v-else>暂无</el-tag>
</el-descriptions-item>
<el-descriptions-item label="签字信息" :span="3">
<el-descriptions-item v-if="false" label="签字信息" :span="3">
<el-image v-if="viewData.sign" :src="viewData.sign"
class="signature-image"></el-image>
<el-tag type="warning" v-else>暂无</el-tag>
@@ -90,7 +90,7 @@ const MEMBER_APPLY_AUDIT_INFO = {
{{ task.extVariable.approvalRemark }}
</el-descriptions-item>
</template>
<el-descriptions-item label="签字" :span="3">
<el-descriptions-item v-if="false" label="签字" :span="3">
<el-image :src="task.extVariable.approvalSignature"
v-if="task.extVariable && task.extVariable.approvalSignature"
class="signature-image"></el-image>
@@ -23,8 +23,8 @@
: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="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">-->
<!-- <pc-signature v-model="formData.approvalSignature"></pc-signature>-->
<!-- <el-form-item v-if="false" label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">-->
<!-- <pc-signature v-if="false" v-model="formData.approvalSignature"></pc-signature>-->
<!-- </el-form-item>-->
</el-form>
<snaker-flow-task-form-action @task-action="handleTaskAction"
@@ -186,9 +186,9 @@
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="签字" :span="3">
<el-descriptions-item v-if="false" label="签字" :span="3">
<el-form-item prop="sign">
<pc-signature v-model="formData.sign"></pc-signature>
<pc-signature v-if="false" v-model="formData.sign"></pc-signature>
</el-form-item>
</el-descriptions-item>
</el-descriptions>
@@ -213,7 +213,7 @@
username: [{required: false, message: "必填", trigger: ["change", "blur"]}],
sex: [{required: false, message: "必填", trigger: ["change", "blur"]}],
isVoluntary: [{required: true, message: "必填", trigger: ["change", "blur"]}],
sign: [{required: true, message: "必填", trigger: ["change", "blur"]}],
sign: [{required: false, message: "必填", trigger: ["change", "blur"]}],
email: [
{
validator: (rule, value, callback) => {
@@ -219,9 +219,9 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-descriptions-item>
<!-- <el-descriptions-item label="签字" :span="3">-->
<!-- <el-descriptions-item v-if="false" label="签字" :span="3">-->
<!-- <el-form-item prop="sign">-->
<!-- <pc-signature v-model="formData.sign"></pc-signature>-->
<!-- <pc-signature v-if="false" v-model="formData.sign"></pc-signature>-->
<!-- </el-form-item>-->
<!-- </el-descriptions-item>-->
</el-descriptions>
@@ -251,7 +251,7 @@ layout("/layouts/platform.html"){
username: [{ required: false, message: "必填", trigger: ["change", "blur"] }],
sex: [{ required: false, message: "必填", trigger: ["change", "blur"] }],
isVoluntary: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
sign: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
sign: [{ required: false, message: "必填", trigger: ["change", "blur"] }],
homeAddress: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
personalData: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
specialty: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
@@ -18,8 +18,8 @@ layout("/layouts/platform.html"){
<el-form-item label="审核意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea>
</el-form-item>
<el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:false,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.approvalSignature"></pc-signature>
<el-form-item v-if="false" label="电子签名" prop="approvalSignature" :rules="[{required:false,message:'必填',trigger:['change','blur']}]">
<pc-signature v-if="false" v-model="formData.approvalSignature"></pc-signature>
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
@@ -21,8 +21,8 @@ layout("/layouts/platform.html"){
<el-form-item label="审核说明" prop="approvalRemark">
<el-input v-model="formData.approvalRemark" type="textarea" :rows="4" placeholder="请输入审核说明"></el-input>
</el-form-item>
<el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:false,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.approvalSignature"></pc-signature>
<el-form-item v-if="false" label="电子签名" prop="approvalSignature" :rules="[{required:false,message:'必填',trigger:['change','blur']}]">
<pc-signature v-if="false" v-model="formData.approvalSignature"></pc-signature>
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
@@ -75,6 +75,7 @@ layout("/layouts/platform.html"){
<!-- <el-dropdown-item :command="{type:'status',data:row}">{{row.isDisabled?'发布':'关闭'}}</el-dropdown-item>-->
<!-- <el-dropdown-item :command="{type:'sendMsg',data:row}">通知未选择人员</el-dropdown-item>-->
<el-dropdown-item :command="{type:'createList',data:row}">生成福利名单</el-dropdown-item>
<el-dropdown-item :command="{type:'clearList',data:row}">清空福利名单</el-dropdown-item>
<el-dropdown-item :command="{type:'edit',data:row}">编辑</el-dropdown-item>
<el-dropdown-item :command="{type:'delete',data:row}">删除</el-dropdown-item>
</el-dropdown-menu>
@@ -290,6 +291,8 @@ layout("/layouts/platform.html"){
this.doDelete(data.id)
} else if (type === "createList") {
this.$refs.filterUserRef.onOpen(data.id)
} else if (type === "clearList") {
this.clearWelfareList(data)
} else if (type === "status") {
this.projectStatusChange(data)
} else if (type === "sendMsg") {
@@ -420,6 +423,28 @@ layout("/layouts/platform.html"){
}
this.submitLoading = false
})
},
clearWelfareList(row) {
this.$confirm("确定要清空该项目的福利名单和已选择记录吗?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(async () => {
this.submitLoading = true
try {
const resp = await this.$axios.post(loc() + "/clearWelfareList", { id: row.id })
if (resp.code === 0) {
this.doSearch()
this.$message.success(resp.msg)
} else {
this.notifyWarning(resp.msg)
}
} catch (e) {
this.notifyWarning(e.status)
} finally {
this.submitLoading = false
}
})
}
},
async created() {
@@ -180,8 +180,8 @@ const optionSelect = {
</el-form-item>
</el-col>
<el-col :span="24" v-if="projectInfo.signMode === 2">
<el-form-item prop="sign" label="签字">
<pc-signature v-model="contactForm.userSign"></pc-signature>
<el-form-item v-if="false" prop="sign" label="签字">
<pc-signature v-if="false" v-model="contactForm.userSign"></pc-signature>
</el-form-item>
</el-col>
</el-row>
@@ -498,12 +498,7 @@ const optionSelect = {
return
}
// 仅“需要签字”时校验签字,避免默认“不签字”的项目仍展示或提交签字字段
if (this.projectInfo.signMode === 2 && !this.contactForm.userSign) {
this.$message.warning("请签字")
return
}
if (this.isSubmitting) return
if (this.isSubmitting) return
this.isSubmitting = true
let selections = []
@@ -154,10 +154,10 @@ let CHOOSE_WELFARE = {
</el-row>
</template>
<el-form-item :rules="{required:true,message: '请签字', trigger: 'blur'}"
label="签字" prop="userSign" v-if="projectInfo.signMode===2">
<el-form-item :rules="{required:false,message: '非必填', trigger: 'blur'}"
label="签字" prop="userSign" v-if="false">
<template v-if="isChoice===0||!is_view">
<pc-signature v-model="formData.userSign"></pc-signature>
<pc-signature v-if="false" v-model="formData.userSign"></pc-signature>
</template>
<template v-else>
<el-image :src="formData.userSign"
@@ -313,11 +313,7 @@ let CHOOSE_WELFARE = {
this.$message.warning("请填写收货地址")
return
}
if (this.projectInfo.signMode === 2 && this.formData.userSign == null || this.formData.userSign === "") {
this.$message.warning("请签字")
return
}
const formData = this.projectInfo.welfareProjectSubjects[0].options.filter(v => v.selectNum >= 1).map(v => {
const formData = this.projectInfo.welfareProjectSubjects[0].options.filter(v => v.selectNum >= 1).map(v => {
return {
welfareId: this.projectInfo.id,
subjectId: v.subjectId,
@@ -43,7 +43,7 @@ layout("/layouts/platform_h5.html"){
<div>
<van-cell-group>
<van-cell :value="viewData.name" title="福利名称"></van-cell>
<van-cell title="是否电子签字">
<van-cell v-if="false" title="是否电子签字">
<dict-tag :options="dict.type.BENEFIT_SIGN_MODE"
:value="viewData.signMode"></dict-tag>
</van-cell>
@@ -72,13 +72,13 @@ layout("/layouts/platform_h5.html"){
</van-collapse>
</div>
<!-- 如果是统一发放并且需要签字-->
<div v-if="viewData.signMode==='BENEFIT_SIGN_MODE_ONE'&&viewData.provideMode === 'BENEFIT_PROVIDE_MODE_ONE'">
<div v-if="false">
<van-cell>
<van-icon class="van-cell__left-icon" color="red" name="info" slot="icon"></van-icon>
<div slot="title" style="font-weight: bold; font-size: 15px">电子签名</div>
<div slot="title" style="font-weight: bold; font-size: 15px" v-if="false">电子签名</div>
<template #label>
<div>
<h5-signature v-model="formData.userSign"></h5-signature>
<h5-signature v-if="false" v-model="formData.userSign"></h5-signature>
</div>
</template>
</van-cell>
@@ -221,12 +221,12 @@ layout("/layouts/platform_h5.html"){
</div>
</van-cell>
<!--电子签字-->
<van-cell v-if="viewData.signMode==='BENEFIT_SIGN_MODE_ONE'">
<van-cell v-if="false">
<van-icon class="van-cell__left-icon" color="red" name="info" slot="icon"></van-icon>
<div slot="title" style="font-weight: bold; font-size: 15px">电子签名</div>
<div slot="title" style="font-weight: bold; font-size: 15px" v-if="false">电子签名</div>
<template #label>
<div>
<h5-signature v-model="formData.userSign"></h5-signature>
<h5-signature v-if="false" v-model="formData.userSign"></h5-signature>
</div>
</template>
</van-cell>
@@ -398,11 +398,7 @@ layout("/layouts/platform_h5.html"){
this.confirmPopup = true
},
submit() {
if (this.viewData.signMode === "BENEFIT_SIGN_MODE_ONE" && !this.formData.userSign) {
this.$toast("请签字后再提交!")
return
}
let flag = false
let flag = false
let msg = ""
this.formData.benefitGoodsList.some((b) => {
if (b.goodsProvideMode === "GOODS_PROVIDE_MODE_POST" && !b.receiveAddress) {
@@ -545,7 +541,7 @@ layout("/layouts/platform_h5.html"){
async created() {
await this.findOneBenefit()
await this.echoUserSelection()
if (this.viewData.signMode === "BENEFIT_SIGN_MODE_ONE" && this.viewData.provideMode === "BENEFIT_PROVIDE_MODE_ONE") {
if (false) {
this.benefitViews = ["1"]
}
}
@@ -52,7 +52,7 @@ layout("/layouts/platform_h5.html"){
<div>
<van-cell-group>
<van-cell :value="viewData.name" title="福利名称"></van-cell>
<van-cell title="是否电子签字">
<van-cell v-if="false" title="是否电子签字">
<dict-tag :options="dict.type.BENEFIT_SIGN_MODE" :value="viewData.signMode"></dict-tag>
</van-cell>
<van-cell title="发放形式">
@@ -109,7 +109,7 @@ layout("/layouts/platform_h5.html"){
<van-cell>
<template #title>
<div style="font-weight: bold; font-size: 15px">电子签名</div>
<div style="font-weight: bold; font-size: 15px" v-if="false">电子签名</div>
</template>
</van-cell>
<van-cell title="">
@@ -113,10 +113,10 @@ layout("/layouts/platform_h5.html"){
</van-cell-group>
<!-- 电子签名 -->
<van-cell-group title="电子签名" class="form-section">
<van-field class="direction-column-field" name="signature" label="">
<van-cell-group v-if="false" title="电子签名" class="form-section">
<van-field v-if="false" class="direction-column-field" name="signature" label="">
<template #input>
<h5-signature v-model="formData.signature" slot="input"></h5-signature>
<h5-signature v-if="false" v-model="formData.signature" slot="input"></h5-signature>
</template>
</van-field>
</van-cell-group>
@@ -29,7 +29,7 @@ const clubUserJoin = {
<van-image :src="viewData.avatar"></van-image>
</template>
</van-cell>
<van-cell title="签字" >
<van-cell title="签字" v-if="false">
<van-image :src="viewData.signature"
v-if="viewData.signature"
class="signature-image"></van-image>
@@ -110,7 +110,7 @@ const H5_ENROLLMENT_REGISTRATION_INFO = {
}}
</template>
</van-cell>
<van-cell title="签字" v-if="!task.ext.isFirstTaskNode">
<van-cell title="签字" v-if="false">
<van-image :src="task.ext.tf_userSign"
v-if="task.ext.tf_userSign"
class="signature-image"></van-image>
@@ -71,10 +71,10 @@ layout("/layouts/platform_h5.html"){
class="more-text"
placeholder="请填审批意见"></van-field>
</van-cell-group>
<van-cell-group title="电子签名" class="form-section">
<van-field class="more-text" name="tf_userSign" label="">
<van-cell-group v-if="false" title="电子签名" class="form-section">
<van-field v-if="false" class="more-text" name="tf_userSign" label="">
<template #input>
<h5-signature v-model="formData.tf_userSign" slot="input"></h5-signature>
<h5-signature v-if="false" v-model="formData.tf_userSign" slot="input"></h5-signature>
</template>
</van-field>
</van-cell-group>
@@ -73,10 +73,10 @@ layout("/layouts/platform_h5.html"){
class="more-text"
placeholder="请填审批意见"></van-field>
</van-cell-group>
<van-cell-group title="电子签名" class="form-section">
<van-field class="more-text" name="tf_userSign" label="">
<van-cell-group v-if="false" title="电子签名" class="form-section">
<van-field v-if="false" class="more-text" name="tf_userSign" label="">
<template #input>
<h5-signature v-model="formData.tf_userSign" slot="input"></h5-signature>
<h5-signature v-if="false" v-model="formData.tf_userSign" slot="input"></h5-signature>
</template>
</van-field>
</van-cell-group>

Some files were not shown because too many files have changed in this diff Show More