fix 统计对接

src/views/statistic/arrivalSign/components/page-search.vue

@@ -24,7 +24,7 @@
       {
         type: 'input',
         label: '操作员',
-        prop: 'auditName'
+        prop: 'signUserId'
       },
       {
         type: 'daterange',
@@ -34,8 +34,8 @@
           format: 'YYYY-MM-DD',
           valueFormat: 'YYYY-MM-DD',
           onChange: (value) => {
-            initKeys.startTime = value ? value[0] : '';
-            initKeys.endTime = value ? value[1] : '';
+            initKeys.statistateStart = value ? value[0] : '';
+            initKeys.statistateEnd = value ? value[1] : '';
             searchRef.value?.setData(initKeys);
           }
         },
@@ -47,9 +47,9 @@
   });
 
   const initKeys = reactive({
-    startTime: '',
-    endTime: '',
-    godownId: ''
+    statistateStart: '',
+    statistateEnd: '',
+    signUserId: ''
   });
 
   function getStoreList(name = '') {
@@ -62,6 +62,7 @@
   const searchRef = ref(null);
   /** 搜索 */
   const search = (data) => {
+    delete data.time;
     emit('search', { ...data});
   };
 </script>

src/views/statistic/arrivalSign/index.vue

@@ -1,63 +1,66 @@
 <template>
-  <ele-page flex-table>
-    <page-search @search="reload"></page-search>
-    <common-table
-      ref="pageRef"
-      :pageConfig="pageConfig"
-      :columns="columns"
-      :tools="false"
-      show-summary
-      :flex-table="false"
-    >
-      <template #toolbar="{ row }">
-        <div>
-          <el-button
-            type="success"
-            plain
-            v-permission="'statistic:arrivalSign:export'"
-            @click="handleExportExcel(row)"
-          >
-            导出EXCEL
-          </el-button>
-        </div>
-      </template>
-    </common-table>
-  </ele-page>
+    <ele-page flex-table>
+        <page-search @search="reload"></page-search>
+        <common-table
+            ref="pageRef"
+            :pageConfig="pageConfig"
+            :columns="columns"
+            :tools="false"
+            show-summary
+            :flex-table="false"
+        >
+            <template #toolbar="{ row }">
+                <div>
+                    <el-button
+                        type="success"
+                        plain
+                        v-permission="'statistic:arrivalSign:export'"
+                        @click="handleExportExcel(row)"
+                    >
+                        导出EXCEL
+                    </el-button>
+                </div>
+            </template>
+        </common-table>
+    </ele-page>
 </template>
 
 <script setup>
-  import { ref, reactive } from 'vue';
-  import CommonTable from '@/components/CommonPage/CommonTable.vue';
-  import pageSearch from './components/page-search.vue';
+    import { ref, reactive } from 'vue';
+    import CommonTable from '@/components/CommonPage/CommonTable.vue';
+    import pageSearch from './components/page-search.vue';
 
-  defineOptions({ name: 'arrivalSign' });
+    defineOptions({ name: 'arrivalSign' });
 
-  /** 表格列配置 */
-  const columns = ref([
-    { type: 'index', label: '#', align: 'center', width: 80 },
-    { label: '操作员', prop: 'godownName', align: 'center' },
-    { label: '到仓签收包裹数量', prop: 'orderNum', align: 'center' },
-    { label: '统计日期', prop: 'createTime', align: 'center' },
-    { label: '仓库', prop: 'godownName', align: 'center' }
-  ]);
+    /** 表格列配置 */
+    const columns = ref([
+        { type: 'index', label: '#', align: 'center', width: 80 },
+        { label: '操作员', prop: 'signUserName', align: 'center' },
+        { label: '到仓签收包裹数量', prop: 'statNum', align: 'center' },
+        { label: '统计日期', prop: 'statDate', align: 'center' },
+        { label: '仓库', prop: 'godownName', align: 'center' }
+    ]);
 
-  /** 页面组件实例 */
-  const pageRef = ref(null);
+    /** 页面组件实例 */
+    const pageRef = ref(null);
 
-  const pageConfig = reactive({
-    pageUrl: '/baseinfo/godown/pagelist',
-    exportUrl: '/baseinfo/godown/export',
-    fileName: '到仓签收统计',
-    cacheKey: 'arrivalSignTable'
-  });
+    const pageConfig = reactive({
+        pageUrl: '/app/ordersignstat/getOrderSignStat',
+        exportUrl: '/app/ordersignstat/getOrderSignStatExport',
+        fileName: '到仓签收统计',
+        cacheKey: 'arrivalSignTable',
+        params: {
+            statType: '2'
+        }
+    });
 
-  //刷新表格
-  function reload(where) {
-    pageRef.value?.reload(where);
-  }
+    //刷新表格
+    function reload(where) {
+        pageRef.value?.reload(where);
+    }
 
-  //导出excel
-  function handleExportExcel() {
-    pageRef.value?.exportData('到仓签收统计');
-  }
+    //导出excel
+    function handleExportExcel() {
+        pageRef.value?.exportData('到仓签收统计');
+    }
 </script>

src/views/statistic/inspection/components/page-search.vue

@@ -24,7 +24,7 @@
       {
         type: 'input',
         label: '操作员',
-        prop: 'auditName'
+        prop: 'signUserId'
       },
       {
         type: 'daterange',
@@ -34,8 +34,8 @@
           format: 'YYYY-MM-DD',
           valueFormat: 'YYYY-MM-DD',
           onChange: (value) => {
-            initKeys.startTime = value ? value[0] : '';
-            initKeys.endTime = value ? value[1] : '';
+            initKeys.statistateStart = value ? value[0] : '';
+            initKeys.statistateEnd = value ? value[1] : '';
             searchRef.value?.setData(initKeys);
           }
         },
@@ -47,9 +47,9 @@
   });
 
   const initKeys = reactive({
-    startTime: '',
-    endTime: '',
-    godownId: ''
+    statistateStart: '',
+    statistateEnd: '',
+    signUserId: ''
   });
 
   function getStoreList(name = '') {
@@ -62,6 +62,7 @@
   const searchRef = ref(null);
   /** 搜索 */
   const search = (data) => {
-    emit('search', { ...data});
+    delete data.time;
+    emit('search', { ...data });
   };
 </script>

src/views/statistic/inspection/index.vue

@@ -1,63 +1,66 @@
 <template>
-  <ele-page flex-table>
-    <page-search @search="reload"></page-search>
-    <common-table
-      ref="pageRef"
-      :pageConfig="pageConfig"
-      :columns="columns"
-      :tools="false"
-      show-summary
-      :flex-table="false"
-    >
-      <template #toolbar="{ row }">
-        <div>
-          <el-button
-            type="success"
-            plain
-            v-permission="'statistic:inspection:export'"
-            @click="handleExportExcel(row)"
-          >
-            导出EXCEL
-          </el-button>
-        </div>
-      </template>
-    </common-table>
-  </ele-page>
+    <ele-page flex-table>
+        <page-search @search="reload"></page-search>
+        <common-table
+            ref="pageRef"
+            :pageConfig="pageConfig"
+            :columns="columns"
+            :tools="false"
+            show-summary
+            :flex-table="false"
+        >
+            <template #toolbar="{ row }">
+                <div>
+                    <el-button
+                        type="success"
+                        plain
+                        v-permission="'statistic:inspection:export'"
+                        @click="handleExportExcel(row)"
+                    >
+                        导出EXCEL
+                    </el-button>
+                </div>
+            </template>
+        </common-table>
+    </ele-page>
 </template>
 
 <script setup>
-  import { ref, reactive } from 'vue';
-  import CommonTable from '@/components/CommonPage/CommonTable.vue';
-  import pageSearch from './components/page-search.vue';
+    import { ref, reactive } from 'vue';
+    import CommonTable from '@/components/CommonPage/CommonTable.vue';
+    import pageSearch from './components/page-search.vue';
 
-  defineOptions({ name: 'inspectionList' });
+    defineOptions({ name: 'inspectionList' });
 
-  /** 表格列配置 */
-  const columns = ref([
-    { type: 'index', label: '#', align: 'center', width: 80 },
-    { label: '操作员', prop: 'godownName', align: 'center' },
-    { label: '批次号', prop: 'orderNum', align: 'center' },
-    { label: '验收包裹数量', prop: 'godownName', align: 'center' },
-    { label: '统计日期', prop: 'createTime', align: 'center' }
-  ]);
+    /** 表格列配置 */
+    const columns = ref([
+        { type: 'index', label: '#', align: 'center', width: 80 },
+        { label: '操作员', prop: 'signUserName', align: 'center' },
+        { label: '批次号', prop: 'batchNum', align: 'center' },
+        { label: '验收包裹数量', prop: 'statNum', align: 'center' },
+        { label: '统计日期', prop: 'statDate', align: 'center' }
+    ]);
 
-  /** 页面组件实例 */
-  const pageRef = ref(null);
+    /** 页面组件实例 */
+    const pageRef = ref(null);
 
-  const pageConfig = reactive({
-    pageUrl: '/baseinfo/godown/pagelist',
-    exportUrl: '/baseinfo/godown/export',
-    fileName: '物流验收统计',
-    cacheKey: 'inspectionTable'
-  });
+    const pageConfig = reactive({
+        pageUrl: '/app/ordersignstat/getOrderSignStat',
+        exportUrl: '/app/ordersignstat/getOrderSignStatExport',
+        fileName: '物流验收统计',
+        cacheKey: 'inspectionTable',
+        params: {
+            statType: '4'
+        }
+    });
 
-  //刷新表格
-  function reload(where) {
-    pageRef.value?.reload(where);
-  }
+    //刷新表格
+    function reload(where) {
+        pageRef.value?.reload(where);
+    }
 
-  //导出excel
-  function handleExportExcel() {
-    pageRef.value?.exportData('物流验收统计');
-  }
+    //导出excel
+    function handleExportExcel() {
+        pageRef.value?.exportData('物流验收统计');
+    }
 </script>

src/views/statistic/unpacking/components/page-search.vue

@@ -23,8 +23,8 @@
     return [
       {
         type: 'input',
-        label: '拆包员',
-        prop: 'auditName'
+        label: '签收员',
+        prop: 'signUserId'
       },
       {
         type: 'daterange',
@@ -34,8 +34,8 @@
           format: 'YYYY-MM-DD',
           valueFormat: 'YYYY-MM-DD',
           onChange: (value) => {
-            initKeys.startTime = value ? value[0] : '';
-            initKeys.endTime = value ? value[1] : '';
+            initKeys.statDateStart = value ? value[0] : '';
+            initKeys.statDateEnd = value ? value[1] : '';
             searchRef.value?.setData(initKeys);
           }
         },
@@ -47,21 +47,16 @@
   });
 
   const initKeys = reactive({
-    startTime: '',
-    endTime: '',
-    godownId: ''
+    statDateStart: '',
+    statDateEnd: '',
+    signUserId: ''
   });
 
