1

src/components/enterprise/material/allAddSC.vue

@@ -398,7 +398,7 @@
                         ImageName: '',
                         ImagePath: '',
                     };
-                } else if (this.type == 7) {//小程序
+                } else if (this.type == 7) {//文件
                     this.addMsg.FileModel = {
                         FileName: '',
                         FilePath: '',

src/components/enterprise/material/textmaterial.vue

@@ -2,7 +2,7 @@
     <div class="textmaterial" style="padding: 0;margin: 0;">
 
         <div class="page-content">
-            <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table"
+            <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:top="props">
                     <div class="col-2 q-table__title"></div>
@@ -31,7 +31,9 @@
 
                         <q-btn flat size="xs" icon="edit" style="font-weight:400;color: #3FC4FF" class="q-mr-xs"
                             label="编辑" @click="goedits(props.row)" />
-                        <q-btn flat size="xs" icon="delete" style="font-weight:400;color: #3FC4FF" class="q-mr-xs"
+                        <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)" />
                     </q-td>
                 </template>
@@ -172,9 +174,11 @@
                 }).onCancel(() => {
 
                 });
+            },
+            plmove(row){
+                this.dataList[row.rowIndex].check = !this.dataList[row.rowIndex].check
+                this.$emit('getmove')
             }
-          
-
         }
     }
 

src/pages/enterprise/materialManage.vue

@@ -19,11 +19,11 @@
                 <q-tab :ripple="false" :name="x.Id" :label="x.Name" v-for="(x,y) in MediumList" :key="y"
                     @click="msg.Type = x.Id,resetSearch()" />
             </q-tabs>
-            <!-- <div v-if="tabCheck=='1'" >
-                 <allmaterial></allmaterial>
-              </div> -->
+            <div v-if="tabCheck=='0'" >
+                 <allmaterial :dataList='dataList' :allclassifyList='allclassifyList' @editsuccess="getchildren"  @getmove="getmove"></allmaterial>
+              </div>
             <div v-if="tabCheck=='1'">
-                 <textmaterial :dataList='dataList' :allclassifyList='allclassifyList' @editsuccess="getchildren"></textmaterial>
+                 <textmaterial :dataList='dataList' :allclassifyList='allclassifyList' @editsuccess="getchildren"  @getmove="getmove"></textmaterial>
             </div>
             <div v-if="tabCheck=='2'">
                  <imgmaterial :dataList='dataList' :allclassifyList='allclassifyList' @editsuccess="getchildren" @getdelete="getdelete" @getmove="getmove"></imgmaterial>
@@ -43,11 +43,18 @@
             <div v-if="tabCheck=='7'">
                  <filematerial :dataList='dataList' :allclassifyList='allclassifyList' @editsuccess="getchildren" @getdelete="getdelete" @getmove="getmove"></filematerial>
             </div>
+            <div style="width: 100%;height: 50px;">
+                <el-pagination @current-change="changePage" style="float: right;margin-top: 9px;" layout="total,prev, pager, next, jumper"
+                    :current-page.sync="msg.pageIndex" :page-size="msg.pageSize" :total='PageCount'>
+                </el-pagination>
+            </div>
+            <q-inner-loading :showing="loading">
+                <q-spinner-gears size="50px" color="primary" />
+            </q-inner-loading>
+            
         </div>
         <!-- <q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="PageCount" :input="true" @input="changePage" /> -->
-        <el-pagination @current-change="changePage" style="float: right;" layout="total,prev, pager, next, jumper"
-            :current-page.sync="msg.pageIndex" :page-size="msg.pageSize" :total='PageCount'>
-        </el-pagination>
+       
         <q-dialog v-model="Ismove" persistent>
             <q-card style="width: 520px; max-width: 80vw;" class="addscfile">
                 <q-card-section>
@@ -107,13 +114,13 @@
             return {
                 loading: false,
                 PageCount: 0,
-                tabCheck: 1,
+                tabCheck: 0,
                 msg: {
                     pageIndex: 1,
                     pageSize: 10,
                     rowsPerPage: 10,
                     MediaGroupId: 0,//分组
-                    Type: 1,//类型
+                    Type: 0,//类型
                     Content: '',
                 },
                 classifyList: [],
@@ -136,6 +143,11 @@
             getMediumTypeList() {
                 getMediumTypeEnumList({}).then(res => {
                     this.MediumList = res.Data
+                    let obj = {
+                        Name: '全部',
+                        Id: 0,
+                    }
+                    this.MediumList.unshift(obj)
                 })
             },
             getWeChatMediumGroupList() {
@@ -150,17 +162,20 @@
                 })
             },
             getList() {
+                this.loading=true
                 getWeChatMediumPageList(this.msg).then(res => {
+                    this.loading=false
                     this.dataList = res.Data.PageData;
-                    this.PageCount = res.Data.PageCount
+                    this.PageCount = res.Data.Count
                     this.dataList.forEach(x=>{
                         x.check= false
                     })
+                    
 
                 })
             },
             changePage(e) {
-                this.msg.PageIndex = e;
+                this.msg.pageIndex = e;
                 this.getList()
             },
             resetSearch() {
@@ -317,4 +332,5 @@
         justify-content: center;
         padding: 4px;
     }
+    
 </style>
\ No newline at end of file