merge

README.md

@@ -1,12 +1,12 @@
 <!--
  * @Author: Aimee~
  * @Date: 2023-05-11 12:02:45
- * @LastEditTime: 2023-06-27 14:25:57
+ * @LastEditTime: 2023-12-12 10:08:00
  * @LastEditors: Aimee
- * @FilePath: /douhuo-agent/README.md
+ * @FilePath: /water_dealer-agent/README.md
  * @Description:   备注信息
 -->
-# 水感应 分公司 中台(数据展示及分公司数据)
+# 水感应 分公司 中台(数据展示及分公司数据)  线下
 打包后文件件需要有一个 static 文件存放
 '/static/vue.min.js'
 '/static/vue-router.min.js'
@@ -14,7 +14,7 @@
 '/static/axios.min.js'
 否则报错
 
-# node 版本 10.23.1
+# node 版本 node-v14.21.3
 
 # 水感应测试-存放路径
 /home/wwwroot/Development/Douhuo/agent

public/Index.vue

@@ -219,9 +219,12 @@ export default {
   },
   computed: {
     currentUser () {
+      console.log(this.$store.getters)
       return {
         name: this.$store.getters.nickname,
-        avatar: this.$store.getters.avatar
+        avatar: this.$store.getters.avatar,
+        isManage: this.$store.getters.isManage,
+        username: this.$store.getters.username
       }
     }
   },

public/index.html

@@ -23,7 +23,7 @@
         <div class="loading-wrp">
           <span class="dot dot-spin"><i></i><i></i><i></i><i></i></span>
         </div>
-        <div style="display: flex; justify-content: center; align-items: center;"WaterFeel.manager Co.,Ltd.</div>
+        <div>WaterFeel.manager Co.,Ltd.</div>
       </div>
     </div>
     <!-- require cdn assets js -->
@@ -32,4 +32,13 @@
     <% } %>
     <!-- built files will be auto injected -->
   </body>
+  <style>
+  .bottomText{
+    display: flex; 
+    justify-content: center; 
+    align-items: center;
+    box-sizing: border-box;
+    flex-direction: row;
+  }
+  </style>
 </html>

src/api/coupon.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 优惠券列表
+export function getMiddlesCoupons (parameter) {
+  return request({
+    url: '/middles/stock/coupons',
+    method: 'get',
+    params: parameter
+  })
+}

src/api/permissions.js

@@ -1,10 +1,45 @@
 import request from '@/utils/request'
 
 // 用户列表
-export function getList (parameter) {
+export function getMiddlesManageUsers (parameter) {
   return request({
-    url: '/middles/user/children',
+    url: '/middles/manage/users',
     method: 'get',
     params: parameter
   })
 }
+
+// 新增管理账号
+export function addMiddlesManageUser (parameter) {
+  return request({
+    url: '/middles/manage/users',
+    method: 'post',
+    params: parameter
+  })
+}
+
+// 修改管理账号
+export function editMiddlesManageUser (middleId, parameter) {
+  return request({
+    url: `/middles/manage/users/${middleId}`,
+    method: 'put',
+    params: parameter
+  })
+}
+
+// 删除管理账号
+export function delMiddlesManageUser (middleId) {
+    return request({
+      url: `/middles/manage/users/${middleId}`,
+      method: 'DELETE'
+    })
+}
+
+// 删除管理账号
+export function setMiddlesManageUserStatus (middleId, parameter) {
+  return request({
+    url: `/middles/manage/users/${middleId}/set_status`,
+    method: 'post',
+    params: parameter
+  })
+}

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/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">

src/components/GlobalHeader/AvatarDropdown.vue

@@ -14,10 +14,10 @@
             <a-icon type="lock" />
             修改密码
           </a-menu-item>
-          <!-- <a-menu-item key="changePermission" @click="goPermission">
+          <a-menu-item v-if="currentUser.isManage" key="changePermission" @click="goPermission">
             <a-icon type="setting" />
-            权限管理
+            管理员管理
-          </a-menu-item> -->
+          </a-menu-item>
           <a-menu-item key="logout" @click="handleLogout">
             <a-icon type="logout" />
             退出登录

src/components/GlobalHeader/RightContent.vue

@@ -60,6 +60,7 @@ export default {
       return {
         name: this.$store.getters.nickname,
         avatar: this.$store.getters.avatar,
+        isManage: this.$store.getters.isManage,
         username: this.$store.getters.username
       }
     }

src/config/router.config.js

@@ -13,7 +13,7 @@ import {
 import detail from './routes/detail'
 import stock from './routes/stock'
 import user from './routes/user'
-// import coupon from './routes/coupon'
+import coupon from './routes/coupon'
 import permission from './routes/permission'
 import sales from './routes/sales'
 import cityExperienceOfficer from './routes/cityExperienceOfficer'
@@ -42,7 +42,7 @@ export const asyncRouterMap = [{
       ...stock,
       ...sales,
       ...user,
-      // ...coupon,
+      ...coupon,
       ...permission
     ]
   },

src/config/routes/permission.js

@@ -14,7 +14,7 @@ export default [
     component: () => import('@/views/permissions/Index'),
     hidden: true,
     meta: {
-        title: '权限管理',
+        title: '管理员管理',
         icon: 'cluster'
     }
   }

src/config/routes/sales.js

@@ -29,14 +29,5 @@ export default [{
             },
             component: () => import('@/views/sales/OnStock')
         }
-        // {
-        //     path: '/sales/offline',
-        //     name: 'SalesOffline',
-        //     meta: {
-        //         title: '线下出货列表',
-        //         icon: 'unordered-list'
-        //     },
-        //     component: () => import('@/views/sales/Offline')
-        // }
     ]
 }]