-  function getStoreList(name = '') {
-    return proxy.$http.post(`/baseinfo/godown/searchGodown?name=${name}`);
-  }
-  getStoreList().then((res) => {
-    godownList.value = res.data.data;
-  });
 
   const searchRef = ref(null);
   /** 搜索 */
   const search = (data) => {
+    delete data.time;
     emit('search', { ...data});
   };
 </script>

src/views/statistic/unpacking/index.vue

@@ -1,62 +1,65 @@
 <template>
-  <ele-page flex-table>
-    <page-search @search="reload"></page-search>
-    <common-table
-      ref="pageRef"
-      :pageConfig="pageConfig"
-      :columns="columns"
-      :tools="false"
-      show-summary
-      :flex-table="false"
-    >
-      <template #toolbar="{ row }">
-        <div>
-          <el-button
-            type="success"
-            plain
-            v-permission="'statistic:unpacking:export'"
-            @click="handleExportExcel(row)"
-          >
-            导出EXCEL
-          </el-button>
-        </div>
-      </template>
-    </common-table>
-  </ele-page>
+    <ele-page flex-table>
+        <page-search @search="reload"></page-search>
+        <common-table
+            ref="pageRef"
+            :pageConfig="pageConfig"
+            :columns="columns"
+            :tools="false"
+            show-summary
+            :flex-table="false"
+        >
+            <template #toolbar="{ row }">
+                <div>
+                    <el-button
+                        type="success"
+                        plain
+                        v-permission="'statistic:unpacking:export'"
+                        @click="handleExportExcel(row)"
+                    >
+                        导出EXCEL
+                    </el-button>
+                </div>
+            </template>
+        </common-table>
+    </ele-page>
 </template>
 
 <script setup>
