修改电子合同

src/App.vue

@@ -117,6 +117,11 @@ export default {
         path: '/login'
       })
     }else{
+      if(document.URL.indexOf("clientConfirm")!=-1){
+          localStorage.openMode=0
+      }else{
+        
+      }
       this.timekeeper()
       this.listeneruser()
     }

src/components/Contract/TravelContract.vue

@@ -1075,7 +1075,6 @@
                   if(this.CtObj.regulatorProvinceid>0){
                       this.GetJianAreaList(this.CtObj.regulatorProvinceid,2,1);
                   }
-
             } else {
                 this.Error(res.data.message);
             }
@@ -1189,7 +1188,6 @@
         this.CtObj.status = 1;
         this.CtObj.contractStatus=2;
         this.apiJavaPost("/api/contract/dosaveOrUpdate",this.CtObj,res => {
-                console.log(res,'ressss');
                 if (res.data.resultCode === 1) {
                     this.Success(res.data.message);
                     this.getList();
@@ -1218,7 +1216,6 @@
             }).then(() => {
                 this.CtObj.status=0;
                 this.apiJavaPost("/api/contract/dosaveOrUpdate",this.CtObj,res => {
-                    console.log(res,'ressss');
                     if (res.data.resultCode === 1) {
                         this.Success(res.data.message);
                         this.getList();
@@ -1240,6 +1237,7 @@
                 if (valid) {
                     this.SaveMsg();
                 } else {
+                    this.Error('请完成必填项');
                     return false;
                 }
             });
@@ -1247,7 +1245,6 @@
      sendAudit(){
         this.CtObj.auditContract=1;
         this.apiJavaPost("/api/contract/dosaveOrUpdate",this.CtObj,res => {
-            console.log(res,'ressss');
             if (res.data.resultCode === 1) {
                 this.Success(res.data.message);
             } else {

src/components/SalesModule/groupTourOrder.vue

@@ -1820,8 +1820,8 @@
                     </span>
 
               </div>
-              <span v-if="item.contractNum==''" class="GO_Contract" @click="goContract(item)" style="display:none">领取合同</span>
-              <span v-else class="GO_Contract" @click="goContract(item)" style="display:none">{{item.contractNum}}</span>
+              <span v-if="item.contractNum==''" class="GO_Contract" @click="goContract(item)" >领取合同</span>
+              <span v-else class="GO_Contract" @click="goContract(item)">{{item.contractNum}}</span>
             </td>
           </tr>
           <tr>
@@ -3827,6 +3827,7 @@
               this.loading = false
               this.total = res.data.data.count
               this.list = res.data.data.pageData;
+              console.log(this.list,'list');
             } else {
               this.$message.error(res.data.message)
             }

src/components/clientConfirm.vue

@@ -27,7 +27,7 @@
 .dic_content .item_content .title {width:100%;text-align:center;margin-top:20px;}
 .dic_content .item_content>label {width:100%;text-align:left;font-weight:bold;background-color:#F2F2F2;margin:30px 0;padding:8px 0;text-indent:20px;display:inline-block;font-size:16px;}
 .dic_content .item_content>span{font-size:13px;line-height:26px;margin-left:10px;}
-.dic_content .item_content .content_table {border:0;margin-top:10px;width:100%;}
+.dic_content .item_content .content_table {border:1px solid #d1d1d1;margin-top:10px;width:100%;}
 .dic_content .item_content .content_table th {background-color:#F2F2F2;}
 .dic_content .item_content .content_table th,.dic_content .item_content .content_table th td {border:1px solid #808080;text-align:center;padding:10px;}
 .dic_content .item_content font {color:blue;display:inline-block;padding:0 10px; font-size: 13px;}
@@ -58,7 +58,7 @@
 .dic_content .zhangOne{position:absolute;width:200px;top:-83px;left:160px;}
 .dic_content .zhangTwo{position:absolute;width:200px;top:-60px;left:80px;}
 .dic_content .comonTb td{padding:15px 0;}
-.dic_content .remindInfo{position:absolute;top:42%;left:25%;font-size:60px;color:#FF7F7F;letter-spacing:20px;}
+.dic_content .remindInfo{position:absolute;top:42%;left:35%;font-size:60px;color:#FF7F7F;letter-spacing:20px;}
 .dic_content .signName{position:relative;top:10px;width:140px;}
 .dic_content .LRTB td:nth-child(odd){text-align:right;padding-right:20px;}
 .dic_content .LRTB td:nth-child(even){text-align:left;padding-left:20px;}
@@ -69,7 +69,7 @@
 #canvas {
   width: 100%;
   height: 100%;
-  position: relative;
+  /* position: relative; */
 }
 #canvas canvas {
   display: block;
@@ -90,9 +90,9 @@
 }
 .CV_Btn{
     color: #fff;
-    padding: 0 15px;
-    height: 30px;
+    padding: 10px 30px;
     background: #E95252;
+    font-size:30px;
     border: 1px solid #E95252;
     cursor: pointer;
     border-radius: 15px;
@@ -106,7 +106,9 @@
 }
 .CliConfirmBtn{
     color: #fff;
-    height: 30px;
+    height: 60px;
+    width:150px;
+    font-size:27px;
     background: #E95252;
     border: 1px solid #E95252;
     border-radius: 15px;
@@ -898,7 +900,7 @@
         this.msg.orderID = this.$route.query.orderID;
         var h = window.screen.height;
         var cHeight=document.getElementsByClassName("CliSignDiv")[0];
-        cHeight.style.height=600+'px';
+        cHeight.style.height=700+'px';
         this.getList();
         this.getCanvas();
     }