供应商

src/main/resources/static/css/supplier-center/logistics-detail.css

@@ -64,7 +64,7 @@
     .protitle {
         color: #22272e;
         font-size: 16px;
-        padding: 15px
+        padding: 15px 20px;
     }
 
     .product ul li {
@@ -83,7 +83,7 @@
     }
 
     .product {
-        padding: 0 15px;
+        padding: 0 21px;
         background: #fff;
         overflow: hidden;
         padding-bottom: 30px;
@@ -197,13 +197,12 @@
     .delivery-logis-title{
         color: #22272e;
         font-size: 16px;
-        padding: 15px
+        padding: 15px 20px;
     }
     .logistics-info{
         background: #fff;
-        padding: 15px;
+        padding: 15px 20px;
         color: #627386;
-        margin-bottom: 20px;
         box-shadow: 0px 3px 6px 0px
 		rgba(0, 0, 0, 0.07);
     }

src/main/resources/static/css/supplier-center/logistics.css

@@ -136,18 +136,26 @@
         -webkit-box-orient: vertical
     }
     .add-logistics{
-       height: 395px;
+       height: auto;
         background-color: #ffffff;
         box-shadow: 0px 3px 6px 0px
             rgba(0, 0, 0, 0.07);
         margin-top: 20px;
-        padding: 0 20px;
+        padding: 20px;
         color: #627386;
     }
-    .company-number div{
+    .company-number{
+        display: flex;
+        width: 100%;
+    }
+    .logist-right>div{
+        margin-top: 5px;
+    }
+    .company-number>div{
         width: 49%;
         display: inline-block;
         margin: 2px 0;
+        flex: 2;
     }
     .company{
         width: 210px;
@@ -156,7 +164,8 @@
         border-radius: 2px;
         border: solid 1px #b8bfca;
         color: #627386;
-        padding-left: 10px
+        padding-left: 10px;
+        cursor: pointer;
     }
     input::placeholder,textarea::placeholder {
         color: #627386;
@@ -309,6 +318,24 @@
          top: 109px;
          color: #9aa5b5
      }
-
+     .defineBtn button{
+        width: 90px;
+        height: 36px;
+        line-height: 36px;
+        text-align: center;
+        color: #fff;
+        background-color: #e15616;
+        border-radius: 2px;
+        border: solid 1px #e15616;
+        cursor: pointer;
+        margin-right: 15px
+     }
+     .defineBtn{
+        overflow: hidden;
+        padding: 20px;
+     }
+     .defineBtn>div{
+        float: right;
+     }
 
 }

src/main/resources/static/css/supplier-center/record.css

@@ -64,7 +64,7 @@
     .protitle {
         color: #22272e;
         font-size: 16px;
-        padding: 15px
+        padding: 15px 20px;
     }
 
     .product ul li {
@@ -83,9 +83,11 @@
     }
 
     .product {
-        padding: 0 15px;
+        padding: 0 20px;
         background: #fff;
         overflow: hidden;
+        box-shadow: 0px 3px 6px 0px
+		rgba(0, 0, 0, 0.07);
     }
 
     .product-title {
@@ -157,7 +159,7 @@
         height: 100%;
     }
     .img-remark{
-        margin: 30px 0;
+        margin: 20px 0;
     }
     .remark {
         color: #627386;

src/main/resources/static/js/common/serviceapi/supplier.service.js

@@ -49,7 +49,7 @@ var SupplierApi = {
                 callback(res);
             });
         },
