Skip to content

C
confucius
Commit 34122328 authored by Mac's avatar Mac
Browse files
Options

1

parent 74e816eb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 483 additions and 160 deletions
src/components/enterprise/applet-form.vue
View file @ 34122328
This diff is collapsed.
src/pages/enterprise/addWelcome.vue
View file @ 34122328
...@@ -56,6 +56,37 @@ ...@@ -56,6 +56,37 @@
{{addMsg.Content}} {{addMsg.Content}}
</div> </div>
</div> </div>
<div style="display: flex;align-items: flex-start;margin-top: 15px;" v-for="(item,index) in MediumModel" :key="index">
<i class="el-icon-user" style="margin-right:20px;font-size: 40px;color: #1890ff;"></i>
<div v-if="item.Type==2" style="width: 1px; flex:1;">
<q-img :src="item.ImageModel.ImagePath"
style="width: 70%;">
</q-img>
</div>
<div v-if="item.Type==3" style="width: 1px; flex:1;padding: 10px 15px; border: 1px solid #eee; border-radius: 4px; background: #fff;">
<div>{{item.ImgTextModel.Title}}</div>
<div style="display: flex;align-items: flex-start;justify-content: space-between;">
<div style="width: 1px;flex:1">
{{item.ImgTextModel.Description}}
</div>
<q-img :src="item.ImgTextModel.ImgPath"
style="width: 80px;height: 80px;margin-left: 10px;">
</q-img>
</div>
</div>
<div v-if="item.Type==6" style="width: 70%;padding: 10px 15px; border: 1px solid #eee; border-radius: 4px; background: #fff;">
<div>{{item.AppletModel.Title}}</div>
<q-img :src="item.AppletModel.ImagePath"
style="width: 100%;">
</q-img>
</div>
</div>
</div> </div>
</div> </div>
<div class="box_r"> <div class="box_r">
...@@ -87,11 +118,12 @@ ...@@ -87,11 +118,12 @@
<div v-if="MediumModel.length>0"> <div v-if="MediumModel.length>0">
<div class="row items-center" v-for="(x,y) in MediumModel" :key="y"> <div class="row items-center" v-for="(x,y) in MediumModel" :key="y">
<i class="el-icon-link"></i> <i class="el-icon-link"></i>
<span style="margin-left: 10px;cursor: pointer;" @click="selectimg">{{Selectobj.name}}</span> <span style="margin-left: 10px;cursor: pointer;" >{{getType(x,'title')}}</span>
<i style="margin-left: 10px;cursor: pointer" class="el-icon-close" @click="Selectobj={}"></i> <i style="margin-left: 10px;cursor: pointer" class="el-icon-close"
@click="deleteModel(y)"></i>
</div> </div>
</div> </div>
<q-btn color="white" text-color="black" label="+添加图片/图文/小程序" size='md'> <q-btn color="white" text-color="black" label="+添加图片/图文/小程序" size='md'>
<q-popup-proxy ref='popupproxy'> <q-popup-proxy ref='popupproxy'>
<q-banner> <q-banner>
...@@ -103,12 +135,13 @@ ...@@ -103,12 +135,13 @@
</q-banner> </q-banner>
</q-popup-proxy> </q-popup-proxy>
</q-btn> </q-btn>
</el-form-item> </el-form-item>
</el-form> </el-form>
<q-card-actions align="left" class="bg-white" style="margin-top: 15px;"> <q-card-actions align="left" class="bg-white" style="margin-top: 15px;">
<q-btn color="accent" class="q-mr-md" label="保存" @click="savemove()" style="width: 100px;" :loading="loading"/> <q-btn color="accent" class="q-mr-md" label="保存" @click="savemove()" style="width: 100px;"
:loading="loading" />
<q-btn class="q-mr-md" label="返回" @click="goblck()" style="width: 60px;" /> <q-btn class="q-mr-md" label="返回" @click="goblck()" style="width: 60px;" />
</q-card-actions> </q-card-actions>
</div> </div>
...@@ -139,14 +172,13 @@ ...@@ -139,14 +172,13 @@
</div> </div>
</el-dialog> </el-dialog>
<!-- 图片 --> <!-- 图片 -->
<selectMaterial v-if="isshowselectMaterial" :materialType="materialType" :saveobj='Selectobj' :classifyList='classifyList' <selectMaterial v-if="isshowselectMaterial" :materialType="materialType" :classifyList='classifyList'
@close="getclose()" @success='getsuccess'> @close="getclose()" @success='getsuccess'>
</selectMaterial> </selectMaterial>
<!-- 图文 --> <!-- 图文 -->
<imagetextform v-if="isshowimagetext" :saveobj='Selectobj' @close="gettwclose()" @success='gettwsuccess'> <imagetextform v-if="isshowimagetext" @close="gettwclose()" @success='gettwsuccess' :classifyList='classifyList'></imagetextform>
</imagetextform>
<!-- 小程序 --> <!-- 小程序 -->
<appletform v-if="isshowapplet" :saveobj='Selectobj' @close="getxcxclose()" @success='getxcxsuccess'> <appletform v-if="isshowapplet" @close="getxcxclose()" @success='getxcxsuccess' :classifyList='classifyList'>
</appletform> </appletform>
</div> </div>
</template> </template>
...@@ -179,7 +211,7 @@ ...@@ -179,7 +211,7 @@
outerVisible: false,//选择人员弹窗 outerVisible: false,//选择人员弹窗
filterText: '',//人员选择 帅选 filterText: '',//人员选择 帅选
memberList: [],// memberList: [],//
allmemberList:[], allmemberList: [],
showMember: [], showMember: [],
membertype: '1', membertype: '1',
ryList: [], ryList: [],
...@@ -198,9 +230,8 @@ ...@@ -198,9 +230,8 @@
isshowselectMaterial: false, isshowselectMaterial: false,
isshowimagetext: false, isshowimagetext: false,
isshowapplet: false, isshowapplet: false,
Selectobj: {},//选中对象 MediumModel: [],//已选的添加内容
MediumModel:[], classifyList: [],
classifyList:[],
} }
}, },
created() { created() {
...@@ -210,7 +241,7 @@ ...@@ -210,7 +241,7 @@
getWeChatMediumGroupList() { getWeChatMediumGroupList() {
getWeChatMediumGroupList({}).then(res => { getWeChatMediumGroupList({}).then(res => {
this.classifyList = res.Data this.classifyList = res.Data
}) })
}, },
getMember2() { getMember2() {
...@@ -219,7 +250,7 @@ ...@@ -219,7 +250,7 @@
queryEmployee({}).then(res => { queryEmployee({}).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
this.memberList = res.Data; this.memberList = res.Data;
this.allmemberList = JSON.parse(JSON.stringify(res.Data)) ; this.allmemberList = JSON.parse(JSON.stringify(res.Data));
} }
}).catch(() => { }).catch(() => {
...@@ -258,7 +289,7 @@ ...@@ -258,7 +289,7 @@
if (!value) return true; if (!value) return true;
return data.DepartmentName.indexOf(value) !== -1; return data.DepartmentName.indexOf(value) !== -1;
}, },
getmemlist(){ getmemlist() {
if (this.filterText === '') { if (this.filterText === '') {
this.memberList = JSON.parse(JSON.stringify(this.allmemberList)) this.memberList = JSON.parse(JSON.stringify(this.allmemberList))
} else { } else {
...@@ -285,9 +316,34 @@ ...@@ -285,9 +316,34 @@
}, },
getsuccess(data) {//选择数据回来 getsuccess(data) {//选择数据回来
this.Selectobj = data this.ISidentical(data)
this.isshowselectMaterial = false this.isshowselectMaterial = false
}, },
ISidentical(data){//返回来的数据进行判断再添加
if(this.MediumModel.length>0){
let isyes = false
this.MediumModel.map(x=>{
if(x.Id== data.Id){
isyes = true;
return
}
})
if(isyes==false){
this.MediumModel.push(data)
}else{
this.$q.notify({
type: 'negative',
message: `重复选择、请您重新选择!`,
position: 'top'
})
return
}
}else{
this.MediumModel = [];
this.MediumModel.push(data)
}
},
selecttextimg() {//图文 selecttextimg() {//图文
this.isshowimagetext = true; this.isshowimagetext = true;
...@@ -299,7 +355,7 @@ ...@@ -299,7 +355,7 @@
this.isshowimagetext = false; this.isshowimagetext = false;
}, },
gettwsuccess(data) {//图文返回成功 gettwsuccess(data) {//图文返回成功
this.Selectobj = data this.ISidentical(data)
this.isshowimagetext = false this.isshowimagetext = false
}, },
...@@ -314,8 +370,8 @@ ...@@ -314,8 +370,8 @@
getxcxclose() {//小程序 关闭 getxcxclose() {//小程序 关闭
this.isshowapplet = false; this.isshowapplet = false;
}, },
getxcxsuccess() {//小程序 关闭 getxcxsuccess(data) {//小程序 关闭
this.Selectobj = data this.ISidentical(data)
this.isshowapplet = false this.isshowapplet = false
}, },
savemove() {//保存 savemove() {//保存
...@@ -336,6 +392,16 @@ ...@@ -336,6 +392,16 @@
return return
} }
} }
this.addMsg.MediumIds == ''
if(this.MediumModel && this.MediumModel.length>0){
let ids=[]
this.MediumModel.forEach(x=>{
ids.push(x.Id)
})
this.addMsg.MediumIds = ids.join(',')
}
if (this.addMsg.MediumIds == '') { if (this.addMsg.MediumIds == '') {
this.addMsg.Type = 1; this.addMsg.Type = 1;
if (this.addMsg.Content == '') { if (this.addMsg.Content == '') {
...@@ -367,6 +433,29 @@ ...@@ -367,6 +433,29 @@
goblck() {//返回上一个页面 goblck() {//返回上一个页面
this.$router.go(-1);//返回上一层 this.$router.go(-1);//返回上一层
}, },
getType(row, name) {
let title = ''
let content = ''
if (row.Type == 2) {
title = row.ImageModel.ImageName
content = row.ImageModel.ImagePath
} else if (row.Type == 3) {
title = row.ImgTextModel.Title
content = row.ImgTextModel.ImgPath
} else if (row.Type == 6) {
title = row.AppletModel.Title
content = row.AppletModel.ImagePath
}
if (name == 'title') {
return title
} else if (name == 'content') {
return content
}
},
deleteModel(index){
this.MediumModel.splice(index,1)
}
} }
......
src/pages/enterprise/welcomeList.vue
View file @ 34122328
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
getWeChatWelcomesPageList(this.msg).then(res => { getWeChatWelcomesPageList(this.msg).then(res => {
this.loading = false this.loading = false
this.data = res.Data.PageData; this.data = res.Data.PageData;
this.pageCount = res.Data.Count this.pageCount = res.Data.PageCount
this.data.forEach(x => { this.data.forEach(x => {
x.UserIdName = '' x.UserIdName = ''
x.UserIdList.map((j, i) => { x.UserIdList.map((j, i) => {
......
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