Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
闫晓茹 2024-04-11 18:05:42 +08:00
commit b9057dcf4e
3 changed files with 16 additions and 15 deletions

View File

@ -236,8 +236,8 @@
placeholder="请输入短信模板名称" placeholder="请输入短信模板名称"
/> />
</el-form-item> </el-form-item>
<el-form-item label="短信ID" prop="textMessageId"> <el-form-item label="短信ID" prop="textMessageId" v-if="title=='修改短信模板信息'">
<el-input v-model="form.textMessageId" placeholder="请输入短信ID" onKeyUp="value=value.replace(/[\W]/g,'')"/> <el-input v-model="form.textMessageId" placeholder="请输入短信ID" onKeyUp="value=value.replace(/[\W]/g,'')" disabled/>
</el-form-item> </el-form-item>
<el-form-item label="短信排序" prop="textMessageSort"> <el-form-item label="短信排序" prop="textMessageSort">
<el-input-number v-model="form.textMessageSort" controls-position="right" :min="0" placeholder="请输入短信排序"   style="width:350px"/> <el-input-number v-model="form.textMessageSort" controls-position="right" :min="0" placeholder="请输入短信排序"   style="width:350px"/>
@ -624,9 +624,9 @@ export default {
textMessageName: [ textMessageName: [
{ required: true, message: "短信模板名称不能为空", trigger: "blur" } { required: true, message: "短信模板名称不能为空", trigger: "blur" }
], ],
textMessageId: [ // textMessageId: [
{ required: true, message: "短信ID不能为空", trigger: "blur" } // { required: true, message: "ID", trigger: "blur" }
], // ],
textMessageContent: [ textMessageContent: [
{ required: true, message: "短信内容不能为空", trigger: "blur" } { required: true, message: "短信内容不能为空", trigger: "blur" }
], ],

View File

@ -257,8 +257,9 @@
style="width: 206px" style="width: 206px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="话术ID" prop="scriptId"> <el-form-item label="话术ID" prop="scriptId" v-if="title=='修改话术信息'">
<el-input <el-input
disabled
onKeyUp="value=value.replace(/[\W]/g,'')" onKeyUp="value=value.replace(/[\W]/g,'')"
v-model="form.scriptId" v-model="form.scriptId"
placeholder="请输入话术ID" placeholder="请输入话术ID"
@ -716,9 +717,9 @@ export default {
scriptName: [ scriptName: [
{ required: true, message: "话术名称不能为空", trigger: "blur" } { required: true, message: "话术名称不能为空", trigger: "blur" }
], ],
scriptId: [ // scriptId: [
{ required: true, message: "话术ID不能为空", trigger: "blur" } // { required: true, message: "ID", trigger: "blur" }
], // ],
platformId: [ platformId: [
{ required: true, message: "平台ID不能为空", trigger: "blur" } { required: true, message: "平台ID不能为空", trigger: "blur" }
], ],

View File

@ -187,8 +187,8 @@
placeholder="请输入微信模板名称" placeholder="请输入微信模板名称"
/> />
</el-form-item> </el-form-item>
<el-form-item label="模板ID" prop="templateId"> <el-form-item label="模板ID" prop="templateId" v-if="title=='修改微信模板'">
<el-input v-model="form.templateId" placeholder="请输入模板ID" onKeyUp="value=value.replace(/[\W]/g,'')" /> <el-input v-model="form.templateId" placeholder="请输入模板ID" onKeyUp="value=value.replace(/[\W]/g,'')" disabled/>
</el-form-item> </el-form-item>
<el-form-item label="微信排序" prop="templateSort"> <el-form-item label="微信排序" prop="templateSort">
<el-input-number v-model="form.templateSort" controls-position="right" :min="0" placeholder="请输入微信排序"   style="width:350px"/> <el-input-number v-model="form.templateSort" controls-position="right" :min="0" placeholder="请输入微信排序"   style="width:350px"/>
@ -552,9 +552,9 @@ export default {
wechatTemplateName: [ wechatTemplateName: [
{ required: true, message: "微信模板名称不能为空", trigger: "blur" } { required: true, message: "微信模板名称不能为空", trigger: "blur" }
], ],
templateId: [ // templateId: [
{ required: true, message: "模板ID不能为空", trigger: "blur" } // { required: true, message: "ID", trigger: "blur" }
], // ],
templateSource: [ templateSource: [
{ required: true, message: "模板来源不能为空", trigger: "blur" } { required: true, message: "模板来源不能为空", trigger: "blur" }
], ],
@ -795,7 +795,7 @@ export default {
this.form.templateSort=undefined this.form.templateSort=undefined
} }
this.open = true; this.open = true;
this.title = "修改信息"; this.title = "修改微信模板";
}); });
}, },