From 2cad342c013109cf9c94e9bafd36e1d953e0f17c Mon Sep 17 00:00:00 2001
From: JasonChen <jason@192.168.3.101>
Date: Fri, 4 Aug 2023 11:05:54 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E6=B0=B4=E6=84=9F=E5=BA=94=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E9=9D=A2=E6=9D=BF=E5=B1=95=E7=A4=BA=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Charts/ChartCard.vue | 10 ++++++----
 src/views/home/components/Count.vue | 13 +++++--------
 yarn.lock                           | 18 +++++++++---------
 3 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/src/components/Charts/ChartCard.vue b/src/components/Charts/ChartCard.vue
index fc1f425..1d63d3c 100644
--- a/src/components/Charts/ChartCard.vue
+++ b/src/components/Charts/ChartCard.vue
@@ -1,7 +1,8 @@
 <template>
   <a-card :loading="loading" :body-style="{ padding: '20px 24px 8px' }" :bordered="false">
+    {{ title }}
     <div class="chart-card-header">
-      <div class="meta">
+      <!-- <div class="meta">
         <span class="chart-card-title">
           <slot name="title">
             {{ title }}
@@ -10,11 +11,12 @@
         <span class="chart-card-action">
           <slot name="action"></slot>
         </span>
-      </div>
+      </div> -->
       <div class="total">
-        <slot name="total">
+        {{ total }}
+        <!-- <slot name="total">
           <span>{{ typeof total === 'function' && total() || total }}</span>
-        </slot>
+        </slot> -->
       </div>
     </div>
     <div class="chart-card-content">
diff --git a/src/views/home/components/Count.vue b/src/views/home/components/Count.vue
index 8b23117..4f3de06 100644
--- a/src/views/home/components/Count.vue
+++ b/src/views/home/components/Count.vue
@@ -3,18 +3,15 @@
     <a-row :gutter="24">
       <!-- 分公司库存 -->
       <a-col
+        v-if="info.middle"
         :sm="24"
         :md="12"
         :xl="12"
         :xxl="12"
         :style="{ marginBottom: '10px' }"
-        v-if="info.middle">
-        <chart-card :loading="loading" :title="$t('分公司总库存(瓶)')" :total="info.middle.total">
-          <a-tooltip :title="$t('总分公司总库存')" slot="action">
-            <a-icon type="info-circle-o" />
-          </a-tooltip>
+      >
+        <chart-card :loading="loading" title="分公司总库存(瓶)" :total="info.middle.total">
           <template slot="footer">
-            <!-- <span> {{ info.total.people }}瓶</span> -->
             <trend flag="up"> <span slot="term">{{ $t('线上库存') }}</span>{{ info.middle.online_stock }}瓶</trend>
             <trend flag="down" style="margin-left: 20px;">
               <span slot="term">{{ $t('线下库存') }}</span>{{ info.middle.offline_stock }}瓶
@@ -31,8 +28,8 @@
         :style="{ marginBottom: '10px' }"
         v-if="info.agent"
       >
-        <chart-card :loading="loading" :title="$t('经销商总库存(瓶)')" :total="info.agent.stock | NumberFormat">
-          <a-tooltip :title="$t('经销商总库存')" slot="action">
+        <chart-card :loading="loading" title="经销商总库存(瓶)" :total="info.agent.stock | NumberFormat">
+          <a-tooltip title="经销商总库存" slot="action">
             <a-icon type="info-circle-o" />
           </a-tooltip>
           <div>
diff --git a/yarn.lock b/yarn.lock
index 2f2d6e7..b81d6c5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1653,9 +1653,9 @@
   integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
 
 "@types/node@*":
-  version "20.4.5"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.4.5.tgz#9dc0a5cb1ccce4f7a731660935ab70b9c00a5d69"
-  integrity sha512-rt40Nk13II9JwQBdeYqmbn2Q6IVTA5uPhvSO+JVqdXw/6/4glI6oR9ezty/A9Hg5u7JH4OmYmuQ+XvjKm0Datg==
+  version "20.4.7"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.4.7.tgz#74d323a93f1391a63477b27b9aec56669c98b2ab"
+  integrity sha512-bUBrPjEry2QUTsnuEjzjbS7voGWCc30W0qzgMf90GPeDGFRakvrz47ju+oqDAKCXLUCe39u57/ORMl/O/04/9g==
 
 "@types/node@8.9":
   version "8.9.5"
@@ -3573,9 +3573,9 @@ caniuse-api@^3.0.0:
     lodash.uniq "^4.5.0"
 
 caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001517:
-  version "1.0.30001518"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001518.tgz#b3ca93904cb4699c01218246c4d77a71dbe97150"
-  integrity sha512-rup09/e3I0BKjncL+FesTayKtPrdwKhUufQFd3riFw1hHg8JmIFoInYfB102cFcY/pPgGmdyl/iy+jgiDi2vdA==
+  version "1.0.30001519"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001519.tgz#3e7b8b8a7077e78b0eb054d69e6edf5c7df35601"
+  integrity sha512-0QHgqR+Jv4bxHMp8kZ1Kn8CH55OikjKJ6JmKkZYP1F3D7w+lnFXF70nG5eNfsZS89jadi5Ywy5UCSKLAglIRkg==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -5075,9 +5075,9 @@ ejs@^2.6.1:
   integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
 
 electron-to-chromium@^1.4.477:
-  version "1.4.480"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.480.tgz#40e32849ca50bc23ce29c1516c5adb3fddac919d"
-  integrity sha512-IXTgg+bITkQv/FLP9FjX6f9KFCs5hQWeh5uNSKxB9mqYj/JXhHDbu+ekS43LVvbkL3eW6/oZy4+r9Om6lan1Uw==
+  version "1.4.484"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.484.tgz#770358eba089471c5dae5719db3a5a4fbf02bfb2"
+  integrity sha512-nO3ZEomTK2PO/3TUXgEx0A97xZTpKVf4p427lABHuCpT1IQ2N+njVh29DkQkCk6Q4m2wjU+faK4xAcfFndwjvw==
 
 element-resize-detector@1.1.13:
   version "1.1.13"

