Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/api/system/wechat.js

@@ -152,4 +152,28 @@ export function SetSynvEduEmployee(data) {
     method: 'post',
     data
   })
+}
+
+/**
+ * 获取欢迎语分页列表
+ * 
+ */
+ export function getWeChatWelcomesPageList(data) {
+  return request({
+    url: '/QYWeChat/GetWeChatWelcomesPageList',
+    method: 'post',
+    data
+  })
+}
+
+/**
+ * 新增修改欢迎语
+ * 
+ */
+ export function setWeChatWelcomesInfo(data) {
+  return request({
+    url: '/QYWeChat/SetWeChatWelcomesInfo',
+    method: 'post',
+    data
+  })
 }
\ No newline at end of file

src/components/enterprise/material/allAddSC.vue

@@ -345,6 +345,7 @@
                 addMsg: {
                     Id: 0,
                     Type: 1,
+                    Is_Sync:1,//是否同步 暂时默认为1 同步
                     MediaGroupId: '',
                 }
 
@@ -353,6 +354,7 @@
         created() {
             if (this.editobj != null) {
                 this.addMsg = this.editobj
+                this.addMsg.Is_Sync=1
             } else {
                 this.gettype()
             }
@@ -361,6 +363,7 @@
             gettype() {
                 this.addMsg.Id = 0;
                 this.addMsg.Type = this.type
+                this.addMsg.Is_Sync = 1;
                 this.addMsg.MediaGroupId = '';
                 if (this.type == 1) {//文本
                     this.addMsg.TextModel = {

src/components/enterprise/material/allmaterial.vue

@@ -6,8 +6,9 @@
         </div>
       </div> -->
     <div class="page-content">
-      <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table no-bottom-table" 
-        separator="none" title="" :data="dataList" :columns="columns" row-key="name">
+      <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat
+        class="sticky-column-table no-bottom-table" separator="none" title="" :data="dataList" :columns="columns"
+        row-key="name">
 
         <template v-slot:body-cell-title="props">
           <q-td :props="props">
@@ -17,47 +18,50 @@
 
         <template v-slot:body-cell-Content="props">
           <q-td :props="props">
-            <span v-if="props.row.Type==1">{{getType(props.row,'content')}}</span>
-            <q-img v-if="props.row.Type==2 || props.row.Type==3 || props.row.Type==6"
-              :src="getType(props.row,'content')" style="width: 80px;height: 80px;border-radius: 6px;display: flex;">
-            </q-img>
-            <audio controls="controls"
-              v-if='props.row.Type==4 && props.row.AudioModel && props.row.AudioModel.AudioPath'
-              style="width: 200px;height: 40px;">
-              <source :src="props.row.AudioModel.AudioPath" type="audio/ogg">
-              <source :src="props.row.AudioModel.AudioPath" type="audio/mpeg">
-            </audio>
-            <video width="200" height="120" controls="controls"
-              v-if="props.row.Type==5 && props.row.VideoModel && props.row.VideoModel.VideoPath">
-              <source :src="props.row.VideoModel.VideoPath" type="video/ogg" />
-              <source :src="props.row.VideoModel.VideoPath" type="video/mp4" />
-              <source :src="props.row.VideoModel.VideoPath" type="video/webm" />
-            </video>
-            <div v-if="props.row.Type==7 && props.row.FileModel && props.row.FileModel.FilePath!=''"
-              @click.stop="showUpLoadFile(props.row.FileModel)">
-              <i v-if="props.row.FileModel.FilePath.substring(props.row.FileModel.FilePath.lastIndexOf('.')+1,props.row.FileModel.FilePath.length).toUpperCase()=='PDF'"
-                class="iconfont icon-pdf"></i>
-              <i v-else-if="props.row.FileModel.FilePath.substring(props.row.FileModel.FilePath.lastIndexOf('.')+1,props.row.FileModel.FilePath.length).toUpperCase()=='TXT'"
-                class="iconfont icon-txt"></i>
-              <i v-else-if="props.row.FileModel.FilePath.substring(props.row.FileModel.FilePath.lastIndexOf('.')+1,props.row.FileModel.FilePath.length).toUpperCase()=='DOCX' || 
+            <div style="width: 200px;">
+              <span v-if="props.row.Type==1">{{getType(props.row,'content')}}</span>
+              <q-img v-if="props.row.Type==2 || props.row.Type==3 || props.row.Type==6"
+                :src="getType(props.row,'content')" style="width: 80px;height: 80px;border-radius: 6px;display: flex;">
+              </q-img>
+              <audio controls="controls"
+                v-if='props.row.Type==4 && props.row.AudioModel && props.row.AudioModel.AudioPath'
+                style="width: 200px;height: 40px;">
+                <source :src="props.row.AudioModel.AudioPath" type="audio/ogg">
+                <source :src="props.row.AudioModel.AudioPath" type="audio/mpeg">
+              </audio>
+              <video width="200" height="120" controls="controls"
+                v-if="props.row.Type==5 && props.row.VideoModel && props.row.VideoModel.VideoPath">
+                <source :src="props.row.VideoModel.VideoPath" type="video/ogg" />
+                <source :src="props.row.VideoModel.VideoPath" type="video/mp4" />
+                <source :src="props.row.VideoModel.VideoPath" type="video/webm" />
+              </video>
+              <div v-if="props.row.Type==7 && props.row.FileModel && props.row.FileModel.FilePath!=''"
+                @click.stop="showUpLoadFile(props.row.FileModel)">
+                <i v-if="props.row.FileModel.FilePath.substring(props.row.FileModel.FilePath.lastIndexOf('.')+1,props.row.FileModel.FilePath.length).toUpperCase()=='PDF'"
+                  class="iconfont icon-pdf"></i>
+                <i v-else-if="props.row.FileModel.FilePath.substring(props.row.FileModel.FilePath.lastIndexOf('.')+1,props.row.FileModel.FilePath.length).toUpperCase()=='TXT'"
+                  class="iconfont icon-txt"></i>
+                <i v-else-if="props.row.FileModel.FilePath.substring(props.row.FileModel.FilePath.lastIndexOf('.')+1,props.row.FileModel.FilePath.length).toUpperCase()=='DOCX' || 
                             props.row.FileModel.FilePath.substring(props.row.FileModel.FilePath.lastIndexOf('.')+1,props.row.FileModel.FilePath.length).toUpperCase()=='DOC'
                             " class="iconfont icon-word"></i>
-              <i v-else class="iconfont icon-excel"></i>
+                <i v-else class="iconfont icon-excel"></i>
+              </div>
             </div>
+
           </q-td>
         </template>
         <template v-slot:body-cell-optioned="props">
           <q-td :props="props">
 
-            <q-btn flat size="xs" icon="edit" style="font-weight:400;color: #3FC4FF" class="q-mr-xs" label="编辑" v-if="props.row.Type==1 || props.row.Type==3 || props.row.Type==6 "
-              @click="goedit(props.row)" />
+            <q-btn flat size="xs" icon="edit" style="font-weight:400;color: #3FC4FF" class="q-mr-xs" label="编辑"
+              v-if="props.row.Type==1 || props.row.Type==3 || props.row.Type==6 " @click="goedit(props.row)" />
             <q-btn flat size="xs" icon="edit" style="font-weight:400;color: #3FC4FF" class="q-mr-xs" label="移动"
               @click="plmove(props)" />
             <q-btn flat size="xs" icon="delete" color="negative" class="q-mr-xs" label="删除"
               @click="goDetailed(props.row,'0')" />
           </q-td>
         </template>
-       
+
       </q-table>
     </div>
     <div v-if="Isadd==true">
@@ -72,8 +76,8 @@
 
   import alladdsc from './allAddSC'
   import {
-        delWecharMediumInfo,//删除素材
-    } from '../../../api/system/wechat';
+    delWecharMediumInfo,//删除素材
+  } from '../../../api/system/wechat';
   export default {
     components: {
       alladdsc,
@@ -95,8 +99,8 @@
         Isadd: false,
 
         ISsystem: false,
-        editobj:null,
-        showtype:1,
+        editobj: null,
+        showtype: 1,
         msg: {
           pageIndex: 1,
           pageSize: 10,
@@ -243,20 +247,20 @@
         this.editobj.Id = row.Id;
         this.editobj.MediaGroupId = row.MediaGroupId;
         this.editobj.Type = row.Type;
-        if(row.Type==1){
+        if (row.Type == 1) {
           this.editobj.TextModel = JSON.parse(JSON.stringify(row.TextModel));
-        }else  if(row.Type==3){
+        } else if (row.Type == 3) {
           this.editobj.ImgTextModel = JSON.parse(JSON.stringify(row.ImgTextModel));
-        }else  if(row.Type==6){
+        } else if (row.Type == 6) {
           this.editobj.AppletModel = JSON.parse(JSON.stringify(row.AppletModel));
         }
         this.showtype = row.Type.toString()
-        
+
         this.Isadd = true
       },
-      getchildren(){
-          this.$emit('editsuccess')
-          this.Isadd = false
+      getchildren() {
+        this.$emit('editsuccess')
+        this.Isadd = false
       },
 
     }