Browse Source

调拨管理

chenrui 4 years ago
parent
commit
b36b1e3770

+ 140 - 81
src/config/router.config.js

@@ -481,64 +481,6 @@ export const asyncRouterMap = [{
           }
         ]
       },
-      {
-        path: '/inventoryManagement/warehouseAllocation',
-        redirect: '/inventoryManagement/warehouseAllocation/list',
-        name: 'warehouseAllocation',
-        component: RouteView,
-        meta: {
-          title: '仓库调拨',
-          icon: 'gateway'
-          // permission: 'M_goodsManage_list'
-        },
-        hideChildrenInMenu: true,
-        children: [
-          {
-            path: '/inventoryManagement/warehouseAllocation/list',
-            name: 'warehouseAllocationList',
-            component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/warehouseAllocation/list.vue'),
-            meta: {
-              title: '仓库调拨列表',
-              icon: 'gateway',
-              hidden: true
-              // permission: 'M_goodsManage_list'
-            }
-          },
-          {
-            path: '/inventoryManagement/warehouseAllocation/add',
-            name: 'warehouseAllocationAdd',
-            component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/warehouseAllocation/edit.vue'),
-            meta: {
-              title: '新增仓库调拨',
-              icon: 'gateway',
-              hidden: true
-              // permission: 'B_goodsManage_edit'
-            }
-          },
-          {
-            path: '/inventoryManagement/warehouseAllocation/edit/:id',
-            name: 'warehouseAllocationEdit',
-            component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/warehouseAllocation/edit.vue'),
-            meta: {
-              title: '编辑仓库调拨',
-              icon: 'gateway',
-              hidden: true
-              // permission: 'B_goodsManage_edit'
-            }
-          },
-          {
-            path: '/inventoryManagement/warehouseAllocation/detail/:id',
-            name: 'warehouseAllocationEdit',
-            component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/warehouseAllocation/detail.vue'),
-            meta: {
-              title: '仓库调拨详情',
-              icon: 'gateway',
-              hidden: true
-              // permission: 'B_goodsManage_edit'
-            }
-          }
-        ]
-      },
       {
         path: '/inventoryManagement/inventoryChecking',
         redirect: '/inventoryManagement/inventoryChecking/list',
@@ -654,19 +596,78 @@ export const asyncRouterMap = [{
       }
     ]
   },