-        tiyixi: function (params, callback) {//发货/添加物流页 确定提交订单列表
+        addLogistics: function (params, callback) {//发货/添加物流页 确定提交订单列表
             Http.AjaxService({ url:'/supplier/addLogistics', type:'post', data:params, json:false, mask:true,replace:true})
             .then(function(res){
                 callback(res);

src/main/resources/static/js/supplier-center/logistics-add.js

@@ -0,0 +1,155 @@
+var isPC = ($(window).width()>768);
+jqMultipleShow("click", ".navList", ".tab", ".con");
+var addlogistics = new Vue({
+    el:'#addlogistics',
+    data:{
+         open:false,
+         userInfo:{},
+         orderList:[],
+         logisticsBatch:{},
+         GoodsImagesList:[],
+         formData:new FormData(),
+         txtVal: 0,
+         desc:'',
+         kdlist:[],
+         logisticList:[
+             {
+                value:'',
+                name:'',
+                numList:[
+                    {number:''}
+                ]
+             }
+         ],
+         params:{
+            logistics:[],//物流
+            logisticsBatchID:'',
+            remarkImage:'',
+            remark:''
+         },
+         select:'',
+         electShow:false,
+    },
+    methods:{
+         uploadGoodsImagesFn: function(event){//上传商品图片
+            var _this = this;
+            var inputDOM = _this.$refs.goodsImages;
+            var file = inputDOM.files;
+            _this.formData.append('file', file[0]);
+            SupplierApi.uploadimg(_this.formData,function(response){
+               _this.GoodsImagesList.push(response.data);
+               _this.params.remarkImage =_this.GoodsImagesList.toString()+'##';
+                event.target.value = '';
+            });
+        },
+         removeGoodsImagesFn: function(index){//删除商品图片
+            var _this = this;
+            _this.GoodsImagesList.splice(index,1);
+             _this.params.remarkImage =_this.GoodsImagesList.toString()+',';
+         },
+         selshow:function(event,index){
+            this.select = index;
+            this.electShow = !this.electShow
+         },
+         addBtn:function () { //添加物流
+             var _this = this;
+             var obj = {
+                        value:'',
+                        name:'',
+                        numList:[
+                            {number:''}
+                        ]
+                  };
+              _this.logisticList.push(obj);
+         },
+         addNum:function(item,index){
+            var _this = this;
+            var obj = {number:''};
+            item.numList.push(obj);
+         },
+         subBtn:function (list) {
+            var _this = this;
+             _this.kdlist.splice(_this.kdlist.indexOf(list), 1);
+         },
+         reduceBtn:function(item){
+            var _this = this;
+             item.numList.splice(item.numList.indexOf(item.numList), 1);
+         },
+         parameter:function(){//参数信息
+           var _this = this;
+           // _this.params.info.shopOrderId = $('.pro-information li').attr('shopOrderID');
+           // $('.pro-information li').each(function(){//发货数
+           //      var productobj={};
+           //        productobj.orderProductId = $(this).attr('orderproductid');
+           //        productobj.num = $(this).find('.del-num').text();
+           //        _this.params.record.push(productobj)
+           //  });
+            _this.logisticList.forEach(function (pros) {
+                    var obj = {};
+                    var Code = pros.value;
+                    var yName = pros.name;
+                    var numList = pros.numList;
+                    numList.forEach(function (item) {
+                        var logisNum = item.number;
+                         obj={
+                            logisticsCompanyCode:Code,
+                            logisticsCompanyName:yName,
+                            number:logisNum
+                        };
+                         _this.params.logistics.push(obj);
+                     })
+              })
+         },
+         ChangeLogistics:function(event,item,index){
+             var donClass = '#logistics'+index;
+             var domLogistics =  document.querySelector(donClass);
+             item.name = domLogistics.options[domLogistics.selectedIndex].text;
+             item.value =event.target.value;
+         },
+         turnBtn:function () {//提交发货
+            var _this = this;
+                _this.parameter();
+                console.log(_this.params)
+                var params = JSON.stringify(_this.params);
+            SupplierApi.addLogisticsInfo({params:params},function (res) {
+                if(res.code == 0) {
+                setTimeout(function () {
+                        CAIMEI.dialog('发货成功')
+                    })
+                     window.location.href = '/supplier/order/delivery_record.html?shopOrderID='+_this.params.info.shopOrderId;
+                  }else {
+
+                  }
+             })
+
+         },
+    },
+    mounted:function () {
+      var _self = this;
+      var shopOrderId=CAIMEI.getUrlParam('shopOrderId');
+      var logisticsBatchId=CAIMEI.getUrlParam('logisticsBatchId');
+      _self.params.logisticsBatchID =logisticsBatchId;
+      SupplierApi.logisticsInfo({logisticsBatchId:logisticsBatchId,shopOrderId:shopOrderId},function (res) {
+        if(res.code==0){
+            _self.userInfo = res.data.userInfo;
+            _self.logisticsBatch = res.data.logisticsBatch;
+            _self.params.remark =_self.logisticsBatch.remark
+            _self.GoodsImagesList =  _self.logisticsBatch.remarkImages;
+            _self.orderList = res.data.logisticsBatch.logisticsRecordList;
+        }
+      })
+      SupplierApi.kdList(function (res) {
+         if(res.code==0){
+            var data = res.data;
+            data.forEach(function(item){
+               _self.kdlist.push(item);
+            });
+          console.log(_self.kdlist.length);
+         }
+      });
+      if(isPC){
+            _self.open=true;
+        }
+
+    }
+})

src/main/resources/static/js/supplier-center/logistics-detail.js

@@ -2,8 +2,8 @@ var logisticsDetail  = new Vue({
     el:'#logisticsDetail',
     data:{
         params:{
-            logisticsBatchId:834,
-            shopOrderId:16089
+            logisticsBatchId:'',
+            shopOrderId:''
         },
         userInfo:{},
         listData:[]
@@ -11,8 +11,8 @@ var logisticsDetail  = new Vue({
     methods:{},
     mounted:function () {
     var _self=this;
-    // _self.params.shopOrderId=CAIMEI.getUrlParam('shopOrderID');
-    // _self.params.logisticsBatchID=CAIMEI.getUrlParam('logisticsBatchID');
+     _self.params.logisticsBatchId=CAIMEI.getUrlParam('logisticsBatchId');
+     _self.params.shopOrderId=CAIMEI.getUrlParam('shopOrderId');
         SupplierApi.logisticsInfo(_self.params,function (res) {
                 if(res.code==0){
                     _self.userInfo = res.data.userInfo;

src/main/resources/static/js/supplier-center/logistics.js

@@ -11,24 +11,26 @@ var logistics = new Vue({
          txtVal: 0,
          desc:'',
          kdlist:[],
-         setkdlist:[],
-         codeNum:0,
+         logisticList:[
+             {
+                value:'',
+                name:'',
+                numList:[
+                    {number:''}
+                ]
+             }
+         ],
          params:{
-            logistics:[//物流
-                {logisticsCompanyCode:''},
-                {logisticsCompanyName:''},
-                {number:''}
-            ],
-            record:[
-                {orderProductId:''},
-                {num:''}
-            ],
+            logistics:[],//物流
+            record:[],
             info:{
                 image:'',
                 note:'',//备注
                 shopOrderId:'',//商品id
             }
-         }
+         },
+         select:'',
+         electShow:false,
     },
     methods:{
          uploadGoodsImagesFn: function(event){//上传商品图片
@@ -38,41 +40,102 @@ var logistics = new Vue({
             _this.formData.append('file', file[0]);
             SupplierApi.uploadimg(_this.formData,function(response){
                _this.GoodsImagesList.push(response.data);
-               _this.secondParams.image1 =_this.GoodsImagesList.toString()+',';
+               _this.params.info.image =_this.GoodsImagesList.toString()+'##';
                 event.target.value = '';
             });
         },
          removeGoodsImagesFn: function(index){//删除商品图片
             var _this = this;
             _this.GoodsImagesList.splice(index,1);
-            _this.secondParams.image1 =_this.GoodsImagesList.toString()+',';
+             _this.params.info.image =_this.GoodsImagesList.toString()+',';
          },
-         descInput:function () {
-             this.txtVal = this.desc.length;
+         selshow:function(event,index){
+            this.select = index;
+            this.electShow = !this.electShow
          },
-         addBtn:function (list) { //添加物流
+         addBtn:function () { //添加物流
              var _this = this;
-              _this.setkdlist.push(list);
-              console.log(_this.setkdlist)
+             var obj = {
+                        value:'',
+                        name:'',
+                        numList:[
+                            {number:''}
+                        ]
+                  };
+              _this.logisticList.push(obj);
          },
-         addNum:function(){
+         addNum:function(item,index){
             var _this = this;
-                _this.codeNum++;
-                console.log( _this.codeNum)
+            var obj = {number:''};
+            item.numList.push(obj);
          },
          subBtn:function (list) {
             var _this = this;
-             _this.setkdlist.splice(_this.setkdlist.indexOf(list), 1);
-         }
+             _this.kdlist.splice(_this.kdlist.indexOf(list), 1);
+         },
+         reduceBtn:function(item){
+            var _this = this;
+             item.numList.splice(item.numList.indexOf(item.numList), 1);
+         },
+         parameter:function(){//参数信息
+           var _this = this;
+           _this.params.info.shopOrderId = $('.pro-information li').attr('shopOrderID');
+           $('.pro-information li').each(function(){//发货数
+                var productobj={};
+                  productobj.orderProductId = $(this).attr('orderproductid');
+                  productobj.num = $(this).find('.del-num').text();
+                  _this.params.record.push(productobj)
+            });
+            _this.logisticList.forEach(function (pros) {
+                    var obj = {};
+                    var Code = pros.value;
+                    var yName = pros.name;
+                    var numList = pros.numList;
+                    numList.forEach(function (item) {
+                        var logisNum = item.number;
+                         obj={
+                            logisticsCompanyCode:Code,
+                            logisticsCompanyName:yName,
+                            number:logisNum
+                        };
+                         _this.params.logistics.push(obj);
+                     })
+              })
+         },
+         ChangeLogistics:function(event,item,index){
+             var donClass = '#logistics'+index;
+             var domLogistics =  document.querySelector(donClass);
+             item.name = domLogistics.options[domLogistics.selectedIndex].text;
+             item.value =event.target.value;
+         },
+         turnBtn:function () {//提交发货
+            var _this = this;
+                _this.parameter();
+                var params = JSON.stringify(_this.params);
+            SupplierApi.addLogistics({params:params},function (res) {
+                if(res.code == 0) {
+                setTimeout(function () {
+                        CAIMEI.dialog('发货成功')
+                    })
+                     window.location.href = '/supplier/order/delivery_record.html?shopOrderID='+_this.params.info.shopOrderId;
+                  }else {
 
+                  }
+             })
+
+         },
     },
     mounted:function () {
       var _self = this;
           SupplierApi.kdList(function (res) {
-                 if(res.code==0){
-                  _self.kdlist = res.data
-                 }
-               })
+             if(res.code==0){
+                var data = res.data;
+                data.forEach(function(item){
+                   _self.kdlist.push(item);
+                });
+              console.log(_self.kdlist.length);
+             }
+          });
       if(isPC){
             _self.open=true;
         }

src/main/resources/static/js/supplier-center/record.js

@@ -61,20 +61,30 @@ var deliveryRecode = new Vue({
                 var logisticsBatchPage = res.data.logisticsBatchPage;
                 if(logisticsBatchPage.results==''){
                      _this.results = [];
-                     // _this.isShow = true
+                     _this.isShow = true
                 }else {
                     _this.results = logisticsBatchPage.results;
-                    // _this.isShow = false
+                    _this.isShow = false
                 }
             }
          })
         },
         seelogistic:function (logisticsBatchID,shopOrderID) {//查看物流
-           window.location.href='/supplier/order/logistics/detail.html?logisticsBatchID='+logisticsBatchID
-        //   +'&shopOrderId='+shopOrderID+''
+           window.location.href='/supplier/order/logistics/detail.html?logisticsBatchId='+logisticsBatchID+'&shopOrderId='+shopOrderID+''
         },
-        addlogistic:function () {
-
+        addlogistic:function (logisticsBatchID,shopOrderID) {
+            setTimeout(function(){
+                    window.location.href = '/supplier/order/logistics/add.html?logisticsBatchId='+logisticsBatchID+'&shopOrderId='+shopOrderID+'';
+                },200)
+        },
+        Revoke:function (logisticsBatchID,shopOrderID) {//撤销发货
+             CAIMEI.Modal('确定要撤销这次发货吗？撤销后需要重新进行发货。','取消','确定',function () {
+                 SupplierApi.cancelShipment({logisticsBatchId:logisticsBatchID},function (res) {
+                    console.log(res);
+                     CAIMEI.dialog('撤销成功')
+                     window.location.reload();
+                 })
+             })
         }
     },
     mounted:function () {

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

@@ -44,10 +44,10 @@
                 </div>
                 <div class="record-product">
                     <div class="protitle">发货记录</div>
-<!--                        <div class="no-delivery-record" v-if="isShow">-->
-<!--                            <img src="/img/order/kon.png">-->
-<!--                            <p>此订单还没有发货记录，快去<span>补充</span>他吧</p>-->
-<!--                        </div>-->
+                        <div class="no-delivery-record" v-if="isShow">
+                            <img src="/img/order/kon.png">
+                            <p>此订单还没有发货记录，快去<span>补充</span>他吧</p>
+                        </div>
                     <div class="product"   v-for="r in results">
                         <ul class="product-title">
                             <li>商品信息</li>
@@ -83,8 +83,9 @@
                             </p>
                         </ul>
                         <div class="record-button">
-                            <button class="view-logistics" type="button" @click="seelogistic(r.id)">查看物流</button>
-                            <button class="add-logistics" type="button" @click="addlogistic">添加物流</button>
+                            <button class="view-logistics" type="button" @click="seelogistic(r.id,r.shopOrderID)">查看物流</button>
+                            <button class="add-logistics" type="button" @click="addlogistic(r.id,r.shopOrderID)">添加物流</button>
+                            <button class="cancellation-logistics" type="button" v-if="r.mailer == 1" @click="Revoke(r.id,r.shopOrderID)">撤销发货</button>
                         </div>
                     </div>
                 </div>

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

@@ -76,8 +76,7 @@
                         </div>
                         <div class="allcheck">
                             <div class="all-election">
-                                <input type="checkbox" @change="ckeckAll()" v-model="allChecked"/>
-                                全选
+                                <input type="checkbox" @change="ckeckAll()" v-model="allChecked"/>&nbsp;&nbsp;全选
                             </div>
                             <div class="delivery-button">
                                 <button class="delivery" type="button" @click="delivery">发货</button>

src/main/resources/templates/supplier-center/order/logistics-add.html

@@ -4,21 +4,134 @@
 <head>
     <title>采美365网-中国美业全方位线上交易服务互动平台，做美业，上采美</title>
     <template th:replace="components/head-link"></template>
-
+    <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/supplier-center/logistics.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
 <!-- 引用头部 -->
 <template th:replace="components/header"></template>
 
 <!-- 我的采美 -->
-<div>
-    <h1>添加物流</h1>
-
-</div>
-
-<!-- 引入底部 -->
-<template th:replace="components/footer"></template>
-<template th:replace="components/foot-link"></template>
+<div id="addlogistics">
+    <div class="navLayout">
+        <div class="crumbs" v-if="isPC">
+            <span>我的交易</span>
+            <span>&gt;</span>
+            <span>我的订单</span>
+            <span>&gt;</span>
+            <span>添加物流</span>
+        </div>
+        <div class="wrap clear">
+            <!--左侧面包屑-->
+            <div v-show="open">
+                <template th:replace="supplier-center/components/tableft"></template>
+            </div>
+            <div class="right">
+                <div class="userinfo">
+                    <p class="info">
+                        <span>买家信息</span>
+                        <button type="button" class="comback" @click="history.go(-1)">返回</button>
+                    </p>
+                    <div class="user">
+                        <p>买家名称：<span>{{userInfo.name}}</span></p>
+                        <p>收货人：<span>{{userInfo.shouHuoRen}}</span></p>
+                        <p>联系方式：<span>{{userInfo.mobile}}</span></p>
+                    </div>
+                    <p class="address">收货地址：<span>{{userInfo.address}}</span></p>
+                </div>
+                <div class="product-info">
+                    <div class="price">
+                        <p class="protitle">商品信息</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="order in orderList " :shopOrderID="order.shopOrderID" :orderProductId = 'order.orderProductID'>
+                                <div class="product-img">
+                                    <img :src="order.image"/>
+                                    <h3>{{order.productName}}</h3>
+                                </div>
+                                <div>{{order.buyNum}}</div>
+                                <div>{{order.shipmentsNum}}</div>
+                                <div>{{order.notShippedNum}}</div>
+                                <div class="del-num">{{order.num}}</div>
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+                <div class="add-logistics">
+                    <div class="add-wrap">
+                        <div class="company-number" v-for="(item,index) in logisticList" :key="index">
+                            <div class="logist-left">
+                                <i class="red icon">*</i>
+                                物流公司：
+                                <select name="" :id="'logistics'+ index" class="logistics-company-name company" @change="ChangeLogistics($event,item,index)">
+                                <option value="0">请选择</option>
+                                    <option v-for="(kd,kdIndex) in kdlist" :key="kdIndex" :value="kd.value" :name='kd.label'>{{kd.label}}</option>
+                                </select>
+                                <button class="add-company companyBtn" @click="addBtn()"v-if="index==0">+</button>
+                                <button class="add-company companyBtn" @click="subBtn(kd)" v-else>-</button>
+                            </div>
+                            <div class="logist-right">
+                                <div v-for="(num,numIndex) in item.numList" :key="numIndex">
+                                    <i class="red">*</i>
+                                    物流编号：
+                                    <input type="text" v-model="num.number" class="logistics-order-number company" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入物流编号">
+                                    <button class="add-number companyBtn" @click="addNum(item,numIndex)" v-if="numIndex==0">+</button>
+                                    <button class="add-number companyBtn" v-else @click="reduceBtn(item)">-</button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="upload-img">
+                        <div class="release-from ">
+                            <span class="red-color">&nbsp;图片备注：</span>
+                            <div class="release-input" id="uploadGoodsImages">
+                                <div class="upload-file" v-for="(item, index) in GoodsImagesList" :key="index">
+                                    <img :data-original='item' :src="item" :data-image="item" alt="" class="upload-img">
+                                    <i class="icon mIcon del" @click="removeGoodsImagesFn(index)"></i>
+                                </div>
+                                <div class="upload-file" v-show="GoodsImagesList.length<5">
+                                    <i class="icon mIcon add"></i>
+                                    <p class="add-text">添加图片</p>
+                                    <input ref="goodsImages" type="file" name="file" value="" class="input-file"
+                                           accept="image/png,image/jpeg,image/gif,image/jpg"
+                                           @change="uploadGoodsImagesFn">
+                                </div>
+                                <div class="form-upload-tips">
+                                    <i class="icon mIcon icon-wen"></i>
+                                    <div class="wen-tips">请备注快递单，发货现场和货物的照片，最多10张</div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="remarks">
+                        <span class="rema">备注：</span>
+                        <textarea maxlength="200" placeholder="文字备注，200字以内" v-model="params.remark"></textarea>
+                        <div class="size-num">{{params.remark.length}}/200</div>
+                    </div>
+                    <div class="defineBtn">
+                        <div>
+                            <button type="button" @click="turnBtn">确定</button>
+                            <button type="button" @click="history.go(-1)">取消</button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    </div>
 
+    <!-- 引入底部 -->
+    <template th:replace="components/footer"></template>
+    <template th:replace="components/foot-link"></template>
+    <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/supplier.service.js(v=${version})}"></script>
+    <script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/logistics-add.js(v=${version})}"></script>
 </body>
 </html>

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

@@ -87,9 +87,9 @@
                                 <div class="logistics-company">物流公司：{{logis.logisticsCompanyName}}</div>
                                 <div class="logistics-number">物流单号：{{logis.nu}}</div>
                             </div>
-                            <div class="logistics-record" v-if="listData.logisticsInformationList.length==0">
-                              <p>暂无物流信息</p>
-                            </div>
+<!--                            <div class="logistics-record" v-if="listData.logisticsInformationList.length==0">-->
+<!--                              <p>暂无物流信息</p>-->
+<!--                            </div>-->
                         </div>
                 </div>
             </div>

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

@@ -41,7 +41,7 @@
                 </div>
                 <div class="product-info">
                     <div class="price">
-                        <p class="protitle">商品金额</p>
+                        <p class="protitle">商品信息</p>
                     </div>
                     <div class="product">
                         <ul class="product-title">
@@ -52,7 +52,8 @@
                             <li>本次发货</li>
                         </ul>
                         <ul class="pro-information">
-                            <li v-for="order in orderList ">
+                            <li v-for="order in orderList " :shopOrderID="order.shopOrderID"
+                                :orderProductId='order.orderProductID'>
                                 <div class="product-img">
                                     <img :src="order.productImage"/>
                                     <h3>{{order.name}}</h3>
@@ -60,50 +61,38 @@
                                 <div>{{order.num}}</div>
                                 <div>{{order.shipmentsNum}}</div>
                                 <div>{{order.notOutStore - order.actualCancelNum}}</div>
-                                <div>{{order.inputVal}}</div>
+                                <div class="del-num">{{order.inputVal}}</div>
                             </li>
                         </ul>
                     </div>
                 </div>
                 <div class="add-logistics">
                     <div class="add-wrap">
-                        <div class="company-number">
+                        <div class="company-number" v-for="(item,index) in logisticList" :key="index">
                             <div class="logist-left">
-                                <i class="red">*</i>
+                                <i class="red icon">*</i>
                                 物流公司：
-                                <select name="" class="logistics-company-name company">
-                                <option value="0">请选择</option>
-                                    <option v-for="item in kdlist" :value="item.value">{{item.label}}</option>
+                                <select name="" :id="'logistics'+ index" class="logistics-company-name company"
+                                        @change="ChangeLogistics($event,item,index)">
+                                    <option value="0">请选择</option>
+                                    <option v-for="(kd,kdIndex) in kdlist" :key="kdIndex" :value="kd.value"
+                                            :name='kd.label'>{{kd.label}}
+                                    </option>
                                 </select>
-                                <button class="add-company companyBtn" @click="addBtn(kdlist)">+</button>
+                                <button class="add-company companyBtn" @click="addBtn()" v-if="index==0">+</button>
+                                <button class="add-company companyBtn" @click="subBtn(kd)" v-else>-</button>
                             </div>
-
                             <div class="logist-right">
-                                <i class="red">*</i>
-                                物流编号：
-                                <input type="text" class="logistics-order-number company"
-                                       oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入物流编号">
-                                <button class="add-number companyBtn" @click="addNum">+</button>
-                            </div>
-                        </div>
-
-                        <div class="company-number" v-for="kd in setkdlist">
-                            <div class="logist-left">
-                                <i class="red">*</i>
-                                物流公司：
-                                <select name="" class="logistics-company-name company">
-                                <option value="0">请选择</option>
-                                    <option v-for="item in kd" :value="item.value">{{item.label}}</option>
-                                </select>
-                                <button class="add-company companyBtn" @click="subBtn(kd)">-</button>
-                            </div>
-
-                            <div class="logist-right">
-                                <i class="red">*</i>
-                                物流编号：
-                                <input type="text" class="logistics-order-number company"
-                                       oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入物流编号">
-                                <button class="add-number companyBtn">-</button>
+                                <div v-for="(num,numIndex) in item.numList" :key="numIndex">
+                                    <i class="red">*</i>
+                                    物流编号：
+                                    <input type="text" v-model="num.number" class="logistics-order-number company"
+                                           oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入物流编号">
+                                    <button class="add-number companyBtn" @click="addNum(item,numIndex)"
+                                            v-if="numIndex==0">+
+                                    </button>
+                                    <button class="add-number companyBtn" v-else @click="reduceBtn(item)">-</button>
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -131,13 +120,19 @@
                     </div>
                     <div class="remarks">
                         <span class="rema">备注：</span>
-                        <textarea maxlength="200" placeholder="文字备注，200字以内"  v-model="desc" @input="descInput" ></textarea>
-                        <div class="size-num">{{txtVal = desc.length}}/200</div>
+                        <textarea maxlength="200" placeholder="文字备注，200字以内" v-model="params.info.note"></textarea>
+                        <div class="size-num">{{params.info.note.length}}/200</div>
+                    </div>
+                    <div class="defineBtn">
+                        <div>
+                            <button type="button" @click="turnBtn">确定</button>
+                            <button type="button" @click="history.go(-1)">取消</button>
+                        </div>
                     </div>
                 </div>
             </div>
         </div>
-
+    </div>
     </div>
 
     <!-- 引入底部 -->