Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/SignName.vue

@@ -142,7 +142,6 @@
       if (this.$route.query && this.$route.query.TypeStr) {
         this.msg.TypeStr = this.$route.query.TypeStr;
       }
-      console.log("this.msg", this.msg);
       this.getCanvas();
       document.getElementsByTagName('body')[0].style = "overscroll-behavior-y: contain;"
     },

src/components/discountProtocol.vue

@@ -200,7 +200,11 @@
               </td>
               <td align="right">
                 <el-button type="primary" size="medium" @click="saveData()" :loading="SaveLoading">保存</el-button>
-                <el-button type="primary" size="medium" @click="isShowFade=true;createQrCode()">生成二维码</el-button>
+                <template v-if="addMsg.ProtocolId>0">
+                  <el-button type="primary" size="medium" @click="saveCompanySign()" :loading="SaveLoading">签章
+                  </el-button>
+                  <el-button type="primary" size="medium" @click="isShowFade=true;createQrCode()">生成二维码</el-button>
+                </template>
               </td>
             </tr>
           </table>
@@ -342,7 +346,6 @@
                 this.addMsg.OrderId = tempObj.OrderId;
                 this.addMsg.GuestId = tempObj.GuestId;
                 this.addMsg.DiscountMoney = tempObj.DiscountMoney;
-                this.addMsg.GuestName = tempObj.GuestName;
                 this.addMsg.GuestIsSign = tempObj.GuestIsSign;
                 this.addMsg.GuestSignature = tempObj.GuestSignature;
                 this.addMsg.GuestSignDate = tempObj.GuestSignDate;
@@ -351,6 +354,7 @@
                 this.addMsg.CompanyImage = tempObj.CompanyImage;
                 this.addMsg.EnterName = tempObj.EnterName;
               }
+              this.addMsg.GuestName = tempObj.GuestName;
             } else {
               this.Error(res.data.message);
             }
@@ -376,6 +380,25 @@
           err => {}
         );
       },
+      //公司盖章
+      saveCompanySign() {
+        var postMsg = {
+          ProtocolId: this.addMsg.ProtocolId,
+          CompanyIsSign: 1,
+        };
+        this.apipost(
+          "traveldisProtocol_post_UpdateCompanySignature", postMsg,
+          res => {
+            if (res.data.resultCode == 1) {
+              this.Success(res.data.message);
+              this.GetData();
+            } else {
+              this.Error(res.data.message);
+            }
+          },
+          err => {}
+        );
+      },
       //生成二维码
       createQrCode() {
         let urlObj = this.domainManager();

src/components/newTravelmanager/TravelGroupControl/tripmap.vue

@@ -204,7 +204,6 @@
             }
           })
           this.citiesData = tempData;
-          console.log("citiesData_2", this.citiesData);
           if (this.citiesData && this.citiesData.length > 0) {
             // 可见范围
             const bounds = new mapboxgl.LngLatBounds();

src/components/newTravelmanager/travelLineTrip/components/travelDays.vue

@@ -822,7 +822,6 @@
           this.RenderingOk = true;
           setTimeout(()=>{
             this.pageHeight = document.querySelector(`#LineOfTravel${this.item * 4}_0${this.index}`).offsetHeight;
-            console.log("dayTrip"+(this.index+1),this.pageHeight);
           },500)
           this.$forceUpdate()
       },