Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-shop-manage into release/1.0

@@ -2,8 +2,7 @@
     <div class="cell-deliver">
         <p class="row">
             发货<span class="num">
-                <Input v-if="rowDisabled" v-model="deliver" placeholder="数量" disabled></Input>
-                <Input v-else v-model="deliver" placeholder="数量"></Input>
+                <Input v-model="deliver" placeholder="数量"></Input>
             </span>
         </p>
         <p class="row">已发数：{{shipNum}}</p>
@@ -14,9 +13,6 @@
     export default {
         name: 'CellDeliver',
         props: {
-            rowDisabled: {
-                type: Boolean
-            },
             rowIndex: {
                 type: Number
             },

@@ -7,6 +7,7 @@
             <p>名称：{{name}}</p>
             <p>品牌：{{brand}}</p>
             <p>销售价：{{price}}</p>
+            <p>采购价：{{purchasePrice}}</p>
         </div>
     </div>
 </template>
@@ -33,6 +34,9 @@
             price: {
                 type: [String, Number]
             },
+            purchasePrice: {
+                type: [String, Number]
+            },
             name: {
                 type: String
             }

@@ -2,14 +2,12 @@
     <div class="cell-stock-out">
         <p class="row">
             缺货<span class="num">
-                <Input v-if="rowDisabled" placeholder="数量" disabled></Input>
-                <Input v-else v-model="uploadNum" placeholder="数量"></Input>
+                <Input v-model="uploadNum" placeholder="数量"></Input>
             </span>
         </p>
         <p class="row" :class="{highlight: lackNum > 0}">缺货数：{{lackNum}}</p>
         <p class="row">
-            <Button v-if="rowDisabled" type="error" @click="showModal" disabled>上传确认缺货</Button>
-            <Button v-else type="error" @click="showModal">上传确认缺货</Button>
+            <Button type="error" @click="showModal">上传确认缺货</Button>
         </p>
     </div>
 </template>
@@ -18,9 +16,6 @@
 export default {
     name: 'CellStockOut',
     props: {
-        rowDisabled: {
-            type: Boolean
-        },
         rowIndex: {
             type: [String, Number]
         },

@@ -101,6 +101,7 @@ export default () => {
                     :name="row.productName"
                     :brand="row.brandName"
                     :price="row.salesPrice"
+                    :purchase-price="row.purchasePrice"
                     :size="row.sizeName"
                 ></cell-prd-info>`;
                     }

@@ -93,6 +93,7 @@ export default () => {
                     :name="row.productName"
                     :brand="row.brandName"
                     :price="row.salesPrice"
+                    :purchase-price="row.purchasePrice"
                     :size="row.sizeName"
                 ></cell-prd-info>`;
                     }
@@ -122,7 +123,6 @@ export default () => {
                     render(row, column, i) {
                         return `<cell-deliver
                             :row-index="${i}"
-                            :row-disabled="${row._disabled}"
                             :ship-num="row.shipmentsNums"
                             @deliver-change="deliverChange">
                         </cell-deliver>`;
@@ -135,7 +135,6 @@ export default () => {
                     render(row, column, index) {
                         return `<cell-stock-out
                             :row-index="${index}"
-                            :row-disabled="${row._disabled}"
                             :lack-num="row.lackNum"
                             @lack-num-change="lackNumChange"
                             @click-upload="showUploadModal(${index})"

@@ -176,7 +176,6 @@
 
                 _.each(list, (v, i) => {
                     v._rowIndex = i; // 当前行index
-                    v._disabled = v.isOvertime === 'Y';
                     v._colorName = v.factoryGoodsName || '';
                     v.createTime = moment.unix(v.createTime).format(fmt);
                     v._needDeliver = v.buyingNums - v.lackNum - v.shipmentsNums; // 当前需发数