-  import { ref, reactive } from 'vue';
-  import CommonTable from '@/components/CommonPage/CommonTable.vue';
-  import pageSearch from './components/page-search.vue';
+    import { ref, reactive } from 'vue';
+    import CommonTable from '@/components/CommonPage/CommonTable.vue';
+    import pageSearch from './components/page-search.vue';
 
-  defineOptions({ name: 'unpackingStatistic' });
+    defineOptions({ name: 'unpackingStatistic' });
 
-  /** 表格列配置 */
-  const columns = ref([
-    { type: 'index', label: '#', align: 'center', width: 80 },
-    { label: '拆包员', prop: 'godownName', align: 'center' },
-    { label: '拆包数量', prop: 'orderNum', align: 'center' },
-    { label: '统计日期', prop: 'createTime', align: 'center' },
-  ]);
+    /** 表格列配置 */
+    const columns = ref([
+        { type: 'index', label: '#', align: 'center', width: 80 },
+        { label: '签收员', prop: 'signUserName', align: 'center' },
+        { label: '签收数量', prop: 'statNum', align: 'center' },
+        { label: '统计日期', prop: 'statDate', align: 'center' }
+    ]);
 
-  /** 页面组件实例 */
-  const pageRef = ref(null);
+    /** 页面组件实例 */
+    const pageRef = ref(null);
 
