commit

2026-01-28 15:43:10 +08:00
parent f00393bdba
commit 62203cf452
13 changed files with 231 additions and 51 deletions
@@ -392,6 +392,7 @@
            Vue.component("excel-import", httpVueLoader("/components/plugins/sysImport/excelImport.vue?v=" + new Date().getTime()))
            Vue.component("flow-form-button", httpVueLoader("/components/plugins/flowable/formButton.vue?v=" + new Date().getTime()))
            Vue.component("snaker-flow", httpVueLoader("/components/plugins/snaker/snakerFlow.vue?v=" + new Date().getTime()))
+            Vue.component("custom-card", httpVueLoader("/components/plugins/sysCard/index.vue?v=" + new Date().getTime()))
            Vue.component(
                "snaker-flow-task-form-action",
                httpVueLoader("/components/plugins/snaker/snakerFlowTaskFormAction.vue?v=" + new Date().getTime())
@@ -536,12 +536,6 @@ const basicForm = {
                    }
                    this.formData.isDisabled = false
                    await this.doHandle('提交')
-                } else {
-                    if(Object.keys(errMsg).length > 0) {
-                        this.$message.warning(errMsg[Object.keys(errMsg)[0]][0].message)
-                        return
-                    }
-                    this.$message.warning("存在必填项未填写")
                }
            })
        },
@@ -230,12 +230,14 @@ layout("/layouts/platform.html"){
                    </el-radio-group>
                </el-form-item>
            </el-form>
-            <el-row class="mt20" justify="end" type="flex">
-                <el-button @click="close">取消</el-button>
-                <el-button type="primary" v-if="formData.isSubmit!=true" plain @click="doSave">保存</el-button>
-                <el-button type="primary" @click="doSubmit">确定</el-button>
-            </el-row>
        </template>
+
+        <template #edit_footer>
+            <el-button @click="close">取消</el-button>
+            <el-button type="primary" v-if="formData.isSubmit!=true" plain @click="doSave">保存</el-button>
+            <el-button type="primary" @click="doSubmit">确定</el-button>
+        </template>
+
    </guava>

    <drawer-user-scope :group_id.sync="formData.activityGroupId" @group_change="getActivityGroup"
@@ -39,6 +39,7 @@ const AU_FORM_TEMPLATE = {
                            upload_result_category="array"
                            complete_result
                            :accept="fileAccept"
+                            :upload_size="(chooseWorksType?.allowSingleFileSize / 1024 * 1024 * 1024) || 10 * 1024 * 1024"
                    ></file-upload>
                </el-form-item>
            </el-form>
@@ -225,10 +225,11 @@ layout("/layouts/platform.html"){
                    ></file-upload>
                </el-form-item>
            </el-form>
-            <el-row justify="end" style="justify-content: end" type="flex">
-                <el-button @click="$refs.guava.index()">取消</el-button>
-                <el-button @click="save" type="primary" v-loading="submitLoading">提交</el-button>
-            </el-row>
+        </template>
+
+        <template #edit_footer>
+            <el-button @click="$refs.guava.index()">取消</el-button>
+            <el-button @click="save" type="primary" v-loading="submitLoading">提交</el-button>
        </template>
    </guava>

@@ -180,13 +180,11 @@ const optionSelect = {
                                    </el-form-item>
                                </el-col>
                                <el-col :span="24">
-                                    <el-form-item prop="sign" label="签字">
+                                    <el-form-item prop="userSign" label="签字" :required="projectInfo.signMode == 2">
                                        <pc-signature v-model="contactForm.userSign"></pc-signature>
                                    </el-form-item>
                                </el-col>
                            </el-row>
-
-
                        </el-form>
                    </div>

@@ -250,6 +248,13 @@ const optionSelect = {
    `,
    store,
    data() {
+        const validateUserSign = (rule, value, callback) => {
+            if (this.projectInfo.signMode === 2 && !value) {
+                callback(new Error("请签字"))
+                return
+            }
+            callback()
+        }
        return {
            projectId: null, // 项目ID
            userId: null, // 用户id 代选的时候用得到
@@ -279,6 +284,9 @@ const optionSelect = {
                        message: "请输入正确的手机号码",
                        trigger: "blur"
                    }
+                ],
+                userSign: [
+                    {validator: validateUserSign, message: "请签字", trigger: "blur"}
                ]
            },
            addressOptions: []
@@ -84,6 +84,7 @@ const applyForm = {
                                            upload_result_type="url"
                                            complete_result
                                            :accept="fileAccept"
+                                            :upload_size="(chooseWorksType?.allowSingleFileSize / 1024 * 1024 * 1024) || 10 * 1024 * 1024"
                                    ></h5-file-upload>
                                </template>
                            </van-field>
@@ -128,7 +128,14 @@ layout("/layouts/platform_h5.html"){
            "pdf-preview": httpVueLoader("/components/plugins/sysFilePreview/PdfIndex.vue?v=" + new Date().getTime())
        },
        methods: {
-            onApply(row) {
+            async onApply(row) {
+                const res = await this.$axios.post('/platform/activity/basic/scope/getScopeUser', {
+                    activityGroupId: Number(row.activityGroupId)
+                })
+                if (res.data === 0) {
+                    this.$toast.fail("您没有权限参与此活动")
+                    return
+                }
                if (this.$moment().isBefore(this.$moment(row.startDateTime))) {
                    this.onView(row)
                    return