供应商

src/main/resources/static/css/equipment/detail.css

@@ -29,7 +29,22 @@ li{list-style:none}
 .detailInfo .tabCon{padding:16px 0;text-align:center}
 .detailInfo .tabCon img{max-width:100%;}
 .detailInfo .tabCon table{width:100%;text-align:left}
-
+.code{
+    position: absolute;
+     display: none;
+    width: 120px;
+    height: 120px;
+    padding: 10px;
+    left: 0;
+    margin-left: -71px;
+    background-color: #fff;
+    border: 1px solid #ccc;
+    border-radius: 3px;
+    z-index: 100
+}
+.share:hover .code {
+    display: block;
+}
 
 }
 

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

@@ -24,12 +24,9 @@
     .print {position: absolute;top: 50%;left: 50%;transform: translate(-50%, -50%);-moz-transform: translate(-50%, -50%);outline: none;cursor: pointer;width: 232px;height: 50px;background-color: #e15616;box-shadow: 0px 3px 6px 0px rgba(249, 75, 75, 0.17);border-radius: 2px;border: 0;color: #fff;font-size: 18px}
     .colour {color: #627386;}
 }
-
-
-/*移动*/
-@media screen and (max-width:768px) {
-     .sales-list {width: 100%;margin: 0 auto;}
-    #saleslist {background: #fff;}
+@media print {
+    .sales-list {width: 1056px;margin: 0 auto;}
+    #saleslist {background: #fff;height: 980px}
     .sales-list > .sales-list-title {width: 100%;height: 120px;line-height: 120px;text-align: center;font-size: 32px;color: #22272e;}
     .sales-list > .sales-list-cantent {width: 96%;background: #fff;margin: 0 auto;border-left: 1px solid #b8bfca;border-top: 1px solid #b8bfca;border-bottom: 1px solid #b8bfca;}
     .sales-list > .sales-list-cantent > .number-time,
@@ -53,3 +50,36 @@
     .print {position: absolute;top: 50%;left: 50%;transform: translate(-50%, -50%);-moz-transform: translate(-50%, -50%);outline: none;cursor: pointer;width: 232px;height: 50px;background-color: #e15616;box-shadow: 0px 3px 6px 0px rgba(249, 75, 75, 0.17);border-radius: 2px;border: 0;color: #fff;font-size: 18px}
     .colour {color: #627386;}
 }
+
+/*移动*/
+@media screen and (max-width:768px) {
+    body{background: #fff;}
+    #saleslist {background: #fff;}
+    .sales-list > .sales-list-title {width: 100%;height:18.3vw;line-height: 18.3vw;text-align: center;font-size: 4.2vw;color: #22272e;}
+    .sales-list > .sales-list-cantent {width: 92%;background: #fff;margin: 0 auto;border-left: 1px solid #b8bfca;border-top: 1px solid #b8bfca;font-size: 3.2vw;}
+    .sales-list > .sales-list-cantent > .number-time,
+    .sales-list > .sales-list-cantent > .buyer-supplier,
+    .sales-list > .sales-list-cantent > .delivery-info ,.goods-info{width: 100%;overflow: hidden;}
+    .delivery-info {    height: 18.8vw;border-bottom: .27vw solid #b8bfca}
+    .delivery-info > div.colour,.goods-info > div.colour{line-height: 18.8vw !important;}
+    .sales-list > .sales-list-cantent > .number-time > div,
+    .sales-list > .sales-list-cantent > .buyer-supplier > div,
+    .sales-list > .sales-list-cantent > .delivery-info > div,.goods-info > div {width: 21.6vw;height: 100%;border-right: .27vw solid #b8bfca;text-indent: 10px; line-height: 10.6vw;float: left;;border-bottom: .27vw solid #b8bfca}
+    .sales-list > .sales-list-cantent > .number-time > div:nth-child(2),
+    .sales-list > .sales-list-cantent > .number-time > div:nth-child(4),
+    .sales-list > .sales-list-cantent > .buyer-supplier > div:nth-child(2),
+    .sales-list > .sales-list-cantent > .buyer-supplier > div:nth-child(4) {width: 75.7%;}
+    .sales-list > .sales-list-cantent > .delivery-info > div:nth-child(2) {width: 75.7%;    line-height: 6.4vw;padding-top: 2.7vw}
+    .sales-list > .sales-list-cantent > .goods-info > div {width: 21.6vw;border-right: .27vw solid #b8bfca;border-bottom: 1px solid #b8bfca;text-indent: 2.7vw;height: 18.8vw}
+    .sales-list > .sales-list-cantent > .goods-info > .goods-info-conent {width: 75.7%;line-height: 6.4vw}
+    .sales-list > .sales-list-cantent > .total-amount {width: 99.9%;border-right: .27vw solid #b8bfca;box-sizing: border-box;}
+    .sales-list > .sales-list-cantent > .total-amount > p {height: 10.6vw;line-height: 10.6vw;border-bottom: .27vw solid #b8bfca}
+    .print-time {width: 100%;height: 40vw;position: relative;}
+    .print {position: absolute;top: 50%;left: 50%;transform: translate(-50%, -50%);-moz-transform: translate(-50%, -50%);outline: none;cursor: pointer;width: 92%;height: 11.2vw;background-color: #e15616;border-radius:.53vw;color: #fff;font-size: 3.5vw}
+    .colour {color: #627386;}
+    .goods-info-conent p:nth-child(1){text-overflow: ellipsis;overflow: hidden;white-space: nowrap;width: 92%}
+    .sales-list > .sales-list-cantent > .total-amount > p label{text-indent: 2.7vw;width: 21.6vw;
+    display: inline-block;border-right: .27vw solid #b8bfca}
+     .sales-list > .sales-list-cantent > .total-amount > p span{display: inline-block;text-indent: 2.7vw}
+    }
+

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

@@ -13,9 +13,12 @@ var delivergoods = new Vue({
         open: false,
     },
     methods: {
-        opentittle: function () {
-            this.open = !this.open;
-        },
+    returnBack:function(){
+        window.location.href='/supplier/order/list.html'
+    },
+    opentittle: function () {
+        this.open = !this.open;
+    },
         computedPrice: function (order) { //单选
             var _self = this;
                     if(event.target.checked){

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

@@ -1,29 +1,29 @@
 var saleslist = new Vue({
     el:'#saleslist',
     data:{
-        isNone:true,
-        shopOrderId:''
+        shopOrderId:'',
+        currentTime:'',
+        shopOrder:{},
+        userInfo:{}
     },
     methods:{
-        print:function () {
-            window.print();
-            this.isNone = false
-        }
     },
     mounted:function () {
      var _this = this;
      _this.shopOrderId=CAIMEI.getUrlParam('shopOrderID');
-     $.getJSON(spiServer + "/supplier/salesList",{shopOrderId:_this.shopOrderId}).done(function (res) {
-                if (res.code === 0 ) {
-                    console.log(res)
-                }
-            });
-     // SupplierApi.salesList({shopOrderId:_this.shopOrderId},function (res) {
-     //     if(res.code==0){
-     //        console.log(res)
-     //     }else {
-     //      CAIMEI.Alert(res.msg,'确定')
-     //     }
-     // })
+     SupplierApi.salesList({shopOrderId:_this.shopOrderId},function (res) {
+         if(res.code==0){
+            _this.shopOrder = res.data.shopOrder;
+            _this.userInfo =  _this.shopOrder.userInfo;
+            _this.currentTime = res.data.currentTime
+         }else {
+          CAIMEI.Alert(res.msg,'确定')
+         }
+     });
+      $('body').on('click','.print',function () {
+        $(this).css('display','none')
+        window.print();
+        $(this).css('display','block')
+     })
     }
 })

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

@@ -53,7 +53,7 @@ var settlement = new Vue({
             var _this = this;
             SupplierApi.settlementList(_this.params,function (res) {
                 if(res.code==0){
-                    if(res.data.results.length>0){
+                    if(res.data.results!=''){
                         _this.list = res.data.results;
                         _this.listRecord = res.data.totalRecord;
                     }else {

src/main/resources/templates/supplier-center/components/tableft.html

@@ -6,7 +6,7 @@
             <!--<a href="/supplier/dashboard.html">我的首页</a>-->
             <a href="/supplier/order/list.html">我的订单</a>
             <a href="/supplier/order/settlement.html">结算管理</a>
-            <a href="/">评价管理</a>
+<!--            <a href="/">评价管理</a>-->
         </div>
     </div>
     <div class="navList">
@@ -46,7 +46,7 @@
                 <div class="con">
                     <a href="/supplier/order/list.html">我的订单</a>
                     <a href="/supplier/order/settlement.html">结算管理</a>
-                    <a href="/">评价管理</a>
+<!--                    <a href="/">评价管理</a>-->
                 </div>
             </div>
             <div class="centerList">

src/main/resources/templates/supplier-center/operation/list.html

@@ -16,7 +16,7 @@
         <div class="crumbs" v-if="isPC">
             <span>机构管理中心</span>
             <span>&gt;</span>
-            <span>运营人员管理</span>
+            <span>员工管理</span>
         </div>
         <div class="wrap clear">
             <!--左侧面包屑-->

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

@@ -80,7 +80,7 @@
                             </div>
                             <div class="delivery-button">
                                 <button class="delivery" type="button" @click="delivery">发货</button>
-                                <button class="false-btn" type="button">取消</button>
+                                <button class="false-btn" type="button" @click="returnBack">取消</button>
                             </div>
                         </div>
                     </form>

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

@@ -29,7 +29,7 @@
             <div class="right">
                 <div class="new-s-item">
                         <form action="">
-                            <div class='order-border'><span>订单编号：</span><input type="text" id="order-number" v-model="params.shopOrderNo" class="Buyer" placeholder="请输入商品货号"></div>
+                            <div class='order-border'><span>订单编号：</span><input type="text" id="order-number" v-model="params.shopOrderNo" class="Buyer" placeholder="请输入订单编号"></div>
                             <div class='order-border'><span>买家名称：</span><input type="text" id="name-buyer" v-model="params.name" class="Buyer" placeholder="请输入买家名称"> </div>
                             <div>
                                 结算状态：

src/main/resources/templates/supplier-center/order/sales-list.html

@@ -5,44 +5,49 @@
     <title>采美365网-中国美业全方位线上交易服务互动平台，做美业，上采美</title>
     <template th:replace="components/head-link"></template>
     <link th:href="@{/css/supplier-center/order/saleslist.css(v=${version})}" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/supplier-center/order/saleslist.css(v=${version})}" rel="stylesheet" type="text/css" @media="print">
 </head>
 <body>
 <!-- 引用头部 -->
+<div>
+    <input type="hidden" th:value="${spiServer}" id="spiServer">
+    <input type="hidden" th:value="${agent}" id="userAgent">
+</div>
 <!-- 我的采美 -->
 <div id="saleslist">
     <div class="sales-list">
             <div class="sales-list-title">售货清单</div>
-                <div class="sales-list-cantent">
+                <div class="sales-list-cantent" >
                 <div class="number-time">
                 <div class="colour">订单编号</div>
-                <div>X159885299087339</div>
+                <div>{{shopOrder.orderNo}}</div>
                 <div class="colour">下单时间</div>
-                <div>2020-08-31 13:49:50</div>
+                <div>{{shopOrder.orderTime}}</div>
             </div>
             <div class="buyer-supplier">
                 <div class="colour">买        家</div>
-            <div >升级测试小吴</div>
+            <div >{{userInfo.name}}</div>
             <div class="colour">供 应 商</div>
-            <div>李俊供应商9</div>
+            <div>{{shopOrder.shopName}}</div>
             </div>
             <div class="delivery-info">
                 <div class="colour">收货信息</div>
-                <div>北京市市辖区东城区太南门啊啊啊 小严 15917362709</div>
+                <div>{{userInfo.province}} {{userInfo.city}} {{userInfo.town}} {{userInfo.address}}    {{userInfo.shouHuoRen}}     {{userInfo.mobile}}</div>
             </div>
             <div class="goods-info">
                 <div class="colour">商品信息</div>
-                <div class="goods-info-conent">
-                <p>1.测试充值余额缴纳定金商品</p>
-                <p>数量（赠品数）x11      单价 ￥10      总价 ￥100</p>
+                <div class="goods-info-conent" v-for="(item,index) in shopOrder.orderProductList">
+                <p>{{(index*1+1)}}.{{item.name}}</p>
+                <p>数量（赠品数）x{{item.num}}（{{item.presentNum}}）     单价 ￥{{item.discountPrice}}      总价 ￥{{item.totalFee}}</p>
             </div>
             </div>
             <div class="total-amount">
-                <p class="print-time-1 colour" >打印时间：<span>2020-09-09 15:29:06</span></p>
-                <p class="colour" >总金额：￥233.2</p>
+                <p class="print-time-1 colour" ><label>打印时间：</label><span>{{currentTime}}</span></p>
+                <p class="colour" ><label>总金额：</label><span>￥{{shopOrder.totalAmount}}</span></p>
             </div>
             </div>
             <div class="print-time">
-                <button type="button" class="print" @click="print" v-show="isNone">打印</button>
+                <button type="button" class="print" >打印</button>
             </div>
 
     </div>

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

@@ -25,7 +25,7 @@
             <div class="right">
                 <div class="head-top">
                     <form action="">
-                        <div class='order-border'><span>订单编号：</span><input type="text" class="Buyer" v-model="params.shopOrderNo"  placeholder="请输入商品货号"> </div>
+                        <div class='order-border'><span>订单编号：</span><input type="text" class="Buyer" v-model="params.shopOrderNo"  placeholder="请输入订单编号"> </div>
                         <div class='order-border'><span>买家名称：</span><input type="text" class="Buyer" v-model="params.userName"  placeholder="请输入买家名称"> </div>
                         <div>
                             结算状态：