5.10

2 years ago · e333067be8
3 changed files with 103 additions and 75 deletions
--- a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-ui/.env.development
+++ b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-ui/.env.development
@ -5,5 +5,5 @@ ENV = 'development'
 VUE_APP_BASE_API = '/api'

 ## 配置测试和本地开发时的 接口地址
-VUE_APP_URL = "http://192.168.3.173:7101"
+VUE_APP_URL = "http://192.168.1.177:7109"
 ##VUE_APP_URL = "http://8.130.39.13:8112"
--- a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-ui/src/api/Zhj/inquireStatistics/index.js
+++ b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-ui/src/api/Zhj/inquireStatistics/index.js
@ -0,0 +1,58 @@
+import request from '@/utils/request'
+
+// 接口文档名称：潜在客户信息
+// Pc端客户基础信息条件分页查询数据的列表
+export function listPage(data) {
+  return request({
+    url: '/dbCenter/crawlAmount/listPage',
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}
+
+// 客户查询
+export function listPageByOrgPathSid(data) {
+  return request({
+    url: '/crm/v1/crmcustomertemp/listPageByOrgPathSid',
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}
+
+// 添加 已改
+export function savePcCustomerInfo(data) {
+  return request({
+    url: '/crm/v1/crmcustomertemp/save',
+    data: data,
+    method: 'post',
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}
+
+// -- 修改 已改
+export function updatePcCustomerInfo(data) {
+  return request({
+    url: '/crm/v1/crmcustomertemp/update/' + data.sid,
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}
+
+// 详情、编辑回显 已改
+export function getPcCustomerInfoBySid(data) {
+  return request({
+    url: '/crm/v1/crmcustomertemp/fetchSid/' + data,
+    method: 'get'
+  })
+}
--- a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-ui/src/views/inquireStatistics/index.vue
+++ b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-ui/src/views/inquireStatistics/index.vue
@ -5,7 +5,7 @@
        <el-form ref="queryParams" :inline="true" :model="queryParams" class="tab-header">
          <span style="font-size: 16px;font-weight: 500">品牌</span>
          <el-select
-            v-model="queryParams.params.brand"
+            v-model="queryParams.params.name"
            placeholder="请选择品牌"
            style="width: 120px;margin-left: 10px;"
            @change="blur"
@ -13,13 +13,13 @@
            <el-option
              v-for="(item, i) in tableData"
              :key="i"
-              :label="item.city"
-              :value="item.city"
+              :label="item.name"
+              :value="item.name"
            />
          </el-select>
          <span style="font-size: 16px;font-weight: 500;margin-left: 10px;">门店</span>
          <el-select
-            v-model="queryParams.params.store"
+            v-model="queryParams.params.storeName"
            placeholder="请选择门店"
            style="width: 120px;margin-left: 10px;"
            :disabled="chooseStore"
@ -28,13 +28,13 @@
            <el-option
              v-for="(item, i) in tableData"
              :key="i"
-              :label="item.address"
-              :value="item.address"
+              :label="item.storeName"
+              :value="item.storeName"
            />
          </el-select>
          <el-form-item label="到货日期" style="margin-left: 10px;margin-top: 3px;">
            <el-date-picker
-              v-model="queryParams.params.applyStartDate"
+              v-model="queryParams.params.fromTime"
              type="date"
              clearable
              value-format="yyyy-MM-dd"
@ -42,7 +42,7 @@
            />
            <span style="padding: 0 8px">至</span>
            <el-date-picker
-              v-model="queryParams.params.applyStartDate1"
+              v-model="queryParams.params.endTime"
              type="date"
              clearable
              value-format="yyyy-MM-dd"
@ -68,25 +68,24 @@
      <div class="container">
        <el-table v-loading="tableLoading" :data="tableData" border style="width: 100%">
          <el-table-column label="序号" width="55px" type="index" align="center"></el-table-column>
-          <el-table-column prop="name" label="厂家" width="100px" align="center">
+          <el-table-column prop="enpName" label="厂家" width="100px" align="center">
          </el-table-column>
-          <el-table-column prop="city" label="品牌" align="center" width="100px">
+          <el-table-column prop="name" label="品牌" align="center" width="100px">
          </el-table-column>
-          <el-table-column prop="address" label="门店" align="center" width="150px">
+          <el-table-column prop="storeName" label="门店" align="center" width="150px">
          </el-table-column>
-          <el-table-column prop="date" label="日期" sortable align="center" width="100px">
+          <el-table-column prop="dataDate" label="日期" sortable align="center" width="100px">
          </el-table-column>
-          <el-table-column prop="zip" label="销售额" align="center" width="100px">
+          <el-table-column prop="salesAmount" label="销售额" align="center" width="100px">
          </el-table-column>
-          <el-table-column prop="" label="油类成本占比" align="center" width="150px">
+          <el-table-column prop="oils" label="油类成本占比" align="center" width="150px">
          </el-table-column>
-          <el-table-column prop="" label="米类成本占比" align="center" width="150px">
+          <el-table-column prop="rice" label="米类成本占比" align="center" width="150px">
          </el-table-column>
-          <el-table-column prop="" label="面类成本占比" align="center" width="150px">
+          <el-table-column prop="face" label="面类成本占比" align="center" width="150px">
          </el-table-column>
-          <el-table-column prop="" label="合计成本金额" align="center" width="150px">
+          <el-table-column prop="totalCount" label="合计成本金额" align="center" width="150px">
          </el-table-column>
-          <el-table-column prop="" label="是否还款" align="center" width="100px"></el-table-column>
          <el-table-column fixed="right" width="200px" label="明细信息" align="center">
            <template slot-scope="scope">
              <el-button
@ -173,6 +172,7 @@
 </template>
  
  <script>
+import {listPage} from '@/api/Zhj/inquireStatistics/index.js'
 export default {
  data() {
    return {
@ -199,58 +199,24 @@ export default {
        size: 10,
        total: 0,
        params: {
-          applyStartDate: "",
-          applyStartDate1: "",
-          brand:'',
-          store:'',
+          StoreName: "",
+          brandName: "",
+          fromTime: "",
+          endTime: "",
        },
      },
-      tableData: [
-        {
-          date: "2016-05-02",
-          name: "中鸿记",
-          province: "上海",
-          city: "熟溢香",
-          address: "熟溢香振头店",
-          zip: 50893,
-        },
-        {
-          date: "2016-05-04",
-          name: "中鸿记",
-          province: "上海",
-          city: "熟溢香",
-          address: "熟溢香欢乐街店",
-          zip: 20033,
-        },
-        {
-          date: "2016-05-01",
-          name: "中鸿记",
-          province: "上海",
-          city: "馍馍卤",
-          address: "馍馍卤大学城店",
-          zip: 78955,
-        },
-        {
-          date: "2016-05-03",
-          name: "中鸿记",
-          province: "上海",
-          city: "馍馍卤",
-          address: "馍馍卤雅清街店",
-          zip: 35890,
-        },
-        {
-          date: "2016-05-05",
-          name: "中鸿记",
-          province: "上海",
-          city: "馍馍卤",
-          address: "馍馍卤振岗店",
-          zip: 15890,
-        },
-      ],
    };
  },
-  mounted() {},
+  mounted() {
+    this.getPageList(this.queryParams);
+  },
  methods: {
+    pagination(val) {
+      // 分页
+      this.page.current = val.pageNum;
+      this.page.size = val.pageSize;
+      this.getPageList(this.queryParams);
+    },
    resetSearch() {
      // 重置
      this.page = {
@ -258,15 +224,19 @@ export default {
        current: 1, // 默认开始页面
        size: 10, // 每页的数据条数
        params: {
-          name: "",
-          psid: "",
-          sourceId: "",
-          sourceName: "",
+          StoreName: "",
+          name:'',
+          fromTime: "",
+          endTime: "",
        },
      };
-      this.getPageList();
+      this.getPageList(this.queryParams);
+    },
+    getPageList(data) {
+      listPage(data).then((res) => {
+        this.tableData=res.data.records
+        })
    },
-    getPageList() {},
    loadList() {
        this.tableLoading = true
      },
@ -275,8 +245,7 @@ export default {
    },
    //获取品牌门店
    blur(){
-      console.log(this.queryParams.params.brand);
-      if(this.queryParams.params.brand){
+      if(this.queryParams.params.name){
        this.chooseStore=false
      }
    },
@ -294,9 +263,10 @@ export default {
    },
    // 查询某天的数据
    dosearch() {
-      console.log(this.queryParams.params);
+      this.getPageList(this.queryParams);
    },
    resetQuery() {
+      this.getPageList(this.queryParams);
      this.chooseStore=true
      this.queryParams = {
        current: 1,