pp

fqboss/app/base/controller/impl/calculatepriceCtl.js

@@ -77,9 +77,9 @@ class calculatepriceCtl extends CtlBase {
       "tm_name": o.tm_name,
       "tm_name": o.tm_name,
       "address": o.address,
       "address": o.address,
       "company": o.company,
       "company": o.company,
-      "contact_person": o.contact_person,
-      "contact_phone": o.contact_phone,
-      "postal_code": o.postal_code
+      // "contact_person": o.contact_person,
+      // "contact_phone": o.contact_phone,
+      // "postal_code": o.postal_code
     };
     };
     let url = settings.apiconfig.tmTrust;
     let url = settings.apiconfig.tmTrust;
     let rc = System.getObject("util.execClient");
     let rc = System.getObject("util.execClient");

fqboss/app/front/vues/pages/automatictmsubmitedit/automatictmsubmitedit.js

@@ -374,13 +374,8 @@
       } else if(!this.apply.customerContact) {
       } else if(!this.apply.customerContact) {
         that.$message.warning("请填写客户联系人");
         that.$message.warning("请填写客户联系人");
         return;
         return;
-      }  else if(!this.apply.mobile) {
-        that.$message.warning("请填写联系电话");
-        return;
-      } else if(!this.apply.zipCode) {
-        that.$message.warning("请填写邮政编码");
-        return;
       }
       }
+      
       that.$root.showMask();
       that.$root.showMask();
       var params = this.apply.type + ";" + this.apply.applyName + ";" + this.apply.identityCard + ";" + this.form.tmFormType
       var params = this.apply.type + ";" + this.apply.applyName + ";" + this.apply.identityCard + ";" + this.form.tmFormType
         + ";" + this.form.colorizedPicUrl + ";" + this.form.picUrl + ";" + this.apply.applyAddr;
         + ";" + this.form.colorizedPicUrl + ";" + this.form.picUrl + ";" + this.apply.applyAddr;
@@ -389,14 +384,22 @@
       var url = window.location.href.split("/autosubmitinside")[0] + "/mobile2?" + "params=" + params + "#/createwts2";
       var url = window.location.href.split("/autosubmitinside")[0] + "/mobile2?" + "params=" + params + "#/createwts2";
       console.log(url);
       console.log(url);
       
       
+      let tm_name = "";
+      if(this.form.tmFormType == 3) {
+        tm_name = this.form.tmName;
+      }
+      if(this.form.tmFormType == 4 || this.form.tmFormType == 7) {
+        tm_name = "图形";
+      }
+      if(this.form.tmFormType == 5) {
+        tm_name = this.form.tmName + "及图";
+      }
+      if(this.form.tmFormType)
       this.$root.getReq("/web/calculatepriceCtl/tmtrust", {
       this.$root.getReq("/web/calculatepriceCtl/tmtrust", {
         assignor: this.apply.applyName, 
         assignor: this.apply.applyName, 
-        tm_name: this.form.tmName,  
+        tm_name: tm_name,  
         address: this.apply.applyAddr,
         address: this.apply.applyAddr,
         company: this.apply.principal,
         company: this.apply.principal,
-        contact_person: this.apply.customerContact,
-        contact_phone: this.apply.mobile,
-        postal_code: this.apply.zipCode,
       }).then(function (d) {
       }).then(function (d) {
 
 
         if (d.data.tm_trust_url != "" && d.data.tm_trust_url != null) {
         if (d.data.tm_trust_url != "" && d.data.tm_trust_url != null) {

fqboss/app/front/vues/pages/automatictmsubmitinside/automatictmsubmitinside.js

@@ -1049,9 +1049,6 @@
       }  else if(!this.apply.mobile) {
       }  else if(!this.apply.mobile) {
         that.$message.warning("请填写联系电话");
         that.$message.warning("请填写联系电话");
         return;
         return;
-      } else if(!this.apply.zipCode) {
-        that.$message.warning("请填写邮政编码");
-        return;
       }
       }
       that.$root.showMask();
       that.$root.showMask();
       var params = this.apply.type + ";" + this.apply.applyName + ";" + this.apply.identityCard + ";" + this.form.tmFormType
       var params = this.apply.type + ";" + this.apply.applyName + ";" + this.apply.identityCard + ";" + this.form.tmFormType
@@ -1060,14 +1057,22 @@
       console.log(params);
       console.log(params);
       var url = window.location.href.split("/autosubmitinside")[0] + "/mobile2?" + "params=" + params + "#/createwts2";
       var url = window.location.href.split("/autosubmitinside")[0] + "/mobile2?" + "params=" + params + "#/createwts2";
       console.log(url);
       console.log(url);
+
+      let tm_name = "";
+      if(this.form.tmFormType == 3) {
+        tm_name = this.form.tmName;
+      }
+      if(this.form.tmFormType == 4 || this.form.tmFormType == 7) {
+        tm_name = "图形";
+      }
+      if(this.form.tmFormType == 5) {
+        tm_name = this.form.tmName + "及图";
+      }
       this.$root.getReq("/web/calculatepriceCtl/tmtrust", {
       this.$root.getReq("/web/calculatepriceCtl/tmtrust", {
         assignor: this.apply.applyName, 
         assignor: this.apply.applyName, 
         tm_name: this.form.tmName,  
         tm_name: this.form.tmName,  
         address: this.apply.applyAddr,
         address: this.apply.applyAddr,
         company: this.apply.principal,
         company: this.apply.principal,
-        contact_person: this.apply.customerContact,
-        contact_phone: this.apply.mobile,
-        postal_code: this.apply.zipCode,
       }).then(function (d) {
       }).then(function (d) {
 
 
         if (d.data.tm_trust_url != "" && d.data.tm_trust_url != null) {
         if (d.data.tm_trust_url != "" && d.data.tm_trust_url != null) {
@@ -1075,7 +1080,7 @@
         } else {
         } else {
           that.$message.warning(`操作失败`);
           that.$message.warning(`操作失败`);
         }
         }
-        that.$root.hideMask();
+        that.$root.hideMask();dd
       }).catch(function (e) {
       }).catch(function (e) {
         that.$root.hideMask();
         that.$root.hideMask();
         that.$message.warning(`操作失败`);
         that.$message.warning(`操作失败`);