123

igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.css

@@ -79,6 +79,7 @@
     height: 32px;
     width: 100%;
     padding-left: 12px;
+    padding-right: 12px;
     box-sizing: border-box;
     line-height: 32px;
     font-family: PingFangSC-Regular;

igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.html

@@ -103,8 +103,8 @@
 						<div class="license-uploader">
 							<img v-if="imageUrl" :src="imageUrl" class="license">
 							<div class="license-uploader-icon" v-else>
-								<img :src="applyInfo.businessLicensePic ? applyInfo.businessLicensePic : \'/imgs/indent/pdf.png\'"
-									alt="" @click="window.open(applyInfo.businessLicensePdf)">
+								<img :src="applyInfo.businessLicensePic ? applyInfo.businessLicensePic : \'/imgs/indent/materialNull.png\'"
+									alt="" @click="openPdf(applyInfo.businessLicensePdf)">
 							</div>
 						</div>
 						<p>营业执照</p>
@@ -113,8 +113,8 @@
 						<div class="license-uploader">
 							<img v-if="imageUrl" :src="imageUrl" class="license">
 							<div class="license-uploader-icon" v-else>
-								<img :src="deliveryInfo.gzwtsUrl?deliveryInfo.gzwtsUrl:\'/imgs/indent/jpg.png\'" alt=""
-									@click="window.open(deliveryInfo.gzwtsUrl)">
+								<img :src="deliveryInfo.gzwtsUrl?deliveryInfo.gzwtsUrl:\'/imgs/indent/materialNull.png\'" alt=""
+									@click="openPdf(deliveryInfo.gzwtsUrl)">
 							</div>
 						</div>
 						<p>委托书</p>
@@ -124,8 +124,8 @@
 						<div class="license-uploader">
 							<img v-if="imageUrl" :src="imageUrl" class="license">
 							<div class="license-uploader-icon" v-else>
-								<img :src="deliveryInfo.smwjUrl?deliveryInfo.smwjUrl:\'/imgs/indent/jpg.png\'" alt=""
-									@click="window.open(deliveryInfo.smwjUrl)>
+								<img :src="deliveryInfo.smwjUrl?deliveryInfo.smwjUrl:\'/imgs/indent/materialNull.png\'" alt=""
+									@click="openPdf(deliveryInfo.smwjUrl)">
 							</div>
 						</div>
 						<p>优先权证明</p>
@@ -134,7 +134,7 @@
 								<div class="license-uploader">
 									<img v-if="imageUrl" :src="imageUrl" class="license">
 									<div class="license-uploader-icon" v-else>
-										<img :src="applyInfo.identityCardPic?applyInfo.identityCardPic:\'/imgs/indent/jpg.png\'"
+										<img :src="applyInfo.identityCardPic?applyInfo.identityCardPic:\'/imgs/indent/materialNull.png\'"
 											alt="">
 									</div>
 								</div>

igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.js

@@ -306,7 +306,6 @@
                 channelUserId: "",
                 itemName: '',
                 deliveryStatus: "",
-                totalSum: "",
                 /*大类下标 */
                 nclIndex: "",
                 editNcl: {},
@@ -329,7 +328,7 @@
                 /*修改验证 对应表单的值 */
                 popupValue: "",
                 /**订单付款信息 */
-                receiptVoucher: "",
+                receiptVoucher: {},
             }
         },
     mounted: function() {
@@ -444,7 +443,9 @@
                     this.form = JSON.parse(JSON.stringify(this.deliveryInfo));
                     this.editDeliveryInfo = JSON.parse(JSON.stringify(this.deliveryInfo));
                     this.form.tmFormType = Number(this.form.tmFormType);
+                    if(d.data.receiptVoucher.length>0){
                         this.receiptVoucher = d.data.receiptVoucher[0];
+                    }
                     switch (this.form.tmFormType) {
                         case 3:
                             this.brandType = "文字";
@@ -518,6 +519,7 @@
                     break;
                 case 2:
                     this.headerInfo = "商标类别";
+                    this.popupValue = "form";
                     break;
                 case 3:
                     this.headerInfo = "交官文件";
@@ -1365,15 +1367,22 @@
             this.checkedNcl = [];
             this.nclSearch();
         },
+        openPdf(v){
+            if(v){
+                window.open(v);
+            }else{
+                this.$message.warning("您还没有上传相关材料");
+            }
+        },
         submitEdit(v, agree){
             console.log(v);
             this.$nextTick(() => {
+                if(this.$refs[this.popupValue].validate){
                     this.$refs[this.popupValue].validate(valid => {
                         if (valid) {
                             console.log(valid);
                             switch (v) {
     
-
                                 case '商标信息':
                                     /* 
                                         this.form.channelUserId = this.channelUserId;
@@ -1514,6 +1523,10 @@
                             return false;
                         }
                     });
+                }else{
+
+                }
+                
             });
 
         },