zhengjinyi před 6 měsíci
rodič
revize
43ca1cc195

+ 3 - 1
src/main/resources/static/js/supplier-center/order/order-edit.js

@@ -10,6 +10,7 @@ const seeDetail = new Vue({
             orderProductList: [],
             payShopRecord: [],
             isFiexd: true,
+            isLoading: true,
             params:{
                 orderProducts:[]
             },
@@ -136,8 +137,9 @@ const seeDetail = new Vue({
         const _self = this;
         this.shopOrderId = CAIMEI.getUrlParam('shopOrderId');
         this.shopOrderDetails();
+        this.isLoading = false
         if (isPC) {
-            _self.open = true;
+            this.open = true;
         }
         $(window).scroll(function (event) {
             var supportPageOffset = window.pageXOffset !== undefined; // 判断是否支持pageXOffset

+ 121 - 122
src/main/resources/templates/supplier-center/order/order-edit.html

@@ -2,7 +2,7 @@
 <html lang="zh-CN" xmlns:th="https://www.thymeleaf.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="https://www.thymeleaf.org ">
 <head>
-    <title>采美365网-修改订单</title>
+    <title>我的交易-修改订单</title>
     <template th:replace="components/head-link"></template>
     <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
     <!--element ui 样式表-->
@@ -16,139 +16,138 @@
 <template th:replace="components/header"></template>
 
 <!-- 我的采美 -->
-<div id="seeDetail" v-cloak>
-    <div class="navLayout" v-cloak>
-        <div class="crumbs" v-if="isPC">
-            <span>我的交易</span>
-            <span>&gt;</span>
-            <span>我的订单</span>
-            <span>&gt;</span>
-            <span>修改订单</span>
-        </div>
-        <div class="wrap clear">
-            <!--左侧面包屑-->
-            <template th:replace="supplier-center/components/tableft"></template>
-            <div class="right">
-                <div class="userinfo">
-                    <p class="info">
-                        <span>买家信息</span>
-                        <span class="comback">
+<div id="seeDetail">
+    <div v-if="isLoading" class="loading" :style="{opacity: isLoading ? '1' :'0'}">
+        <img src="/img/base/loading.gif">
+    </div>
+    <template v-else>
+        <div class="navLayout">
+            <div class="crumbs" v-if="isPC"></div>
+            <div class="wrap clear">
+                <!--左侧面包屑-->
+                <template th:replace="supplier-center/components/tableft"></template>
+                <div class="right">
+                    <div class="userinfo">
+                        <p class="info">
+                            <span>买家信息</span>
+                            <span class="comback">
                             <el-button round  style="margin: 0 10px;" @click="history.go(-1)">返回</el-button>
                         </span>
-                    </p>
-                    <div class="user">
-                        <p>买家名称:<span>{{ userInfo.name ? userInfo.name : '暂无' }}</span></p>
-                        <p>收货人:<span>{{ userInfo.receiver ? userInfo.receiver : '' }}</span></p>
-                        <p>联系方式:<span>{{ userInfo.mobile ? userInfo.mobile : '' }}</span></p>
-                    </div>
-                    <p class="address">收货地址:<span>{{userInfo.address}}</span></p>
-                    <p class="address">留言:<span>{{ order.note ? order.note : '无' }}</span></p>
-                </div>
-                <div class="product-info">
-                    <div class="price">
-                        <p class="protitle">商品金额:<span class="red">¥{{order.productAmount | amountfilters}}</span></p>
-                        <p class="price-right">结算商品金额:<span class="red">¥{{order.productAmount | amountfilters}}</span></p>
+                        </p>
+                        <div class="user">
+                            <p>买家名称:<span>{{ userInfo.name ? userInfo.name : '暂无' }}</span></p>
+                            <p>收货人:<span>{{ userInfo.receiver ? userInfo.receiver : '' }}</span></p>
+                            <p>联系方式:<span>{{ userInfo.mobile ? userInfo.mobile : '' }}</span></p>
+                        </div>
+                        <p class="address">收货地址:<span>{{userInfo.address}}</span></p>
+                        <p class="address">留言:<span>{{ order.note ? order.note : '无' }}</span></p>
                     </div>
-                    <div class="product" >
-                        <ul class="product-title">
-                            <li>商品信息</li>
-                            <li>规格</li>
-                            <li>单价</li>
-                            <li>数量</li>
-                            <li>总价</li>
-                        </ul>
-                        <ul class="pro-information">
-                            <li v-for="pro in orderProductList ">
-                                <div class="product-img">
-                                    <span class="tips" v-if="pro.giftType==2||pro.giftType==1">赠品</span>
-                                    <img :src="pro.image"/>
-                                    <h3>{{pro.name}}</h3>
+                    <div class="product-info">
+                        <div class="price">
+                            <p class="protitle">商品金额:<span class="red">¥{{order.productAmount | amountfilters}}</span></p>
+                            <p class="price-right">结算商品金额:<span class="red">¥{{order.productAmount | amountfilters}}</span></p>
+                        </div>
+                        <div class="product" >
+                            <ul class="product-title">
+                                <li>商品信息</li>
+                                <li>规格</li>
+                                <li>单价</li>
+                                <li>数量</li>
+                                <li>总价</li>
+                            </ul>
+                            <ul class="pro-information">
+                                <li v-for="pro in orderProductList ">
+                                    <div class="product-img">
+                                        <span class="tips" v-if="pro.giftType==2||pro.giftType==1">赠品</span>
+                                        <img :src="pro.image"/>
+                                        <h3>{{pro.name}}</h3>
+                                    </div>
+                                    <div>{{pro.productUnit}}</div>
+                                    <div>
+                                        <el-input v-model="pro.price" style="width: 90px" @input="e => (pro.price= checkedInput(e))"></el-input>
+                                    </div>
+                                    <div>
+                                        <el-input
+                                                v-model="pro.num"
+                                                type="text"
+                                                style="width: 60px"
+                                                placeholder="请输入商品数量"
+                                                disabled="true"
+                                                maxlength="10">
+                                        </el-input>
+                                    </div>
+                                    <div>¥{{pro.price*pro.num}}</div>
+                                </li>
+                            </ul>
+                        </div>
+                        <div class="order-info">
+                            <div class="info-title">订单信息</div>
+                            <div class="content">
+                                <div class="order-item">
+                                    <p><el-tag type="success" effect="dark" size="mini" v-if="order.orderType === 0">采购员</el-tag>订单编号:{{order.shopOrderNo}}</p>
+                                    <p class="state">{{order.status | statusFilters}}</p>
                                 </div>
-                                <div>{{pro.productUnit}}</div>
-                                <div>
-                                    <el-input v-model="pro.price" style="width: 90px" @input="e => (pro.price= checkedInput(e))"></el-input>
+                                <div class="order-item pay">
+                                    <p>结算状态:<span>{{ order.settlestatus | payStatusType }}</span></p>
+                                    <p>发货状态:<span>{{ order.sendOutStatus | sendOutStatusType }}</span> </p>
+                                    <p>收款状态:<span>{{ order.receiptStatus | receiptStatusType }}</span> </p>
+                                    <p>退款状态:&nbsp;<span>{{ order.refundStatus | refundStatusType }}</span> </p>
                                 </div>
-                                <div>
-                                    <el-input
-                                        v-model="pro.num"
-                                        type="text"
-                                        style="width: 60px"
-                                        placeholder="请输入商品数量"
-                                        disabled="true"
-                                        maxlength="10">
-                                    </el-input>
+                                <div class="order-item">
+                                    <p>商品金额:<span class="red">¥{{ order.productAmount | amountfilters }}</span> </p>
+                                    <p>结算商品金额:<span class="red">¥{{ order.shopProductAmount | amountfilters }}</span> </p>
+                                    <!--                              <p>结算税费:<span class="red">¥{{ order.shopTaxFee | amountfilters }}</span> </p>-->
+                                    <p>订单来源:<span class="red">{{ order.organizeId === 0 ? '【采美平台】' : '【丽格集采联盟平台】' }}</span></p>
                                 </div>
-                                <div>¥{{pro.price*pro.num}}</div>
-                            </li>
-                        </ul>
-                    </div>
-                    <div class="order-info">
-                      <div class="info-title">订单信息</div>
-                      <div class="content">
-                          <div class="order-item">
-                              <p><el-tag type="success" effect="dark" size="mini" v-if="order.orderType === 0">采购员</el-tag>订单编号:{{order.shopOrderNo}}</p>
-                              <p class="state">{{order.status | statusFilters}}</p>
-                           </div>
-                          <div class="order-item pay">
-                              <p>结算状态:<span>{{ order.settlestatus | payStatusType }}</span></p>
-                              <p>发货状态:<span>{{ order.sendOutStatus | sendOutStatusType }}</span> </p>
-                              <p>收款状态:<span>{{ order.receiptStatus | receiptStatusType }}</span> </p>
-                              <p>退款状态:&nbsp;<span>{{ order.refundStatus | refundStatusType }}</span> </p>
-                          </div>
-                          <div class="order-item">
-                              <p>商品金额:<span class="red">¥{{ order.productAmount | amountfilters }}</span> </p>
-                              <p>结算商品金额:<span class="red">¥{{ order.shopProductAmount | amountfilters }}</span> </p>
-<!--                              <p>结算税费:<span class="red">¥{{ order.shopTaxFee | amountfilters }}</span> </p>-->
-                              <p>订单来源:<span class="red">{{ order.organizeId === 0 ? '【采美平台】' : '【丽格集采联盟平台】' }}</span></p>
-                          </div>
-                          <div class="order-item">
-                              <p>结算运费:<span class="red">{{ order.postageInfo }}</span> </p>
-                              <p v-if="order.couponAmount > 0">优惠券:<span class="red">¥{{order.couponAmount | amountfilters}}</span> </p>
-                              <p v-if="order.promotionFullReduction > 0">促销满减:<span class="red">¥{{order.promotionFullReduction | amountfilters}}</span> </p>
-                              <p v-if="order.presentNum > 0">赠品数:<span class="red">{{order.presentNum }}</span> </p>
-                          </div>
-                          <div class="order-item">
-                              <p>总结算金额:<span class="red">¥{{ order.shouldPayShopAmount | amountfilters }}</span> </p>
-                              <p>已结算金额:<span class="red">¥{{ order.payedShopAmount | amountfilters }}</span> </p>
-                          </div>
-                    </div>
-                    <div class="section-botton shadow" :class="isFiexd ? 'fiexd' : 'float'">
-                        <div class="inner" style="text-align: right">
-                            <el-button
-                                    type="primary"
-                                    style="margin: 0 10px;"
-                                    @click="handeleUpdate">
-                                确认修改
-                            </el-button>
+                                <div class="order-item">
+                                    <p>结算运费:<span class="red">{{ order.postageInfo }}</span> </p>
+                                    <p v-if="order.couponAmount > 0">优惠券:<span class="red">¥{{order.couponAmount | amountfilters}}</span> </p>
+                                    <p v-if="order.promotionFullReduction > 0">促销满减:<span class="red">¥{{order.promotionFullReduction | amountfilters}}</span> </p>
+                                    <p v-if="order.presentNum > 0">赠品数:<span class="red">{{order.presentNum }}</span> </p>
+                                </div>
+                                <div class="order-item">
+                                    <p>总结算金额:<span class="red">¥{{ order.shouldPayShopAmount | amountfilters }}</span> </p>
+                                    <p>已结算金额:<span class="red">¥{{ order.payedShopAmount | amountfilters }}</span> </p>
+                                </div>
+                            </div>
+                            <div class="section-botton shadow" :class="isFiexd ? 'fiexd' : 'float'">
+                                <div class="inner" style="text-align: right">
+                                    <el-button
+                                            type="primary"
+                                            style="margin: 0 10px;"
+                                            @click="handeleUpdate">
+                                        确认修改
+                                    </el-button>
+                                </div>
+                            </div>
                         </div>
                     </div>
                 </div>
             </div>
+            <!-- 商品价格异常弹窗  -->
+            <el-dialog
+                    title="提示"
+                    :visible.sync="abnormalDialogVisible"
+                    width="700px"
+                    :close-on-click-modal="false"
+                    :show-close="false"
+            >
+                <el-tag type="danger" style="margin: 5px 0;">以下商品修改后的单价会导致不能覆盖成本和平台服务费,请重新修改。</el-tag>
+                <el-table ref="table" :data="abnormalProductList" border >
+                    <el-table-column prop="image" label="商品图片" align="center">
+                        <template slot-scope="{ row }">
+                            <img :src="row.image" :alt="row.name" style="width: 40px;height: 40px;">
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="name" label="商品名称" align="center"></el-table-column>
+                </el-table>
+                <div slot="footer">
+                    <el-button type="primary" @click="abnormalDialogVisible = false">确定</el-button>
+                </div>
+            </el-dialog>
         </div>
-    </div>
-    <!-- 商品价格异常弹窗  -->
-    <el-dialog
-            title="提示"
-            :visible.sync="abnormalDialogVisible"
-            width="700px"
-            :close-on-click-modal="false"
-            :show-close="false"
-    >
-        <el-tag type="danger" style="margin: 5px 0;">以下商品修改后的单价会导致不能覆盖成本和平台服务费,请重新修改。</el-tag>
-        <el-table ref="table" :data="abnormalProductList" border >
-            <el-table-column prop="image" label="商品图片" align="center">
-                <template slot-scope="{ row }">
-                    <img :src="row.image" :alt="row.name" style="width: 40px;height: 40px;">
-                </template>
-            </el-table-column>
-            <el-table-column prop="name" label="商品名称" align="center"></el-table-column>
-        </el-table>
-        <div slot="footer">
-            <el-button type="primary" @click="abnormalDialogVisible = false">确定</el-button>
-        </div>
-    </el-dialog>
+    </template>
 </div>
-
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>