Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-05-08 e53fcbe9fe844b7788b29c5106c1ac24d17c5535

 zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-writeoff-info.html

@@ -31,7 +31,7 @@
                <el-row style="display:flex;">
                    <el-col :span="6">
                        <el-form-item label="奖品图片：" :label-width="formLabelWidth">
                            {{formSelect.jptp}}
                            <img :src="formSelect.jptp" style="max-width: 200px;">
                        </el-form-item>
                    </el-col>
                    <el-col :span="6">
@@ -154,11 +154,16 @@
            //核销
            dataSubmit : function(formName) {
                const _this = this;
                let flag = false;
                _this.$refs[formName].validate((valid) => {
                    if (!valid) {
                        flag = true;
                        return;
                    }
                });
                if (flag) {
                    return;
                }
                let resultData = {
                    writeoffId : writeoffId,
                    writeOffCode : _this.ruleForm.writeOffCode,
@@ -172,6 +177,7 @@
                            message: data.info,
                            type: 'success',
                        });
                        _this.loadInfo();
                    }
                });
            },
@@ -181,6 +187,7 @@
            },
            closeFrame() {
                parent.layer.close(parent.layer.getFrameIndex(window.name));
                parent.location.reload();
            },
        }
    })