From 58d8b32131b724f4d8bd0f321d406e359f70663b Mon Sep 17 00:00:00 2001
From: JasonChen <jason@192.168.3.101>
Date: Fri, 4 Aug 2023 15:53:16 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E7=BA=BF=E4=B8=8B=E5=87=BA=E8=B4=A7?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/stock.js                       |  25 +++
 src/config/routes/sales.js             |  28 +--
 src/views/sales/Offline.vue            | 289 ++++++++-----------------
 src/views/sales/widgets/AddOffline.vue |  56 +++--
 4 files changed, 158 insertions(+), 240 deletions(-)

diff --git a/src/api/stock.js b/src/api/stock.js
index aea91ad..421395e 100644
--- a/src/api/stock.js
+++ b/src/api/stock.js
@@ -69,6 +69,7 @@ export function getMiddlesOrderIdentity (parameter) {
     params: parameter
   })
 }
+
 // 订单详情
 export function getMiddlesOrderDetail (id) {
   return request({
@@ -78,3 +79,27 @@ export function getMiddlesOrderDetail (id) {
 }
 
 // 线下出货订单
+export function getMiddlesStockOffline (parameter) {
+  return request({
+    url: '/middles/stock/offline',
+    method: 'get',
+    params: parameter
+  })
+}
+
+// 线下搜索前置
+export function getMiddlesStockOfflineInit () {
+  return request({
+    url: 'middles/stock/offline/before',
+    method: 'get'
+  })
+}
+
+// 创建线下出货订单
+export function createMiddlesStockOffline (parameter) {
+  return request({
+    url: 'middles/stock/offline',
+    method: 'post',
+    params: parameter
+  })
+}
diff --git a/src/config/routes/sales.js b/src/config/routes/sales.js
index 29c57f6..f679df6 100644
--- a/src/config/routes/sales.js
+++ b/src/config/routes/sales.js
@@ -20,23 +20,23 @@ export default [{
             },
             component: () => import('@/views/sales/Online')
         },
-        {
-            path: '/sales/stock',
-            name: 'SalesStock',
-            meta: {
-                title: '线上进货订单',
-                icon: 'unordered-list'
-            },
-            component: () => import('@/views/sales/OnStock')
-        }
         // {
-        //     path: '/sales/offline',
-        //     name: 'SalesOffline',
+        //     path: '/sales/stock',
+        //     name: 'SalesStock',
         //     meta: {
-        //         title: '线下出货列表',
+        //         title: '线上进货订单',
         //         icon: 'unordered-list'
         //     },
-        //     component: () => import('@/views/sales/Offline')
-        // }
+        //     component: () => import('@/views/sales/OnStock')
+        // },
+        {
+            path: '/sales/offline',
+            name: 'SalesOffline',
+            meta: {
+                title: '线下出货列表',
+                icon: 'unordered-list'
+            },
+            component: () => import('@/views/sales/Offline')
+        }
     ]
 }]
diff --git a/src/views/sales/Offline.vue b/src/views/sales/Offline.vue
index cb8efd4..f75fd51 100644
--- a/src/views/sales/Offline.vue
+++ b/src/views/sales/Offline.vue
@@ -6,49 +6,40 @@
       <div class="table-page-search-wrapper">
         <a-form layout="inline">
           <a-row :gutter="48">
-            <a-col :md="8" :sm="24">
-              <a-form-item label="订单号码">
-                <a-input v-model="queryParam.item_id" placeholder="订单号" />
-              </a-form-item>
-            </a-col>
             <a-col :md="8" :sm="24">
               <a-form-item label="手机号码">
-                <a-input v-model="queryParam.order_no" placeholder="购买人手机号" />
+                <a-input v-model="queryParam.mobile" placeholder="购买人手机号" />
               </a-form-item>
             </a-col>
             <a-col :md="8" :sm="24">
               <a-form-item label="真实姓名">
-                <a-input v-model="queryParam.item_id" placeholder="购买人真实姓名" />
+                <a-input v-model="queryParam.name" placeholder="购买人真实姓名" />
               </a-form-item>
             </a-col>
             <a-col :md="8" :sm="24">
-              <a-form-item label="发货数量" has-feedback>
-                <a-input v-model="queryParam.order_no" placeholder="发货数量" />
+              <a-form-item label="详细地址">
+                <a-input v-model="queryParam.address" placeholder="购买人收货地址" />
               </a-form-item>
             </a-col>
-            <a-col :md="8" :sm="24">
-              <a-form-item label="快递类型" has-feedback>
-                <a-select v-model="queryParam.business_type_id" @change="onBusinessChange" placeholder="快递类型">
-                  <a-select-option v-for="item in businessArray" :key="item.id" :value="item.id">{{ item.title }}</a-select-option>
+
+            <!-- <a-col :md="8" :sm="24">
+              <a-form-item label="发货方式" has-feedback>
+                <a-select v-model="queryParam.channel" placeholder="发货方式">
+                  <a-select-option v-for="item in channels" :key="item.value" :value="item.value">{{ item.text }}</a-select-option>
                 </a-select>
               </a-form-item>
             </a-col>
             <a-col :md="8" :sm="24">
-              <a-form-item label="快递单号">
-                <a-input v-model="queryParam.item_id" placeholder="快递单号" />
+              <a-form-item label="快递类型" has-feedback>
+                <a-select v-model="queryParam.express" placeholder="快递类型">
+                  <a-select-option v-for="(item, key, index) in expresses" :key="index" :value="key">{{ item }}</a-select-option>
+                </a-select>
               </a-form-item>
