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

src/views/business/inventory/detail.vue

@@ -27,15 +27,15 @@
           <div class="title">剩余库存：{{ info.totalRemainQty }}</div>
         </el-col>
         <el-col :span="8" :offset="1" :xs="{span: 24, offset: 0}">
-          <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}">
+        <el-col :span="7" :xs="{span: 24, offset: 0}" v-if="(status && status.value == 2) || (status && status.value == 3)">
+          <div class="title">结算库存：{{ info.totalSettleQty }}</div>
+        </el-col>
+        <el-col :span="8" :offset="1" :xs="{span: 24, offset: 0}" v-if="(status && status.value == 2) || (status && status.value == 3)">
           <div class="title">门店应付金额：￥{{ $numberFormat(info.totalPurchaseCost) }}</div>
         </el-col>
-        <el-col :span="7" :xs="{span: 24, offset: 0}">
+        <el-col :span="7" :xs="{span: 24, offset: 0}" v-if="(status && status.value == 2) || (status && status.value == 3)">
           <div class="title">实际结算金额：￥{{ $numberFormat(info.payAmount) }}</div>
         </el-col>
       </el-col>
@@ -45,25 +45,27 @@
     <el-row :gutter="10">
       <el-col :span="22" :offset="1">
         <div class="info-title">状态</div>
-        <el-col :span="8" :offset="1" :xs="{span: 24, offset: 0}">
-          <div class="title">状态：{{ status.desc }}</div>
+        <el-col :span="24" :offset="1" :xs="{span: 24, offset: 0}">
+          <div class="title" v-if="status && status.value != 1">状态：{{ status.desc }}</div>
         </el-col>
-        <el-col :span="8" :offset="1" :xs="{span: 24, offset: 0}" v-if="status && status.value == 2">
+        <el-col :span="24" :offset="1" :xs="{span: 24, offset: 0}" v-if="status && status.value == 2">
           <div class="title">支付金额：￥{{ $numberFormat(info.payAmount) }}</div>
         </el-col>
-        <el-col :span="7" :xs="{span: 24, offset: 0}" v-if="(status && status.value == 2) || (status && status.value == 3)">
+        <el-col :span="24" :offset="1" :xs="{span: 24, offset: 0}" v-if="(status && status.value == 2) || (status && status.value == 3)">
           <div class="title">发起结算时间：{{ parseTime(info.pushTime) }}</div>
         </el-col>
-        <el-col :span="8" :offset="1" :xs="{span: 24, offset: 0}" v-if="status && status.value == 2">
+        <el-col :span="24" :offset="1" :xs="{span: 24, offset: 0}" v-if="status && status.value == 2">
           <div class="title">结算时间：{{ parseTime(info.settleTime) || '--' }}</div>
         </el-col>
-        <el-button
+        <el-col :span="24" :offset="1" :xs="{span: 24, offset: 0}" style="margin-bottom: 10px;">
+          <el-button
         v-if="status && status.value == 1"
           v-hasPermi="['business:ticket:on']"
           type="primary"
           @click="toInventory()"
-        >去结算</el-button
-        >
+        >去结算</el-button>
+        </el-col>
+        
       </el-col>
     </el-row>
 

src/views/business/inventory/index.vue

@@ -87,9 +87,9 @@
           <div>{{ parseTime(row.items[0].createdTime) }}</div>
         </template>
       </el-table-column>
-      <el-table-column label="门店" prop="channelName" min-width="120" >
+      <el-table-column label="门店(手机号)" prop="channelName" min-width="120" >
         <template slot-scope="{ row }">
-          <div>{{ row.channelName+'，'+row.mobile }}</div>
+          <div>{{ row.channelName+'（'+row.mobile+'）' }}</div>
         </template>
       </el-table-column>
       <el-table-column label="总库存" prop="totalQuantity" min-width="50" />