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

src/views/business/inventory/detail.vue

@@ -37,7 +37,7 @@
       <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>
+          <div class="title">状态：{{ status.desc }}</div>
         </el-col>
         <el-col :span="8" :offset="1" :xs="{span: 24, offset: 0}" v-if="status && status.value == 2">
           <div class="title">支付金额：￥{{ $numberFormat(info.payAmount) }}</div>

src/views/business/inventory/index.vue

@@ -101,7 +101,7 @@
         </template>
       </el-table-column>
       <el-table-column label="结算库存" prop="totalSettleQty" min-width="50" />
-      <el-table-column label="订单状态" align="center">
+      <el-table-column label="状态" align="center">
         <template slot-scope="{ row }">
           <div>
             <el-tag :type="row.status.value == 1? 'success' : 'info'" v-if="row.status">{{

src/views/order/store/index.vue

@@ -288,7 +288,6 @@ export default {
   },
   created() {
     this.getList();
-    this.getSupplierItems()
     this.getSaleSiteList()
   },
   methods: {