帮机构下单版本

src/main/resources/static/css/supplier-center/order/order-edit.css

@@ -1,4 +1,5 @@
 @media screen and (min-width:768px) {
+    table, td, th{border: none;}
     .crumbs {font-size: 16px;color: #22272e}
     .userinfo {padding: 5px 20px;background: #fff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
     .info {height: 56px;line-height: 56px;border-bottom: solid 1px #e2e7ef;font-size: 16px;color: #22272e;overflow: hidden}
@@ -52,6 +53,7 @@
 
 /*移动*/
 @media screen and (max-width:768px) {
+    table, td, th{border: none;}
     .wrap_tittle {height: 10.6vw;line-height: 10.6vw;background: #fff;padding: 0 2.7vw;font-size: 3.4vw;color: #22272e;border-bottom: solid .27vw #e2e7ef;}
     .mIcon.wrap_tittle:before {width: 6.7vw;height: 6.7vw;background-position: -50.7vw -51.5vw;position: absolute;top: 28vw;}
     .mIcon.open:before {width: 10.6vw;height: 11.2vw;float: right;background-position: -48.8vw 2.7vw;}

src/main/resources/static/js/supplier-center/order/order-create.js

@@ -294,11 +294,8 @@ const seeDetail = new Vue({
         // 已选择的禁用勾选框
         handleSelectable(row) {
             const skuIds = this.checkedProductList.map(pros => pros.skuId);
-            if (skuIds.includes(row.skuId)) {
-                return false
-            } else {
-                return true
-            }
+            console.log('skuIds',skuIds)
+            return !skuIds.includes(row.skuId);
         },
         //取消选择
         handleCanle(){
@@ -341,8 +338,6 @@ const seeDetail = new Vue({
         },
         // 修改数量判断阶梯价
         handleChangeNumber(row){
-            console.log('count',row.count)
-            console.log('minBuyNumber',row.minBuyNumber)
             if (row.count < row.minBuyNumber) {
                 row.count = row.minBuyNumber
                 if (row.ladderPriceFlag === 1) {
@@ -393,6 +388,9 @@ const seeDetail = new Vue({
                     if(data.abnormalProductList.length > 0){
                         _this.abnormalProductList = data.abnormalProductList
                         _this.abnormalDialogVisible = true
+                        // 根据 checkedProductList 中的 skuId，删除 abnormalProductList 中的相同 skuId 的数据
+                        _this.checkedProductList = _this.checkedProductList.filter(check => !_this.abnormalProductList.map(abnormal => abnormal.skuId).includes(check.skuId));
+                        console.log('checkedProductList',_this.checkedProductList)
                     }else{
                         _this.supplier = data.shop
                         _this.orderInfoArray.push(_this.supplier)
@@ -406,12 +404,6 @@ const seeDetail = new Vue({
                 }
             })
         },
-        // 隐藏提示
-        handleAbnormalDialogVisible(){
-            // this.productRadio = null
-            // this.checkedProductList = []
-            this.abnormalDialogVisible = false
-        },
         // 选择商品
         handleSelectionChange(row) {
             this.productRadio = row

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

@@ -16,6 +16,8 @@ const seeDetail = new Vue({
             rules: {
                 amount: [{required: true, validator: this.picValidator, trigger: 'blur'}]
             },
+            abnormalDialogVisible:false,
+            abnormalProductList:[],// 成本异常商品
         }
     },
     filters: {
@@ -108,6 +110,9 @@ const seeDetail = new Vue({
                         CAIMEI.dialog('修改成功',true,function () {
                             window.location.href = '/supplier/order/detail.html?shopOrderId='+_self.shopOrderId;
                         })
+                    }else{
+                        _self.abnormalProductList = response.data
+                        _self.abnormalDialogVisible = true
                     }
                 })
             })

src/main/resources/templates/supplier-center/order/detail.html

@@ -32,7 +32,7 @@
                 <div class="userinfo">
                     <p class="info"><span>买家信息</span></p>
                     <div class="user">
-                        <p>买家名称：<span>{{ userInfo.name ? userInfo.name : '无' }}</span></p>
+                        <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>
@@ -71,7 +71,7 @@
                       <div class="info-title">订单信息</div>
                       <div class="content">
                           <div class="order-item">
-                            <p>订单编号：{{order.shopOrderNo}}</p>
+                            <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">

src/main/resources/templates/supplier-center/order/order-create.html

@@ -348,7 +348,7 @@
             :show-close="false"
     >
       <el-tag type="danger" style="margin: 5px 0;">以下商品修改后的单价会导致不能覆盖成本和平台服务费，请重新修改。</el-tag>
-      <el-table ref="table" :data="abnormalProductList" height="300px" border >
+      <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;">
@@ -357,7 +357,7 @@
         <el-table-column prop="name" label="商品名称" align="center"></el-table-column>
       </el-table>
       <div slot="footer">
-        <el-button type="primary" @click="handleAbnormalDialogVisible">确定</el-button>
+        <el-button type="primary" @click="abnormalDialogVisible = false">确定</el-button>
       </div>
     </el-dialog>
   </div>

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

@@ -23,7 +23,7 @@
             <span>&gt;</span>
             <span>我的订单</span>
             <span>&gt;</span>
-            <span>订单详情</span>
+            <span>修改订单</span>
         </div>
         <div class="wrap clear">
             <!--左侧面包屑-->
@@ -37,7 +37,7 @@
                         </span>
                     </p>
                     <div class="user">
-                        <p>买家名称：<span>{{ userInfo.name ? userInfo.name : '' }}</span></p>
+                        <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>
@@ -86,7 +86,7 @@
                       <div class="info-title">订单信息</div>
                       <div class="content">
                           <div class="order-item">
-                              <p>订单编号：{{order.shopOrderNo}}</p>
+                              <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">
@@ -126,6 +126,27 @@
             </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>
 
 <!-- 引入底部 -->

src/main/resources/templates/supplier-center/order/order-return.html

@@ -37,7 +37,7 @@
                         </span>
                     </p>
                     <div class="user">
-                        <p>买家名称：<span>{{ userInfo.name ? userInfo.name : '' }}</span></p>
+                        <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>
@@ -48,7 +48,7 @@
                     <div class="order-info">
                         <div class="content">
                             <div class="order-item">
-                                <p>订单编号：{{order.shopOrderNo}}</p>
+                                <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">