门店

src/api/sch/shop.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询抖音门店列表
+export function listShop(query) {
+  return request({
+    url: '/system/shop/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询抖音门店详细
+export function getShop(shopId) {
+  return request({
+    url: '/system/shop/' + shopId,
+    method: 'get'
+  })
+}
+
+// 新增抖音门店
+export function addShop(data) {
+  return request({
+    url: '/system/shop',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改抖音门店
+export function updateShop(data) {
+  return request({
+    url: '/system/shop',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除抖音门店
+export function delShop(shopId) {
+  return request({
+    url: '/system/shop/' + shopId,
+    method: 'delete'
+  })
+}

src/views/sch/shop/index.vue

@@ -0,0 +1,338 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="店铺名称" prop="shopName">
+        <el-input
+          v-model="queryParams.shopName"
+          placeholder="请输入店铺名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="区域" prop="area">
+        <el-input
+          v-model="queryParams.area"
+          placeholder="请输入区域"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="城市" prop="city">
+        <el-input
+          v-model="queryParams.city"
+          placeholder="请输入城市"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="联系人" prop="contacts">
+        <el-input
+          v-model="queryParams.contacts"
+          placeholder="请输入联系人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="备注名" prop="remarkName">
+        <el-input
+          v-model="queryParams.remarkName"
+          placeholder="请输入备注名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="备注id" prop="remarkId">
+        <el-input
+          v-model="queryParams.remarkId"
+          placeholder="请输入备注id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:shop:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:shop:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:shop:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:shop:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="shopList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="门店id 和抖音门店id 一致" align="center" prop="shopId" />
+      <el-table-column label="店铺名称" align="center" prop="shopName" />
+      <el-table-column label="门店品类" align="center" prop="shopType" />
+      <el-table-column label="主营类目" align="center" prop="businessCategory" />
+      <el-table-column label="区域" align="center" prop="area" />
+      <el-table-column label="城市" align="center" prop="city" />
+      <el-table-column label="地址" align="center" prop="address" />
+      <el-table-column label="联系人" align="center" prop="contacts" />
+      <el-table-column label="营业状态" align="center" prop="status" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="备注名" align="center" prop="remarkName" />
+      <el-table-column label="备注id" align="center" prop="remarkId" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:shop:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:shop:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改抖音门店对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="店铺名称" prop="shopName">
+          <el-input v-model="form.shopName" placeholder="请输入店铺名称" />
+        </el-form-item>
+        <el-form-item label="主营类目" prop="businessCategory">
+          <el-input v-model="form.businessCategory" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="区域" prop="area">
+          <el-input v-model="form.area" placeholder="请输入区域" />
+        </el-form-item>
+        <el-form-item label="城市" prop="city">
+          <el-input v-model="form.city" placeholder="请输入城市" />
+        </el-form-item>
+        <el-form-item label="地址" prop="address">
+          <el-input v-model="form.address" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="联系人" prop="contacts">
+          <el-input v-model="form.contacts" placeholder="请输入联系人" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="备注名" prop="remarkName">
+          <el-input v-model="form.remarkName" placeholder="请输入备注名" />
+        </el-form-item>
+        <el-form-item label="备注id" prop="remarkId">
+          <el-input v-model="form.remarkId" placeholder="请输入备注id" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listShop, getShop, delShop, addShop, updateShop } from "@/api/sch/shop";
+
+export default {
+  name: "Shop",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 抖音门店表格数据
+      shopList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        shopName: null,
+        shopType: null,
+        businessCategory: null,
+        area: null,
+        city: null,
+        address: null,
+        contacts: null,
+        status: null,
+        remarkName: null,
+        remarkId: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询抖音门店列表 */
+    getList() {
+      this.loading = true;
+      listShop(this.queryParams).then(response => {
+        this.shopList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        shopId: null,
+        shopName: null,
+        shopType: null,
+        businessCategory: null,
+        area: null,
+        city: null,
+        address: null,
+        contacts: null,
+        status: "0",
+        remark: null,
+        remarkName: null,
+        remarkId: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.shopId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加抖音门店";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const shopId = row.shopId || this.ids
+      getShop(shopId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改抖音门店";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.shopId != null) {
+            updateShop(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addShop(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const shopIds = row.shopId || this.ids;
+      this.$modal.confirm('是否确认删除抖音门店编号为"' + shopIds + '"的数据项？').then(function() {
+        return delShop(shopIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/shop/export', {
+        ...this.queryParams
+      }, `shop_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/system/employee/index.vue

@@ -468,6 +468,8 @@ export default {
         type: 'warning'
       }).then(function () {
         // 走释放线索逻辑，并禁用该用户
+        empAPi.delete(row.employeeId);
+        this.getList();
       }).then(() => {
         this.msgSuccess('注销成功！');
       });
@@ -488,8 +490,10 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(function () {
+      }).then(() => {
         // 检查一下，如果被使用，提示不可删除
+        empAPi.delete(row.employeeId);
+        this.getList();
       }).then(() => {
         this.msgSuccess('删除成功！');
       });

src/views/zs/clue/components/FollowInfoDialog.vue

@@ -0,0 +1,39 @@
+<template>
+      <el-dialog title="跟进记录" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="800px">
+        <FollowRecord v-if="clueId" :clue-id="clueId" />
+       </el-dialog>
+  </template>
+  <script>
+  import FollowRecord from '../ClueForm/components/FollowRecord.vue';
+  export default {
+    name: 'FollowInfoDialog',
+    components: {
+        FollowRecord
+    },
+    data() {
+      return {
+        visible: false,
+        title: undefined,
+        clueId: undefined
+      };
+    },
+    methods: {
+      init(info = undefined) {
+        this.$nextTick(() => {
+            this.visible = true;
+          if (info) {
+            this.clueId = info;
+          }
+        });
+      }
+    }
+  };
+  </script>
+  
+  <style scoped>
+  .el-divider--vertical {
+    height: 15em !important;
+  }
+  </style>
+      
+      

src/views/zs/clue/index.vue

@@ -73,6 +73,8 @@
             v-if="(admin == 'true' || (scope.row.followUser2 != undefined && scope.row.followUser2.indexOf(userId) != -1)) && !scope.row.state"
             v-hasPermi="['zs:clue:discard']" type="text" @click.native.stop="handleDiscard(scope.row)">释放</el-button>
           <el-button v-if="quickSearch == 8" type="text" @click="handleViewZhuangDan(scope.row)"> 撞单信息</el-button>
+          <el-button type="text" @click="handleViewFollowInfo(scope.row)"> 跟进信息</el-button>
+
           <!-- <el-button v-if="searchForm.quickSearch == 8" type="text" > 撞单信息</el-button> -->
         </template>
       </el-table-column>
@@ -101,6 +103,8 @@
     <InvitationDialog ref="InvitationDialog" @refreshDataList="_getTableList" />
     <!-- 跟进统计弹窗 -->
     <FollowCountDialog ref="FollowCountDialog" />
+    <!-- 跟进记录弹框 -->
+    <FollowInfoDialog ref="FollowInfoDialog" />
   </div>
 </template>
 
@@ -117,6 +121,7 @@ import DYClueFormDialog from './components/DYClueFormDialog.vue';
 import SkillDialog from './components/SkillDialog.vue';
 import InvitationDialog from './components/InvitationDialog.vue';
 import FollowCountDialog from './components/FollowCountDialog.vue';
+import FollowInfoDialog from './components/FollowInfoDialog.vue';
 
 import { defaultColumns } from './columns.js';
 import { getClueList, deleteClue, getClueCountBadge, discardClue, getSign, getConsultRecord } from '@/api/zs/clue';
@@ -125,7 +130,7 @@ export default {
   name: 'Clue',
   components: {
     SearchForm, BatchUpdateDialog, PublicDialog, UploadDialog, SignFormDialog, DistributeDialog, ZhuangDanDialog, MemoFormDialog,
-    DYClueFormDialog, SkillDialog, InvitationDialog, FollowCountDialog
+    DYClueFormDialog, SkillDialog, InvitationDialog, FollowCountDialog, FollowInfoDialog
   },
   beforeRouteEnter(to, from, next) {
     if (from.name == 'ClueForm') {
@@ -374,15 +379,19 @@ export default {
     handleInvitation(item) {
       this.$nextTick(() => {
         this.$refs.InvitationDialog.init(item)
-      })
-
+      });
     },
     // 跟进统计页面
     handleFollowCount() {
-
       this.$nextTick(() => {
         this.$refs.FollowCountDialog.init()
-      })
+      });
+    },
+    // 查看跟进记录
+    handleViewFollowInfo (item) {
+      this.$nextTick(() => {
+        this.$refs.FollowInfoDialog.init(item.clueId);
+      });
     }
   }
 };

vue.config.js

@@ -43,7 +43,7 @@ module.exports = {
       },
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `https://xueche.ahduima.com/duima/`,
+        // target: `https://xueche.kxxc.top/duima/`,
         target: `http://localhost:8088`,
         changeOrigin: true,
         pathRewrite: {