-  const pageConfig = reactive({
-    pageUrl: '/baseinfo/godown/pagelist',
-    exportUrl: '/baseinfo/godown/export',
-    fileName: '拆包统计',
-    cacheKey: 'unpackingTable'
-  });
+    const pageConfig = reactive({
+        pageUrl: '/app/ordersignstat/getOrderSignStat',
+        exportUrl: '/app/ordersignstat/getOrderSignStatExport',
+        fileName: '拆包统计',
+        cacheKey: 'unpackingTable',
+        params: {
+            statType: 5
+        }
+    });
 
-  //刷新表格
-  function reload(where) {
-    pageRef.value?.reload(where);
-  }
+    //刷新表格
+    function reload(where) {
+        pageRef.value?.reload(where);
+    }
 
-  //导出excel
-  function handleExportExcel() {
-    pageRef.value?.exportData('拆包统计');
-  }
+    //导出excel
+    function handleExportExcel() {
+        pageRef.value?.exportData('拆包统计');
+    }
 </script>

src/views/statistic/weight/components/page-search.vue

@@ -23,8 +23,8 @@
     return [
       {
         type: 'input',
-        label: '拆包员',
-        prop: 'auditName'
+        label: '签收员',
+        prop: 'signUserId'
       },
       {
         type: 'daterange',
@@ -34,8 +34,8 @@
           format: 'YYYY-MM-DD',
           valueFormat: 'YYYY-MM-DD',
           onChange: (value) => {
-            initKeys.startTime = value ? value[0] : '';
-            initKeys.endTime = value ? value[1] : '';
+            initKeys.statDateStart = value ? value[0] : '';
+            initKeys.statDateEnd = value ? value[1] : '';
             searchRef.value?.setData(initKeys);
           }
         },
@@ -47,21 +47,16 @@
   });
 
   const initKeys = reactive({
-    startTime: '',
-    endTime: '',
-    godownId: ''
+    statDateStart: '',
+    statDateEnd: '',
+    signUserId: ''
   });
 
-  function getStoreList(name = '') {
-    return proxy.$http.post(`/baseinfo/godown/searchGodown?name=${name}`);
-  }
-  getStoreList().then((res) => {
-    godownList.value = res.data.data;
-  });
 
   const searchRef = ref(null);
   /** 搜索 */
   const search = (data) => {
+    delete data.time;
     emit('search', { ...data});
   };
 </script>

src/views/statistic/weight/index.vue

@@ -35,19 +35,22 @@
   /** 表格列配置 */
   const columns = ref([
     { type: 'index', label: '#', align: 'center', width: 80 },
-    { label: '拆包员', prop: 'godownName', align: 'center' },
-    { label: '拆包数量', prop: 'orderNum', align: 'center' },
-    { label: '统计日期', prop: 'createTime', align: 'center' },
+    { label: '拆包员', prop: 'signUserName', align: 'center' },
+    { label: '拆包数量', prop: 'statNum', align: 'center' },
+    { label: '统计日期', prop: 'statDate', align: 'center' },
   ]);
 
   /** 页面组件实例 */
   const pageRef = ref(null);
 
   const pageConfig = reactive({
-    pageUrl: '/baseinfo/godown/pagelist',
-    exportUrl: '/baseinfo/godown/export',
+    pageUrl: '/app/ordersignstat/getOrderSignStat',
+    exportUrl: '/app/ordersignstat/getOrderSignStatExport',
     fileName: '重量统计',
-    cacheKey: 'weightStatisticTable'
+    cacheKey: 'weightStatisticTable',
+    params: {
+      statType: 3
+    }
   });
 
   //刷新表格