chenrui 4 年 前
コミット
4dabb959c4

+ 11 - 0
src/api/allocLinkageOut.js

@@ -11,3 +11,14 @@ export const allocLinkageOutList = (params) => {
     method: 'post'
   })
 }
+//  连锁调拨调出详情列表  分页
+export const allocLinkageOutDetailList = (params) => {
+  const url = `/allocLinkageOut/findDetailPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}

+ 11 - 0
src/api/allocLinkagePut.js

@@ -11,3 +11,14 @@ export const allocLinkagePutList = (params) => {
     method: 'post'
   })
 }
+//  连锁调拨调入详情列表  分页
+export const allocLinkagePutDetailList = (params) => {
+  const url = `/allocLinkagePut/findDetailPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}

+ 11 - 0
src/api/allocWarehouse.js

@@ -11,3 +11,14 @@ export const allocWarehouseList = (params) => {
     method: 'post'
   })
 }
+//  仓库调拨详情列表  分页
+export const allocWarehouseDetailList = (params) => {
+  const url = `/allocWarehouse/findDetailPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}

+ 11 - 0
src/api/storeCallOut.js

@@ -11,3 +11,14 @@ export const storeCallOutList = (params) => {
     method: 'post'
   })
 }
+//  店内调出详情列表  分页
+export const storeCallOutDetailList = (params) => {
+  const url = `/storeCallOut/findDetailPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}

+ 8 - 8
src/config/router.config.js

