2022-7-20

src/SManagement/archives/index.vue

@@ -4,17 +4,19 @@
     <bread-crumbs :tempFileData="tempFileData" @BreadCrumbsChange="BreadCrumbsChange">
     </bread-crumbs>
     <div class="header-panl">
-      <!--类型选择面板-->
-      <!-- <select-panl :titleLists="titleLists" @CurrentSelectType="CurrentSelectType" ref="selectPanl" v-if="tool.checkAuth($route.name,'read')"></select-panl> -->
       <search @searchActive="searchActive" @clearData="clearData"></search>
       <!--切换最热最新-->
       <hot-new-control @sortTypeChange="sortTypeChange" v-if="tool.checkAuth($route.name, 'read')"></hot-new-control>
     </div>
-    <!--文件展示-->
-    <file-list :fileData="fileData" @upFileData="upFileData" @statusChange="statusChange" :isCollect="true"
-      v-if="tool.checkAuth($route.name, 'read')">
-    </file-list>
-
+    <div class="content">
+      <!--文件展示-->
+      <file-list :fileData="fileData" @upFileData="upFileData" @statusChange="statusChange" :isCollect="true"
+        v-if="tool.checkAuth($route.name, 'read')">
+      </file-list>
+      <pagination :total="total" :pageSize="params.content.pageSize" :currentPage="params.content.pageNumber"
+        @pageChange="pageChange">
+      </pagination>
+    </div>
   </div>
 </template>
 
@@ -24,6 +26,8 @@ import SelectPanl from '@/SManagement/submitedit_one/components/SelectPanl'
 import HotNewControl from '@/components/hot-new-control/HotNewControl'
 import search from '@/components/search/index'
 import BreadCrumbs from '@/components/bread-crumbs/BreadCrumbs'
