线下出货模块处理

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
+  })
+}

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',
+        //     path: '/sales/stock',
-        //     name: 'SalesOffline',
+        //     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')
+        }
     ]
 }]

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-form-item label="详细地址">
-                <a-input v-model="queryParam.order_no" placeholder="发货数量" />
+                <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-col :md="8" :sm="24">
-                <a-select v-model="queryParam.business_type_id" @change="onBusinessChange" placeholder="快递类型">
+              <a-form-item label="发货方式" has-feedback>
-                  <a-select-option v-for="item in businessArray" :key="item.id" :value="item.id">{{ item.title }}</a-select-option>
+                <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-form-item label="快递类型" has-feedback>
-                <a-input v-model="queryParam.item_id" placeholder="快递单号" />
+                <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="name" slot-scope="text, record">
-        <div slot="user" slot-scope="text, record" style="color: #1890ff">
+          <div>{{ record.name }} {{ record.mobile?'('+record.mobile+')':'--' }}</div>
-          <div>{{ record.user }}</div>
+          <div>{{ record.address || '--' }}</div>
         </div>
-        <!-- 创建时间 -->
+        <div slot="number" slot-scope="text, record">
-        <span slot="created_at" slot-scope="text, record">{{ record.created_at }}</span>
+          {{ record.number }}件
-        <!-- 操作 -->
+        </div>
-        <div slot="actions" slot-scope="text, record">
+        <div slot="channel" slot-scope="text, record">
-          <a class="ant-dropdown-link" @click="onInfo(record)">查看详情</a>
+          {{ record.channel == 'express' ?'快递':'自提' }}
-          <!-- <a-divider type="vertical" /> -->
+        </div>
-          <!-- <a class="ant-dropdown-link" @click="onEdit(record)">发货</a> -->
+        <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 {
+import { getMiddlesStockOffline, getMiddlesStockOfflineInit } from '@/api/stock'
-  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 AddOffline from './widgets/AddOffline.vue'
 
 // 列表规格
 const columns = [
 {
-    title: '订单号',
+    title: 'ID',
-    dataIndex: 'user22',
+    dataIndex: 'offline_id',
-    align: 'center'
+    align: 'center',
-  },
+    width: 100
-  {
-    title: '收货人',
-    dataIndex: 'created_at',
-    align: 'center'
   },
   {
     title: '发货数量',
-    dataIndex: 'created_at1',
+    scopedSlots: { customRender: 'number' },
-    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' },
     align: 'center',
-    width: 160,
+    width: 120
-    fixed: 'right'
+  },
+  {
+    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: [], // 业务类型
+      expresses: [], // 快递列表
-      statusArray: [], // 机构列表
+      channels: [], // 返货方式
 
       queryParam: {
-        order_no: '', // 订单编号
+        name: undefined,
-        institution: '', // 机构名称
+        mobile: undefined,
-        item_id: '', // 机构编号
+        channel: undefined,
-        nickname: '', // 下单人
+        address: undefined,
-        business_type_id: '', // 业务类型
+        express: undefined
-        status: '', // 机构状态
-        paid_at: undefined, // 下单时间
-        audit_at: undefined, // 执行时间
-        settle_at: 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 => {
+      getMiddlesStockOfflineInit().then(res => {
-        this.statusArray = res.status // 机构状态
+        this.channels = res.channel
-        this.businessArray = res.type // 业务类型
+        this.expresses = res.expresses
-        // this.canExports()
       })
     },
-    // 更改创建时间
-    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: '', // 订单编号
+        name: undefined,
-        institution: '', // 机构名称
+        mobile: undefined,
-        item_id: '', // 机构编号
+        channel: undefined,
-        nickname: '', // 下单人
+        address: undefined,
-        business_type_id: '', // 业务类型
+        express: undefined
-        status: '', // 机构状态
-        paid_at: undefined, // 下单时间
-        audit_at: undefined, // 执行时间
-        settle_at: undefined// 结案时间
       }
       this.$refs.table.refresh(true) // 重置接口且刷先到第一页
     },
-    // 机构是否能导出
+    // 创建线下出货
-    canExports () {
+    CreateOffline () {
-      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 () {
       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: {
+          offline,
-            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,
           on: {
             ok: () => {
               this.$refs.table.loadData()

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 v-for="item in offline.channels" :key="item.value" :value="item.value">{{ item.text }}</a-select-option>
-        <a-select-option value="offline">线下自提</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 v-for="(item, key, index) in offline.expresses" :key="index" :value="key">{{ item }}</a-select-option>
-        <a-select-option value="yunda">韵达快递</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="自提时间"
+      label="发货时间"
-      v-if="currentType === 'offline'"
     >
       <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 = {
+            values.deliver_at = moment(values.deliver_at).format('YYYY-MM-DD')
-              status: values.status
+            createMiddlesStockOffline(values).then((res) => {
-            }
-            changeStatusTwo(this.item.order_item_id, params).then((res) => {
               this.$notification.success({
                 message: '成功',
-                description: '修改成功'
+                description: '新增线下出货成功！！'
               })
               resolve(true)
             }).catch((err) => {