Commit a4f57640 authored by zhengke's avatar zhengke

修改

parent 6fdf9e41
...@@ -73,11 +73,13 @@ ...@@ -73,11 +73,13 @@
font-size: 14px; font-size: 14px;
margin-left: 5px; margin-left: 5px;
} }
.Sysuser_Date .el-range-editor .el-range-input{
background-color:transparent; .Sysuser_Date .el-range-editor .el-range-input {
background-color: transparent;
} }
.Sysuser_Date .el-range-editor.el-input__inner{
background-color:transparent; .Sysuser_Date .el-range-editor.el-input__inner {
background-color: transparent;
} }
</style> </style>
...@@ -93,26 +95,27 @@ ...@@ -93,26 +95,27 @@
<div class="page-search row items-center"> <div class="page-search row items-center">
<div class="col row wrap q-mr-lg q-col-gutter-md"> <div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3"> <div class="col-3">
<q-input clearable @change="getList" standout="bg-primary text-white" class="col-6 q-pr-lg q-pr-lg" v-model="waterMsg.ReceiverName" <q-input clearable @change="getList" standout="bg-primary text-white" class="col-6 q-pr-lg q-pr-lg"
label="收信人/电话" /> v-model="waterMsg.ReceiverName" label="收信人/电话" />
</div> </div>
<div class="col-3"> <div class="col-3">
<q-input clearable @change="getList" standout="bg-primary text-white" class="col-6 q-pr-lg q-pr-lg" v-model="waterMsg.SendContent" <q-input clearable @change="getList" standout="bg-primary text-white" class="col-6 q-pr-lg q-pr-lg"
label="内容" /> v-model="waterMsg.SendContent" label="内容" />
</div> </div>
<div class="col-3 Sysuser_Date"> <div class="col-3 Sysuser_Date">
<q-field filled class="col-6 q-pr-lg q-pb-lg"> <q-field filled class="col-6 q-pr-lg q-pb-lg">
            <template v-slot:control>             <template v-slot:control>
              <el-date-picker v-model="dateListOne" @change="getList()" value-format="yyyy-MM-dd" type="daterange"               
 style="border:none;" <el-date-picker v-model="dateListOne" @change="getList()" value-format="yyyy-MM-dd" type="daterange"
                range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">  style="border:none;"                 range-separator="至"  start-placeholder="开始日期"
              </el-date-picker>  end-placeholder="结束日期">
            </template>               </el-date-picker>
          </q-field>             </template>
          </q-field>