+import Pagination from '@/components/pagination/Pagination'
+
 import { log } from '@antv/g2plot/lib/utils'
 export default {
   name: 'index',
@@ -36,7 +40,7 @@ export default {
         "content": {
           "nocache": true,
           "pageNumber": 1,
-          "pageSize": 9999999999999,
+          "pageSize": 2,
           "parentid": JSON.parse(sessionStorage.getItem("folderid")).salematerialfolderid,
           "where": {
             "condition": "",
@@ -52,18 +56,6 @@ export default {
         filename: '文件',
         id: null,
       }],
-      //类型选择数据
-      titleLists: [
-        { name: '全部', type: 'all' },
-        { name: 'Word', type: 'word' },
-        { name: 'Excel', type: 'excel' },
-        { name: 'PPT', type: 'ppt' },
-        { name: 'PDF', type: 'pdf' },
-        { name: '图片', type: 'image' },
-        { name: '视频', type: 'video' },
-        { name: '压缩包', type: 'zip' },
-        { name: '文本', type: 'txt' },
-      ],
       fileData: [],
       allFileData: [],
       //当前选择的文件类型
@@ -82,6 +74,7 @@ export default {
     FileList,
     HotNewControl,
     BreadCrumbs,
+    Pagination
   },
   computed: {
   },
@@ -102,6 +95,10 @@ export default {
       this.allFileData = this.fileType.fileList(res.data)
       this.fileData = this.filterFileData(this.allFileData, this.isType)
     },
+    pageChange(n) {
+      this.params.content.pageNumber = n
+      this.getFileList()
+    },
     searchActive(txt) {
       this.params.content.where.condition = txt
       this.getFileList()
@@ -122,20 +119,13 @@ export default {
       })
 
     },
-    //监听类型选择组件发出的更改事件
-    CurrentSelectType(type) {
-      this.isType = type
-      this.fileData = this.filterFileData(this.allFileData, type)
-    },
     //面包屑发出的事件
     BreadCrumbsChange(index) {
       if (this.tempFileData.length <= 1) return
-      this.isType = 'all'
       this.params.content.parentid = index
-      this.$refs.selectPanl.currentName = 'all'
       this.tempFileData.splice(this.tempFileData.indexOf(this.tempFileData.find(item => item.id == index)) + 1)
+      this.params.content.pageNumber = 1
       this.getFileList()
-
     },
     //修改收藏状态
     statusChange(id, item) {
@@ -192,4 +182,15 @@ export default {
 .normal-card .header-panl .el-dropdown .el-dropdown-link .select {
   margin-left: 8px;
 }
+.normal-card .content {
+  position: relative;
+  padding-bottom: 30px;
+  min-height: calc(100vh - 240px);
+}
+.normal-card .content .el-pagination {
+  position: absolute;
+  bottom: 0;
+  right: 16px;
+  margin-bottom: 0;
+}
 </style>

src/SManagement/orderclue/components/follow.vue

@@ -14,7 +14,14 @@
         <el-row :gutter="10">
           <el-col :span="12">
             <el-form-item label="跟进时间" label-position="left" label-width="100px">
-              <el-input :value="getNowDate()" size="small" disabled></el-input>
+              <!-- <el-input :value="getNowDate()" size="small" disabled></el-input> -->
+              <el-date-picker
+                v-model="timer"
+                type="date"
+                format="yyyy-MM-dd HH:mm:ss"
+                disabled
+                size="small">
+              </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -81,6 +88,7 @@ export default {
             "competitor": ""
         }
       },
+      timer:new Date(),
       rules: {
         content:[
           {required:true,message:'内容不能为空',trigger:'blur'},
@@ -142,35 +150,6 @@ export default {
       })
       
     },
-    getNowDate() {
-      var date = new Date();
-      var sign2 = ":";
-      var year = date.getFullYear() // 年
-      var month = date.getMonth() + 1; // 月
-      var day = date.getDate(); // 日
-      var hour = date.getHours(); // 时
-      var minutes = date.getMinutes(); // 分
-      var seconds = date.getSeconds() //秒
-      var weekArr = ['星期一', '星期二', '星期三', '星期四', '星期五', '星期六', '星期天'];
-      var week = weekArr[date.getDay()];
-      // 给一位数的数据前面加 “0”
-      if (month >= 1 && month <= 9) {
-        month = "0" + month;
-      }
-      if (day >= 0 && day <= 9) {
-        day = "0" + day;
-      }
-      if (hour >= 0 && hour <= 9) {
-        hour = "0" + hour;
-      }
-      if (minutes >= 0 && minutes <= 9) {
-        minutes = "0" + minutes;
-      }
-      if (seconds >= 0 && seconds <= 9) {
-        seconds = "0" + seconds;
-      }
-      return year + "-" + month + "-" + day + " " + hour + sign2 + minutes + sign2 + seconds;
-    }
   },
 };
 </script>

src/SManagement/submitedit_more/index.vue

@@ -22,6 +22,7 @@ export default {
           "classname": "saletool.submitedit.submitedit",
           "method": "select_submitlist",
           "content": {
+              "nocache":true,
               "onceonly":0,
               "pageNumber": 1,
               "pageSize": 4,

src/SManagement/submitedit_one/index.vue

@@ -14,6 +14,7 @@ import SelectPanl from '@/SManagement/submitedit_one/components/SelectPanl'
 import TimeSelect from '@/SManagement/submitedit_one/components/TimeSelect'
 
 import list from '@/SManagement/submitedit_one/components/list'
+import { log } from '@antv/g2plot/lib/utils'
 export default {
   name: 'index',
   data () {
@@ -22,6 +23,7 @@ export default {
           "classname": "saletool.submitedit.submitedit",
           "method": "select_submitlist",
           "content": {
+              "nocache":true,
               "onceonly":1,
               "pageNumber": 1,
               "pageSize": 9,
@@ -54,6 +56,8 @@ export default {
       let res = await this.$api.requested(this.param)
       this.oneData = res.data
       this.total = res.total
+      console.log(this.oneData);
+      
     },
     pageChange (n) {
       this.param.content.pageNumber = n

src/SManagement/user/user-info/UserInfo.vue

@@ -1,14 +1,14 @@
 <template>
-  <div class="user-info-panl" v-if="tool.checkAuth($route.name,'read')">
+  <div class="user-info-panl">
       <div class="top">
         <div class="avatar">
           <img :src="getAvatar || require('@/assets/normal_avatar.png')" alt="">
-            <up-load target="avatar" @onSuccess="onSuccess" classType="1" v-if="tool.checkAuth($route.name,'update')"></up-load>
+            <up-load target="avatar" @onSuccess="onSuccess" classType="1"></up-load>
         </div>
       </div>
       <base-info :userInfo="userInfo" ref="userInfo">
-          <phone-edit slot="phoneEdit" :userInfo="userInfo" @phoneChange="phoneChange" v-if="tool.checkAuth($route.name,'update')"></phone-edit>
-          <pass-edit slot="passEdit" :userInfo="userInfo" v-if="tool.checkAuth($route.name,'update')"></pass-edit>
+          <phone-edit slot="phoneEdit" :userInfo="userInfo" @phoneChange="phoneChange"></phone-edit>
+          <pass-edit slot="passEdit" :userInfo="userInfo"></pass-edit>
       </base-info>
       <wx-bind :userInfo="userInfo">
       </wx-bind>

src/components/bread-crumbs/BreadCrumbs.vue

@@ -10,6 +10,7 @@
 </template>
 
 <script>
+import { log } from '@antv/g2plot/lib/utils';
 export default {
   name: "BreadCrumbs",
   data() {

src/views/mediaStock/modules/list.vue

@@ -87,6 +87,12 @@ export default {
         e.ischeck = false
       })
       this.list = res.data
+      this.list.forEach(item => {
+        console.log(item.document,item.url);
+        
+      })
+      console.log(this.list);
+      
       this.total = res.total
       this.currentPage = res.pageNumber
       this.sort = res.sort