src/config/routes/stock.js

@@ -31,14 +31,23 @@ export default [{
                     }
                 },
                 {
-                    path: '/stock/out',
+                    path: '/sales/offline',
-                    name: 'StockOut',
+                    name: 'SalesOffline',
-                    component: () => import('@/views/stock/Out'),
                     meta: {
-                        title: '出库管理',
+                        title: '线下出货列表',
-                        icon: 'export'
+                        icon: 'unordered-list'
-                    }
+                    },
+                    component: () => import('@/views/sales/Offline')
                 }
+                // {
+                //     path: '/stock/out',
+                //     name: 'StockOut',
+                //     component: () => import('@/views/stock/Out'),
+                //     meta: {
+                //         title: '出库管理',
+                //         icon: 'export'
+                //     }
+                // }
             ]
         },
         {

src/store/getters.js

@@ -8,6 +8,7 @@ const getters = {
   user_id: state => state.user.user_id,
   username: state => state.user.username,
   nickname: state => state.user.nickname,
+  isManage: state => state.user.is_manage,
   roles: state => state.user.roles,
   userInfo: state => state.user.info,
   addRouters: state => state.permission.addRouters,

src/store/modules/user.js

@@ -10,6 +10,7 @@ const user = {
     username: '',
     nickname: '',
     avatar: '',
+    is_manage: false,
     roles: [],
     info: {}
   },
@@ -33,6 +34,9 @@ const user = {
     SET_NICKNAME: (state, name) => {
       state.nickname = name
     },
+    SET_IS_MANAGE: (state, isManage) => {
+      state.is_manage = isManage
+    },
     SET_AVATAR: (state, avatar) => {
       state.avatar = avatar
     },
@@ -85,13 +89,10 @@ const user = {
     GetMiddleUser ({ commit }) {
       return new Promise((resolve, reject) => {
         getMiddleUser().then(res => {
-          // storage.set('middleground_id', res.middleground_id)
           commit('SET_USER_ID', res.middleground_id)
-          // commit('SET_USERTYPE', res.type)
           commit('SET_USERNAME', res.username)
           commit('SET_NICKNAME', res.name)
-          // commit('SET_AVATAR', res.avatar || '')
+          commit('SET_IS_MANAGE', res.is_manage)
-          // commit('SET_INFO', res || '')
           resolve(res)
         }).catch(error => {
           reject(error)
@@ -105,6 +106,7 @@ const user = {
         commit('SET_TOKEN', '')
         commit('SET_ORG_ID', '')
         commit('is_subscribe', '')
+        commit('SET_IS_MANAGE', false)
         commit('SET_ROLES', [])
         storage.remove(ACCESS_TOKEN)
         storage.remove('is_subscribe')

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()

src/views/coupon/Index.vue

@@ -6,35 +6,32 @@
         <a-form layout="inline">
           <a-row :gutter="48">
             <a-col :md="8" :sm="24">
-              <a-form-item label="优惠券生成人姓名">
+              <a-form-item label="管理人手机号或昵称">
-                <a-input v-model="queryParam.item_id" placeholder="优惠券生成人姓名" />
+                <a-input v-model="queryParam.manage_username" placeholder="请输入" />
               </a-form-item>
             </a-col>
             <a-col :md="8" :sm="24">
-              <a-form-item label="优惠券类型" has-feedback>
+              <a-form-item label="优惠券名称" has-feedback>
-                <a-select v-model="queryParam.business_type_id" @change="onBusinessChange" placeholder="优惠券类型">
+                <a-select v-model="queryParam.goods_id" placeholder="请选择">
-                  <a-select-option v-for="item in businessArray" :key="item.id" :value="item.id">{{ item.title }}</a-select-option>
+                  <a-select-option v-for="item in goods" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
                 </a-select>
               </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 v-model="queryParam.status" placeholder="请选择">
-                  <a-select-option v-for="item in businessArray" :key="item.id" :value="item.id">{{ item.title }}</a-select-option>
+                  <a-select-option v-for="item in status" :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.username" placeholder="请输入" />
+              </a-form-item>
+            </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" @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>
@@ -47,26 +44,29 @@
         ref="table"
         :columns="columns"
         :data="loadData"
-        :rowKey="(row) => row.order_item_id"
+        :rowKey="(row) => row.stock_card_id"
         showPagination="auto"
         bordered
         size="default"
         :scroll="{ x: 1200, y: 1000 }">
-        <div slot="name">
+        <div slot="manage-name" slot-scope="text,record">
-          <div>zdx</div>
+          <div>{{ record.manage.nickname || '--' }}{{ record.manage.name?'('+record.manage.name+')':'' }}</div>
         </div>
-        <div slot="phone">
+        <div slot="manage-username" slot-scope="text,record">
-          <div>14745798066</div>
+          <div>{{ record.manage.username || '--' }}</div>
         </div>
-        <div slot="time">
+        <div slot="user-name" slot-scope="text,record">
-          <div>2023-11-11~2029-11-11</div>
+          <div>{{ record.user.nickname || '--' }}{{ record.user.name?'('+record.user.name+')':'' }}</div>
+        </div>
+        <div slot="user-username" slot-scope="text,record">
+          <div>{{ record.user.username || '--' }}</div>
+        </div>
+        <div slot="time" slot-scope="text, record">
+          <div>{{ record.created_at }}~{{ record.actived_at }}</div>
         </div>
 
-        <div slot="type">
+        <div slot="status" slot-scope="text, record">
-          <div>3瓶优惠券</div>
+          <a-tag :color="record.status.value === 0?'blue':record.status.value === 1?'pink':record.status.value === 2?'orange':record.status.value === 3?'green':record.status.value === 9?'purple':''">{{ record.status.text }}</a-tag>
-        </div>
-        <div slot="status">
-          <div>待使用</div>
         </div>
         <span slot="created_at" slot-scope="text, record">{{ record.created_at }}</span>
         <!-- 操作 -->
@@ -81,31 +81,39 @@
 <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 {
-  getList,
+  getMiddlesCoupons
-  init,
+} from '@/api/coupon'
-  canExport
-} from '@/api/organization'
-import storage from 'store'
 import StockInfo from './widgets/StockInfo.vue'
 import AddRole from './widgets/AddRole.vue'
 
 // 列表规格
 const columns = [
+{
+    title: '优惠券名称',
+    dataIndex: 'name',
+    width: 120,
+    align: 'center'
+  },
+  {
+    title: '优惠券状态',
+    scopedSlots: { customRender: 'status' },
+    width: 140,
+    align: 'center'
+  },
   {
     title: '优惠券生成人',
     children: [
       {
         title: '姓名',
-        scopedSlots: { customRender: 'name' },
+        scopedSlots: { customRender: 'manage-name' },
         align: 'center'
       },
       {
         title: '手机号',
-        scopedSlots: { customRender: 'phone' },
+        scopedSlots: { customRender: 'manage-username' },
         align: 'center'
       }
     ],
@@ -116,12 +124,12 @@ const columns = [
     children: [
       {
         title: '姓名',
-        scopedSlots: { customRender: 'name' },
+        scopedSlots: { customRender: 'user-name' },
         align: 'center'
       },
       {
         title: '手机号',
-        scopedSlots: { customRender: 'phone' },
+        scopedSlots: { customRender: 'user-username' },
         align: 'center'
       }
     ],
@@ -132,18 +140,6 @@ const columns = [
     scopedSlots: { customRender: 'time' },
     width: 240,
     align: 'center'
-  },
-  {
-    title: '优惠券类型',
-    scopedSlots: { customRender: 'type' },
-    width: 140,
-    align: 'center'
-  },
-  {
-    title: '优惠券状态',
-    scopedSlots: { customRender: 'status' },
-    width: 140,
-    align: 'center'
   }
   // {
   //   title: '操作',
@@ -164,74 +160,34 @@ export default {
   },
   data () {
     return {
-      exports_can: false,
       columns,
-      searchType: false, // 展示全部的搜索
+      goods: [], // 优惠券类型
-      businessArray: [], // 业务类型
+      status: [], // 优惠券使用状态
-      statusArray: [], // 机构列表
-
       queryParam: {
-        order_no: '', // 订单编号
+        goods_id: undefined, // 商品id
-        institution: '', // 机构名称
+        manage_username: undefined, // 管理人手机号或昵称
-        item_id: '', // 机构编号
+        username: undefined, // 使用人手机号或昵称
-        nickname: '', // 下单人
+        status: undefined // 优惠券状态
-        business_type_id: '', // 业务类型
-        status: '', // 机构状态
-        paid_at: undefined, // 下单时间
-        audit_at: undefined, // 执行时间
-        settle_at: undefined // 结案时间
       },
-      listCount: 0,
       loadData: (parameter) => {
         const requestParameters = Object.assign({}, parameter, this.queryParam)
-        return getList(requestParameters)
+        return getMiddlesCoupons(requestParameters).then(res => {
+          if (this.goods.length === 0) {
+            this.goods = res.search.goods
+            this.status = res.search.status
+          }
+          return res.cards
+        })
       }
     }
   },
   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')
-      ) {
-        this.$refs.table.loadData()
-      }
     }
   },
-  created () {
-    this.init()
-  },
   methods: {
     moment,
-    // 获取检索的基本样式
+
-    init () {
-      init().then(res => {
-        this.statusArray = res.status // 机构状态
-        this.businessArray = res.type // 业务类型
-        // 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
@@ -247,43 +203,13 @@ export default {
     // 重置搜索列表
     resetSearch () {
       this.queryParam = {
-        order_no: '', // 订单编号
+        goods_id: undefined, // 商品id
-        institution: '', // 机构名称
+        manage_username: undefined, // 管理人手机号或昵称
-        item_id: '', // 机构编号
+        username: undefined, // 使用人手机号或昵称
-        nickname: '', // 下单人
+        status: undefined // 优惠券状态
-        business_type_id: '', // 业务类型
-        status: '', // 机构状态
-        paid_at: undefined, // 下单时间
-        audit_at: undefined, // 执行时间
-        settle_at: 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 () {
       const success = {

src/views/exception/noRight.vue

@@ -0,0 +1,18 @@
+<template>
+  <a-result status="403" title="403" sub-title="Sorry，您当前没有权限操作这些~">
+    <template #extra>
+      <a-button type="primary" @click="toHome">返回数据看板</a-button>
+    </template>
+  </a-result>
+</template>
+
+<script>
+export default {
+  name: 'NoRight',
+  methods: {
+    toHome () {
+      this.$router.replace({ name: 'Home' })
+    }
+  }
+}
+</script>

src/views/home/Index.vue

@@ -34,7 +34,9 @@ export default {
     currentUser () {
       return {
         name: this.$store.getters.nickname,
-        avatar: this.$store.getters.avatar
+        avatar: this.$store.getters.avatar,
+        isManage: this.$store.getters.isManage,
+        username: this.$store.getters.username
       }
     }
   },

src/views/home/components/Count.vue

@@ -3,20 +3,17 @@
     <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">
+        <chart-card :loading="loading" title="分公司总库存(瓶)" :total="info.middle.total">
-          <a-tooltip :title="$t('总分公司总库存')" slot="action">
-            <a-icon type="info-circle-o" />
-          </a-tooltip>
           <template slot="footer">
-            <!-- <span> {{ info.total.people }}瓶</span> -->
+            <!-- <trend flag="up"> <span slot="term">{{ $t('线上库存') }}</span>{{ info.middle.online_stock }}瓶</trend> -->
-            <trend flag="up"> <span slot="term">{{ $t('线上库存') }}</span>{{ info.middle.online_stock }}瓶</trend>
+            <trend flag="down">
-            <trend flag="down" style="margin-left: 20px;">
               <span slot="term">{{ $t('线下库存') }}</span>{{ info.middle.offline_stock }}瓶
             </trend>
           </template>
@@ -31,8 +28,8 @@
         :style="{ marginBottom: '10px' }"
         v-if="info.agent"
       >
-        <chart-card :loading="loading" :title="$t('经销商总库存(瓶)')" :total="info.agent.stock | NumberFormat">
+        <chart-card :loading="loading" title="经销商总库存(瓶)" :total="info.agent.stock | NumberFormat">
-          <a-tooltip :title="$t('经销商总库存')" slot="action">
+          <a-tooltip title="经销商总库存" slot="action">
             <a-icon type="info-circle-o" />
           </a-tooltip>
           <div>
@@ -80,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"/>
+            <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"/>
           </a-col>
           <a-col :sm="24" :md="12" :xl="8" :xxl="8" class="mt20">
             <info title="线下出货数量(瓶)" :value="''+info.sales_quantity.offline" />
@@ -100,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">
+          <a-col :sm="24" :md="12" :xl="8" :xxl="8" class="mt20">
-            <info title="代理进货金额(元)" :value="''+info.sales_amount.online_agent_in" :bordered="true"/>
+            <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">
+          <a-col :sm="24" :md="12" :xl="8" :xxl="8" 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">
             <info title="线上销售金额(元)" :value="''+info.sales_amount.online_sell" :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.offline_sell" />
+            <info title="线下出货金额总和(元)" :value="''+info.sales_amount.offline_sell" />
           </a-col>
         </a-row>
       </a-card>

src/views/permissions/Index.vue

@@ -2,26 +2,19 @@
   <page-header-wrapper>
     <!-- 有操作权限 -->
     <!-- v-if="$store.getters.hasPromissionsShow.permission" -->
-    <a-card :bordered="false" class="card">
+    <a-card :bordered="false" class="card" v-if="isManage">
       <a-row>
         <a-col :span="24">
           <div class="table-page-search-wrapper">
             <a-form layout="inline">
               <a-row :gutter="24">
-                <a-col :md="6" :sm="24">
-                  <a-form-item label="用户角色">
-                    <a-select placeholder="请选择" v-model="queryParam.identity_id">
-                      <a-select-option v-for="item in indentitys" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
-                    </a-select>
-                  </a-form-item>
-                </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="用户姓名">
                     <a-input v-model="queryParam.name" placeholder="" />
                   </a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
-                  <a-form-item label="用户手机">
+                  <a-form-item label="登录账号">
                     <a-input v-model="queryParam.username" placeholder="" />
                   </a-form-item>
                 </a-col>
@@ -37,29 +30,21 @@
             ref="table"
             :columns="columns"
             :data="loadData"
-            :rowKey="row => row.user.user_id"
+            :rowKey="row => row.middleground_id"
             showPagination="auto"
             bordered
             size="default"
           >
-            <div slot="name" slot-scope="text, record">
+            <div slot="status" slot-scope="text, record">
-              <div>{{ record.name }}</div>
+              <a-switch :default-checked="record.status.value ===1? true : false" checked-children="可以登录" un-checked-children="禁止登录" @change="switchChange(record,$event)" />
-              <div>{{ record.username }}</div>
             </div>
-            <div slot="type" slot-scope="text, record">{{ record.type }}</div>
+
-            <!-- <div slot="status" class="status">
-              <div class="status-item">初审中 <a> (0) </a></div><a-divider type="vertical" />
-              <div class="status-item">复审中 <a> (0) </a></div>
-              <a-divider type="vertical" />
-              <div class="status-item">待签收 <a> (0) </a></div><a-divider type="vertical" />
-              <div class="status-item">办理中 <a> (0) </a></div>
-            </div> -->
             <div slot="actions" slot-scope="text, record">
               <a @click="EditPromissions(record)">修改</a>
               <a-divider type="vertical" />
               <a-popconfirm
                 placement="left"
-                title="是否确认删除该角色?"
+                title="是否确认删除该用户?"
                 ok-text="OK"
                 cancel-text="NO"
                 @confirm="delPromissions(record)"
@@ -72,39 +57,44 @@
       </a-row>
     </a-card>
     <!-- 没有操作权限限制 -->
-    <!-- <NoPromissions /> -->
+    <NoRight v-else />
   </page-header-wrapper>
 </template>
 
 <script>
 import { STable, UserInfo } from '@/components'
 import DeriveButton from '@/components/OrderDetailInfo/DeriveButton'
-import { getList } from '@/api/permissions'
+import { getMiddlesManageUsers, delMiddlesManageUser, setMiddlesManageUserStatus } from '@/api/permissions'
 import AddPromissions from './modules/AddPromissions'
 import EditPromissions from './modules/EditPromissions'
-import AssignmentChange from './modules/AssignmentChange'
+import NoRight from '@/views/exception/noRight'
-// import NoPromissions from '@/views/exception/noRight'
 
 const columns = [
   {
     title: '用户ID',
-    dataIndex: 'staff_id',
+    dataIndex: 'middleground_id',
     align: 'center',
     width: 120
   },
   {
     title: '用户姓名',
     key: 'name',
-    scopedSlots: { customRender: 'name' },
+    dataIndex: 'name',
     align: 'center',
     width: 200
   },
   {
-    title: '用户角色',
+    title: '登录账号',
-    scopedSlots: { customRender: 'type' },
+    dataIndex: 'username',
     align: 'center',
     width: 160
   },
+  {
+    title: '用户状态',
+    scopedSlots: { customRender: 'status' },
+    align: 'center',
+    width: 120
+  },
   {
     title: '创建时间',
     dataIndex: 'created_at',
@@ -127,54 +117,44 @@ export default {
     DeriveButton,
     AddPromissions,
     EditPromissions,
-    AssignmentChange
+    NoRight
-    // NoPromissions
     },
     data () {
     this.columns = columns
     return {
-        indentitys: [
-            { id: 1, name: '普通用户' },
-            { id: 2, name: 'VIP' },
-            { id: 4, name: '创客' },
-            { id: 6, name: '代理商' }
-        ], // 业务类型
         queryParam: {
-            identity_id: undefined,
             name: undefined,
             username: undefined
         },
-        permission: false, // 展示展示分配权限
+        isManage: this.$store.getters.isManage, // 展示展示分配权限
         loadData: parameter => {
             const requestParameters = Object.assign({}, parameter, this.queryParam)
-            return getList(requestParameters)
+            return getMiddlesManageUsers(requestParameters)
         }
     }
 },
+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: {
-    // 确认删除权限
+
-    delPromissions (item) {
+    // 新增用户
-    //   delDepartsUser(item.staff_id).then(res => {
-            this.$refs.table.loadData()
-            this.$notification.success({
-            message: '成功',
-            description: '删除成功'
-            })
-            this.staffDeparts()
-        // }).catch(err => {
-        //   this.$notification.error(err)
-        // })
-    },
-    // 重置搜索列表
-    resetSearch () {
-        this.queryParam = {
-            username: undefined,
-            name: undefined,
-            identity_id: undefined
-        }
-        this.$refs.table.refresh(true) // 重置接口且刷先到第一页
-    },
-    // 新增权限
     addPromissions () {
         this.$dialog(
         AddPromissions,
@@ -182,7 +162,6 @@ export default {
             on: {
                 ok: () => {
                     this.$refs.table.refresh(true)
-                    this.staffDeparts()
                 }
             }
         },
@@ -196,7 +175,7 @@ export default {
         }
         )
     },
-    // 编辑权限
+    // 编辑用户
     EditPromissions (item) {
         this.$dialog(
         EditPromissions,
@@ -218,35 +197,42 @@ export default {
         }
         )
     },
-    // 指派订单
+     // 删除
-    Assignment (item) {
+    delPromissions (item) {
-        const order = {
+      delMiddlesManageUser(item.middleground_id).then(res => {
-        item: item,
+            this.$refs.table.loadData()
-        orderId: this.id,
+            this.$notification.success({
-        type: this.promissions
+              message: '成功',
-        }
+              description: '删除成功'
-        this.$dialog(
+            })
-        AssignmentChange,
+        }).catch(err => {
-        {
+          this.$notification.error(err)
-            order,
+        })
-            on: {
+    },
-            ok: () => {
+    // 重置搜索列表
-                this.$refs.table.loadData()
+    resetSearch () {
-              // this.getInfo()
+      this.queryParam = {
-            }
+          username: undefined,
-            }
+          name: undefined
-        },
+      }
-        {
+      this.$refs.table.refresh(true) // 重置接口且刷先到第一页
-            title: '指派订单',
+    },
-            width: 500,
+    // 更改状态
-            maskClosable: true,
+    switchChange (record, e) {
-            closable: true,
+      const data = {
-            okText: '确认指派',
+        status: (e ? 1 : 0)
-            cancelText: '取消'
+      }
-        }
+      setMiddlesManageUserStatus(record.middleground_id, data).then(res => {
-        )
+        this.$notification.success({
-    }
+          message: '成功',
+          description: res
+        })
+        this.$refs.table.loadData()
+      }).catch(err => {
+          this.$notification.error(err)
+        })
     }
+  }
 }
 </script>
 

src/views/permissions/modules/AddPromissions.vue

@@ -44,7 +44,7 @@
 </template>
 
 <script>
-// import { addPreDepartUser, addDepartsUser } from '@/api/permissions'
+import { addMiddlesManageUser } from '@/api/permissions'
 import moment from 'moment'
 export default {
   name: 'OperationAdd',
@@ -53,48 +53,31 @@ export default {
       labelCol: { span: 6 },
       wrapperCol: { span: 14 }
     },
-    loading: false,
+    loading: false
-    permission: [],
-    users: []
   }),
   beforeCreate () {
     this.form = this.$form.createForm(this)
   },
-  created () {
-    this.getBase('')
-  },
   methods: {
     moment,
-    getBase (key) {
-      // addPreDepartUser({ key: key }).then(res => {
-      //   if (key === '') {
-      //     this.permission = res.permission
-      //   } else {
-      //     this.users = res.users
-      //   }
-      // })
-    },
-    handleRoleChange (value) {
-      this.getBase(value + '')
-    },
     onOk () {
       return new Promise(resolve => {
         this.form.validateFields((errors, values) => {
           values.password = values.password || '111111'
           if (!errors) {
-            // addDepartsUser(values).then((res) => {
+            addMiddlesManageUser(values).then((res) => {
-            //   this.$notification.success({
+              this.$notification.success({
-            //     message: '成功',
+                message: '成功',
-            //     description: '添加成功'
+                description: '添加成功'
-            //   })
+              })
-            //   resolve(true)
+              resolve(true)
-            // }).catch((err) => {
+            }).catch((err) => {
-            //   this.$notification.error({
+              this.$notification.error({
-            //     message: '失败',
+                message: '失败',
-            //     description: err.message
+                description: err.message
-            //   })
+              })
-            //   resolve(false)
+              resolve(false)
-            // })
+            })
           }
         })
       })

src/views/permissions/modules/AssignmentChange.vue

@@ -1,107 +0,0 @@
-<template>
-  <a-form ref="form" v-bind="formItemLayout" :form="form">
-    <a-form-item label="指派人员">
-      <a-select
-        v-decorator="[
-          'role',
-          {
-            rules: [
-              { required: true, message: '请选择指派人员！', type: 'string' },
-            ]
-          }
-        ]"
-        placeholder="请选择指派人员！">
-        <a-select-option
-          :value="item.key"
-          v-for="item in order.type[1].children"
-          :key="item.key">
-          <a-icon
-            type="user"
-            :style="{ fontSize: '14px', color: '#1890ff', padding: '6px 16px 6px 0' }" />{{ item.title }}</a-select-option>
-      </a-select>
-    </a-form-item>
-    <a-form-item label="备注信息">
-      <a-textarea
-        :rows="4"
-        v-decorator="[
-          'description',
-          {
-            rules: [
-              { required: true, message: '请输入备注信息!', type: 'string' },
-            ]
-          }
-        ]"
-        placeholder="请输入备注信息!" />
-    </a-form-item>
-  </a-form>
-</template>
-
-<script>
-// import { doLogs } from '@/api/order'
-import moment from 'moment'
-export default {
-  name: 'AssignmentAdd',
-  props: {
-    order: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    }
-  },
-  data: () => ({
-    formItemLayout: {
-      labelCol: { span: 6 },
-      wrapperCol: { span: 14 }
-    },
-    loading: false,
-    expressList: []
-  }),
-  beforeCreate () {
-    this.form = this.$form.createForm(this)
-  },
-  created () {
-    // getExpressCommonList(this.order.order_no).then(res => {
-    //   this.expressList = res
-    // })
-  },
-  methods: {
-    moment,
-    onChange (date, dateString) {
-    },
-    onOk () {
-      return new Promise(resolve => {
-        this.form.validateFields((errors, values) => {
-          values.password = values.password || '111111'
-
-          if (!errors) {
-            // doLogs(this.order.orderId, params).then((res) => {
-            //   this.$notification.success({
-            //     message: '成功',
-            //     description: '添加记录成功'
-            //   })
-              resolve(true)
-            // }).catch((err) => {
-            //   this.$notification.error({
-            //     message: '失败',
-            //     description: err.message
-            //   })
-            //   resolve(false)
-            // })
-          }
-        })
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-.flexrow {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: center;
-  box-sizing: border-box;
-}
-</style>

src/views/permissions/modules/EditPromissions.vue

@@ -1,6 +1,20 @@
 <!-- 驳回原因客户姓名输入 -->
 <template>
   <a-form ref="form" v-bind="formItemLayout" :form="form">
+    <a-form-item label="登录账号">
+      <a-input
+        :maxLength="11"
+        :disabled="true"
+        v-decorator="[
+          'username',
+          {
+            rules: [
+              { required: true, message: '请输入添加登录账号!', type: 'string' },
+            ]
+          }
+        ]"
+        placeholder="请输入添加登录账号!" />
+    </a-form-item>
     <a-form-item label="用户姓名">
       <a-input
         :rows="4"
@@ -14,19 +28,6 @@
         ]"
         placeholder="请输入添加姓名!" />
     </a-form-item>
-    <a-form-item label="手机号码">
-      <a-input
-        :maxLength="11"
-        v-decorator="[
-          'username',
-          {
-            rules: [
-              { required: true, message: '请输入添加手机号码!', type: 'string' },
-            ]
-          }
-        ]"
-        placeholder="请输入添加手机号码!" />
-    </a-form-item>
     <a-form-item label="初始密码">
       <a-input
         :maxLength="6"
@@ -44,7 +45,7 @@
 </template>
 
 <script>
-// import { addPreDepartUser, editDepartsUser, getDefaultUserInfo } from '@/api/permissions'
+import { editMiddlesManageUser } from '@/api/permissions'
 import moment from 'moment'
 export default {
   name: 'EditPromissions',
@@ -53,13 +54,7 @@ export default {
       labelCol: { span: 6 },
       wrapperCol: { span: 14 }
     },
-    loading: false,
+    loading: false
-    permissions: [],
-    users: [],
-    defaultRoleKey: '', // 默认role 的 key
-    defaultRoleName: '', // 默认显示下拉姓名
-    defaultParentsKey: '', // 默认Parents 的 key
-    defaultParentsName: '' // 默认显示下拉姓名
   }),
   props: {
     item: {
@@ -69,77 +64,41 @@ export default {
       }
     }
   },
+  mounted () {
+    this.$nextTick(() => {
+      this.form.setFieldsValue({
+        name: this.item.name,
+        username: this.item.username
+      })
+    })
+  },
   beforeCreate () {
     this.form = this.$form.createForm(this)
   },
-  mounted () {
-    this.getBase('')
-    // getDefaultUserInfo(this.item.staff_id).then(res => {
-    //   this.$nextTick(() => {
-    //     this.form.setFieldsValue({
-    //       name: res.name,
-    //       username: res.username
-    //       // role: res.type.key
-    //       // address: res.address
-    //     })
-    //     this.defaultRoleKey = res.type.key
-    //     this.defaultRoleName = res.type.text
-    //     this.defaultParentsKey = res.parent_id
-    //   })
-    //   this.getBase(res.type.key)
-    // }).catch(err => {
-    //   console.log(err)
-    // })
-  },
   methods: {
     moment,
-    getBase (key) {
-      // addPreDepartUser({ key: key }).then(res => {
-      //   if (key === '') {
-      //     this.permissions = res.permission
-      //   } else {
-      //     this.users = res.users
-      //     const index = res.users.findIndex(item => item.staff_id === this.defaultParentsKey)
-      //     if (index >= 0) {
-      //       this.defaultParentsName = res.users[index].name + '(' + res.users[index].type + ')' + res.users[index].username
-      //     }
-      //   }
-      // })
-    },
-    handleRoleChange (value) {
-      this.getBase(value + '')
-      this.defaultParentsKey = ''
-      this.defaultParentsName = ''
-      this.defaultRoleKey = ''
-      this.defaultRoleName = ''
-      this.form.setFieldsValue({
-        parent_id: ''
-      })
-    },
     onOk () {
       return new Promise(resolve => {
         this.form.validateFields((errors, values) => {
-          // const data = {
+          const data = {
-          //   name: values.name,
+            name: values.name,
-          //   password: values.password || '111111',
+            password: values.password || '111111',
-          //   username: values.username,
+            username: values.username
-          //   role: this.defaultRoleKey || values.role,
+          }
-          //   parent_id: this.defaultParentsKey || values.parent_id
-          // }
           if (!errors) {
-            // editDepartsUser(this.item.staff_id, data).then((res) => {
+            editMiddlesManageUser(this.item.middleground_id, data).then((res) => {
-            //   this.$notification.success({
+              this.$notification.success({
-            //     message: '成功',
+                message: '成功',
-            //     description: '修改成功'
+                description: '修改成功'
-            //   })
+              })
-            //   resolve(true)
+              resolve(true)
-            // }).catch((err) => {
+            }).catch((err) => {
-            //   this.$notification.error({
+              this.$notification.error({
-            //     message: '失败',
+                message: '失败',
-            //     description: err.message
+                description: err.message
-            //   })
+              })
-            //   resolve(false)
+              resolve(false)
-            // })
+            })
           }
         })
       })

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">{{ record.number }}件</div>
-        <span slot="created_at" slot-scope="text, record">{{ record.created_at }}</span>
+        <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="actions" slot-scope="text, record">
+        <div slot="express" slot-scope="text, record">
-          <a class="ant-dropdown-link" @click="onInfo(record)">查看详情</a>
+          <div v-if="record.channel === 'express'">
-          <!-- <a-divider type="vertical" /> -->
+            {{ record.express.name || '-' }} <div>{{ record.express.express_no || '-' }}</div>
-          <!-- <a class="ant-dropdown-link" @click="onEdit(record)">发货</a> -->
+          </div>
+          <div v-else>发货时间：{{ record.deliver_at }}</div>
         </div>
       </s-table>
     </a-card>
@@ -86,62 +78,59 @@
 <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: 'total' },
+    align: 'center',
+    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,37 +146,37 @@ 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)
       }
     }
   },
   watch: {
     $route (to, from) {
-      if (
+      if (to.name === 'SalesOffline' && (
-        (from.name === 'Detail' && to.name === 'FristCheckrderIndex') ||
+        from.name === 'Home' ||
-        (from.name === 'Home' && to.name === 'FristCheckrderIndex') ||
+        from.name === 'cityExperienceOfficer' ||
-        (from.name === 'AssignrderIndex' && to.name === 'FristCheckrderIndex') ||
+        from.name === 'StockOut' ||
-        (from.name === 'SignInrderIndex' && to.name === 'FristCheckrderIndex') ||
+        from.name === 'StockIn' ||
-        (from.name === 'ReCheckrderIndex' && to.name === 'FristCheckrderIndex') ||
+        from.name === 'DealerIn' ||
-        (from.name === 'HandleService' && to.name === 'FristCheckrderIndex') ||
+        from.name === 'DealerOut' ||
-        (from.name === 'CompleteOrder' && to.name === 'FristCheckrderIndex')
+        from.name === 'UserIndex' ||
+        from.name === 'SalesOnline' ||
+        from.name === 'SalesOffline' ||
+        from.name === 'PermissionsIndex' ||
+        from.name === 'SalesStock')
       ) {
         this.$refs.table.loadData()
       }
@@ -200,36 +189,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 +201,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 +219,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/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()

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()

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,31 +100,30 @@
       />
     </a-form-item>
     <a-form-item
-      label="自提时间"
+      label="发货时间"
-      v-if="currentType === 'offline'"
     >
       <a-date-picker
         v-decorator="[
-          'time',
+          'deliver_at',
           {
             rules: [
-              { required: true, message: `请选择自提时间!` },
+              { required: false, message: `请选择发货时间!` },
             ]
           }
         ]"
-        :placeholder="`请选择自提时间!`"
+        :placeholder="`请选择发货时间!`"
         style="width: 100%" />
     </a-form-item>
   </a-form>
 </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) => {

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()

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: '分公司/平台',
+  //    title: '分公司/平台',
-     scopedSlots: { customRender: 'out_user' },
+  //    scopedSlots: { customRender: 'out_user' },
-     align: 'center',
+  //    align: 'center',
-     width: 140
+  //    width: 140
-   },
+  //  },
   {
     title: '库变数据',
     scopedSlots: { customRender: 'number' },
@@ -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()

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()

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()