增加装运时间

.env.development

@@ -6,13 +6,13 @@ VITE_PUBLIC_PATH = /
 
 # 跨域代理，您可以配置多个 ,请注意，没有换行符
 # VITE_PROXY = [["/jeecgboot","http://192.168.0.105:9999"],["/upload","http://localhost:3300/upload"]]
-VITE_PROXY = [["/jeecgboot","http://192.168.1.32:9999"],["/upload","http://localhost:3300/upload"]]
+VITE_PROXY = [["/jeecgboot","http://192.168.0.119:9999"],["/upload","http://localhost:3300/upload"]]
 
 #后台接口全路径地址(必填)
 # VITE_GLOB_DOMAIN_URL=http://localhost:9999
 # VITE_GLOB_DOMAIN_URL=http://192.168.0.105:8080/jeecg-boot
 # VITE_GLOB_DOMAIN_URL=http://192.168.6.24:8080/jeecg-boot
-VITE_GLOB_DOMAIN_URL=http://192.168.1.32:9999
+VITE_GLOB_DOMAIN_URL=http://192.168.0.119:9999
 
 
 

src/views/billet/storageAndTransportation/index.vue

@@ -26,6 +26,7 @@
               <span>炉号：{{ item.heatNo }}</span>
               <span style="padding: 0 20px"> 总支数：{{ item.heatNoAmount }} </span>
               <span> 总重量：{{ item.heatNoWeight }} t </span>
+              <span style="padding: 0 20px"> 开始时间：{{ item.createTime }} </span>
             </template>
             <template #avatar>
               <a-tag color="#108ee9">{{ (page - 1) * pageSize + index + 1 }}</a-tag>
@@ -140,13 +141,21 @@
       },
     },
     {
-      label: '日期',
+      label: '炉次日期',
       field: 'createTime',
       component: 'RangePicker',
       componentProps: {
         valueFormat: 'YYYY-MM-DD',
       },
     },
+    {
+      label: '装运日期',
+      field: 'storageTime',
+      component: 'RangePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD',
+      },
+    },
   ];
   /**
    * BasicForm绑定注册;
@@ -161,7 +170,10 @@
     //折叠时默认显示行数，默认1行
     alwaysShowLines: 3,
     //将表单内时间区域的值映射成 2个字段, 'YYYY-MM-DD'日期格式化
-    fieldMapToTime: [['createTime', ['createTime_begin', 'createTime_end'], 'YYYY-MM-DD']],
+    fieldMapToTime: [
+      ['createTime', ['createTime_begin', 'createTime_end'], 'YYYY-MM-DD'],
+      ['storageTime', ['storageTime_begin', 'storageTime_end'], 'YYYY-MM-DD'],
+    ],
     //每列占比，默认一行为24
     baseColProps: { span: 6 },
   });
@@ -208,6 +220,7 @@
       if (!values.ccmNo) {
         values.ccmNo = '5';
       }
+      console.log('values', values);
 
       const params = Object.assign(
         {},
@@ -215,7 +228,13 @@
           pageNo: page.value,
           pageSize: pageSize.value,
         },
-        values
+        values,
+        {
+          createTimeBegin: values.createTime_begin,
+          createTimeEnd: values.createTime_end,
+          storageTimeBegin: values.storageTime_begin,
+          storageTimeEnd: values.storageTime_end,
+        }
       );
 
       const res = await getStorageCenterInvoicingInfo(params);
@@ -309,9 +328,23 @@
       values
     );
 
-    let queryParams = Object.keys(params).map((key) => {
-      return `${key}=${params[key]}`;
-    });
+    let queryParams = Object.keys(params)
+      .filter((v) => params[v])
+      .map((key) => {
+        if (key === 'createTime_begin') {
+          return `createTimeBegin=${params[key]}`;
+        }
+        if (key === 'createTime_end') {
+          return `createTimeEnd=${params[key]}`;
+        }
+        if (key === 'storageTime_begin') {
+          return `storageTimeBegin=${params[key]}`;
+        }
+        if (key === 'storageTime_end') {
+          return `storageTimeEnd=${params[key]}`;
+        }
+        return `${key}=${params[key]}`;
+      });
 
     return handleExportXls('储运中心', exportExcel() + (queryParams.length > 0 ? '?' + queryParams.join('&') : ''));
   };