供应商发货 添加商品资质信息~

src/main/resources/static/css/supplier-center/order/qualifications-details.css

@@ -11,11 +11,11 @@
     .qualifications-content .list-view.margin{margin-bottom: 20px;}
     .qualifications-content .list-view-label{width: 74px;min-height: 44px;line-height:44px;font-size: 14px;color: #627386;float: left;}
     .qualifications-content .list-view-text{width:500px;min-height: 44px;line-height:44px;font-size: 14px;color: #22272e;float: left;}
-    .qualifications-content .list-file-view{width:500px;min-height: 30px;line-height:30px;font-size: 14px;color: #22272e;float: left;}
+    .qualifications-content .list-file-view{width:500px;min-height: 44px;line-height:44px;font-size: 14px;color: #22272e;float: left;}
     .qualifications-content .list-view-image{width:112px;height: 80px;display: block;float: left;margin-right: 16px;margin-bottom: 16px;}
     .qualifications-content .list-view-image:nth-child(4n){margin-right: 0;}
     .qualifications-btn{width: 100%;height: 36px;float: left;margin-top: 100px;}
-    .qualifications-btn .edit-button{width: 156px;height: 36px;margin: 0 auto;font-size: 14px;background-color: #E15616;color: #FFFFFF;text-align: center;line-height: 36px;}
+    .qualifications-btn .edit-button{width: 156px;height: 36px;margin: 0 auto;font-size: 14px;background-color: #E15616;color: #FFFFFF;text-align: center;line-height: 36px;cursor: pointer;}
 }
 
 /*移动*/

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

@@ -31,12 +31,12 @@
     .qualifications-content .upload-image{width: 92px;height: 66px;float: left;margin-right: 7px;margin-bottom: 7px;border: solid 1px #b8bfca;box-sizing: border-box;cursor: pointer;position: relative;}
     .qualifications-content .list-view-image{width: 100%;height: 100%;display: block;}
     .qualifications-content .list-view-image:nth-child(4n){margin-right: 0;}
-    .qualifications-content .list-btn{width: 156px;height: 36px;cursor: pointer;box-sizing: border-box;border: 1px solid #E15616;line-height: 36px;color: #E15616;margin: 0 auto;border-radius: 2px;padding: 10px 37px;}
+    .qualifications-content .list-btn{width: 156px;height: 36px;cursor: pointer;box-sizing: border-box;border: 1px solid #E15616;line-height: 36px;color: #E15616;margin: 0 auto;border-radius: 2px;padding: 10px 37px;cursor: pointer;}
     .qualifications-content .list-btn .i-span{width: 16px;height: 16px;display: block;border-radius: 50%;border: 1px solid #E15616;box-sizing: border-box;text-align: center;line-height: 13px;font-size: 14px;float: left;}
     .qualifications-content .list-btn .p-span{display: block;float: right;line-height: 16px;height: 16px;}
     .qualifications-btn{width: 100%;height: 36px;float: left;margin-top: 100px;}
-    .qualifications-btn .cancel-button{width: 232px;height: 50px;float: left;font-size: 14px;box-sizing: border-box;border: 1px solid #E15616;background-color: #ffe6dc;color: #E15616;text-align: center;line-height: 50px;}
-    .qualifications-btn .edit-button{width: 232px;height: 50px;float: right;font-size: 14px;background-color: #E15616;color: #FFFFFF;text-align: center;line-height: 50px;}
+    .qualifications-btn .cancel-button{width: 232px;height: 50px;float: left;font-size: 14px;box-sizing: border-box;border: 1px solid #E15616;background-color: #ffe6dc;color: #E15616;text-align: center;line-height: 50px;cursor: pointer;}
+    .qualifications-btn .edit-button{width: 232px;height: 50px;float: right;font-size: 14px;background-color: #E15616;color: #FFFFFF;text-align: center;line-height: 50px;cursor: pointer;}
 }
 
 /*移动*/

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

@@ -14,7 +14,10 @@ var addlogistics = new Vue({
                 recordId:'',
                 sn:'',
                 fileList:[],
-                imageList:[]
+                imageList:[
+                    'https://dss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=1194131577,2954769920&fm=26&gp=0.jpg',
+                    'https://dss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=1194131577,2954769920&fm=26&gp=0.jpg'
+                ]
             }
         ]
     },
@@ -55,6 +58,10 @@ var addlogistics = new Vue({
         editButtonConfim:function(){//确定添加商品资质信息
             var _this = this;
             var params = [];
+            var isRecordId = false;
+            var isSnCode = false;
+            var isFileList = false;
+            var isImageList = false;
             _this.qualificationsList.forEach(function(el,index){
                 var obj = {
                         recordId : el.recordId,
@@ -64,21 +71,43 @@ var addlogistics = new Vue({
                     };
                 params.push(obj)
             });
+            if(isRecordId){
+                CAIMEI.dialog('请选择商品');
+                return
+            }
+            if(isSnCode){
+                CAIMEI.dialog('请输入商品SN码');
+                return
+            }
+            if(isFileList && isImageList){
+                CAIMEI.dialog('请上传商品资质文件');
+                return
+            }
+            console.log('params========>',params)
             SupplierApi.GetSupplierQualificationUpdata({ params:JSON.stringify(params) },function(response){
                 if(response.code == 0 ){
                     CAIMEI.dialog('保存资质成功');
+                    setTimeout(function(){
+                        window.location.href = '/supplier/order/delivery_record.html?shopOrderID='+_this.shopOrderId;
+                    },2000);
                 }else{
                     CAIMEI.Alert(response.msg, '确定', false);
                 }
             })
         },
+        hanldSnCodeChecked: function(e){//校验SN码格式错误
+            if(!this.$reg.isNoChinese(e.detail.value)){
+                this.$util.msg('SN码格式错误',2000);
+                return
+            }
+        },
         showViewerImageFn: function(index,imageIndex ){//预览图片
             var _this = this;
             var DomEven = '#listViewImage'+index+''+imageIndex;
             var ViewerDom = document.querySelector(DomEven);
             _this.viewer = new Viewer(ViewerDom, {url:'data-image'});
         },
-        showGoodSelect:function(){
+        showGoodSelect:function(){//显示选择商品下拉框
             var _this = this;
             _this.selectGoods = !_this.selectGoods;
         },

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

@@ -13,7 +13,7 @@
 <template th:replace="components/header"></template>
 
 <!-- 我的采美 -->
-<div id="qualifications">
+<div id="qualifications" v-cloak>
     <div class="navLayout">
         <div class="crumbs" v-if="isPC">
             <span>我的交易</span>
@@ -31,7 +31,7 @@
             </div>
             <div class="right">
                 <div class="qualifications-content clear">
-                    <div class="qualifications-title">若发货商品内存在仪器类商品，建议填写下列商品信息再发货</div>
+                    <div class="qualifications-title">若发货商品内存在仪器类商品，建议填写下列商品信息。</div>
                     <div class="list clear" v-for="(item,index) in qualificationsList" :key="index">
                         <div class="list-view-title">
                             <div class="title-left">商品{{ index+1 }}</div>
@@ -66,7 +66,7 @@
                                     <input :ref="'QualificationsFile'+index"
                                            type="file" name="file"
                                            class="input-file"
-                                           accept="*.pdf*.doc*.docx"
+                                           accept="*.pdf/*.doc*/.docx"
                                            @change="uploadFileFn(index,item.fileList,$event)"
                                     >
                                 </div>

src/main/resources/templates/supplier-center/order/qualifications-details.html

@@ -13,7 +13,7 @@
 <template th:replace="components/header"></template>
 
 <!-- 我的采美 -->
-<div id="qualifications">
+<div id="qualifications" v-cloak>
     <div class="navLayout">
         <div class="crumbs" v-if="isPC">
             <span>我的交易</span>
@@ -35,17 +35,17 @@
                         <div class="list-view-title">商品{{ index+1 }}</div>
                         <div class="list-view">
                             <div class="list-view-label">商品:</div>
-                            <div class="list-view-text">{{ item.name }}</div>
+                            <div class="list-view-text">{{ item.productName }}</div>
                         </div>
                         <div class="list-view">
                             <div class="list-view-label">SN码:</div>
-                            <div class="list-view-text">{{ item.code }}</div>
+                            <div class="list-view-text">{{ item.sn }}</div>
                         </div>
                         <div class="list-view margin">
                             <div class="list-view-label">资质文件:</div>
                             <div class="list-view-text">
                                <div class="list-file-view" v-for="(file,fileIndex) in item.fileList" :key="fileIndex">
-                                   {{ file.ossName }}
+                                   {{ file.fileName }}
                                </div>
                             </div>
                         </div>