-            </a-col>
+            </a-col> -->
             <a-col :md="8" :sm="24">
               <a-button type="primary" @click="search"><a-icon type="search" />搜索</a-button>
-              <a-button class="ml8" t ype="primary" @click="onAddRole"><a-icon type="plus" />新增线下出货</a-button>
+              <a-button class="ml8" t ype="primary" @click="CreateOffline"><a-icon type="plus" />新增线下出货</a-button>
               <a-button class="ml8" @click="resetSearch"><a-icon type="undo" />重置</a-button>
-              <a-button
-                v-if="exports_can"
-                class="ml8"
-                type="dashed"
-                shape="round"
-                icon="download"
-                @click="exports"/>
             </a-col>
           </a-row>
         </a-form>
@@ -61,22 +52,23 @@
         ref="table"
         :columns="columns"
         :data="loadData"
-        :rowKey="(row) => row.order_item_id"
+        :rowKey="(row) => row.offline_id"
         showPagination="auto"
         bordered
         size="default"
-        :scroll="{ x: 1200, y: 1000 }">
-        <!-- 申请用户 实习顾问 法务老师 -->
-        <div slot="user" slot-scope="text, record" style="color: #1890ff">
-          <div>{{ record.user }}</div>
+      >
+        <div slot="name" slot-scope="text, record">
+          <div>{{ record.name }} {{ record.mobile?'('+record.mobile+')':'--' }}</div>
+          <div>{{ record.address || '--' }}</div>
         </div>
-        <!-- 创建时间 -->
-        <span slot="created_at" slot-scope="text, record">{{ record.created_at }}</span>
-        <!-- 操作 -->
-        <div slot="actions" slot-scope="text, record">
-          <a class="ant-dropdown-link" @click="onInfo(record)">查看详情</a>
-          <!-- <a-divider type="vertical" /> -->
-          <!-- <a class="ant-dropdown-link" @click="onEdit(record)">发货</a> -->
+        <div slot="number" slot-scope="text, record">
+          {{ record.number }}件
+        </div>
+        <div slot="channel" slot-scope="text, record">
+          {{ record.channel == 'express' ?'快递':'自提' }}
+        </div>
+        <div slot="express" slot-scope="text, record">
+          {{ record.express.name || '-' }} <div>{{ record.express.express_no || '-' }}</div>
         </div>
       </s-table>
     </a-card>
@@ -86,62 +78,53 @@
 <script>
 import { STable, UserInfo } from '@/components'
 import DeriveButton from '@/components/OrderDetailInfo/DeriveButton'
-import { institutionsExports } from '@/api/storage'
 import moment from 'moment'
 import Info from '@/views/home/components/Info'
-import {
-  init,
-  canExport
-} from '@/api/organization'
-import { getMiddlesExperience } from '@/api/stock'
-import storage from 'store'
-import EditSend from './widgets/EditSend.vue'
-import StockInfo from './widgets/StockInfo.vue'
+import { getMiddlesStockOffline, getMiddlesStockOfflineInit } from '@/api/stock'
 import AddOffline from './widgets/AddOffline.vue'
 
 // 列表规格
 const columns = [
 {
-    title: '订单号',
-    dataIndex: 'user22',
-    align: 'center'
-  },
-  {
-    title: '收货人',
-    dataIndex: 'created_at',
-    align: 'center'
+    title: 'ID',
+    dataIndex: 'offline_id',
+    align: 'center',
+    width: 100
   },
   {
     title: '发货数量',
-    dataIndex: 'created_at1',
-    align: 'center'
-  },
-  {
-    title: '订单信息',
-    children: [
-      {
-        title: '状态',
-        dataIndex: 'name',
-        key: 'name',
-        align: 'center'
-      },
-      {
-        title: '金额',
-        dataIndex: 'name1',
-        key: 'name1',
-        align: 'center'
-      }
-    ],
-    width: 300,
-    align: 'center'
-  },
-  {
-    title: '操作',
-    scopedSlots: { customRender: 'actions' },
+    scopedSlots: { customRender: 'number' },
     align: 'center',
-    width: 160,
-    fixed: 'right'
+    width: 120
+  },
+  {
+    title: '发货方式',
+    scopedSlots: { customRender: 'channel' },
+    align: 'center',
+    width: 120
+  },
+  {
+    title: '收货人',
+    scopedSlots: { customRender: 'name' },
+    align: 'center'
+  },
+  {
+    title: '快递信息',
+    scopedSlots: { customRender: 'express' },
+    align: 'center'
+  },
+  {
+    title: '创建时间',
+    dataIndex: 'created_at',
+    align: 'center'
   }
+  // {
+  //   title: '操作',
+  //   scopedSlots: { customRender: 'actions' },
+  //   align: 'center',
+  //   width: 160,
+  //   fixed: 'right'
+  // }
 ]
 
 export default {
@@ -157,24 +140,20 @@ export default {
       exports_can: false,
       columns,
       searchType: false, // 展示全部的搜索
-      businessArray: [], // 业务类型
-      statusArray: [], // 机构列表
+      expresses: [], // 快递列表
+      channels: [], // 返货方式
 
       queryParam: {
-        order_no: '', // 订单编号
-        institution: '', // 机构名称
-        item_id: '', // 机构编号
-        nickname: '', // 下单人
-        business_type_id: '', // 业务类型
-        status: '', // 机构状态
-        paid_at: undefined, // 下单时间
-        audit_at: undefined, // 执行时间
-        settle_at: undefined // 结案时间
+        name: undefined,
+        mobile: undefined,
+        channel: undefined,
+        address: undefined,
+        express: undefined
       },
       listCount: 0,
       loadData: (parameter) => {
         const requestParameters = Object.assign({}, parameter, this.queryParam)
-        return getMiddlesExperience(requestParameters)
+        return getMiddlesStockOffline(requestParameters)
       }
     }
   },
