发货修改

@@ -26,6 +26,7 @@
         },
         methods: {
             confirm(){
+                this.$em
                 this.$Message.error('上传缺货')
             },
             change(val){

+<template>
+    <Modal
+        v-model="showModal"
+        @on-ok="ok"
+        @on-cancel="cancel"
+        width="auto"
+        class-name="deliver-modal"
+        cancel-text="取消"
+        ok-text="提交">
+        <div class="deliver-modal">
+            <div class="deliver-info">
+                <Row class-name="info-row">
+                    <Col span="4" class-name="info-col">收货仓库：</Col>
+                    <Col span="20">{{houseInfo.storehouseName}}</Col>
+                </Row>
+                <Row class-name="info-row">
+                    <Col span="4">物流公司：</Col>
+                    <Col span="20">
+                        <Select v-model="houseId">
+                            <Option v-for="item in houseList"
+                                    :value="item.value"
+                                    :key="item">
+                                {{ item.label }}
+                            </Option>
+                        </Select>
+                    </Col>
+                </Row>
+                <Row>
+                    <Col span="4">物流单号：</Col>
+                    <Col span="20"><Input></Input></Col>
+                </Row>
+                <p class="info-tip">
+                    发往：{{houseInfo.storehouseName}}{{houseInfo.address}}{{houseInfo.adminName}}
+                </p>
+            </div>
+            <!--<Spin v-if="showLoading" fix size="large"></Spin>-->
+        </div>
+    </Modal>
+</template>
+
+<script>
+import _ from 'lodash';
+import service from 'trade-service';
+
+export default {
+    name: 'OutStock',
+    props: {
+    },
+    data() {
+        return {
+            showModal: false,
+            showLoading: true,
+            houseInfo: {},
+            houseId: 0,
+            houseList: [
+                {
+                    label: 'EMS',
+                    value: '0'
+
+                }
+            ]
+        };
+    },
+    watch: {
+    },
+    methods: {
+        show() {
+            this.showModal = true;
+            service.allotWarehouseInfo()
+                .then(res => {
+                    // todo
+
+                    this.houseInfo = {
+                        adminName: '许凯',
+                        address: '南京市玄武区1号',
+                        phone: 13901065166,
+                        storehouseName: '南京1号仓库',
+                        id: 3,
+                        status: 1
+                    }
+                });
+        },
+        ok(){
+
+        },
+        cancel(){
+            this.$Message.info('click cancel')
+
+        }
+    }
+};
+</script>
+
+<style lang="scss">
+
+    .deliver-modal {
+        padding: 30px;
+
+        .info-row {
+            margin-bottom: 20px;
+        }
+
+        .info-tip {
+            margin-top: 20px;
+            color: #ff0000;
+            text-align: center;
+        }
+
+        .ivu-modal {
+            width: 50%;
+        }
+    }
+
+
+</style>

 import SizeEdit from './size-edit';
-import UploadStockOut from './size-edit';
+import UploadStockOut from './upload-stock-out';
+import DeliverProduct from './deliver-product';
 
 export {
     SizeEdit,
-    UploadStockOut
+    UploadStockOut,
+    DeliverProduct
 };

@@ -56,12 +56,11 @@ export default {
     watch: {
     },
     methods: {
+        show() {
+            this.showModal = true;
+        },
         ok(){
 
-            // todo
-
-
-
         },
         cancel(){
             this.$Message.info('click cancel')

@@ -52,8 +52,7 @@
     import moment from 'moment';
     import service from 'trade-service';
     import Store from '../store/done';
-    import { OutStock } from 'components/modal'
-    import { CellPrdInfo, CellDispatch, CellDeliver, CellStockOut } from 'components/cell';
+    import { CellPrdInfo, CellDispatch } from 'components/cell';
 
     export default {
         name: 'TabDone',
@@ -193,10 +192,7 @@
         },
         components: {
             CellPrdInfo,
-            CellDispatch,
-            CellDeliver,
-            CellStockOut,
-            OutStock
+            CellDispatch
         }
     };
 </script>

@@ -45,7 +45,8 @@
                   @on-change="pageChange" :page-size="20" show-total></Page>
         </LayoutList>
 
-        <UploadStockOut></UploadStockOut>
+        <UploadStockOut ref="stockOut"></UploadStockOut>
+        <DeliverProduct ref="deliver"></DeliverProduct>
     </div>
 </template>
 
@@ -54,7 +55,7 @@
     import moment from 'moment';
     import service from 'trade-service';
     import Store from '../store/undone';
-    import { UploadStockOut } from 'components/modal'
+    import { UploadStockOut, DeliverProduct } from 'components/modal'
     import { CellPrdInfo, CellDispatch, CellDeliver, CellStockOut } from 'components/cell';
 
     export default {
@@ -162,7 +163,7 @@
 
             },
             sendOut(){
-
+                this.$refs.deliver.show();
             },
             setModel(k, v) {
                 this.filters[k].model = v;
@@ -182,7 +183,8 @@
             CellDispatch,
             CellDeliver,
             CellStockOut,
-            UploadStockOut
+            UploadStockOut,
+            DeliverProduct
         }
     };
 </script>

@@ -113,19 +113,16 @@ export default () => {
                 {
                     title: '发货',
                     align: 'center',
-                    render(){
-                        return `<cell-deliver
-                    :ship-num="row.shipmentsNums">
-                </cell-deliver>`
+                    render(row){
+                        return `<p>发货数：${row.shipmentsNums}</p>`
+
                     }
                 },
                 {
                     title: '缺货',
                     align: 'center',
-                    render(){
-                        return `<cell-stock-out
-                    :lack-num="row.lackNum"
-                ></cell-stock-out>`
+                    render(row){
+                        return `<p>缺货数：${row.lackNum}</p>`
                     }
                 },
                 {
@@ -136,7 +133,7 @@ export default () => {
                         ot = ot === 'N' ? true : false;
 
                         return `<span v-if="${ot}">待处理</span>
-                <span v-else>待处理（超时）</span>`;
+                                <span v-else>待处理（超时）</span>`;
                     }
                 },
                 {

@@ -58,8 +58,8 @@ const tradeService = {
                 return {};
             });
     },
-    allotWarehouseInfo(params) {
-        return axios.post(apiUrl.allotWarehouseInfo, params)
+    allotWarehouseInfo() {
+        return axios.post(apiUrl.allotWarehouseInfo)
             .then(res => {
                 if(res.status === 200) {
                     return res.data;