pp

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

@@ -75,7 +75,11 @@ class calculatepriceCtl extends CtlBase {
     let obj = {
     let obj = {
       "assignor": o.assignor,
       "assignor": o.assignor,
       "tm_name": o.tm_name,
       "tm_name": o.tm_name,
-      "address": o.address
+      "address": o.address,
+      "company": o.company,
+      "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

@@ -371,6 +371,15 @@
       } else if (!this.apply.principal) {
       } else if (!this.apply.principal) {
         that.$message.warning("请选择提报类型");
         that.$message.warning("请选择提报类型");
         return;
         return;
+      } else if(!this.apply.customerContact) {
+        that.$message.warning("请填写客户联系人");
+        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
@@ -379,7 +388,16 @@
       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);
-      this.$root.getReq("/web/calculatepriceCtl/tmtrust", { assignor: this.apply.applyName, tm_name: this.form.tmName,  address: this.apply.applyAddr}).then(function (d) {
+      
+      this.$root.getReq("/web/calculatepriceCtl/tmtrust", {
+        assignor: this.apply.applyName, 
+        tm_name: this.form.tmName,  
+        address: this.apply.applyAddr,
+        company: this.apply.principal,
+        contact_person: this.apply.customerContact,
+        contact_phone: this.apply.mobile,
+        postal_code: this.apply.zipCode,
+      }).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) {
           window.open(d.data.tm_trust_url);
           window.open(d.data.tm_trust_url);

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

@@ -1042,6 +1042,16 @@
         return;
         return;
       } else if (!this.apply.principal) {
       } else if (!this.apply.principal) {
         that.$message.warning("请选择提报主体");
         that.$message.warning("请选择提报主体");
+        return;
+      } else if(!this.apply.customerContact) {
+        that.$message.warning("请填写客户联系人");
+        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
@@ -1050,7 +1060,15 @@
       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);
-      this.$root.getReq("/web/calculatepriceCtl/tmtrust", { assignor: this.apply.applyName, tm_name: this.form.tmName,  address: this.apply.applyAddr}).then(function (d) {
+      this.$root.getReq("/web/calculatepriceCtl/tmtrust", {
+        assignor: this.apply.applyName, 
+        tm_name: this.form.tmName,  
+        address: this.apply.applyAddr,
+        company: this.apply.principal,
+        contact_person: this.apply.customerContact,
+        contact_phone: this.apply.mobile,
+        postal_code: this.apply.zipCode,
+      }).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) {
           window.open(d.data.tm_trust_url);
           window.open(d.data.tm_trust_url);