@@ -200,36 +179,11 @@ export default {
     moment,
     // 获取检索的基本样式
     init () {
-      init().then(res => {
-        this.statusArray = res.status // 机构状态
-        this.businessArray = res.type // 业务类型
-        // this.canExports()
+      getMiddlesStockOfflineInit().then(res => {
+        this.channels = res.channel
+        this.expresses = res.expresses
       })
     },
-    // 更改创建时间
-    onCreateChange (dates, dateStrings) {
-      this.queryParam.paid_at = dateStrings
-    },
-    // 更改执行时间
-    onCarryChange (dates, dateStrings) {
-      this.queryParam.audit_at = dateStrings
-    },
-    // 更改结案时间
-    onSettleChange (dates, dateStrings) {
-      this.queryParam.settle_at = dateStrings
-    },
-    // 处理状态
-    onDisposeChange (e) {
-      this.queryParam.dispose = e
-    },
-    // 业务类型
-    onBusinessChange (e) {
-      this.queryParam.business_type_id = e
-    },
-    // 机构状态
-    onOrganizationChange (e) {
-      this.queryParam.status = e
-    },
     // 搜索列表
     search () {
       this.$refs.table.refresh(true) // 重置接口且刷先到第一页
@@ -237,45 +191,16 @@ export default {
     // 重置搜索列表
     resetSearch () {
       this.queryParam = {
-        order_no: '', // 订单编号
-        institution: '', // 机构名称
-        item_id: '', // 机构编号
-        nickname: '', // 下单人
-        business_type_id: '', // 业务类型
-        status: '', // 机构状态
-        paid_at: undefined, // 下单时间
-        audit_at: undefined, // 执行时间
-        settle_at: undefined// 结案时间
+        name: undefined,
+        mobile: undefined,
+        channel: undefined,
+        address: undefined,
+        express: undefined
       }
       this.$refs.table.refresh(true) // 重置接口且刷先到第一页
     },
-    // 机构是否能导出
-    canExports () {
-      canExport(storage.get('userid')).then(res => {
-        this.exports_can = res.exports
-      })
-    },
-    // 导出列表
-    exports () {
-      const params = this.queryParam
-      params.audit_at = this.queryParam.audit_at || ''
-      params.paid_at = this.queryParam.paid_at || ''
-      params.settle_at = this.queryParam.settle_at || ''
-      if (this.listCount > 0) {
-        let downUrl = institutionsExports() + '?user_id=' + storage.get('userid')
-        for (const key in params) {
-          downUrl = downUrl + '&' + key + '=' + params[key]
-        }
-        window.open(downUrl)
-      } else {
-        this.$notification.error({
-          message: '温馨提醒',
-          description: '数据为空不能下载！'
-        })
-      }
-    },
-    // 新增用户
-    onAddRole () {
+    // 创建线下出货
+    CreateOffline () {
       const success = {
         title: '新增线下出货',
         width: 600,
@@ -284,55 +209,15 @@ export default {
         okText: '确认新增',
         cancelText: '取消'
       }
+      const offline = {
+        channels: this.channels,
+        expresses: this.expresses
+      }
+      console.log(offline)
       this.$dialog(
         AddOffline,
         {
-          on: {
-            ok: () => {
-              this.$refs.table.loadData()
-            }
-          }
-        },
-        success
-      )
-    },
-    // 查看详情
-    onInfo (item) {
-      const success = {
-        title: '立即发货',
-        width: 1000,
-        maskClosable: true,
-        closable: true,
-        footer: '',
-        cancelText: '取消'
-      }
-      this.$dialog(
-        StockInfo,
-        {
-          item,
-          on: {
-            ok: () => {
-              this.$refs.table.loadData()
-            }
-          }
-        },
-        success
-      )
-    },
-    // 发货
-    onEdit (item) {
-      const success = {
-        title: '立即发货',
-        width: 600,
-        maskClosable: true,
-        closable: true,
-        okText: '确认发货',
-        cancelText: '取消'
-      }
-      this.$dialog(
-        EditSend,
-        {
-          item,
+          offline,
           on: {
             ok: () => {
               this.$refs.table.loadData()
diff --git a/src/views/sales/widgets/AddOffline.vue b/src/views/sales/widgets/AddOffline.vue
index 639688a..818a752 100644
--- a/src/views/sales/widgets/AddOffline.vue
+++ b/src/views/sales/widgets/AddOffline.vue
@@ -8,7 +8,7 @@
     <a-form-item label="收货人名">
       <a-input
         v-decorator="[
-          'no1',
+          'name',
           {
             rules: [
               { required: true, message: `请选择收货人名!`, type: 'string' },
@@ -18,10 +18,23 @@
         :placeholder="`请选择收货人名!`"
       />
     </a-form-item>
+    <a-form-item label="收货手机号">
+      <a-input
+        v-decorator="[
+          'mobile_no',
+          {
+            rules: [
+              { required: true, message: `请选择收货手机号!`, type: 'string' },
+            ]
+          }
+        ]"
+        :placeholder="`请选择收货手机号!`"
+      />
+    </a-form-item>
     <a-form-item label="收货地址">
       <a-input
         v-decorator="[
-          'no2',
+          'address',
           {
             rules: [
               { required: true, message: `请选择收货地址!`, type: 'string' },
@@ -34,21 +47,21 @@
     <a-form-item label="购买数量">
       <a-input
         v-decorator="[
-          'no3',
+          'number',
           {
             rules: [
-              { required: true, message: `请选择购买数量!`, type: 'string' },
+              { required: true, message: `请输入购买数量!`, type: 'string' },
             ]
           }
         ]"
-        :placeholder="`请选择购买数量!`"
+        :placeholder="`请输入购买数量!`"
       />
     </a-form-item>
     <a-form-item label="发货方式">
       <a-select
         @change="typeChange"
         v-decorator="[
-          'status',
+          'channel',
           {
             rules: [
               { required: true, message: `请选择发货方式!`, type: 'string' }
@@ -56,14 +69,13 @@
           }
         ]"
         :placeholder="`请选择发货方式!`">
-        <a-select-option value="online">线上发货</a-select-option>
-        <a-select-option value="offline">线下自提</a-select-option>
+        <a-select-option v-for="item in offline.channels" :key="item.value" :value="item.value">{{ item.text }}</a-select-option>
       </a-select>
     </a-form-item>
-    <a-form-item label="快递类型" v-if="currentType === 'online'">
+    <a-form-item label="快递类型" v-if="currentType === 'express'">
       <a-select
         v-decorator="[
-          'tpe',
+          'express_id',
           {
             rules: [
               { required: true, message: `请选择快递类型!`, type: 'string' }
@@ -71,14 +83,13 @@
           }
         ]"
         :placeholder="`请选择快递类型!`">
-        <a-select-option value="shunfeng">顺丰速递</a-select-option>
-        <a-select-option value="yunda">韵达快递</a-select-option>
+        <a-select-option v-for="(item, key, index) in offline.expresses" :key="index" :value="key">{{ item }}</a-select-option>
       </a-select>
     </a-form-item>
-    <a-form-item label="快递单号" v-if="currentType === 'online'">
+    <a-form-item label="快递单号" v-if="currentType === 'express'">
       <a-input
         v-decorator="[
-          'no',
+          'express_no',
           {
             rules: [
               { required: true, message: `请选择快递单号!`, type: 'string' },
@@ -89,12 +100,11 @@
       />
     </a-form-item>
     <a-form-item
-      label="自提时间"
-      v-if="currentType === 'offline'"
+      label="发货时间"
     >
       <a-date-picker
         v-decorator="[
-          'time',
+          'deliver_at',
           {
             rules: [
               { required: true, message: `请选择自提时间!` },
@@ -108,12 +118,12 @@
 </template>
 
 <script>
-import { changeStatusTwo } from '@/api/organization'
+import { createMiddlesStockOffline } from '@/api/stock'
 import moment from 'moment'
 export default {
   name: 'EditSend',
   props: {
-    item: {
+    offline: {
       type: Object,
       default: () => {
           return {}
@@ -137,13 +147,11 @@ export default {
       return new Promise(resolve => {
         this.form.validateFields((errors, values) => {
           if (!errors) {
-            const params = {
-              status: values.status
-            }
-            changeStatusTwo(this.item.order_item_id, params).then((res) => {
+            values.deliver_at = moment(values.deliver_at).format('YYYY-MM-DD')
+            createMiddlesStockOffline(values).then((res) => {
               this.$notification.success({
                 message: '成功',
-                description: '修改成功'
+                description: '新增线下出货成功！！'
               })
               resolve(true)
             }).catch((err) => {

From 60b34ebcd02803e06dd6082a6a13be0603362763 Mon Sep 17 00:00:00 2001
From: JasonChen <jason@192.168.3.101>
Date: Fri, 4 Aug 2023 16:45:40 +0800
Subject: [PATCH 3/8] =?UTF-8?q?watch=E7=9B=91=E5=90=AC=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=88=97=E8=A1=A8=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/cityExperienceOfficer/Index.vue |  2 ++
 src/views/permissions/Index.vue           | 19 +++++++++++++++++++
 src/views/sales/Offline.vue               | 20 ++++++++++++--------
 src/views/sales/OnStock.vue               |  2 ++
 src/views/sales/Online.vue                |  2 ++
 src/views/stock/DealerIn.vue              |  2 ++
 src/views/stock/DealerOut.vue             |  2 ++
 src/views/stock/In.vue                    |  2 ++
 src/views/stock/Out.vue                   |  2 ++
 9 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/src/views/cityExperienceOfficer/Index.vue b/src/views/cityExperienceOfficer/Index.vue
index 1c6cfb8..aeca3ec 100644
--- a/src/views/cityExperienceOfficer/Index.vue
+++ b/src/views/cityExperienceOfficer/Index.vue
@@ -226,6 +226,8 @@ export default {
         from.name === 'DealerOut' ||
         from.name === 'UserIndex' ||
         from.name === 'SalesOnline' ||
+        from.name === 'SalesOffline' ||
+        from.name === 'PermissionsIndex' ||
         from.name === 'SalesStock')
       ) {
         this.$refs.table.loadData()
diff --git a/src/views/permissions/Index.vue b/src/views/permissions/Index.vue
index e38232a..e7d34e5 100644
--- a/src/views/permissions/Index.vue
+++ b/src/views/permissions/Index.vue
@@ -133,6 +133,25 @@ export default {
         }
     }
 },
+watch: {
+    $route (to, from) {
+      if (to.name === 'PermissionsIndex' && (
+        from.name === 'Home' ||
+        from.name === 'cityExperienceOfficer' ||
+        from.name === 'StockOut' ||
+        from.name === 'StockIn' ||
+        from.name === 'DealerIn' ||
+        from.name === 'DealerOut' ||
+        from.name === 'UserIndex' ||
+        from.name === 'SalesOnline' ||
+        from.name === 'SalesOffline' ||
+        from.name === 'PermissionsIndex' ||
+        from.name === 'SalesStock')
+      ) {
+        this.$refs.table.loadData()
+      }
+    }
+  },
     methods: {
 
     // 新增用户
diff --git a/src/views/sales/Offline.vue b/src/views/sales/Offline.vue
index f75fd51..caf7e7d 100644
--- a/src/views/sales/Offline.vue
+++ b/src/views/sales/Offline.vue
@@ -159,14 +159,18 @@ export default {
   },
   watch: {
     $route (to, from) {
-      if (
-        (from.name === 'Detail' && to.name === 'FristCheckrderIndex') ||
-        (from.name === 'Home' && to.name === 'FristCheckrderIndex') ||
-        (from.name === 'AssignrderIndex' && to.name === 'FristCheckrderIndex') ||
-        (from.name === 'SignInrderIndex' && to.name === 'FristCheckrderIndex') ||
-        (from.name === 'ReCheckrderIndex' && to.name === 'FristCheckrderIndex') ||
-        (from.name === 'HandleService' && to.name === 'FristCheckrderIndex') ||
-        (from.name === 'CompleteOrder' && to.name === 'FristCheckrderIndex')
+      if (to.name === 'SalesOffline' && (
+        from.name === 'Home' ||
+        from.name === 'cityExperienceOfficer' ||
+        from.name === 'StockOut' ||
+        from.name === 'StockIn' ||
+        from.name === 'DealerIn' ||
+        from.name === 'DealerOut' ||
+        from.name === 'UserIndex' ||
+        from.name === 'SalesOnline' ||
+        from.name === 'SalesOffline' ||
+        from.name === 'PermissionsIndex' ||
+        from.name === 'SalesStock')
       ) {
         this.$refs.table.loadData()
       }
diff --git a/src/views/sales/OnStock.vue b/src/views/sales/OnStock.vue
index de88673..9f81276 100644
--- a/src/views/sales/OnStock.vue
+++ b/src/views/sales/OnStock.vue
@@ -168,6 +168,8 @@ export default {
         from.name === 'DealerOut' ||
         from.name === 'UserIndex' ||
         from.name === 'SalesOnline' ||
+        from.name === 'SalesOffline' ||
+        from.name === 'PermissionsIndex' ||
         from.name === 'SalesStock')
       ) {
         this.$refs.table.loadData()
diff --git a/src/views/sales/Online.vue b/src/views/sales/Online.vue
index 1a8a9a7..33418e5 100644
--- a/src/views/sales/Online.vue
+++ b/src/views/sales/Online.vue
@@ -173,6 +173,8 @@ export default {
         from.name === 'DealerOut' ||
         from.name === 'UserIndex' ||
         from.name === 'SalesOnline' ||
+        from.name === 'SalesOffline' ||
+        from.name === 'PermissionsIndex' ||
         from.name === 'SalesStock')
       ) {
         this.$refs.table.loadData()
diff --git a/src/views/stock/DealerIn.vue b/src/views/stock/DealerIn.vue
index 4356417..5b9c01e 100644
--- a/src/views/stock/DealerIn.vue
+++ b/src/views/stock/DealerIn.vue
@@ -183,6 +183,8 @@ export default {
         from.name === 'DealerOut' ||
         from.name === 'UserIndex' ||
         from.name === 'SalesOnline' ||
+        from.name === 'SalesOffline' ||
+        from.name === 'PermissionsIndex' ||
         from.name === 'SalesStock')
       ) {
         this.$refs.table.loadData()
diff --git a/src/views/stock/DealerOut.vue b/src/views/stock/DealerOut.vue
index e311e08..679b51e 100644
--- a/src/views/stock/DealerOut.vue
+++ b/src/views/stock/DealerOut.vue
@@ -181,6 +181,8 @@ export default {
         from.name === 'DealerOut' ||
         from.name === 'UserIndex' ||
         from.name === 'SalesOnline' ||
+        from.name === 'SalesOffline' ||
+        from.name === 'PermissionsIndex' ||
         from.name === 'SalesStock')
       ) {
         this.$refs.table.loadData()
diff --git a/src/views/stock/In.vue b/src/views/stock/In.vue
index 6b3538e..885f4d2 100644
--- a/src/views/stock/In.vue
+++ b/src/views/stock/In.vue
@@ -132,6 +132,8 @@ export default {
         from.name === 'DealerOut' ||
         from.name === 'SalesOnline' ||
         from.name === 'UserIndex' ||
+        from.name === 'SalesOffline' ||
+        from.name === 'PermissionsIndex' ||
         from.name === 'SalesStock')
       ) {
         this.$refs.table.loadData()
diff --git a/src/views/stock/Out.vue b/src/views/stock/Out.vue
index bb09bcf..8f2108f 100644
--- a/src/views/stock/Out.vue
+++ b/src/views/stock/Out.vue
@@ -177,6 +177,8 @@ export default {
         from.name === 'DealerOut' ||
         from.name === 'SalesOnline' ||
         from.name === 'UserIndex' ||
+        from.name === 'SalesOffline' ||
+        from.name === 'PermissionsIndex' ||
         from.name === 'SalesStock')
       ) {
         this.$refs.table.loadData()

From 3593b8e00daa9efa56a48a172d850458e0a7110e Mon Sep 17 00:00:00 2001
From: JasonChen <jason@192.168.3.102>
Date: Mon, 7 Aug 2023 16:39:44 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=BA=BF=E4=B8=8B?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/routes/sales.js | 17 ++++-------------
 src/config/routes/stock.js | 21 +++++++++++++++------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/config/routes/sales.js b/src/config/routes/sales.js
index f679df6..433a739 100644
--- a/src/config/routes/sales.js
+++ b/src/config/routes/sales.js
@@ -20,23 +20,14 @@ export default [{
             },
             component: () => import('@/views/sales/Online')
         },
-        // {
-        //     path: '/sales/stock',
-        //     name: 'SalesStock',
-        //     meta: {
-        //         title: '线上进货订单',
-        //         icon: 'unordered-list'
-        //     },
-        //     component: () => import('@/views/sales/OnStock')
-        // },
         {
-            path: '/sales/offline',
-            name: 'SalesOffline',
+            path: '/sales/stock',
+            name: 'SalesStock',
             meta: {
-                title: '线下出货列表',
+                title: '线上进货订单',
                 icon: 'unordered-list'
             },
-            component: () => import('@/views/sales/Offline')
+            component: () => import('@/views/sales/OnStock')
         }
     ]
 }]
diff --git a/src/config/routes/stock.js b/src/config/routes/stock.js
index 81d6fae..27972bf 100644
--- a/src/config/routes/stock.js
+++ b/src/config/routes/stock.js
@@ -31,14 +31,23 @@ export default [{
                     }
                 },
                 {
-                    path: '/stock/out',
-                    name: 'StockOut',
-                    component: () => import('@/views/stock/Out'),
+                    path: '/sales/offline',
+                    name: 'SalesOffline',
                     meta: {
-                        title: '出库管理',
-                        icon: 'export'
-                    }
+                        title: '线下出货列表',
+                        icon: 'unordered-list'
+                    },
+                    component: () => import('@/views/sales/Offline')
                 }
+                // {
+                //     path: '/stock/out',
+                //     name: 'StockOut',
+                //     component: () => import('@/views/stock/Out'),
+                //     meta: {
+                //         title: '出库管理',
+                //         icon: 'export'
+                //     }
+                // }
             ]
         },
         {

From 6a4aa2826a8549a3c6aa3ca2d62a3f670bfa608b Mon Sep 17 00:00:00 2001
From: JasonChen <jason@192.168.3.102>
Date: Mon, 7 Aug 2023 16:41:26 +0800
Subject: [PATCH 5/8] merge

---
 .DS_Store | Bin 12292 -> 12292 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 0f7c77f44087aad037b5b6137297c91eef0cb5a9..a27e3c17d372672aeff144958c5f060739f3dcb2 100644
GIT binary patch
delta 36
scmZokXi1ph&*;7}U^hRb?qmT*#m%|`w>dUjNM2@}*kG`kTj3`^0O*|zg#Z8m

delta 79
zcmZokXi1ph&*-r+U^hRb-edtr#m%|`w>fk<7>XH67!rXvlOdTwfx*Z#CqFqUCqIdS
bfkA+Qfl(KT<^Ds#W>(2-Y@4|ie)0nVm8cn@


From de844a9462ceca91cdc0e7bb3abb23c1eccebf49 Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Thu, 24 Aug 2023 10:27:57 +0800
Subject: [PATCH 6/8] merge

---
 .DS_Store                              | Bin 12292 -> 12292 bytes
 src/views/sales/Offline.vue            |   5 ++++-
 src/views/sales/widgets/AddOffline.vue |   4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index a27e3c17d372672aeff144958c5f060739f3dcb2..56e951d8e2139cf73de0518f8c440164059d852a 100644
GIT binary patch
delta 20
bcmZokXi3;mrowJwtfOFQV6?ebrJWl9NFD}G

delta 20
bcmZokXi3;mrowJ$qN8AGY`D2rrJWl9NE8N6

diff --git a/src/views/sales/Offline.vue b/src/views/sales/Offline.vue
index caf7e7d..edbf189 100644
--- a/src/views/sales/Offline.vue
+++ b/src/views/sales/Offline.vue
@@ -68,7 +68,10 @@
           {{ record.channel == 'express' ?'快递':'自提' }}
         </div>
         <div slot="express" slot-scope="text, record">
-          {{ record.express.name || '-' }} <div>{{ record.express.express_no || '-' }}</div>
+          <div v-if="record.channel === 'express'">
+            {{ record.express.name || '-' }} <div>{{ record.express.express_no || '-' }}</div>
+          </div>
+          <div v-else>发货时间：{{ record.deliver_at }}</div>
         </div>
       </s-table>
     </a-card>
diff --git a/src/views/sales/widgets/AddOffline.vue b/src/views/sales/widgets/AddOffline.vue
index 818a752..a03f701 100644
--- a/src/views/sales/widgets/AddOffline.vue
+++ b/src/views/sales/widgets/AddOffline.vue
@@ -107,11 +107,11 @@
           'deliver_at',
           {
             rules: [
-              { required: true, message: `请选择自提时间!` },
+              { required: false, message: `请选择发货时间!` },
             ]
           }
         ]"
-        :placeholder="`请选择自提时间!`"
+        :placeholder="`请选择发货时间!`"
         style="width: 100%" />
     </a-form-item>
   </a-form>

From e130380d2028a17d289cf12eee79861fdc2e4d84 Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Thu, 24 Aug 2023 13:35:54 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E6=B0=B4=E6=84=9F=E5=BA=94=E7=BB=8F?=
 =?UTF-8?q?=E9=94=80=E5=95=86=E7=AB=AF=E4=B8=AD=E5=8F=B0=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/components/Count.vue | 27 +++++++++------------------
 src/views/sales/Offline.vue         | 15 +++++++++------
 2 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/src/views/home/components/Count.vue b/src/views/home/components/Count.vue
index 4f3de06..babeb3f 100644
--- a/src/views/home/components/Count.vue
+++ b/src/views/home/components/Count.vue
@@ -12,8 +12,8 @@
       >
         <chart-card :loading="loading" title="分公司总库存(瓶)" :total="info.middle.total">
           <template slot="footer">
-            <trend flag="up"> <span slot="term">{{ $t('线上库存') }}</span>{{ info.middle.online_stock }}瓶</trend>
-            <trend flag="down" style="margin-left: 20px;">
+            <!-- <trend flag="up"> <span slot="term">{{ $t('线上库存') }}</span>{{ info.middle.online_stock }}瓶</trend> -->
+            <trend flag="down">
               <span slot="term">{{ $t('线下库存') }}</span>{{ info.middle.offline_stock }}瓶
             </trend>
           </template>
@@ -77,16 +77,10 @@
       <a-card :bordered="false" title="累计销售数量">
         <a-row>
           <a-col :sm="24" :md="12" :xl="8" :xxl="8" class="mt20">
-            <info title="线上销售数量(瓶)" :value="''+info.sales_quantity.online_all" :bordered="true" />
+            <info title="累计销售数量(瓶)" :value="''+info.sales_quantity.online_all" :bordered="true" />
           </a-col>
           <a-col :sm="24" :md="12" :xl="8" :xxl="8" class="mt20">
-            <info title="线上零售数量(瓶)" :value="''+info.sales_quantity.online_retail" :bordered="true"/>
-          </a-col>
-          <a-col :sm="24" :md="12" :xl="8" :xxl="8" class="mt20">
-            <info title="线上代理进货数量(瓶)" :value="''+info.sales_quantity.online_agent_in" :bordered="true"/>
-          </a-col>
-          <a-col :sm="24" :md="12" :xl="8" :xxl="8" class="mt20">
-            <info title="线上创客进货数量(瓶)" :value="''+info.sales_quantity.online_maker_in" :bordered="true"/>
+            <info title="线上销售数量(瓶)" :value="''+info.sales_quantity.online_retail" :bordered="true"/>
           </a-col>
           <a-col :sm="24" :md="12" :xl="8" :xxl="8" class="mt20">
             <info title="线下出货数量(瓶)" :value="''+info.sales_quantity.offline" />
@@ -97,17 +91,14 @@
     <a-col :span="24" v-if="info.sales_amount">
       <a-card :bordered="false" title="售卖数据管理">
         <a-row>
-          <a-col :sm="24" :md="12" :xl="6" :xxl="6" class="mt20">
-            <info title="代理进货金额(元)" :value="''+info.sales_amount.online_agent_in" :bordered="true"/>
+          <a-col :sm="24" :md="12" :xl="8" :xxl="8" class="mt20">
+            <info title="售卖数据管理总数(元)" :value="''+info.sales_amount.online_agent_all" :bordered="true"/>
           </a-col>
-          <a-col :sm="24" :md="12" :xl="6" :xxl="6" class="mt20">
-            <info title="创客进货金额(元)" :value="''+info.sales_amount.online_maker_in" :bordered="true"/>
-          </a-col>
-          <a-col :sm="24" :md="12" :xl="6" :xxl="6" class="mt20">
+          <a-col :sm="24" :md="12" :xl="8" :xxl="8" class="mt20">
             <info title="线上销售金额(元)" :value="''+info.sales_amount.online_sell" :bordered="true"/>
           </a-col>
-          <a-col :sm="24" :md="12" :xl="6" :xxl="6" class="mt20">
-            <info title="线下销售金额(元)" :value="''+info.sales_amount.offline_sell" />
+          <a-col :sm="24" :md="12" :xl="8" :xxl="8" class="mt20">
+            <info title="线下出货金额总和(元)" :value="''+info.sales_amount.offline_sell" />
           </a-col>
         </a-row>
       </a-card>
diff --git a/src/views/sales/Offline.vue b/src/views/sales/Offline.vue
index edbf189..2682e0a 100644
--- a/src/views/sales/Offline.vue
+++ b/src/views/sales/Offline.vue
@@ -61,12 +61,9 @@
           <div>{{ record.name }} {{ record.mobile?'('+record.mobile+')':'--' }}</div>
           <div>{{ record.address || '--' }}</div>
         </div>
-        <div slot="number" slot-scope="text, record">
-          {{ record.number }}件
-        </div>
-        <div slot="channel" slot-scope="text, record">
-          {{ record.channel == 'express' ?'快递':'自提' }}
-        </div>
+        <div slot="number" slot-scope="text, record">{{ record.number }}件</div>
+        <a slot="total" slot-scope="text, record">￥{{ record.total || '0.00' }}</a>
+        <div slot="channel" slot-scope="text, record">{{ record.channel == 'express' ?'快递':'自提' }}</div>
         <div slot="express" slot-scope="text, record">
           <div v-if="record.channel === 'express'">
             {{ record.express.name || '-' }} <div>{{ record.express.express_no || '-' }}</div>
@@ -100,6 +97,12 @@ const columns = [
     align: 'center',
     width: 120
   },
+  {
+    title: '金额',
+    scopedSlots: { customRender: 'total' },
+    align: 'center',
+    width: 120
+  },
   {
     title: '发货方式',
     scopedSlots: { customRender: 'channel' },

From 7ccd43b4dd4ae3e696b31967edf439c2ddfbf20c Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Tue, 24 Oct 2023 15:06:29 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E5=88=86=E5=85=AC=E5=8F=B8=E5=8F=8A=E5=B9=B3=E5=8F=B0=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .DS_Store                     | Bin 12292 -> 12292 bytes
 src/views/stock/DealerOut.vue |  14 +++++++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 56e951d8e2139cf73de0518f8c440164059d852a..6a1644b86d26ea1ce0ace632c1219cdc9c614431 100644
GIT binary patch
delta 20
bcmZokXi3;mrowJ!s-s|OV7j?hrJWl9NL~h2

delta 20
bcmZokXi3;mrowJwtfOFQV6?ebrJWl9NFD}G

diff --git a/src/views/stock/DealerOut.vue b/src/views/stock/DealerOut.vue
index 679b51e..a6b2076 100644
--- a/src/views/stock/DealerOut.vue
+++ b/src/views/stock/DealerOut.vue
@@ -107,16 +107,16 @@ const columns = [
   },
   {
     title: '经销商',
-    scopedSlots: { customRender: 'in_user' },
+    scopedSlots: { customRender: 'out_user' },
     align: 'center',
     width: 140
   },
-  {
-     title: '分公司/平台',
-     scopedSlots: { customRender: 'out_user' },
-     align: 'center',
-     width: 140
-   },
+  // {
+  //    title: '分公司/平台',
+  //    scopedSlots: { customRender: 'out_user' },
+  //    align: 'center',
+  //    width: 140
+  //  },
   {
     title: '库变数据',
     scopedSlots: { customRender: 'number' },