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

src/views/business/inventory/components/InventoryGoods.vue

@@ -14,12 +14,12 @@
         <el-form-item label="需结算：">
           <span>{{ inventoryInfo.totalRemainQty }}件</span>
         </el-form-item>
-        <el-form-item label="总采购成本：">
-          <span>￥{{ $numberFormat(inventoryInfo.totalPurchaseCost) }}</span>
+        <el-form-item label="采购成本：">
+          <span>￥{{ $numberFormat(inventoryInfo.items[0].purchaseCost) }}</span>
         </el-form-item>
-        <!-- <el-form-item label="门店应付金额：">
+        <el-form-item label="门店应付金额：">
           <span>￥{{ $numberFormat(inventoryInfo.totalPurchaseCost) }}</span>
-        </el-form-item> -->
+        </el-form-item>
         <el-form-item label="实际结算金额：" prop="settleAmt">
           <el-input v-model="form.settleAmt" type="number" style="width: 180px" placeholder="请输入金额">
               <template slot="append">元</template>
@@ -28,7 +28,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="close">取 消</el-button>
-        <el-button type="primary" :disabled="loading" @click="saveClick">向门店发送订单</el-button>
+        <el-button type="primary" :disabled="loading" @click="saveClick">向门店发送账单</el-button>
       </div>
     </el-dialog>
   </div>

src/views/business/inventory/index.vue

@@ -95,11 +95,11 @@
       <el-table-column label="总库存" prop="totalQuantity" min-width="50" />
       <el-table-column label="总已核销" prop="totalVerifyQty" min-width="50" />
       <el-table-column label="剩余总库存" prop="totalRemainQty" min-width="55" />
-      <el-table-column label="总采购成本" min-width="70">
+      <!-- <el-table-column label="总采购成本" min-width="70">
         <template slot-scope="{ row }">
           <div>￥{{ $numberFormat(row.totalPurchaseCost) }}</div>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="结算库存" prop="totalSettleQty" min-width="50" />
       <el-table-column label="状态" align="center">
         <template slot-scope="{ row }">

src/views/order/store/detail.vue

@@ -227,18 +227,18 @@ export default {
           this.status = JSON.parse(res.data.status);
           res.data.deliverList &&
             res.data.deliverList.forEach((item) => {
-              item.channelGoodsOrderItem.forEach((ele) => {
+              item.items.forEach((ele) => {
                 let picUrlArr = ele.picUrl.split(",");
                 ele.picUrl = publicFileGetUrl + picUrlArr[0];
               });
             });
           this.deliverList = res.data.deliverList;
-          res.data.channelGoodsOrderItem &&
-            res.data.channelGoodsOrderItem.forEach((item) => {
+          res.data.items &&
+            res.data.items.forEach((item) => {
               let picUrlArr = item.picUrl.split(",");
               item.picUrl = publicFileGetUrl + picUrlArr[0];
             });
-          this.list = res.data.channelGoodsOrderItem;
+          this.list = res.data.items;
         }
       });
     },