</div> </div>
<div class="col-3"> <div class="col-3">
<q-select @input="getList" standout="bg-primary text-white" class="col-6 q-pr-lg q-pr-lg" v-model="waterMsg.SendStatus" <q-select @input="getList" standout="bg-primary text-white" class="col-6 q-pr-lg q-pr-lg"
:options="ShowOpts" emit-value map-options label="发送状态" /> v-model="waterMsg.SendStatus" :options="ShowOpts" emit-value map-options label="发送状态" />
</div> </div>
</div> </div>
</div> </div>
...@@ -142,8 +145,9 @@ ...@@ -142,8 +145,9 @@
<div class="page-search row items-center"> <div class="page-search row items-center">
<div class="col row wrap q-mr-lg q-col-gutter-md"> <div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3"> <div class="col-3">
<q-select @input="getConfigList" standout="bg-primary text-white" class="col-6 q-pr-lg q-pr-lg" v-model="ConfigMsg.StoreType" <q-select @input="getConfigList" standout="bg-primary text-white" class="col-6 q-pr-lg q-pr-lg"
:options="statusData" option-value="Id" option-label="Name" emit-value map-options label="类型" /> v-model="ConfigMsg.StoreType" :options="statusData" option-value="Id" option-label="Name" emit-value
map-options label="类型" />
</div> </div>
</div> </div>
<div class="page-option"> <div class="page-option">
...@@ -190,8 +194,9 @@ ...@@ -190,8 +194,9 @@
<div class="page-search row items-center"> <div class="page-search row items-center">
<div class="col row wrap q-mr-lg q-col-gutter-md"> <div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3"> <div class="col-3">
<q-select @input="getSetingMsg" class="col-6 q-pr-lg q-pr-lg" standout="bg-primary text-white" v-model="setMsg.StoreType" <q-select @input="getSetingMsg" class="col-6 q-pr-lg q-pr-lg" standout="bg-primary text-white"
:options="statusData" option-value="Id" option-label="Name" emit-value map-options label="类型" /> v-model="setMsg.StoreType" :options="statusData" option-value="Id" option-label="Name" emit-value
map-options label="类型" />
</div> </div>
</div> </div>
<div class="page-option"> <div class="page-option">
...@@ -203,7 +208,8 @@ ...@@ -203,7 +208,8 @@
<div class="order_top"> <div class="order_top">
<div style="display:flex;align-items:center;"> <div style="display:flex;align-items:center;">
<img v-if="item.BaseTemplateType==1" src="../../assets/images/myimg/gou.png" /> <img v-if="item.BaseTemplateType==1" src="../../assets/images/myimg/gou.png" />
<img v-if="item.BaseTemplateType==2" style="width:30px;height:30px;" src="../../assets/images/myimg/failed.png" /> <img v-if="item.BaseTemplateType==2" style="width:30px;height:30px;"
src="../../assets/images/myimg/failed.png" />
<span style="margin-left:10px;">{{item.BaseTemplateTypeStr}}</span> <span style="margin-left:10px;">{{item.BaseTemplateTypeStr}}</span>
</div> </div>
<div> <div>
...@@ -238,74 +244,79 @@ ...@@ -238,74 +244,79 @@
:input="true" @input="changePage3" /> :input="true" @input="changePage3" />
</template> </template>
<el-drawer title="" :visible.sync="drawer" :with-header="false"> <q-dialog v-model="persistent1" maximized full-height seamless position="right" @hide="closeperForm">
<div class="drawerTop"> <q-card style="margin-top:61px;width:600px" class="no-border-radius classinfo_Dialog">
<div style="display:flex;align-items:center;"> <div class="drawerTop">
<img src="../../assets/images/myimg/success.png" alt="" /> <div style="display:flex;align-items:center;margin:20px 0 0 20px;">
<span class="drawer_Span">短信账号配置</span> <span class="drawer_Span">短信账号配置</span>
</div>
</div> </div>
<div> <div style="padding:20px 15px;">
<i class="iconfont icon-guanbi" @click="drawer=false"></i> <q-radio v-model="configEditMsg.StoreType" style="margin-right:20px;" v-for="(item,index) in statusData"
v-if="item.Id>0" :val="item.Id" :label="item.Name" :key="index" />
</div> </div>
</div> <div class="col-12" style="margin:0 24px;">
<div style="padding:20px 15px;"> <q-input filled stack-label maxlength="100" :dense="false" v-model="configEditMsg.MsgBase.RegionId"
<q-radio v-model="configEditMsg.StoreType" style="margin-right:20px;" v-for="(item,index) in statusData" class="col-12" label="地区" :rules="[val => !!val || '请填写地区']" />
v-if="item.Id>0" :val="item.Id" :label="item.Name" :key="index" />
</div>
<div class="col-12" style="margin:0 24px;">
<q-input filled stack-label maxlength="100" :dense="false" v-model="configEditMsg.MsgBase.RegionId"
class="col-12" label="地区" :rules="[val => !!val || '请填写地区']" />
</div>
<div class="col-12" style="margin:20px 24px;">
<q-input filled stack-label maxlength="100" :dense="false" v-model="configEditMsg.MsgBase.Domain" class="col-12"
label="域名" :rules="[val => !!val || '请填写域名']" />
</div>
<div filled class="col-12" style="margin:20px 24px;">
<q-input filled stack-label maxlength="100" :dense="false" v-model="configEditMsg.MsgBase.AccessKeyId"
class="col-12" label="秘钥Key" :rules="[val => !!val || '请填写秘钥Key']" />
</div>
<div filled class="col-12" style="margin:0 24px;">
<q-input filled stack-label maxlength="100" :dense="false" v-model="configEditMsg.MsgBase.AccessSecret"
class="col-12" label="秘钥Secret" :rules="[val => !!val || '请填写秘钥Secret']" />
</div>
<div style="margin:30px 10px 0 0;text-align:right;">
<q-btn color="accent" class="q-mr-md" icon="add" label="保存" @click="saveConfig()" />
</div>
</el-drawer>
<el-drawer title="" :visible.sync="msgDrawdia" :with-header="false">
<div class="drawerTop">
<div style="display:flex;align-items:center;">
<img src="../../assets/images/myimg/success.png" alt="" />
<span class="drawer_Span">短信设置</span>
</div> </div>
<div> <div class="col-12" style="margin:20px 24px;">
<i class="iconfont icon-guanbi" @click="msgDrawdia=false"></i> <q-input filled stack-label maxlength="100" :dense="false" v-model="configEditMsg.MsgBase.Domain"
class="col-12" label="域名" :rules="[val => !!val || '请填写域名']" />
</div> </div>
<div filled class="col-12" style="margin:20px 24px;">
<q-input filled stack-label maxlength="100" :dense="false" v-model="configEditMsg.MsgBase.AccessKeyId"
class="col-12" label="秘钥Key" :rules="[val => !!val || '请填写秘钥Key']" />
</div>
<div filled class="col-12" style="margin:0 24px;">
<q-input filled stack-label maxlength="100" :dense="false" v-model="configEditMsg.MsgBase.AccessSecret"
class="col-12" label="秘钥Secret" :rules="[val => !!val || '请填写秘钥Secret']" />
</div>
<div style="margin:30px 10px 0 0;text-align:right;">
<q-btn color="accent" class="q-mr-md" icon="add" label="保存" @click="saveConfig()" />
</div>
</q-card>
<div class="dialog-out-close" @click="closeperForm"
style="height:40px !important;border-top-left-radius: 4px !important;border-bottom-left-radius: 4px !important;">
<q-icon name="iconfont icon-jujue1" size="26px" />
</div> </div>
<div style="padding:20px 15px;"> </q-dialog>
<q-radio v-model="baseEditMsg.StoreType" style="margin-right:20px;" v-for="(item,index) in statusData" :key="index" v-if="item.Id>0"
:val="item.Id" :label="item.Name" /> <q-dialog v-model="persistent2" maximized full-height seamless position="right" @hide="closeperFormTwo">
</div> <q-card style="margin-top:61px;width:600px" class="no-border-radius classinfo_Dialog">
<div class="col-12" style="margin:0 20px;"> <div class="drawerTop">
<q-toggle size="md" label="模板状态" color="primary" :false-value="1" :true-value="0" <div style="display:flex;align-items:center;margin:20px 0 0 20px">
v-model="baseEditMsg.TemplateStaus" /> <span class="drawer_Span">短信设置</span>
</div> </div>
<div class="col-12" style="margin:20px 24px;"> </div>
<q-select standout="bg-primary text-white" v-model="baseEditMsg.BaseTemplateType" :options="moduleList" <div style="padding:20px 15px;">
option-value="Id" option-label="Name" emit-value map-options label="模板类型" /> <q-radio v-model="baseEditMsg.StoreType" style="margin-right:20px;" v-for="(item,index) in statusData"
</div> :key="index" v-if="item.Id>0" :val="item.Id" :label="item.Name" />
<div filled class="col-12" style="margin:30px 24px 0 24px;"> </div>
<q-input filled stack-label maxlength="100" :dense="false" v-model="baseEditMsg.Sign" class="col-12" label="签名" <div class="col-12" style="margin:0 20px;">
:rules="[val => !!val || '请填写签名']" /> <q-toggle size="md" label="模板状态" color="primary" :false-value="1" :true-value="0"
</div> v-model="baseEditMsg.TemplateStaus" />
<div filled class="col-12" style="margin:20px 24px 0 24px;"> </div>
<q-input filled stack-label maxlength="100" :dense="false" v-model="baseEditMsg.TemplateId" class="col-12" <div class="col-12" style="margin:20px 24px;">
label="模板id" :rules="[val => !!val || '请填写模板id']" /> <q-select standout="bg-primary text-white" v-model="baseEditMsg.BaseTemplateType" :options="moduleList"
</div> option-value="Id" option-label="Name" emit-value map-options label="模板类型" />
<div style="margin:30px 10px 0 0;text-align:right;"> </div>
<q-btn color="accent" class="q-mr-md" icon="add" label="保存" @click="saveSatMsg()" /> <div filled class="col-12" style="margin:30px 24px 0 24px;">
<q-input filled stack-label maxlength="100" :dense="false" v-model="baseEditMsg.Sign" class="col-12"
label="签名" :rules="[val => !!val || '请填写签名']" />
</div>
<div filled class="col-12" style="margin:20px 24px 0 24px;">
<q-input filled stack-label maxlength="100" :dense="false" v-model="baseEditMsg.TemplateId" class="col-12"
label="模板id" :rules="[val => !!val || '请填写模板id']" />
</div>
<div style="margin:30px 10px 0 0;text-align:right;">
<q-btn color="accent" class="q-mr-md" icon="add" label="保存" @click="saveSatMsg()" />
</div>
</q-card>
<div class="dialog-out-close" @click="closeperFormTwo"
style="height:40px !important;border-top-left-radius: 4px !important;border-bottom-left-radius: 4px !important;">
<q-icon name="iconfont icon-jujue1" size="26px" />
</div> </div>
</el-drawer> </q-dialog>
</div> </div>
</template> </template>
...@@ -405,7 +416,6 @@ ...@@ -405,7 +416,6 @@
value: 2 value: 2
} }
], ],
drawer: false, //显示右侧抽屉
ConfigMsg: { ConfigMsg: {
PageIndex: 1, PageIndex: 1,
...@@ -433,7 +443,6 @@ ...@@ -433,7 +443,6 @@
//短信配置数据 //短信配置数据
configData: [], configData: [],
pageCountConfig: 0, //配置 页数 pageCountConfig: 0, //配置 页数
msgDrawdia: false, //短信设置右侧弹窗
baseEditMsg: { baseEditMsg: {
ID: 0, ID: 0,
StoreType: 1, //短信供应商 1-腾讯云,2-阿里,3-其他 StoreType: 1, //短信供应商 1-腾讯云,2-阿里,3-其他
...@@ -445,7 +454,10 @@ ...@@ -445,7 +454,10 @@
moduleList: [], //配置类型列表 moduleList: [], //配置类型列表
setUpData: [], //短信设置数据 setUpData: [], //短信设置数据
setDataCount: 0, //短信设置页数 setDataCount: 0, //短信设置页数
dateListOne:[], //日期 dateListOne: [], //日期
persistent1: false,
persistent2:false,
} }
}, },
mounted() { mounted() {
...@@ -500,8 +512,8 @@ ...@@ -500,8 +512,8 @@
}, },
//获去下拉状态 //获去下拉状态
getStatus() { getStatus() {
let msg={ let msg = {
Type:1 Type: 1
} }
getConfigStatus(msg).then(res => { getConfigStatus(msg).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
...@@ -529,7 +541,7 @@ ...@@ -529,7 +541,7 @@
}, },
//新增配置 //新增配置
addConfig() { addConfig() {
this.drawer = true; this.persistent1 = true;
this.configEditMsg.ID = 0; this.configEditMsg.ID = 0;
this.configEditMsg.StoreType = 1; this.configEditMsg.StoreType = 1;
this.configEditMsg.MsgBase.RegionId = ''; this.configEditMsg.MsgBase.RegionId = '';
...@@ -542,7 +554,7 @@ ...@@ -542,7 +554,7 @@
let msg = { let msg = {
ID: obj.ID ID: obj.ID
} }
this.drawer = true; this.persistent1 = true;
GetMsgBaseList(msg).then(res => { GetMsgBaseList(msg).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
var data = res.Data; var data = res.Data;
...@@ -595,7 +607,7 @@ ...@@ -595,7 +607,7 @@
position: "top", position: "top",
message: `保存成功` message: `保存成功`
}) })
this.drawer = false; this.persistent1 = false;
this.getConfigList(); this.getConfigList();
}).catch(() => { }).catch(() => {
...@@ -630,11 +642,11 @@ ...@@ -630,11 +642,11 @@
this.baseEditMsg.BaseTemplateType = 1; this.baseEditMsg.BaseTemplateType = 1;
this.baseEditMsg.Sign = ''; this.baseEditMsg.Sign = '';
this.baseEditMsg.TemplateId = ''; this.baseEditMsg.TemplateId = '';
this.msgDrawdia = true; this.persistent2=true;
}, },
//修改数据 //修改数据
getMsgInfo(item) { getMsgInfo(item) {
this.msgDrawdia = true; this.persistent2=true;
this.baseEditMsg.ID = item.ID; this.baseEditMsg.ID = item.ID;
this.baseEditMsg.StoreType = item.StoreType; this.baseEditMsg.StoreType = item.StoreType;
this.baseEditMsg.TemplateStaus = item.TemplateStaus; this.baseEditMsg.TemplateStaus = item.TemplateStaus;
...@@ -668,12 +680,19 @@ ...@@ -668,12 +680,19 @@
message: `保存成功` message: `保存成功`
}) })
this.getSetingMsg(); this.getSetingMsg();
this.msgDrawdia = false; // this.msgDrawdia = false;
this.persistent2 = false;
} }
}).catch(() => { }).catch(() => {
}) })
},
closeperForm() {
this.persistent1 = false;
},
closeperFormTwo(){
this.persistent2 = false;
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment