1

src/pages/enterprise/addWelcome.vue

@@ -56,6 +56,37 @@
                         {{addMsg.Content}}
                     </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 class="box_r">
@@ -87,8 +118,9 @@
                     <div v-if="MediumModel.length>0">
                         <div class="row items-center" v-for="(x,y) in MediumModel" :key="y">
                             <i class="el-icon-link"></i>
-                            <span style="margin-left: 10px;cursor: pointer;" @click="selectimg">{{Selectobj.name}}</span>
-                            <i style="margin-left: 10px;cursor: pointer" class="el-icon-close" @click="Selectobj={}"></i>
+                            <span style="margin-left: 10px;cursor: pointer;" >{{getType(x,'title')}}</span>
+                            <i style="margin-left: 10px;cursor: pointer" class="el-icon-close"
+                                @click="deleteModel(y)"></i>
                         </div>
                     </div>
 
@@ -108,7 +140,8 @@
                 </el-form-item>
             </el-form>
             <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-card-actions>
         </div>
@@ -139,14 +172,13 @@
             </div>
         </el-dialog>
         <!-- 图片 -->
-        <selectMaterial v-if="isshowselectMaterial" :materialType="materialType" :saveobj='Selectobj' :classifyList='classifyList'
+        <selectMaterial v-if="isshowselectMaterial" :materialType="materialType" :classifyList='classifyList'
             @close="getclose()" @success='getsuccess'>
         </selectMaterial>
         <!-- 图文 -->
-        <imagetextform v-if="isshowimagetext" :saveobj='Selectobj' @close="gettwclose()" @success='gettwsuccess'>
-        </imagetextform>
+        <imagetextform v-if="isshowimagetext" @close="gettwclose()" @success='gettwsuccess' :classifyList='classifyList'></imagetextform>
         <!-- 小程序 -->
-        <appletform v-if="isshowapplet" :saveobj='Selectobj' @close="getxcxclose()" @success='getxcxsuccess'>
+        <appletform v-if="isshowapplet" @close="getxcxclose()" @success='getxcxsuccess' :classifyList='classifyList'>
         </appletform>
     </div>
 </template>
@@ -179,7 +211,7 @@
                 outerVisible: false,//选择人员弹窗
                 filterText: '',//人员选择 帅选
                 memberList: [],//
-                allmemberList:[],
+                allmemberList: [],
                 showMember: [],
                 membertype: '1',
                 ryList: [],
@@ -198,9 +230,8 @@
                 isshowselectMaterial: false,
                 isshowimagetext: false,
                 isshowapplet: false,
-                Selectobj: {},//选中对象
-                MediumModel:[],
-                classifyList:[],
+                MediumModel: [],//已选的添加内容
+                classifyList: [],
             }
         },
         created() {
@@ -219,7 +250,7 @@
                 queryEmployee({}).then(res => {
                     if (res.Code == 1) {
                         this.memberList = res.Data;
-                        this.allmemberList = JSON.parse(JSON.stringify(res.Data)) ;
+                        this.allmemberList = JSON.parse(JSON.stringify(res.Data));
                     }
                 }).catch(() => {
 
@@ -258,7 +289,7 @@
                 if (!value) return true;
                 return data.DepartmentName.indexOf(value) !== -1;
             },
-            getmemlist(){
+            getmemlist() {
                 if (this.filterText === '') {
                     this.memberList = JSON.parse(JSON.stringify(this.allmemberList))
                 } else {
@@ -285,9 +316,34 @@
             },
 
             getsuccess(data) {//选择数据回来
-                this.Selectobj = data
+                this.ISidentical(data)
                 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() {//图文
                 this.isshowimagetext = true;
@@ -299,7 +355,7 @@
                 this.isshowimagetext = false;
             },
             gettwsuccess(data) {//图文返回成功
-                this.Selectobj = data
+                this.ISidentical(data)
                 this.isshowimagetext = false
             },
 
@@ -314,8 +370,8 @@
             getxcxclose() {//小程序 关闭
                 this.isshowapplet = false;
             },
-            getxcxsuccess() {//小程序 关闭
-                this.Selectobj = data
+            getxcxsuccess(data) {//小程序 关闭
+                this.ISidentical(data)
                 this.isshowapplet = false
             },
             savemove() {//保存
@@ -336,6 +392,16 @@
                         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 == '') {
                     this.addMsg.Type = 1;
                     if (this.addMsg.Content == '') {
@@ -367,6 +433,29 @@
             goblck() {//返回上一个页面
                 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

@@ -161,7 +161,7 @@
         getWeChatWelcomesPageList(this.msg).then(res => {
           this.loading = false
           this.data = res.Data.PageData;
-          this.pageCount = res.Data.Count
+          this.pageCount = res.Data.PageCount
           this.data.forEach(x => {
             x.UserIdName = ''
             x.UserIdList.map((j, i) => {