Merge branch 'master' of http://git.2weisou.com/liumin/zkPCproject

src/const/crud/admin/log.js

@@ -1,4 +1,89 @@
 export const tableOption = {
+  border: true,
+  index: true,
+  indexLabel: "序号",
+  stripe: true,
+  menuAlign: "center",
+  menuWidth: 250,
+  menu:false,
+  align: "center",
+  refreshBtn: false,
+  showColumnBtn: false,
+  searchSize: "mini",
+  searchMenuSpan: 9,
+  delBtn: false,
+  addBtn: false,
+  editBtn: false,
+  viewBtn: true,
+  column: [
+    {
+      label: "操作人",
+      prop: "name",
+      search: true
+    },
+    {
+      label: "操作手机",
+      prop: "type",
+      search: true
+    },
+    {
+      label: "终端",
+      prop: "title"
+    },
+    {
+      label: "登录IP",
+      prop: "remoteAddr"
+    },
+    {
+      label: "操作时间",
+      prop: "method",
+      search: true,
+      type: "datetime",
+      rangeSeparator: "-",
+      format: "yyyy-MM-dd",
+      valueFormat: "yyyy-MM-dd",
+      searchRange: true,
+      searchSpan: 8,
+    },
+    {
+      label: "操作类型",
+      prop: "type",
+      type: "select",
+      search: true,
+      dicData: [{
+        label: '新增管理',
+        value: 0
+      }, {
+        label: '编辑项目',
+        value: 1
+      }, {
+        label: '删除项目',
+        value: 2
+      }, {
+        label: '新增公司',
+        value: 3
+      }, {
+        label: '编辑公司',
+        value: 4
+      }, {
+        label: '删除公司',
+        value: 5
+      }, {
+        label: '新增代理商',
+        value: 6
+      }, {
+        label: '系统运营',
+        value: 7
+      }]
+    },
+    {
+      label: '操作内容',
+      prop: 'time',
+      search: true
+    }
+  ]
+};
+export const tableOption1 = {
   border: true,
   index: true,
   indexLabel: "序号",

src/views/Customer/CustomerDetail.vue

@@ -51,6 +51,7 @@
         <el-menu-item index="3">客户意向</el-menu-item>
         <el-menu-item index="4">销讲执行</el-menu-item>
         <el-menu-item index="5">违禁触达</el-menu-item>
+        <el-menu-item index="6">客户日志</el-menu-item>
       </el-menu>
       <!-- 历史记录 -->
       <template v-if="activeIndex == 1">
@@ -236,7 +237,6 @@
           </div>
         </div>
       </template>
-
       <template v-if="activeIndex == 5">
         <div class="all-screen">
           <div class="tops">
@@ -272,11 +272,27 @@
           </div>
         </div>
       </template>
+      <template v-if="activeIndex == 6">
+        <div class="log-box">
+          <avue-crud
+            ref="crud"
+            :page.sync="page"
+            :data="tableData"
+            :table-loading="tableLoading"
+            :option="tableOption"
+            @on-load="getList"
+            @size-change="sizeChange"
+            @current-change="currentChange"
+          >
+          </avue-crud>
+        </div>
+      </template>
     </div>
   </div>
 </template>
 
 <script>
+import { delObj, fetchList1 } from "@/api/admin/log";
 export default {
   data() {
     return {
@@ -301,10 +317,90 @@ export default {
           id: "3"
         }
       ],
-      activeName: 1 // 折叠面板选中项
-    };
+      activeName: 1, // 折叠面板选中项
+      tableData: [],
+      page: {
+        total: 0, // 总页数
+        currentPage: 1, // 当前页数
+        pageSize: 10, // 每页显示多少条
+      },
+      tableLoading: false,
+      tableOption:{
+        border: true,
+        index: true,
+        indexLabel: "序号",
+        stripe: true,
+        menuAlign: "center",
+        menuWidth: 150,
+        menu:false,
+        align: "center",
+        refreshBtn: true,
+        showClomnuBtn: false,
+        searchSize: "mini",
+        searchMenuSpan: 6,
+        delBtn: false,
+        addBtn: false,
+        editBtn: false,
+        viewBtn: true,
+        props: {
+          label: "label",
+          value: "value"
+        },
+        column: [
+          {
+            label: "操作时间",
+            prop: "name"
+          },
+          {
+            label: "操作人",
+            prop: "namwe"
+          },
+          {
+            label: "修改项",
+            prop: "type",
+            type: "select",
+            dicData: [{
+              label: '手机号',
+              value: 0
+            }, {
+              label: '客户等级',
+              value: 1
+            }, {
+              label: '客户来源',
+              value: 2
+            }, {
+              label: '客户姓名',
+              value: 3
+            }],
+          },
+          {
+            label: "修改前内容",
+            prop: "title"
+          },
+          {
+            label: "修改后内容",
+            prop: "remoteAddr"
+        }]
+      }
+    }
   },
   methods: {
+    getList(page, params) {
+      this.tableLoading = true;
+      fetchList1(
+        Object.assign(
+          {
+            current: page.currentPage,
+            size: page.pageSize
+          },
+          params
+        )
+      ).then((response) => {
+        this.tableData = response.data.records;
+        this.page.total = response.data.total;
+        this.tableLoading = false;
+      });
+    },
     // 历史记录筛选
     handleSelect(key, keyPath) {
       console.log(key, keyPath);
@@ -639,9 +735,7 @@ export default {
 .el-menu-demo {
   border-bottom: 1px solid #e0e0e0 !important;
 }
-</style>
 
-<style lang="scss">
 .el-collapse-item__header {
   padding: 0 0 0 80px;
   background-color: #f8f8f8;
@@ -653,4 +747,7 @@ export default {
 .el-progress__text {
   font-size: 14px;
 }
+.log-box{
+  margin-top: 30px;
+}
 </style>

src/views/admin/log/log.vue

@@ -1,92 +1,6 @@
 
 <template>
   <div class="log">
-    <div class="app-top">
-      <div class="app-titel" style="margin-top: 5px">
-        <div class="div-lab">
-          <div class="label">登录时间：</div>
-          <el-date-picker
-            v-model="time"
-            type="daterange"
-            class="div-inp"
-            range-separator="-"
-            start-placeholder="开始日期"
-            :default-time="['00:00:00', '23:59:59']"
-            value-format="yyyy-MM-dd"
-            end-placeholder="结束日期"
-            @change="timeChange"
-          >
-          </el-date-picker>
-        </div>
-
-        <div class="div-lab">
-          <el-input
-            v-model="value"
-            @change="valueChange"
-            clearable
-            placeholder="请输入"
-            maxlength="15"
-            style="width: 363px"
-          >
-            <el-select
-              v-model="searchForm.flag"
-              @change="selChange"
-              slot="prepend"
-              class="input-with-select"
-              style="width: 115px"
-
-              placeholder="请选择"
-            >
-              <el-option label="用户名称" value="1"></el-option>
-              <!-- <el-option label="登陆手机" value="2"></el-option> -->
-              <el-option label="登陆ip" value="3"></el-option>
-            </el-select>
-          </el-input>
-        </div>
-        <div class="div-lab">
-             <div class="label">标题：</div>
-              <el-input
-            v-model="searchForm.title"
-            placeholder="请输入"
-            maxlength="15"
-            style="width: 180px"
-          > </el-input>
-        </div>
-        <!-- <div class="div-lab">
-          <div class="label">设备状态</div>
-          <el-select
-            class="div-inp"
-            multiple
-            clearable
-            collapse-tags
-            v-model="searchForm.acceptanceStatus"
-            placeholder="请选择"
-          >
-            <el-option
-              v-for="item in equipmentStatusList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-        </div> -->
-      </div>
-      <div class="app-titel" style="margin-top: 15px">
-        <!-- <div class="label" style="color: #ffffff">筛选相关：</div> -->
-        <div style="margin-left: 20px">
-          <el-button type="primary" @click="screen"
-            >筛选</el-button
-          >
-        </div>
-        <div style="margin-left: 20px">
-          <el-button @click="reset" type="text">清空筛选条件</el-button>
-        </div>
-        <div style="margin-left: auto;margin-right:10px;" v-if="admin_log_downLoad">
-          <el-button @click="downLoad" icon="el-icon-download">导出</el-button>
-        </div>
-      </div>
-    </div>
     <basic-container>
       <avue-crud
         ref="crud"
@@ -101,7 +15,8 @@
         @size-change="sizeChange"
         @current-change="currentChange"
         @row-del="handleDel"
-      />
+      >
+      </avue-crud>
     </basic-container>
   </div>
 </template>