feat: #10000 配货功能

2023-04-04 15:36:28 +08:00 · 2023-04-04 15:36:28 +08:00 · 81e10c3a5a
commit 81e10c3a5a
parent 48888606da
37 changed files with 39 additions and 30 deletions
--- a/app/Exports/OrderBlankExport.php
+++ b/app/Exports/OrderBlankExport.php
@ -37,7 +37,7 @@ class OrderBlankExport implements FromCollection, WithStyles
        $noStr = implode(',', $this->no);
        $data = [
            ['店铺名称', $this->shopName],
-//            ['跟团号', $noStr],
+            ['跟团号', $noStr],
            ['种类', '品牌', '商品规格', '商品名称', '数量', '所在货架编号', '配货'],
        ];
        $goodsCodes = array_column($excelDate, 'goods_code');
@ -68,6 +68,7 @@ class OrderBlankExport implements FromCollection, WithStyles
    public function styles(Worksheet $sheet)
    {
        $count = $this->count + 2;
+        $sheet->mergeCells('B2:G2');
        $sheet->getStyle('B2')->getAlignment()
            ->setVertical('center')
            ->setWrapText(true);
--- a/public/dist/css/chunk-0b2fb3a8.ebe80e03.css
+++ b/public/dist/css/chunk-0b2fb3a8.ebe80e03.css
--- a/public/dist/css/chunk-281ed902.b3153d73.css
+++ b/public/dist/css/chunk-281ed902.b3153d73.css
--- a/public/dist/css/chunk-7e09c5c4.749f9966.css
+++ b/public/dist/css/chunk-7e09c5c4.749f9966.css
@ -0,0 +1 @@
+.block[data-v-8ac9ae68]{margin-top:20px}
--- a/public/dist/css/chunk-dae6d032.c998c48a.css
+++ b/public/dist/css/chunk-dae6d032.c998c48a.css
@ -0,0 +1 @@
+.block[data-v-40c048a6]{margin-top:20px}
--- a/public/dist/index.html
+++ b/public/dist/index.html
@ -1 +1 @@
-<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>erp</title><link href="css/chunk-088acbde.902ebb66.css" rel="prefetch"><link href="css/chunk-0cbcaa56.e05858e7.css" rel="prefetch"><link href="css/chunk-0f6f9608.b3153d73.css" rel="prefetch"><link href="css/chunk-26daa808.62429343.css" rel="prefetch"><link href="css/chunk-35db73ce.1f9c10ff.css" rel="prefetch"><link href="css/chunk-43a9ad8f.ebe80e03.css" rel="prefetch"><link href="css/chunk-4caed774.ad94328f.css" rel="prefetch"><link href="css/chunk-52fcdd7c.51e3ffbd.css" rel="prefetch"><link href="css/chunk-6ae0a0d3.84a02b23.css" rel="prefetch"><link href="css/chunk-743f0316.fb5066fb.css" rel="prefetch"><link href="css/chunk-75426f71.902ebb66.css" rel="prefetch"><link href="css/chunk-904e5abc.902ebb66.css" rel="prefetch"><link href="css/chunk-a3ddd952.902ebb66.css" rel="prefetch"><link href="css/chunk-ab4d3e40.d941d6ef.css" rel="prefetch"><link href="css/chunk-e35186f0.902ebb66.css" rel="prefetch"><link href="css/chunk-f0b6f0d4.a3b83cc4.css" rel="prefetch"><link href="css/chunk-f35dfe36.ea52b615.css" rel="prefetch"><link href="js/chunk-088acbde.08d60870.js" rel="prefetch"><link href="js/chunk-0cbcaa56.46e3dd42.js" rel="prefetch"><link href="js/chunk-0f6f9608.cdc3788a.js" rel="prefetch"><link href="js/chunk-26daa808.9e326ce2.js" rel="prefetch"><link href="js/chunk-35db73ce.ae2590c3.js" rel="prefetch"><link href="js/chunk-43a9ad8f.22ca8cda.js" rel="prefetch"><link href="js/chunk-4caed774.d65d1796.js" rel="prefetch"><link href="js/chunk-52fcdd7c.0070e388.js" rel="prefetch"><link href="js/chunk-63c1eac8.59f3df74.js" rel="prefetch"><link href="js/chunk-6ae0a0d3.ee4aa3e0.js" rel="prefetch"><link href="js/chunk-743f0316.503949a4.js" rel="prefetch"><link href="js/chunk-75426f71.128f599c.js" rel="prefetch"><link href="js/chunk-904e5abc.e6a5edbe.js" rel="prefetch"><link href="js/chunk-a3ddd952.0482ce75.js" rel="prefetch"><link href="js/chunk-ab4d3e40.078de018.js" rel="prefetch"><link href="js/chunk-e35186f0.055dd015.js" rel="prefetch"><link href="js/chunk-f0b6f0d4.e264ca96.js" rel="prefetch"><link href="js/chunk-f35dfe36.e7038b09.js" rel="prefetch"><link href="css/app.6c30acd7.css" rel="preload" as="style"><link href="css/chunk-vendors.9181e156.css" rel="preload" as="style"><link href="js/app.99e885d1.js" rel="preload" as="script"><link href="js/chunk-vendors.524d6b36.js" rel="preload" as="script"><link href="css/chunk-vendors.9181e156.css" rel="stylesheet"><link href="css/app.6c30acd7.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but erp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/chunk-vendors.524d6b36.js"></script><script src="js/app.99e885d1.js"></script></body></html>
+<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>erp</title><link href="css/chunk-088acbde.902ebb66.css" rel="prefetch"><link href="css/chunk-0b2fb3a8.ebe80e03.css" rel="prefetch"><link href="css/chunk-0cbcaa56.e05858e7.css" rel="prefetch"><link href="css/chunk-26daa808.62429343.css" rel="prefetch"><link href="css/chunk-281ed902.b3153d73.css" rel="prefetch"><link href="css/chunk-35db73ce.1f9c10ff.css" rel="prefetch"><link href="css/chunk-4caed774.ad94328f.css" rel="prefetch"><link href="css/chunk-52fcdd7c.51e3ffbd.css" rel="prefetch"><link href="css/chunk-6ae0a0d3.84a02b23.css" rel="prefetch"><link href="css/chunk-743f0316.fb5066fb.css" rel="prefetch"><link href="css/chunk-75426f71.902ebb66.css" rel="prefetch"><link href="css/chunk-7e09c5c4.749f9966.css" rel="prefetch"><link href="css/chunk-904e5abc.902ebb66.css" rel="prefetch"><link href="css/chunk-a3ddd952.902ebb66.css" rel="prefetch"><link href="css/chunk-ab4d3e40.d941d6ef.css" rel="prefetch"><link href="css/chunk-dae6d032.c998c48a.css" rel="prefetch"><link href="css/chunk-e35186f0.902ebb66.css" rel="prefetch"><link href="css/chunk-f0b6f0d4.a3b83cc4.css" rel="prefetch"><link href="css/chunk-f35dfe36.ea52b615.css" rel="prefetch"><link href="js/chunk-088acbde.e3b91ba7.js" rel="prefetch"><link href="js/chunk-0b2fb3a8.c7277f66.js" rel="prefetch"><link href="js/chunk-0cbcaa56.46e3dd42.js" rel="prefetch"><link href="js/chunk-26daa808.9e326ce2.js" rel="prefetch"><link href="js/chunk-281ed902.01d8bc0c.js" rel="prefetch"><link href="js/chunk-35db73ce.ae2590c3.js" rel="prefetch"><link href="js/chunk-4caed774.d65d1796.js" rel="prefetch"><link href="js/chunk-52fcdd7c.0070e388.js" rel="prefetch"><link href="js/chunk-63c1eac8.59f3df74.js" rel="prefetch"><link href="js/chunk-6ae0a0d3.ee4aa3e0.js" rel="prefetch"><link href="js/chunk-743f0316.cc5e2a5b.js" rel="prefetch"><link href="js/chunk-75426f71.128f599c.js" rel="prefetch"><link href="js/chunk-7e09c5c4.5e89acae.js" rel="prefetch"><link href="js/chunk-904e5abc.e6a5edbe.js" rel="prefetch"><link href="js/chunk-a3ddd952.0482ce75.js" rel="prefetch"><link href="js/chunk-ab4d3e40.c28d58b3.js" rel="prefetch"><link href="js/chunk-dae6d032.7fa60b44.js" rel="prefetch"><link href="js/chunk-e35186f0.f1d6b68d.js" rel="prefetch"><link href="js/chunk-f0b6f0d4.b774c023.js" rel="prefetch"><link href="js/chunk-f35dfe36.e7038b09.js" rel="prefetch"><link href="css/app.6c30acd7.css" rel="preload" as="style"><link href="css/chunk-vendors.9181e156.css" rel="preload" as="style"><link href="js/app.7aa7bce6.js" rel="preload" as="script"><link href="js/chunk-vendors.524d6b36.js" rel="preload" as="script"><link href="css/chunk-vendors.9181e156.css" rel="stylesheet"><link href="css/app.6c30acd7.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but erp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/chunk-vendors.524d6b36.js"></script><script src="js/app.7aa7bce6.js"></script></body></html>
--- a/public/dist/js/app.7aa7bce6.js
+++ b/public/dist/js/app.7aa7bce6.js
--- a/public/dist/js/app.7aa7bce6.js.map
+++ b/public/dist/js/app.7aa7bce6.js.map
--- a/public/dist/js/app.99e885d1.js
+++ b/public/dist/js/app.99e885d1.js
--- a/public/dist/js/app.99e885d1.js.map
+++ b/public/dist/js/app.99e885d1.js.map
--- a/public/dist/js/chunk-088acbde.08d60870.js.map
+++ b/public/dist/js/chunk-088acbde.08d60870.js.map
--- a/public/dist/js/chunk-088acbde.e3b91ba7.js
+++ b/public/dist/js/chunk-088acbde.e3b91ba7.js
--- a/public/dist/js/chunk-088acbde.e3b91ba7.js.map
+++ b/public/dist/js/chunk-088acbde.e3b91ba7.js.map
--- a/public/dist/js/chunk-0b2fb3a8.c7277f66.js
+++ b/public/dist/js/chunk-0b2fb3a8.c7277f66.js
--- a/public/dist/js/chunk-0b2fb3a8.c7277f66.js.map
+++ b/public/dist/js/chunk-0b2fb3a8.c7277f66.js.map
--- a/public/dist/js/chunk-281ed902.01d8bc0c.js
+++ b/public/dist/js/chunk-281ed902.01d8bc0c.js
--- a/public/dist/js/chunk-281ed902.01d8bc0c.js.map
+++ b/public/dist/js/chunk-281ed902.01d8bc0c.js.map
--- a/public/dist/js/chunk-43a9ad8f.22ca8cda.js
+++ b/public/dist/js/chunk-43a9ad8f.22ca8cda.js
--- a/public/dist/js/chunk-43a9ad8f.22ca8cda.js.map
+++ b/public/dist/js/chunk-43a9ad8f.22ca8cda.js.map
--- a/public/dist/js/chunk-743f0316.503949a4.js.map
+++ b/public/dist/js/chunk-743f0316.503949a4.js.map
--- a/public/dist/js/chunk-743f0316.cc5e2a5b.js
+++ b/public/dist/js/chunk-743f0316.cc5e2a5b.js
--- a/public/dist/js/chunk-743f0316.cc5e2a5b.js.map
+++ b/public/dist/js/chunk-743f0316.cc5e2a5b.js.map
--- a/public/dist/js/chunk-7e09c5c4.5e89acae.js
+++ b/public/dist/js/chunk-7e09c5c4.5e89acae.js
--- a/public/dist/js/chunk-7e09c5c4.5e89acae.js.map
+++ b/public/dist/js/chunk-7e09c5c4.5e89acae.js.map
--- a/public/dist/js/chunk-ab4d3e40.078de018.js.map
+++ b/public/dist/js/chunk-ab4d3e40.078de018.js.map
--- a/public/dist/js/chunk-ab4d3e40.c28d58b3.js
+++ b/public/dist/js/chunk-ab4d3e40.c28d58b3.js
--- a/public/dist/js/chunk-ab4d3e40.c28d58b3.js.map
+++ b/public/dist/js/chunk-ab4d3e40.c28d58b3.js.map
--- a/public/dist/js/chunk-dae6d032.7fa60b44.js
+++ b/public/dist/js/chunk-dae6d032.7fa60b44.js
--- a/public/dist/js/chunk-dae6d032.7fa60b44.js.map
+++ b/public/dist/js/chunk-dae6d032.7fa60b44.js.map
--- a/public/dist/js/chunk-e35186f0.055dd015.js.map
+++ b/public/dist/js/chunk-e35186f0.055dd015.js.map
--- a/public/dist/js/chunk-e35186f0.f1d6b68d.js
+++ b/public/dist/js/chunk-e35186f0.f1d6b68d.js
--- a/public/dist/js/chunk-e35186f0.f1d6b68d.js.map
+++ b/public/dist/js/chunk-e35186f0.f1d6b68d.js.map
--- a/public/dist/js/chunk-f0b6f0d4.b774c023.js
+++ b/public/dist/js/chunk-f0b6f0d4.b774c023.js
--- a/public/dist/js/chunk-f0b6f0d4.b774c023.js.map
+++ b/public/dist/js/chunk-f0b6f0d4.b774c023.js.map
--- a/public/dist/js/chunk-f0b6f0d4.e264ca96.js
+++ b/public/dist/js/chunk-f0b6f0d4.e264ca96.js
--- a/public/dist/js/chunk-f0b6f0d4.e264ca96.js.map
+++ b/public/dist/js/chunk-f0b6f0d4.e264ca96.js.map
--- a/resources/frontend/vue.config.js
+++ b/resources/frontend/vue.config.js
@ -11,8 +11,8 @@ module.exports = {
    proxy: {
      // 配置代理
      "/api": {
-        target: "http://192.168.247.186:81",
-        // target: "http://erp.chutang66.com",
+        // target: "http://192.168.247.186:81",
+        target: "http://erp.chutang66.com",
        changeOrigin: true, // 开启代理
        pathRewrite: {
          // 重命名