Kaynağa Gözat

fix 重量统计

ylong 8 ay önce
ebeveyn
işleme
844d4ecbd7

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

@@ -24,7 +24,7 @@
       {
         type: 'input',
         label: '操作员',
-        prop: 'signUserId'
+        prop: 'signUserName'
       },
       {
         type: 'daterange',

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

@@ -24,7 +24,7 @@
       {
         type: 'input',
         label: '操作员',
-        prop: 'signUserId'
+        prop: 'signUserName'
       },
       {
         type: 'daterange',
@@ -49,7 +49,7 @@
   const initKeys = reactive({
     statistateStart: '',
     statistateEnd: '',
-    signUserId: ''
+    signUserName: ''
   });
 
   function getStoreList(name = '') {

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

@@ -23,8 +23,8 @@
     return [
       {
         type: 'input',
-        label: '签收员',
-        prop: 'signUserId'
+        label: '拆包员',
+        prop: 'signUserName'
       },
       {
         type: 'daterange',
@@ -49,7 +49,7 @@
   const initKeys = reactive({
     statDateStart: '',
     statDateEnd: '',
-    signUserId: ''
+    signUserName: ''
   });
 
 

+ 2 - 2
src/views/statistic/unpacking/index.vue

@@ -35,8 +35,8 @@
     /** 表格列配置 */
     const columns = ref([
         { type: 'index', label: '#', align: 'center', width: 80 },
-        { label: '签收员', prop: 'signUserName', align: 'center' },
-        { label: '签收数量', prop: 'statNum', align: 'center' },
+        { label: '拆包员', prop: 'signUserName', align: 'center' },
+        { label: '拆包数量', prop: 'statNum', align: 'center' },
         { label: '统计日期', prop: 'statDate', align: 'center' }
     ]);
 

+ 55 - 52
src/views/statistic/weight/components/page-search.vue

@@ -1,62 +1,65 @@
 <!-- 搜索表单 -->
 <template>
-  <ele-card :body-style="{ paddingBottom: '8px' }">
-    <ProSearch
-      :items="formItems"
-      ref="searchRef"
-      @search="search"
-      :initKeys="initKeys"
-      :offset="1"
-    ></ProSearch>
-  </ele-card>
+    <ele-card :body-style="{ paddingBottom: '8px' }">
+        <ProSearch
+            :items="formItems"
+            ref="searchRef"
+            @search="search"
+            :initKeys="initKeys"
+            :offset="1"
+        ></ProSearch>
+    </ele-card>
 </template>
 
 <script setup>
-  import { reactive, ref, defineEmits } from 'vue';
-  import ProSearch from '@/components/CommonPage/ProSearch2.vue';
+    import { reactive, ref, defineEmits } from 'vue';
+    import ProSearch from '@/components/CommonPage/ProSearch2.vue';
 
-  let { proxy } = getCurrentInstance();
-  const emit = defineEmits(['search']);
+    const emit = defineEmits(['search']);
 
-  const godownList = ref([]);
-  const formItems = computed(() => {
-    return [
-      {
-        type: 'input',
-        label: '签收员',
-        prop: 'signUserId'
-      },
-      {
-        type: 'daterange',
-        label: ' ',
-        prop: 'time',
-        props: {
-          format: 'YYYY-MM-DD',
-          valueFormat: 'YYYY-MM-DD',
-          onChange: (value) => {
-            initKeys.statDateStart = value ? value[0] : '';
-            initKeys.statDateEnd = value ? value[1] : '';
-            searchRef.value?.setData(initKeys);
-          }
-        },
-        colProps: {
-          span: 6
-        }
-      }
-    ];
-  });
+    const formItems = computed(() => {
+        return [
+            {
+                type: 'input',
+                label: 'ISBN',
+                prop: 'isbn'
+            },
+            {
+                type: 'input',
+                label: '操作员',
+                prop: 'createId'
+            },
+            {
+                type: 'daterange',
+                label: '创建时间',
+                prop: 'time',
+                props: {
+                    format: 'YYYY-MM-DD',
+                    valueFormat: 'YYYY-MM-DD',
+                    onChange: (value) => {
+                        initKeys.createTimeStart = value ? value[0] : '';
+                        initKeys.createTimeEnd = value ? value[1] : '';
+                        searchRef.value?.setData(initKeys);
+                    }
+                },
+                colProps: {
+                    span: 6
+                }
+            }
+        ];
+    });
 
-  const initKeys = reactive({
-    statDateStart: '',
-    statDateEnd: '',
-    signUserId: ''
-  });
+    const initKeys = reactive({
+        createTimeStart: '',
+        createTimeEnd: '',
+        createId: '',
+        isbn: ''
+    });
 
-
-  const searchRef = ref(null);
-  /** 搜索 */
-  const search = (data) => {
-    delete data.time;
-    emit('search', { ...data});
-  };
+    const searchRef = ref(null);
+    /** 搜索 */
+    const search = (data) => {
+        delete data.time;
+        emit('search', { ...data });
+    };
 </script>

+ 2 - 5
src/views/statistic/weight/index.vue

@@ -44,13 +44,10 @@
   const pageRef = ref(null);
 
   const pageConfig = reactive({
-    pageUrl: '/app/ordersignstat/getOrderSignStat',
-    exportUrl: '/app/ordersignstat/getOrderSignStatExport',
+    pageUrl: '/book/weightchange/getChangeLogPage',
+    exportUrl: '/book/weightchange/export',
     fileName: '重量统计',
     cacheKey: 'weightStatisticTable',
-    params: {
-      statType: 3
-    }
   });
 
   //刷新表格