+  // 调拨管理
   {
-    path: '/chainAllocation',
-    redirect: '/chainAllocation/chainTransferIn',
+    path: '/allocationManagement',
+    redirect: '/allocationManagement/warehouseAllocation',
     component: PageView,
     meta: {
-      title: '连锁调拨',
+      title: '调拨管理',
       icon: 'cluster'
       // permission: 'M_shop'
     },
     children: [
       {
-        path: '/chainAllocation/chainTransferIn',
-        redirect: '/chainAllocation/chainTransferIn/list',
+        path: '/allocationManagement/warehouseAllocation',
+        redirect: '/allocationManagement/warehouseAllocation/list',
+        name: 'warehouseAllocation',
+        component: RouteView,
+        meta: {
+          title: '仓库调拨',
+          icon: 'gateway'
+          // permission: 'M_goodsManage_list'
+        },
+        hideChildrenInMenu: true,
+        children: [
+          {
+            path: '/allocationManagement/warehouseAllocation/list',
+            name: 'warehouseAllocationList',
+            component: () => import(/* webpackChunkName: "shop" */ '@/views/allocationManagement/warehouseAllocation/list.vue'),
+            meta: {
+              title: '仓库调拨列表',
+              icon: 'gateway',
+              hidden: true
+              // permission: 'M_goodsManage_list'
+            }
+          },
+          {
+            path: '/allocationManagement/warehouseAllocation/add',
+            name: 'warehouseAllocationAdd',
+            component: () => import(/* webpackChunkName: "shop" */ '@/views/allocationManagement/warehouseAllocation/edit.vue'),
+            meta: {
+              title: '新增仓库调拨',
+              icon: 'gateway',
+              hidden: true
+              // permission: 'B_goodsManage_edit'
+            }
+          },
+          {
+            path: '/allocationManagement/warehouseAllocation/edit/:id',
+            name: 'warehouseAllocationEdit',
+            component: () => import(/* webpackChunkName: "shop" */ '@/views/allocationManagement/warehouseAllocation/edit.vue'),
+            meta: {
+              title: '编辑仓库调拨',
+              icon: 'gateway',
+              hidden: true
+              // permission: 'B_goodsManage_edit'
+            }
+          },
+          {
+            path: '/allocationManagement/warehouseAllocation/detail/:id',
+            name: 'warehouseAllocationEdit',
+            component: () => import(/* webpackChunkName: "shop" */ '@/views/allocationManagement/warehouseAllocation/detail.vue'),
+            meta: {
+              title: '仓库调拨详情',
+              icon: 'gateway',
+              hidden: true
+              // permission: 'B_goodsManage_edit'
+            }
+          }
+        ]
+      },
+      {
+        path: '/allocationManagement/chainTransferIn',
+        redirect: '/allocationManagement/chainTransferIn/list',
         name: 'chainTransferIn',
         component: RouteView,
         meta: {
@@ -677,9 +678,9 @@ export const asyncRouterMap = [{
         hideChildrenInMenu: true,
         children: [
           {
-            path: '/chainAllocation/chainTransferIn/list',
+            path: '/allocationManagement/chainTransferIn/list',
             name: 'chainTransferInList',
-            component: () => import(/* webpackChunkName: "shop" */ '@/views/chainAllocation/chainTransferIn/list.vue'),
+            component: () => import(/* webpackChunkName: "shop" */ '@/views/allocationManagement/chainTransferIn/list.vue'),
             meta: {
               title: '连锁调入列表',
               icon: 'cluster',
@@ -688,9 +689,9 @@ export const asyncRouterMap = [{
             }
           },
           {
-            path: '/chainAllocation/chainTransferIn/add',
+            path: '/allocationManagement/chainTransferIn/add',
             name: 'chainTransferInAdd',
-            component: () => import(/* webpackChunkName: "shop" */ '@/views/chainAllocation/chainTransferIn/edit.vue'),
+            component: () => import(/* webpackChunkName: "shop" */ '@/views/allocationManagement/chainTransferIn/edit.vue'),
             meta: {
               title: '新增连锁调入',
               icon: 'cluster',
@@ -699,9 +700,9 @@ export const asyncRouterMap = [{
             }
           },
           {
-            path: '/chainAllocation/chainTransferIn/edit/:id',
+            path: '/allocationManagement/chainTransferIn/edit/:id',
             name: 'chainTransferInEdit',
-            component: () => import(/* webpackChunkName: "shop" */ '@/views/chainAllocation/chainTransferIn/edit.vue'),
+            component: () => import(/* webpackChunkName: "shop" */ '@/views/allocationManagement/chainTransferIn/edit.vue'),
             meta: {
               title: '编辑连锁调入',
               icon: 'cluster',
@@ -710,9 +711,9 @@ export const asyncRouterMap = [{
             }
           },
           {
-            path: '/chainAllocation/chainTransferIn/detail/:id',
+            path: '/allocationManagement/chainTransferIn/detail/:id',
             name: 'chainTransferInEdit',
-            component: () => import(/* webpackChunkName: "shop" */ '@/views/chainAllocation/chainTransferIn/detail.vue'),
+            component: () => import(/* webpackChunkName: "shop" */ '@/views/allocationManagement/chainTransferIn/detail.vue'),
             meta: {
               title: '连锁调入详情',
               icon: 'cluster',
@@ -723,8 +724,8 @@ export const asyncRouterMap = [{
         ]
       },
       {
-        path: '/chainAllocation/chainTransferOut',
-        redirect: '/chainAllocation/chainTransferOut/list',
+        path: '/allocationManagement/chainTransferOut',
+        redirect: '/allocationManagement/chainTransferOut/list',
         name: 'chainTransferOut',
         component: RouteView,
         meta: {
@@ -735,9 +736,9 @@ export const asyncRouterMap = [{
         hideChildrenInMenu: true,
         children: [
           {
-            path: '/chainAllocation/chainTransferOut/list',
+            path: '/allocationManagement/chainTransferOut/list',
             name: 'chainTransferOutList',
-            component: () => import(/* webpackChunkName: "shop" */ '@/views/chainAllocation/chainTransferOut/list.vue'),
+            component: () => import(/* webpackChunkName: "shop" */ '@/views/allocationManagement/chainTransferOut/list.vue'),
             meta: {
               title: '连锁调出列表',
               icon: 'pull-request',
@@ -746,9 +747,9 @@ export const asyncRouterMap = [{
             }
           },
           {
-            path: '/chainAllocation/chainTransferOut/add',
+            path: '/allocationManagement/chainTransferOut/add',
             name: 'chainTransferOutAdd',
-            component: () => import(/* webpackChunkName: "shop" */ '@/views/chainAllocation/chainTransferOut/edit.vue'),
+            component: () => import(/* webpackChunkName: "shop" */ '@/views/allocationManagement/chainTransferOut/edit.vue'),
             meta: {
               title: '新增连锁调出',
               icon: 'pull-request',
@@ -757,9 +758,9 @@ export const asyncRouterMap = [{
             }
           },
           {
-            path: '/chainAllocation/chainTransferOut/edit/:id',
+            path: '/allocationManagement/chainTransferOut/edit/:id',
             name: 'chainTransferOutEdit',
-            component: () => import(/* webpackChunkName: "shop" */ '@/views/chainAllocation/chainTransferOut/edit.vue'),
+            component: () => import(/* webpackChunkName: "shop" */ '@/views/allocationManagement/chainTransferOut/edit.vue'),
             meta: {
               title: '编辑连锁调出',
               icon: 'pull-request',
@@ -768,9 +769,9 @@ export const asyncRouterMap = [{
             }
           },
           {
-            path: '/chainAllocation/chainTransferOut/detail/:id',
+            path: '/allocationManagement/chainTransferOut/detail/:id',
             name: 'chainTransferOutEdit',
-            component: () => import(/* webpackChunkName: "shop" */ '@/views/chainAllocation/chainTransferOut/detail.vue'),
+            component: () => import(/* webpackChunkName: "shop" */ '@/views/allocationManagement/chainTransferOut/detail.vue'),
             meta: {
               title: '连锁调出详情',
               icon: 'pull-request',
@@ -779,6 +780,64 @@ export const asyncRouterMap = [{
             }
           }
         ]
+      },
+      {
+        path: '/allocationManagement/storeTransferOut',
+        redirect: '/allocationManagement/storeTransferOut/list',
+        name: 'storeTransferOut',
+        component: RouteView,
+        meta: {
+          title: '店内调出',
+          icon: 'gateway'
+          // permission: 'M_goodsManage_list'
+        },
+        hideChildrenInMenu: true,
+        children: [
+          {
+            path: '/allocationManagement/storeTransferOut/list',
+            name: 'storeTransferOutList',
+            component: () => import(/* webpackChunkName: "shop" */ '@/views/allocationManagement/storeTransferOut/list.vue'),
+            meta: {
+              title: '店内调出列表',
+              icon: 'gateway',
+              hidden: true
+              // permission: 'M_goodsManage_list'
+            }
+          },
+          {
+            path: '/allocationManagement/storeTransferOut/add',
+            name: 'storeTransferOutAdd',
+            component: () => import(/* webpackChunkName: "shop" */ '@/views/allocationManagement/storeTransferOut/edit.vue'),
+            meta: {
+              title: '新增店内调出',
+              icon: 'gateway',
+              hidden: true
+              // permission: 'B_goodsManage_edit'
+            }
+          },
+          {
+            path: '/allocationManagement/storeTransferOut/edit/:id',
+            name: 'storeTransferOutEdit',
+            component: () => import(/* webpackChunkName: "shop" */ '@/views/allocationManagement/storeTransferOut/edit.vue'),
+            meta: {
+              title: '编辑店内调出',
+              icon: 'gateway',
+              hidden: true
+              // permission: 'B_goodsManage_edit'
+            }
+          },
+          {
+            path: '/allocationManagement/storeTransferOut/detail/:id',
+            name: 'storeTransferOutEdit',
+            component: () => import(/* webpackChunkName: "shop" */ '@/views/allocationManagement/storeTransferOut/detail.vue'),
+            meta: {
+              title: '店内调出详情',
+              icon: 'gateway',
+              hidden: true
+              // permission: 'B_goodsManage_edit'
+            }
+          }
+        ]
       }
     ]
   },

+ 1 - 1
src/views/chainAllocation/chainTransferIn/detail.vue → src/views/allocationManagement/chainTransferIn/detail.vue

@@ -101,7 +101,7 @@
       handleSubmit(){},
       //  返回列表
       handleBack(){
-        this.$router.push({ path: '/inventoryManagement/chainTransferIn/list'})
+        this.$router.push({ path: '/allocationManagement/chainTransferIn/list'})
       },
     }
   }

+ 1 - 1
src/views/chainAllocation/chainTransferIn/edit.vue → src/views/allocationManagement/chainTransferIn/edit.vue

@@ -150,7 +150,7 @@
       handleSubmit(){},
       //  返回列表
       handleBack(){
-        this.$router.push({ path: '/inventoryManagement/chainTransferIn/list'})
+        this.$router.push({ path: '/allocationManagement/chainTransferIn/list'})
       },
     }
   }

+ 3 - 3
src/views/chainAllocation/chainTransferIn/list.vue → src/views/allocationManagement/chainTransferIn/list.vue

@@ -195,14 +195,14 @@ export default {
     },
     //  详情
     handleDetail(row){
-      this.$router.push({ path: `/chainAllocation/chainTransferIn/detail/${row.id}` })
+      this.$router.push({ path: `/allocationManagement/chainTransferIn/detail/${row.id}` })
     },
     //  新增/编辑
     handleEdit(row){
       if(row){  //  编辑
-        this.$router.push({ path: `/chainAllocation/chainTransferIn/edit/${row.id}` })
+        this.$router.push({ path: `/allocationManagement/chainTransferIn/edit/${row.id}` })
       }else{  //  新增
-        this.$router.push({ path: '/chainAllocation/chainTransferIn/add' })
+        this.$router.push({ path: '/allocationManagement/chainTransferIn/add' })
       }
     },
   }

+ 8 - 8
src/views/chainAllocation/chainTransferOut/basicInfoModal.vue → src/views/allocationManagement/chainTransferOut/basicInfoModal.vue

@@ -1,7 +1,7 @@
 <template>
-	<a-modal centered class="warehouseAllocation-basicInfo-modal" :footer="null" :maskClosable="false" title="新增连锁调出单" v-model="isShow" @cancle="isShow = false" width="80%">
+	<a-modal centered class="chainTransferOut-basicInfo-modal" :footer="null" :maskClosable="false" title="新增连锁调出单" v-model="isShow" @cancle="isShow = false" width="80%">
 		<a-form-model
-			id="warehouseAllocation-basicInfo-form"
+			id="chainTransferOut-basicInfo-form"
 			ref="ruleForm"
 			:model="form"
 			:rules="rules"
@@ -12,7 +12,7 @@
 				<v-select
 					v-model="form.billStatus"
 					ref="billStatus"
-					id="warehouseAllocation-basicInfo-billStatus"
+					id="chainTransferOut-basicInfo-billStatus"
 					code="PAYMENT_TYPE"
 					placeholder="请选择调出产品类型"
 					allowClear
@@ -24,12 +24,12 @@
 			  </a-select>
 			</a-form-model-item>
 			<a-form-model-item label="备注" prop="remarks">
-				<a-textarea id="warehouseAllocation-basicInfo-remarks" :maxLength="500" v-model="form.remarks" placeholder="请输入备注(最多500个字符)" allowClear />
+				<a-textarea id="chainTransferOut-basicInfo-remarks" :maxLength="500" v-model="form.remarks" placeholder="请输入备注(最多500个字符)" allowClear />
 			</a-form-model-item>
 		</a-form-model>
 		<div class="btn-cont">
-			<a-button type="primary" id="warehouseAllocation-basicInfo-modal-save" @click="handleSave">保存</a-button>
-			<a-button id="warehouseAllocation-basicInfo-modal-back" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
+			<a-button type="primary" id="chainTransferOut-basicInfo-modal-save" @click="handleSave">保存</a-button>
+			<a-button id="chainTransferOut-basicInfo-modal-back" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
 		</div>
 	</a-modal>
 </template>
@@ -37,7 +37,7 @@
 <script>
 import { VSelect } from '@/components';
 export default {
-	name: 'WarehouseAllocationBasicInfoModal',
+	name: 'chainTransferOutBasicInfoModal',
 	components: { VSelect },
 	props: {
 		openModal: {
@@ -89,7 +89,7 @@ export default {
 </script>
 
 <style lang="less">
-.warehouseAllocation-basicInfo-modal {
+.chainTransferOut-basicInfo-modal {
 	.ant-modal-body {
 		padding: 40px 40px 24px;
 	}

+ 1 - 1
src/views/chainAllocation/chainTransferOut/detail.vue → src/views/allocationManagement/chainTransferOut/detail.vue

@@ -101,7 +101,7 @@
       handleSubmit(){},
       //  返回列表
       handleBack(){
-        this.$router.push({ path: '/chainAllocation/chainTransferOut/list'})
+        this.$router.push({ path: '/allocationManagement/chainTransferOut/list'})
       },
     }
   }

+ 1 - 1
src/views/chainAllocation/chainTransferOut/edit.vue → src/views/allocationManagement/chainTransferOut/edit.vue

@@ -322,7 +322,7 @@
       },
       //  返回列表
       handleBack(){
-        this.$router.push({ path: '/inventoryManagement/chainTransferOut/list'})
+        this.$router.push({ path: '/allocationManagement/chainTransferOut/list'})
       },
       filterOption(input, option) {
       	return (

+ 2 - 2
src/views/chainAllocation/chainTransferOut/list.vue → src/views/allocationManagement/chainTransferOut/list.vue

@@ -171,7 +171,7 @@ export default {
     },
     //  基本信息  保存
     handleOk(){
-      this.$router.push({ path: `/chainAllocation/chainTransferOut/add` })
+      this.$router.push({ path: `/allocationManagement/chainTransferOut/add` })
     },
     //  删除
     handleDel(row){
@@ -223,7 +223,7 @@ export default {
     },
     //  详情
     handleDetail(row){
-      this.$router.push({ path: `/chainAllocation/chainTransferOut/detail/${row.id}` })
+      this.$router.push({ path: `/allocationManagement/chainTransferOut/detail/${row.id}` })
     },
     //  新增/编辑
     handleEdit(row){

+ 109 - 0
src/views/allocationManagement/storeTransferOut/basicInfoModal.vue

@@ -0,0 +1,109 @@
+<template>
+	<a-modal centered class="storeTransferOut-basicInfo-modal" :footer="null" :maskClosable="false" title="新增店内调出单" v-model="isShow" @cancle="isShow = false" width="80%">
+		<a-form-model
+			id="storeTransferOut-basicInfo-form"
+			ref="ruleForm"
+			:model="form"
+			:rules="rules"
+			:label-col="formItemLayout.labelCol"
+			:wrapper-col="formItemLayout.wrapperCol"
+		>
+			<a-form-model-item label="调往对象" prop="type">
+			  <a-radio-group v-model="form.type">
+			    <a-radio value="a">客户</a-radio>
+			    <a-radio value="b">员工</a-radio>
+			  </a-radio-group>
+			</a-form-model-item>
+			<a-form-model-item label="调往对象名称" prop="name">
+			  <a-select v-if="form.type=='a'" v-model="form.name" placeholder="请选择" allowClear :showSearch="true" option-filter-prop="children" :filter-option="filterOption">
+			  	<a-select-option v-for="item in brandData" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
+			  </a-select>
+        <a-input v-if="form.type=='b'" v-model="form.name" placeholder="请输入调往对象名称(最多30个字符)" allowClear :maxLength="30" />
+			</a-form-model-item>
+      <a-form-model-item label="调拨类型" prop="sort">
+      	<v-select
+      		v-model="form.billStatus"
+      		ref="billStatus"
+      		id="storeTransferOut-basicInfo-billStatus"
+      		code="PAYMENT_TYPE"
+      		placeholder="请选择调拨类型"
+      		allowClear
+      	></v-select>
+      </a-form-model-item>
+			<a-form-model-item label="备注" prop="remarks">
+				<a-textarea id="storeTransferOut-basicInfo-remarks" :maxLength="120" v-model="form.remarks" placeholder="请输入备注(最多120个字符)" allowClear />
+			</a-form-model-item>
+		</a-form-model>
+		<div class="btn-cont">
+			<a-button type="primary" id="storeTransferOut-basicInfo-modal-save" @click="handleSave">保存</a-button>
+			<a-button id="storeTransferOut-basicInfo-modal-back" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
+		</div>
+	</a-modal>
+</template>
+
+<script>
+import { VSelect } from '@/components';
+export default {
+	name: 'storeTransferOutBasicInfoModal',
+	components: { VSelect },
+	props: {
+		openModal: {
+			//  弹框显示状态
+			type: Boolean,
+			default: false
+		}
+	},
+	data() {
+		return {
+			isShow: this.openModal, //  是否打开弹框
+			formItemLayout: {
+				labelCol: { span: 6 },
+				wrapperCol: { span: 16 }
+			},
+			form: {
+        type: 'a',
+				name: undefined, // 仓库名称
+				sort: '' //  排序
+			},
+			rules: {
+				name: [{ required: true, message: '请选择调出产品类型', trigger: 'change' }]
+			},
+			brandData: [] //  供应商  下拉数据
+		};
+	},
+	methods: {
+		//  保存
+		handleSave() {
+			this.isShow = false
+			this.$emit('ok')
+		},
+		filterOption(input, option) {
+			return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+		}
+	},
+	watch: {
+		//  父页面传过来的弹框状态
+		openModal(newValue, oldValue) {
+			this.isShow = newValue
+		},
+		//  重定义的弹框状态
+		isShow(newValue, oldValue) {
+			if (!newValue) {
+				this.$emit('close')
+			}
+		}
+	}
+};
+</script>
+
+<style lang="less">
+.storeTransferOut-basicInfo-modal {
+	.ant-modal-body {
+		padding: 40px 40px 24px;
+	}
+	.btn-cont {
+		text-align: center;
+		margin: 35px 0 10px;
+	}
+}
+</style>

+ 127 - 0
src/views/allocationManagement/storeTransferOut/detail.vue

@@ -0,0 +1,127 @@
+<template>
+  <div class="storeTransferOutDetail-wrap">
+    <a-page-header :ghost="false" @back="handleBack" class="storeTransferOutDetail-back">
+      <!-- 自定义的二级文字标题 -->
+      <template slot="subTitle">
+        <a id="storeTransferOutDetail-back-btn" href="javascript:;" @click="handleBack">返回列表</a>
+      </template>
+      <!-- 操作区,位于 title 行的行尾 -->
+      <template slot="extra">
+        <a-button key="2" id="storeTransferOutDetail-preview-btn">打印预览</a-button>
+        <a-button key="1" type="primary" id="storeTransferOutDetail-print-btn">快速打印</a-button>
+      </template>
+    </a-page-header>
+    <a-card :bordered="false" class="storeTransferOutDetail-cont">
+      <a-descriptions :column="3">
+        <a-descriptions-item label="调往对象">箭冠营销中心</a-descriptions-item>
+        <a-descriptions-item label="店内调出单号">箭冠营销中心</a-descriptions-item>
+        <a-descriptions-item label="审核状态">箭冠营销中心</a-descriptions-item>
+        <a-descriptions-item label="完结状态">箭冠营销中心</a-descriptions-item>
+        <a-descriptions-item label="调拨类型">箭冠营销中心</a-descriptions-item>
+        <a-descriptions-item label="备注">箭冠营销中心</a-descriptions-item>
+      </a-descriptions>
+    </a-card>
+    <!-- 总计 -->
+    <a-alert type="info" showIcon style="margin-bottom:15px">
+      <div slot="message">总款数:<strong>1</strong>,总数量:<strong>1</strong>,总成本(¥):<strong>240</strong></div>
+    </a-alert>
+    <a-card :bordered="false" class="storeTransferOutDetail-cont">
+      <!-- 列表 -->
+      <s-table
+        class="sTable"
+        ref="table"
+        size="default"
+        :rowKey="(record) => record.id"
+        :columns="columns"
+        :data="loadData"
+        bordered></s-table>
+    </a-card>
+  </div>
+</template>
+
+<script>
+  import { STable, VSelect } from '@/components'
+  export default{
+    components: { STable, VSelect },
+    data(){
+      return{
+        queryParam: {
+          
+        },
+        disabled: false, //  查询、重置按钮是否可操作
+        brandData: [],  //  产品品牌  下拉数据
+        typeData: [],  //  产品类别  下拉数据
+        // 表头
+        columns: [
+          { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
+          { title: '产品编码', dataIndex: 'creatDate', align: 'center' },
+          { title: '产品名称', dataIndex: 'custNahme', align: 'center', ellipsis: true },
+          { title: '单位', dataIndex: 'custsNsagme', align: 'center' },
+          { title: '成本价', dataIndex: 'custsNagme', align: 'center' },
+          { title: '调出仓库', dataIndex: 'warehouse', align: 'center' },
+          { title: '调出数量', scopedSlots: { customRender: 'transferOutQuantity' }, align: 'center' },
+          { title: '成本小计(¥)', dataIndex: 'custsN2agme', align: 'center' },
+        ],
+        // 加载数据方法 必须为 Promise 对象
+        loadData: parameter => {
+          this.disabled = true
+          // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
+          //   const data = res.data
+          //   const no = (data.pageNo - 1) * data.pageSize
+          //   for (var i = 0; i < data.list.length; i++) {
+          //     data.list[i].no = no + i + 1
+          //   }
+          //   this.disabled = false
+          //   return data
+          // })
+          const _this = this
+          return new Promise(function(resolve, reject){
+            const data = {
+              pageNo: 1,
+              pageSize: 10,
+              list: [
+                { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
+              ],
+              count: 10
+            }
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            _this.disabled = false
+            resolve(data)
+          })
+        },
+      }
+    },
+    methods: {
+      //  重置
+      resetSearchForm () {
+        this.queryParam.orderBundleNo = ''
+        this.queryParam.orderBundle.custMobile = ''
+        this.queryParam.bundleName = ''
+        this.queryParam.itemName = ''
+        this.oldTime = undefined
+        this.newTime = undefined
+        this.$refs.table.refresh(true)
+      },
+      //  提交
+      handleSubmit(){},
+      //  返回列表
+      handleBack(){
+        this.$router.push({ path: '/allocationManagement/storeTransferOut/list'})
+      },
+    }
+  }
+</script>
+
+<style lang="less">
+  .storeTransferOutDetail-wrap{
+    .storeTransferOutDetail-back{
+      margin-bottom: 15px;
+    }
+    .storeTransferOutDetail-cont{
+      margin-bottom: 15px;
+    }
+  }
+</style>

+ 347 - 0
src/views/allocationManagement/storeTransferOut/edit.vue

@@ -0,0 +1,347 @@
+<template>
+  <div class="storeTransferOutEdit-wrap">
+    <a-page-header :ghost="false" @back="handleBack" class="storeTransferOutEdit-back">
+      <!-- 自定义的二级文字标题 -->
+      <template slot="subTitle">
+        <a id="storeTransferOutEdit-back-btn" href="javascript:;" @click="handleBack">返回列表</a>
+      </template>
+      <!-- 操作区,位于 title 行的行尾 -->
+      <template slot="extra">
+        <a-button key="2" id="storeTransferOutEdit-preview-btn">打印预览</a-button>
+        <a-button key="1" type="primary" id="storeTransferOutEdit-print-btn">快速打印</a-button>
+      </template>
+    </a-page-header>
+    <!-- 基础信息 -->
+    <a-card :bordered="false" class="storeTransferOutEdit-cont">
+      <a-collapse :activeKey="['1']">
+        <a-collapse-panel key="1">
+          <template slot="header">
+            基础信息
+            <a-button type="primary" shape="circle" size="small" icon="edit" class="edit-circle-btn" id="storeTransferOutEdit-circle-btn" @click.stop="handleEditInfo" />
+          </template>
+          <a-descriptions :column="3">
+            <a-descriptions-item label="调往对象">箭冠营销中心</a-descriptions-item>
+          </a-descriptions>
+        </a-collapse-panel>
+      </a-collapse>
+    </a-card>
+    <!-- 选择产品 -->
+    <a-card :bordered="false" class="storeTransferOutEdit-cont">
+      <a-collapse :activeKey="['1']">
+        <a-collapse-panel key="1" header="选择产品">
+          <!-- 筛选条件 -->
+          <div class="table-page-search-wrapper">
+            <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+              <a-row :gutter="15">
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="产品编码" prop="name">
+                    <a-input id="storeTransferOutEdit-name" v-model="queryParam.name" placeholder="请输入产品编码" allowClear />
+                  </a-form-item>
+                </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="产品名称" prop="name">
+                    <a-input id="storeTransferOutEdit-name" v-model="queryParam.name" placeholder="请输入产品名称" allowClear />
+                  </a-form-item>
+                </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="仓库">
+                    <v-select
+                      v-model="queryParam.billStatus"
+                      ref="billStatus"
+                      id="storeTransferOutEdit-billStatus"
+                      code="PAYMENT_TYPE"
+                      placeholder="请选择仓库"
+                      allowClear></v-select>
+                  </a-form-item>
+                </a-col>
+                <template v-if="advanced">
+                  <a-col :md="6" :sm="24">
+                    <a-form-item label="产品类别">
+                      <a-cascader :options="typeData" id="storeTransferOutEdit-state" placeholder="请选择产品类别" allowClear v-model="queryParam.brand" />
+                    </a-form-item>
+                  </a-col>
+                  <a-col :md="6" :sm="24">
+                    <a-form-item label="产品品牌">
+                      <a-select placeholder="请选择" id="storeTransferOutEdit-state" allowClear v-model="queryParam.dataSourceNo" :showSearch="true" option-filter-prop="children" :filter-option="filterOption">
+                        <a-select-option v-for="item in brandData" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
+                      </a-select>
+                    </a-form-item>
+                  </a-col>
+                </template>
+                <a-col :md="6" :sm="24" style="margin-bottom: 24px;">
+                  <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="storeTransferOutList-refresh">查询</a-button>
+                  <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="storeTransferOutList-reset">重置</a-button>
+                  <a @click="advanced=!advanced" style="margin-left: 8px">
+                    {{ advanced ? '收起' : '展开' }}
+                    <a-icon :type="advanced ? 'up' : 'down'"/>
+                  </a>
+                </a-col>
+              </a-row>
+            </a-form>
+          </div>
+          <!-- 列表 -->
+          <s-table
+            class="sTable"
+            ref="table"
+            size="default"
+            :rowKey="(record) => record.id"
+            :columns="columns"
+            :data="loadData"
+            bordered>
+            <!-- 操作 -->
+            <template slot="action" slot-scope="text, record">
+              <a-button type="primary" @click="handleAdd(record)" id="storeTransferOutEdit-add-btn">添加</a-button>
+            </template>
+          </s-table>
+        </a-collapse-panel>
+      </a-collapse>
+    </a-card>
+    <!-- 已选产品 -->
+    <a-card :bordered="false" class="storeTransferOutEdit-cont">
+      <a-collapse :activeKey="['1']">
+        <a-collapse-panel key="1" header="已选产品">
+          <!-- 总计 -->
+          <a-alert type="info" showIcon style="margin-bottom:15px">
+            <div slot="message">总成本:¥<strong>6.33</strong>,总款数: <strong>6</strong> ,总数量: <strong>6</strong> </div>
+          </a-alert>
+          <!-- 筛选条件 -->
+          <a-row :gutter="15" justify="space-between">
+            <a-col :span="21">
+              <div class="table-page-search-wrapper">
+                <a-form layout="inline" @keyup.enter.native="$refs.chooseTable.refresh(true)">
+                  <a-row :gutter="15">
+                    <a-col :md="6" :sm="24">
+                      <a-form-item label="产品编码" prop="name">
+                        <a-input id="storeTransferOutEdit-name" v-model="queryParam.name" placeholder="请输入产品编码" allowClear />
+                      </a-form-item>
+                    </a-col>
+                    <a-col :md="6" :sm="24">
+                      <a-form-item label="产品名称" prop="name">
+                        <a-input id="storeTransferOutEdit-name" v-model="queryParam.name" placeholder="请输入产品名称" allowClear />
+                      </a-form-item>
+                    </a-col>
+                    <a-col :md="6" :sm="24" style="margin-bottom: 24px;">
+                      <a-button type="primary" @click="$refs.chooseTable.refresh(true)" :disabled="disabled" id="storeTransferOutList-refresh">查询</a-button>
+                      <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="storeTransferOutList-reset">重置</a-button>
+                    </a-col>
+                  </a-row>
+                </a-form>
+              </div>
+            </a-col>
+            <a-col :span="3">
+              <a-button style="margin-left: 8px" id="storeTransferOutEdit-import-btn">导入明细</a-button>
+            </a-col>
+          </a-row>
+          <!-- 列表 -->
+          <s-table
+            class="sTable"
+            ref="chooseTable"
+            size="default"
+            :rowKey="(record) => record.id"
+            :columns="chooseColumns"
+            :data="chooseLoadData"
+            bordered>
+            <!-- 调出数量 -->
+            <template slot="transferOutQuantity" slot-scope="text, record">
+              <a-input-number
+                id="storeTransferOutEdit-storageQuantity"
+                :value="record.storageQuantity"
+                :precision="0"
+                :min="0"
+                :max="999999"
+                placeholder="请输入" />
+            </template>
+            <!-- 操作 -->
+            <template slot="action" slot-scope="text, record">
+              <a-button type="danger" @click="handleDel(record)" id="storeTransferOutEdit-del-btn">删除</a-button>
+            </template>
+          </s-table>
+        </a-collapse-panel>
+      </a-collapse>
+    </a-card>
+    <a-affix :offset-bottom="0">
+      <div style="text-align: center;width: 100%;background-color: #fff;padding: 30px 0;box-shadow: 0 0 20px #dcdee2;">
+        <a-button type="primary" id="storeTransferOutEdit-submit" size="large" @click="handleSubmit" style="padding: 0 60px;">提交</a-button>
+      </div>
+    </a-affix>
+    <!-- 选择基本信息弹框 -->
+    <basic-info-modal :openModal="openModal" @ok="handleOk" @close="openModal=false" />
+  </div>
+</template>
+
+<script>
+  import { STable, VSelect } from '@/components'
+  import basicInfoModal from './basicInfoModal.vue'
+  export default{
+    components: { STable, VSelect, basicInfoModal },
+    data(){
+      return{
+        queryParam: {
+          
+        },
+        brandData: [],  //  产品品牌  下拉数据
+        typeData: [],  //  产品类别  下拉数据
+        disabled: false, //  查询、重置按钮是否可操作
+        advanced: false,  // 高级搜索 展开/关闭
+        // 表头
+        columns: [
+          { title: '产品编码', dataIndex: 'creatDate', align: 'center' },
+          { title: '产品名称', dataIndex: 'custNahme', align: 'center', ellipsis: true },
+          { title: '单位', dataIndex: 'custsNsagme', align: 'center' },
+          { title: '仓库', dataIndex: 'custsNdame', align: 'center' },
+          { title: '仓位', dataIndex: 'custsNafme', align: 'center' },
+          { title: '库存数量', dataIndex: 'custsNagme', align: 'center' },
+          { title: '成本价', dataIndex: 'storageQuantity', align: 'center' },
+          { title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center' }
+        ],
+        // 加载数据方法 必须为 Promise 对象
+        loadData: parameter => {
+          this.disabled = true
+          // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
+          //   const data = res.data
+          //   const no = (data.pageNo - 1) * data.pageSize
+          //   for (var i = 0; i < data.list.length; i++) {
+          //     data.list[i].no = no + i + 1
+          //   }
+          //   this.disabled = false
+          //   return data
+          // })
+          const _this = this
+          return new Promise(function(resolve, reject){
+            const data = {
+              pageNo: 1,
+              pageSize: 10,
+              list: [
+                { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
+              ],
+              count: 10
+            }
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            _this.disabled = false
+            resolve(data)
+          })
+        },
+        // 表头
+        chooseColumns: [
+          { title: '序号', dataIndex: 'no', align: 'center' },
+          { title: '产品编码', dataIndex: 'creatDate', align: 'center' },
+          { title: '产品名称', dataIndex: 'custNahme', align: 'center', ellipsis: true },
+          { title: '单位', dataIndex: 'custsNsagme', align: 'center' },
+          { title: '成本价', dataIndex: 'storageQuantity', align: 'center' },
+          { title: '仓库', dataIndex: 'custsNdame', align: 'center' },
+          { title: '仓位', dataIndex: 'custsNafme', align: 'center' },
+          { title: '调出数量', scopedSlots: { customRender: 'transferOutQuantity' }, align: 'center' },
+          { title: '成本小计', dataIndex: 'custsNagme', align: 'center' },
+          { title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center' }
+        ],
+        // 加载数据方法 必须为 Promise 对象
+        chooseLoadData: parameter => {
+          this.disabled = true
+          // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
+          //   const data = res.data
+          //   const no = (data.pageNo - 1) * data.pageSize
+          //   for (var i = 0; i < data.list.length; i++) {
+          //     data.list[i].no = no + i + 1
+          //   }
+          //   this.disabled = false
+          //   return data
+          // })
+          const _this = this
+          return new Promise(function(resolve, reject){
+            const data = {
+              pageNo: 1,
+              pageSize: 10,
+              list: [
+                { id: '1', purchaseNo: 'jgqp11111111111', custssName: 0, creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
+              ],
+              count: 10
+            }
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            _this.disabled = false
+            resolve(data)
+          })
+        },
+        openModal: false, // 选择基本信息弹框是否显示
+      }
+    },
+    methods: {
+      //  重置
+      resetSearchForm () {
+        this.queryParam.orderBundleNo = ''
+        this.queryParam.orderBundle.custMobile = ''
+        this.queryParam.bundleName = ''
+        this.queryParam.itemName = ''
+        this.oldTime = undefined
+        this.newTime = undefined
+        this.$refs.table.refresh(true)
+      },
+      //  添加
+      handleAdd(row){},
+      //  删除
+      handleDel(row){},
+      //  编辑基本信息
+      handleEditInfo(){
+        this.openModal = true
+      },
+      //  基本信息  保存
+      handleOk(){
+        
+      },
+      //  提交
+      handleSubmit(){},
+      //  导入明细
+      handleImport(){
+        console.log(333)
+      },
+      //  返回列表
+      handleBack(){
+        this.$router.push({ path: '/allocationManagement/storeTransferOut/list'})
+      },
+      filterOption(input, option) {
+      	return (
+      		option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      	)
+      },
+    },
+    beforeRouteEnter (to, from, next) {
+      next(vm => {
+        vm.openModal = false
+      })
+    }
+  }
+</script>
+
+<style lang="less">
+  .storeTransferOutEdit-wrap{
+    .storeTransferOutEdit-back{
+      margin-bottom: 15px;
+    }
+    .storeTransferOutEdit-cont{
+      margin-bottom: 15px;
+      .sub-title{
+        font-size: 12px;
+        color: #808695;
+        margin-left: 10px;
+      }
+      .tag-txt{
+        font-size: 12px;
+        color: #ed1c24;
+      }
+      .edit-circle-btn{
+        margin-left: 15px;
+        i{
+          vertical-align: text-bottom;
+        }
+      }
+      .import-btn{
+        margin-left: 15px;
+      }
+    }
+  }
+</style>

+ 244 - 0
src/views/allocationManagement/storeTransferOut/list.vue

@@ -0,0 +1,244 @@
+<template>
+  <a-card :bordered="false" class="storeTransferOutList-wrap">
+    <!-- 搜索条件 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+        <a-row :gutter="15">
+          <a-col :md="6" :sm="24">
+            <a-form-item label="创建时间">
+              <a-range-picker
+                  style="width:100%"
+                  id="storeTransferOutList-bundleNamesss"
+                  :disabledDate="disabledDate"
+                  v-model="queryParam.brand"
+                  :format="dateFormat"
+                  :placeholder="['开始时间', '结束时间']" />
+              </a-form-item>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="调往对象">
+              <v-select
+                v-model="queryParam.billStatus"
+                ref="billStatus"
+                id="storeTransferOutList-billStatus"
+                code="PAYMENT_TYPE"
+                placeholder="请选择调往对象"
+                allowClear></v-select>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="调拨类型">
+              <v-select
+                v-model="queryParam.billStatus"
+                ref="billStatus"
+                id="storeTransferOutList-billStatus"
+                code="PAYMENT_TYPE"
+                placeholder="请选择调拨类型"
+                allowClear></v-select>
+            </a-form-item>
+          </a-col>
+          <template v-if="advanced">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="单据状态">
+                <v-select
+                  v-model="queryParam.billStatus"
+                  ref="billStatus"
+                  id="storeTransferOutList-billStatus"
+                  code="PAYMENT_TYPE"
+                  placeholder="请选择单据状态"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :md="6" :sm="24" style="margin-bottom: 24px;">
+            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="storeTransferOutList-refresh">查询</a-button>
+            <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="storeTransferOutList-reset">重置</a-button>
+            <a @click="advanced=!advanced" style="margin-left: 8px">
+              {{ advanced ? '收起' : '展开' }}
+              <a-icon :type="advanced ? 'up' : 'down'"/>
+            </a>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 操作按钮 -->
+    <div class="table-operator">
+      <a-button id="storeTransferOutList-add" type="primary" @click="handleEdit()">新增店内调出单</a-button>
+    </div>
+    <!-- 列表 -->
+    <s-table
+      class="sTable"
+      ref="table"
+      size="default"
+      :rowKey="(record) => record.id"
+      :columns="columns"
+      :data="loadData"
+      bordered>
+      <!-- 状态 -->
+      <template slot="status" slot-scope="text, record">
+        <span :class="record.status==1?'green':'red'"> {{ record.status==1? '待提交': '待审核' }} </span>
+      </template>
+      <!-- 操作 -->
+      <template slot="action" slot-scope="text, record">
+        <a-button size="small" type="primary" @click="handleExamine(record)" id="storeTransferOutList-examine-btn">审核</a-button>
+        <a-button size="small" @click="handleEdit(record)" id="storeTransferOutList-edit-btn" style="margin: 0 0 10px 8px;">编辑</a-button>
+        <a-button size="small" type="primary" @click="handleOut(record)" id="storeTransferOutList-out-btn" style="margin: 0 0 10px 8px;">出库</a-button>
+        <a-button size="small" type="primary" @click="handleDetail(record)" id="storeTransferOutList-detail-btn" style="margin: 0 0 0 8px;">详情</a-button>
+        <a-button size="small" type="danger" @click="handleDel(record)" id="storeTransferOutList-del-btn" style="margin: 0 0 0 8px;">删除</a-button>
+      </template>
+    </s-table>
+    <!-- 新增/编辑 -->
+    <basic-info-modal :openModal="openModal" @ok="handleOk" @close="openModal=false" />
+  </a-card>
+</template>
+
+<script>
+import moment from 'moment'
+// import { customerBundleDelayList, customerBundleExportDelay } from '@/api/FinancialManagement'
+import { STable, VSelect } from '@/components'
+import basicInfoModal from './basicInfoModal.vue'
+export default {
+  components: { STable, VSelect, basicInfoModal },
+  data () {
+    return {
+      advanced: false,  // 高级搜索 展开/关闭
+      queryParam: { //  查询条件
+        bundleName: '', //  品牌名称
+        state: undefined,  //  状态
+      },
+      disabled: false, //  查询、重置按钮是否可操作
+      dateFormat: 'YYYY-MM-DD',
+      columns: [
+        { title: '创建时间', dataIndex: 'no', width: 70, align: 'center', width: 180 },
+        { title: '店内调出单号', dataIndex: 'productName', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '调往对象', dataIndex: 'inventoryMoney', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '调拨类型', dataIndex: 'productOldNum', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '总款数', dataIndex: 'inventsoryMoney', width: 180, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总数量', dataIndex: 'inventoryModney', width: 180, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总成本', dataIndex: 'inventoryaMoney', width: 180, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '审核时间', dataIndex: 'inventoryMongey', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '状态', scopedSlots: { customRender: 'status' }, width: 180, align: 'center' },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 300, align: 'center' }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
+        //   const data = res.data
+        //   const no = (data.pageNo - 1) * data.pageSize
+        //   for (var i = 0; i < data.list.length; i++) {
+        //     data.list[i].no = no + i + 1
+        //   }
+        //   this.disabled = false
+        //   return data
+        // })
+        const _this = this
+        return new Promise(function(resolve, reject){
+          const data = {
+            pageNo: 1,
+            pageSize: 10,
+            list: [
+              { id: '1', productNum: 'jgqp11111111111', productName: '产品1', productOldNum: 'jgqp111123545', productBrand: '箭冠品牌', productType: '产品分类1', inventoryNum: '5', inventoryMoney: '122' }
+            ]
+          }
+          const no = (data.pageNo - 1) * data.pageSize
+          for (var i = 0; i < data.list.length; i++) {
+            data.list[i].no = no + i + 1
+          }
+          _this.disabled = false
+          resolve(data)
+        })
+      },
+      openModal: false,  //  新增编辑  弹框
+      itemId: ''  //  当前品牌id
+    }
+  },
+  methods: {
+    // 不可选日期
+    disabledDate (date, dateStrings) {
+      return date && date.valueOf() > Date.now()
+    },
+    //  重置
+    resetSearchForm () {
+      this.queryParam.orderBundleNo = ''
+      this.queryParam.orderBundle.custMobile = ''
+      this.queryParam.bundleName = ''
+      this.queryParam.itemName = ''
+      this.oldTime = undefined
+      this.newTime = undefined
+      this.$refs.table.refresh(true)
+    },
+    //  基本信息  保存
+    handleOk(){
+      this.$router.push({ path: `/allocationManagement/storeTransferOut/add` })
+    },
+    //  删除
+    handleDel(row){
+      const _this = this
+      this.$confirm({
+        title: '提示',
+        content: '删除后不可恢复,确定要进行删除吗?',
+        okText: '确定',
+        cancelText: '取消',
+		centered: true,
+        onOk () {
+          // delectRolePower({
+          //   id: row.id
+          // }).then(res => {
+          //   console.log(res, 'res1111')
+          //   if (res.status == 200) {
+          //     _this.$message.success(res.message)
+          //     _this.$refs.table.refresh()
+          //   }
+          // })
+        }
+      })
+    },
+    //  出库
+    handleOut(row){
+      
+    },
+    //  审核
+    handleExamine(){
+      const _this = this
+      this.$confirm({
+        title: '提示',
+        content: '确认要审核通过吗?',
+        okText: '确定',
+        cancelText: '取消',
+		centered: true,
+        onOk () {
+          // delectRolePower({
+          //   id: row.id
+          // }).then(res => {
+          //   console.log(res, 'res1111')
+          //   if (res.status == 200) {
+          //     _this.$message.success(res.message)
+          //     _this.$refs.table.refresh()
+          //   }
+          // })
+        }
+      })
+    },
+    //  详情
+    handleDetail(row){
+      this.$router.push({ path: `/allocationManagement/storeTransferOut/detail/${row.id}` })
+    },
+    //  新增/编辑
+    handleEdit(row){
+      this.openModal = true
+    },
+  }
+}
+</script>
+
+<style lang="less">
+  .storeTransferOutList-wrap{
+    .sTable{
+      table{
+        width: auto;
+      }
+    }
+  }
+</style>

+ 0 - 0
src/views/inventoryManagement/warehouseAllocation/basicInfoModal.vue → src/views/allocationManagement/warehouseAllocation/basicInfoModal.vue


+ 1 - 1
src/views/inventoryManagement/warehouseAllocation/detail.vue → src/views/allocationManagement/warehouseAllocation/detail.vue

@@ -115,7 +115,7 @@
     methods: {
       //  返回列表
       handleBack(){
-        this.$router.push({ path: '/inventoryManagement/warehouseAllocation/list'})
+        this.$router.push({ path: '/allocationManagement/warehouseAllocation/list'})
       },
       //  导出
       handleExport () {

+ 1 - 1
src/views/inventoryManagement/warehouseAllocation/edit.vue → src/views/allocationManagement/warehouseAllocation/edit.vue

@@ -334,7 +334,7 @@
       },
       //  返回列表
       handleBack(){
-        this.$router.push({ path: '/inventoryManagement/warehouseAllocation/list'})
+        this.$router.push({ path: '/allocationManagement/warehouseAllocation/list'})
       },
       filterOption(input, option) {
       	return (

+ 4 - 4
src/views/inventoryManagement/warehouseAllocation/list.vue → src/views/allocationManagement/warehouseAllocation/list.vue

@@ -170,7 +170,7 @@ export default {
     },
     //  基本信息  保存
     handleOk(){
-      this.$router.push({ path: `/inventoryManagement/warehouseAllocation/add` })
+      this.$router.push({ path: `/allocationManagement/warehouseAllocation/add` })
     },
     //  删除
     handleDel(row){
@@ -218,14 +218,14 @@ export default {
     },
     //  详情
     handleDetail(row){
-      this.$router.push({ path: `/inventoryManagement/warehouseAllocation/detail/${row.id}` })
+      this.$router.push({ path: `/allocationManagement/warehouseAllocation/detail/${row.id}` })
     },
     //  新增/编辑
     handleEdit(row){
       // if(row){  //  编辑
-      //   this.$router.push({ path: `/inventoryManagement/warehouseAllocation/edit/${row.id}` })
+      //   this.$router.push({ path: `/allocationManagement/warehouseAllocation/edit/${row.id}` })
       // }else{  //  新增
-      //   this.$router.push({ path: '/inventoryManagement/warehouseAllocation/add' })
+      //   this.$router.push({ path: '/allocationManagement/warehouseAllocation/add' })
       // }
       this.openModal = true
     },