@@ -543,8 +543,8 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/allocationManagement/warehouseAllocation/detail/:id',
-                name: 'warehouseAllocationEdit',
+                path: '/allocationManagement/warehouseAllocation/detail/:id/:sn',
+                name: 'warehouseAllocationDetail',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/allocationManagement/warehouseAllocation/detail.vue'),
                 meta: {
                   title: '仓库调拨详情',
@@ -601,8 +601,8 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/allocationManagement/chainTransferIn/detail/:id',
-                name: 'chainTransferInEdit',
+                path: '/allocationManagement/chainTransferIn/detail/:id/:sn',
+                name: 'chainTransferInDetail',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/allocationManagement/chainTransferIn/detail.vue'),
                 meta: {
                   title: '连锁调入详情',
@@ -659,8 +659,8 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/allocationManagement/chainTransferOut/detail/:id',
-                name: 'chainTransferOutEdit',
+                path: '/allocationManagement/chainTransferOut/detail/:id/:sn',
+                name: 'chainTransferOutDetail',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/allocationManagement/chainTransferOut/detail.vue'),
                 meta: {
                   title: '连锁调出详情',
@@ -717,8 +717,8 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/allocationManagement/storeTransferOut/detail/:id',
-                name: 'storeTransferOutEdit',
+                path: '/allocationManagement/storeTransferOut/detail/:id/:sn',
+                name: 'storeTransferOutDetail',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/allocationManagement/storeTransferOut/detail.vue'),
                 meta: {
                   title: '店内调出详情',

+ 52 - 75
src/views/allocationManagement/chainTransferIn/detail.vue

@@ -24,87 +24,64 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
-        bordered></s-table>
+        bordered>
+        <!-- 成本小计 -->
+        <template slot="costSubtotal" slot-scope="text, record">
+          <span>{{(record.putCost * record.putQty) || 0}}</span>
+        </template>
+      </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', customRender: function (text) { return text || '--' } },
-          { title: '产品名称', dataIndex: 'custNahme', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-          { title: '原厂编码', dataIndex: 'totalP', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '成本价', dataIndex: 'custsN2agme', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-          { title: '调入数量', scopedSlots: { customRender: 'transferOutQuantity' }, align: 'center' },
-          { title: '单位', dataIndex: 'custsNsagme', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '成本小计', dataIndex: 'custsNagme', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-          { title: '仓库', dataIndex: 'warehouse', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '仓位', dataIndex: 'warehouseLoc', align: 'center', customRender: function (text) { return text || '--' } }
-        ],
-        // 加载数据方法 必须为 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(){
+	import { allocLinkagePutDetailList } from '@/api/allocLinkagePut'
+	import { STable, VSelect } from '@/components'
+	export default{
+		components: { STable, VSelect },
+		data(){
+		  return{
+			queryParam: {
+				allocationLinkagePutSn: this.$route.params.sn
+			},
+			disabled: false, //  查询、重置按钮是否可操作
+			brandData: [],  //  产品品牌  下拉数据
+			typeData: [],  //  产品类别  下拉数据
+			// 表头
+			columns: [
+				{ title: '序号', dataIndex: 'no', width: 70, align: 'center' },
+				{ title: '产品编码', dataIndex: 'productCode', align: 'center', customRender: function (text) { return text || '--' } },
+				{ title: '产品名称', dataIndex: 'productName', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+				{ title: '原厂编码', dataIndex: 'productOrigCode', align: 'center', customRender: function (text) { return text || '--' } },
+				{ title: '成本价', dataIndex: 'putCost', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+				{ title: '调入数量', dataIndex: 'putQty', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+				{ title: '单位', dataIndex: 'productUnit', align: 'center', customRender: function (text) { return text || '--' } },
+				{ title: '成本小计', scopedSlots: { customRender: 'costSubtotal' }, align: 'center' },
+				{ title: '仓库', dataIndex: 'warehouseName', align: 'center', customRender: function (text) { return text || '--' } },
+				{ title: '仓位', dataIndex: 'warehouseLocationName', align: 'center', customRender: function (text) { return text || '--' } }
+			],
+			// 加载数据方法 必须为 Promise 对象
+			loadData: parameter => {
+				this.disabled = true
+				return allocLinkagePutDetailList( 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
+				})
+			},
+		  }
+		},
+		methods: {
+		  //  返回列表
+		  handleBack(){
         this.$router.push({ path: '/allocationManagement/chainTransferIn/list'})
-      },
-    }
-  }
+		  },
+		}
+	}
 </script>
 
 <style lang="less">

+ 1 - 1
src/views/allocationManagement/chainTransferIn/list.vue

@@ -172,7 +172,7 @@ export default {
     },
     //  详情
     handleDetail (row) {
-      this.$router.push({ path: `/allocationManagement/chainTransferIn/detail/${row.id}` })
+      this.$router.push({ path: `/allocationManagement/chainTransferIn/detail/${row.id}/${row.allocationLinkagePutSn}` })
     },
     //  新增/编辑
     handleEdit (row) {

+ 19 - 32
src/views/allocationManagement/chainTransferOut/detail.vue

@@ -24,19 +24,25 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
-        bordered></s-table>
+        bordered>
+        <!-- 成本小计 -->
+        <template slot="costSubtotal" slot-scope="text, record">
+          <span>{{(record.outCost * record.outQty) || 0}}</span>
+        </template>
+      </s-table>
     </a-card>
   </div>
 </template>
 
 <script>
+  import { allocLinkageOutDetailList } from '@/api/allocLinkageOut'
   import { STable, VSelect } from '@/components'
   export default{
     components: { STable, VSelect },
     data(){
       return{
         queryParam: {
-          
+          allocationLinkageOutSn: this.$route.params.sn
         },
         disabled: false, //  查询、重置按钮是否可操作
         brandData: [],  //  产品品牌  下拉数据
@@ -44,44 +50,25 @@
         // 表头
         columns: [
           { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-          { title: '产品编码', dataIndex: 'creatDate', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '产品名称', dataIndex: 'custNahme', align: 'center', ellipsis: true },
-          { title: '原厂编码', dataIndex: 'totalP', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '成本价', dataIndex: 'custsN2agme', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-          { title: '调入数量', scopedSlots: { customRender: 'transferOutQuantity' }, align: 'center' },
-          { title: '单位', dataIndex: 'custsNsagme', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '成本小计', dataIndex: 'custsNagme', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-          { title: '仓库', dataIndex: 'warehouse', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '仓位', dataIndex: 'warehouseLoc', align: 'center', customRender: function (text) { return text || '--' } }
+          { title: '产品编码', dataIndex: 'productCode', align: 'center', customRender: function (text) { return text || '--' } },
+          { title: '产品名称', dataIndex: 'productName', align: 'center', ellipsis: true },
+          { title: '原厂编码', dataIndex: 'productOrigCode', align: 'center', customRender: function (text) { return text || '--' } },
+          { title: '成本价', dataIndex: 'outCost', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+          { title: '调出仓库', dataIndex: 'warehouseName', align: 'center', customRender: function (text) { return text || '--' } },
+          { title: '调出数量', dataIndex: 'outQty', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+          { title: '成本小计(¥)', scopedSlots: { customRender: 'costSubtotal' }, 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
-            }
+          return allocLinkageOutDetailList( 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
-            resolve(data)
+            this.disabled = false
+            return data
           })
         },
       }

+ 1 - 1
src/views/allocationManagement/chainTransferOut/list.vue

@@ -207,7 +207,7 @@ export default {
     },
     //  详情
     handleDetail(row){
-      this.$router.push({ path: `/allocationManagement/chainTransferOut/detail/${row.id}` })
+      this.$router.push({ path: `/allocationManagement/chainTransferOut/detail/${row.id}/${row.allocationLinkageOutSn}` })
     },
     //  新增/编辑
     handleEdit(row){

+ 20 - 30
src/views/allocationManagement/storeTransferOut/detail.vue

@@ -34,19 +34,25 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
-        bordered></s-table>
+        bordered>
+        <!-- 成本小计 -->
+        <template slot="costSubtotal" slot-scope="text, record">
+          <span>{{(record.outCost * record.outQty) || 0}}</span>
+        </template>
+      </s-table>
     </a-card>
   </div>
 </template>
 
 <script>
+  import { storeCallOutDetailList } from '@/api/storeCallOut'
   import { STable, VSelect } from '@/components'
   export default{
     components: { STable, VSelect },
     data(){
       return{
         queryParam: {
-          
+          storeCallOutSn: this.$route.params.sn
         },
         disabled: false, //  查询、重置按钮是否可操作
         brandData: [],  //  产品品牌  下拉数据
@@ -54,42 +60,26 @@
         // 表头
         columns: [
           { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-          { title: '产品编码', dataIndex: 'creatDate', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '产品名称', dataIndex: 'custNahme', align: 'center', ellipsis: true },
-          { title: '单位', dataIndex: 'custsNsagme', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '成本价', dataIndex: 'custsNagme', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-          { title: '调出仓库', dataIndex: 'warehouse', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '调出数量', scopedSlots: { customRender: 'transferOutQuantity' }, align: 'center' },
-          { title: '成本小计(¥)', dataIndex: 'custsN2agme', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+          { title: '产品编码', dataIndex: 'productCode', align: 'center', customRender: function (text) { return text || '--' } },
+          { title: '产品名称', dataIndex: 'productName', align: 'center', ellipsis: true },
+          { title: '单位', dataIndex: 'productUnit', align: 'center', customRender: function (text) { return text || '--' } },
+          { title: '成本价', dataIndex: 'outCost', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+          { title: '调出仓库', dataIndex: 'warehouseName', align: 'center', customRender: function (text) { return text || '--' } },
+          { title: '调出数量', dataIndex: 'outQty', align: 'center' },
+          { title: '成本小计(¥)', scopedSlots: { customRender: 'costSubtotal' }, 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
-            }
+          this.queryParam = {}
+          return storeCallOutDetailList( 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
-            resolve(data)
+            this.disabled = false
+            return data
           })
         },
       }

+ 1 - 1
src/views/allocationManagement/storeTransferOut/list.vue

@@ -207,7 +207,7 @@ export default {
     },
     //  详情
     handleDetail(row){
-      this.$router.push({ path: `/allocationManagement/storeTransferOut/detail/${row.id}` })
+      this.$router.push({ path: `/allocationManagement/storeTransferOut/detail/${row.id}/${row.storeCallOutSn}` })
     },
     //  新增/编辑
     handleEdit(row){

+ 32 - 50
src/views/allocationManagement/warehouseAllocation/detail.vue

@@ -45,13 +45,18 @@
             :columns="columns"
             :data="loadData"
             bordered>
-            <!-- 采购数量 -->
-            <template slot="purchaseNum" slot-scope="text, record">
-              <span>{{record.purchaseNum}}</span>
+            <!-- 产品类别 -->
+            <template slot="productType" slot-scope="text, record">
+              <a-tooltip placement="top">
+                <template slot="title">
+                  <span>{{record.productTypeName}}</span>
+                </template>
+                {{record.productTypeName3}}
+              </a-tooltip>
             </template>
-            <!-- 缺货数量 -->
-            <template slot="outOfStockNum" slot-scope="text, record">
-              <span>{{record.outOfStockNum}}</span>
+            <!-- 成本小计 -->
+            <template slot="costSubtotal" slot-scope="text, record">
+              <span>{{(record.allocationCost * record.allocationQty) || 0}}</span>
             </template>
           </s-table>
         </a-collapse-panel>
@@ -61,53 +66,44 @@
 </template>
 
 <script>
+  import { allocWarehouseDetailList } from '@/api/allocWarehouse'
   import { STable, VSelect } from '@/components'
   export default{
     components: { STable, VSelect },
     data(){
       return{
         exportLoading: false, // 导出loading
+        queryParam: {
+          allocationWarehouseSn: this.$route.params.sn
+        },
         // 表头
         columns: [
           { title: '序号', dataIndex: 'no', align: 'center' },
-          { title: '产品编码', dataIndex: 'creatDate', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '产品名称', dataIndex: 'custName', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '原厂编码', dataIndex: 'totalP', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '类别', dataIndex: 'tostalP', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '数量', scopedSlots: { customRender: 'outOfStockNum' }, align: 'center' },
-          { title: '单位', dataIndex: 'mementPay', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '成本小计', dataIndex: 'totalNums', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-          { title: '调出仓位', dataIndex: 'shDate', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '调入仓位', dataIndex: 'shDsate', align: 'center', customRender: function (text) { return text || '--' } },
+          { title: '产品编码', dataIndex: 'productCode', align: 'center', customRender: function (text) { return text || '--' } },
+          { title: '产品名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' } },
+          { title: '原厂编码', dataIndex: 'productOrigCode', align: 'center', customRender: function (text) { return text || '--' } },
+          { title: '类别', scopedSlots: { customRender: 'productType' }, align: 'center' },
+          { title: '数量', dataIndex: 'allocationQty', align: 'center' },
+          { title: '单位', dataIndex: 'productUnit', align: 'center', customRender: function (text) { return text || '--' } },
+          { title: '成本小计', scopedSlots: { customRender: 'costSubtotal' }, align: 'center' },
+          { title: '调出仓位', dataIndex: 'outWarehouseLocationName', align: 'center', customRender: function (text) { return text || '--' } },
+          { title: '调入仓位', dataIndex: 'putWarehouseLocationName', align: 'center', customRender: function (text) { return text || '--' } },
         ],
         // 加载数据方法 必须为 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
-            }
+          return allocWarehouseDetailList( 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
+              const productTypeName1 = data.list[i].productTypeName1 ? data.list[i].productTypeName1 : ''
+              const productTypeName2 = data.list[i].productTypeName2 ? ' > ' + data.list[i].productTypeName2 : ''
+              const productTypeName3 = data.list[i].productTypeName3 ? ' > ' + data.list[i].productTypeName3 : ''
+              data.list[i].productTypeName = productTypeName1 + productTypeName2 + productTypeName3
             }
-            _this.disabled = false
-            resolve(data)
+            this.disabled = false
+            return data
           })
         },
       }
@@ -120,20 +116,6 @@
       //  导出
       handleExport () {
         const params = this.queryParam
-        if (this.oldTime && this.oldTime.length > 0) {
-          params.beginOldExpiryDate = moment(this.oldTime[0]).format('YYYY-MM-DD')
-          params.endOldExpirydDate = moment(this.oldTime[1]).format('YYYY-MM-DD')
-        } else {
-          params.beginOldExpiryDate = ''
-          params.endOldExpirydDate = ''
-        }
-        if (this.newTime && this.newTime.length > 0) {
-          params.beginDate = moment(this.newTime[0]).format('YYYY-MM-DD')
-          params.endDate = moment(this.newTime[1]).format('YYYY-MM-DD')
-        } else {
-          params.beginDate = ''
-          params.endDate = ''
-        }
         this.exportLoading = true
         customerBundleExportDelay(params).then(res => {
           this.exportLoading = false

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

@@ -82,7 +82,7 @@
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
         <a-button size="small" type="primary" @click="handleExamine(record)" id="warehouseAllocationList-examine-btn">审核</a-button>
-        <a-button size="small" @click="handleEdit(record)" id="warehouseAllocationList-edit-btn" style="margin: 0 0 0 8px;">编辑</a-button>
+        <a-button size="small" @click="handleEdit(record)" id="warehouseAllocationList-edit-btn" style="margin: 0 0 8px 8px;">编辑</a-button>
         <a-button size="small" type="primary" @click="handleDetail(record)" id="warehouseAllocationList-detail-btn" style="margin: 0 0 0 8px;">详情</a-button>
         <a-button size="small" type="danger" @click="handleDel(record)" id="warehouseAllocationList-del-btn" style="margin: 0 0 0 8px;">删除</a-button>
       </template>
@@ -164,7 +164,7 @@ export default {
         content: '删除后不可恢复,确定要进行删除吗?',
         okText: '确定',
         cancelText: '取消',
-		centered: true,
+        centered: true,
         onOk () {
           // delectRolePower({
           //   id: row.id
@@ -186,7 +186,7 @@ export default {
         content: '确认要审核通过吗?',
         okText: '确定',
         cancelText: '取消',
-		centered: true,
+        centered: true,
         onOk () {
           // delectRolePower({
           //   id: row.id
@@ -202,7 +202,7 @@ export default {
     },
     //  详情
     handleDetail(row){
-      this.$router.push({ path: `/allocationManagement/warehouseAllocation/detail/${row.id}` })
+      this.$router.push({ path: `/allocationManagement/warehouseAllocation/detail/${row.id}/${row.allocationWarehouseSn}` })
     },
     //  新增/编辑
     handleEdit(row){