Merge branch 'dev' of mangpiao/mp-ui-pc into test

src/views/business/inventory/detail.vue

@@ -27,7 +27,16 @@
           <div class="title">剩余库存：{{ info.totalRemainQty }}</div>
         </el-col>
         <el-col :span="8" :offset="1" :xs="{span: 24, offset: 0}">
-          <div class="title">采购成本：￥{{ $numberFormat(info.totalPurchaseCost) }}</div>
+          <div class="title">结算库存：{{ info.totalSettleQty }}</div>
+        </el-col>
+        <el-col :span="7" :xs="{span: 24, offset: 0}">
+          <div class="title">采购成本：￥{{ $numberFormat(info.items && info.items[0].purchaseCost) }}</div>
+        </el-col>
+        <el-col :span="8" :offset="1" :xs="{span: 24, offset: 0}">
+          <div class="title">门店应付金额：￥{{ $numberFormat(info.totalPurchaseCost) }}</div>
+        </el-col>
+        <el-col :span="8" :offset="1" :xs="{span: 24, offset: 0}">
+          <div class="title">实际结算金额：￥{{ $numberFormat(info.settleAmt) }}</div>
         </el-col>
       </el-col>
     </el-row>
@@ -80,9 +89,9 @@
               <div>{{ row.properties || "--" }}</div>
             </template>
           </el-table-column>
-          <el-table-column label="采购成本（元）" prop="purchaseCost" min-width="80">
+          <el-table-column label="采购成本（单价）" prop="purchaseCost" min-width="80">
             <template slot-scope="{ row }">
-              <div>{{ $numberFormat(row.purchaseCost) }}</div>
+              <div>￥{{ $numberFormat(row.purchaseCost) }}</div>
             </template>
           </el-table-column>
             <el-table-column label="库存" prop="quantity" min-width="80"/>

src/views/order/store/detail.vue

@@ -78,18 +78,18 @@
         <div class="info-item-logistics" >
           <div class="info">
             <el-col :span="5" :xs="{span: 24, offset: 0}">
-              <div class="tit">配送方式：{{ deliveryCompany.companyName || deliveryCompany.deliveryFlowId ? "快递发货":"无需物流" }}</div>
+              <div class="tit">配送方式：{{ (deliveryCompany && deliveryCompany.companyName) || (deliveryCompany && deliveryCompany.deliveryFlowId) ? "快递发货":"无需物流" }}</div>
             </el-col>
             <el-col :span="5" :xs="{span: 24, offset: 0}">
-              <div class="tit" v-if="deliveryCompany.companyName">快递公司：{{ deliveryCompany.companyName || "--" }}</div>
+              <div class="tit" v-if="deliveryCompany && deliveryCompany.companyName">快递公司：{{ (deliveryCompany && deliveryCompany.companyName) || "--" }}</div>
               <div class="tit" v-else></div>
             </el-col>
             <el-col :span="5" :xs="{span: 24, offset: 0}">
-              <div class="tit" v-if="info.deliveryFlowId">快递单号：{{ info.deliveryFlowId || "--" }}</div>
+              <div class="tit" v-if="info && info.deliveryFlowId">快递单号：{{ (info && info.deliveryFlowId) || "--" }}</div>
               <div class="tit" v-else></div>
             </el-col>
             <el-col :span="7" :xs="{span: 24, offset: 0}">
-              <div class="tit">发货时间：{{ parseTime(info.deliveryTime) || "--" }}</div>
+              <div class="tit">发货时间：{{ parseTime(info && info.deliveryTime) || "--" }}</div>
             </el-col>
             <el-col :span="2" :xs="{span: 24, offset: 0}">
               <div class="edit-express" @click="editExpress(deliveryCompany)" v-if="status.value === 2 || status.value === 4">修改</div>