pp

fqboss/app/base/db/metadata/apps/platform.js

@@ -2073,7 +2073,7 @@ module.exports = {
             "order_status": { "1": "未付款", "2": "订单取消", "4": "付款成功", "8": "退款处理中", "16": "已退款", "32": "已提报", "64": "审核中" },
             "order_status": { "1": "未付款", "2": "订单取消", "4": "付款成功", "8": "退款处理中", "16": "已退款", "32": "已提报", "64": "审核中" },
             "msg_notice_type": { "friend": "朋友", "boss": "老板" },
             "msg_notice_type": { "friend": "朋友", "boss": "老板" },
             "tm_apply_type": { "ent": "企业", "person": "个人" },
             "tm_apply_type": { "ent": "企业", "person": "个人" },
-            "tm_principal": { "ht": "汉唐信通（北京）咨询有限公司", "zy": "知域互联科技有限公司", "ali": "阿里巴巴科技（北京）有限公司"},
+            "tm_principal": { "汉唐信通（北京）咨询有限公司": "汉唐信通（北京）咨询有限公司", "知域互联科技有限公司": "知域互联科技有限公司", "阿里巴巴科技（北京）有限公司": "阿里巴巴科技（北京）有限公司"},
             "tm_apply_types": { "ent": "企业" },
             "tm_apply_types": { "ent": "企业" },
             "op_type": { "applying": "申请中", "issued": "已发放", "issueError": "发放异常" },
             "op_type": { "applying": "申请中", "issued": "已发放", "issueError": "发放异常" },
             "tmFirstOrder": { 0: "否", 1: "是" },
             "tmFirstOrder": { 0: "否", 1: "是" },

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

@@ -280,7 +280,7 @@
             <el-form-item label-width="140px" label="电子邮箱" style="width:950px;float:left;padding-right:50px;">
             <el-form-item label-width="140px" label="电子邮箱" style="width:950px;float:left;padding-right:50px;">
               <el-input v-model="apply.email"> </el-input>
               <el-input v-model="apply.email"> </el-input>
             </el-form-item>
             </el-form-item>
-            <el-form-item label-width="140px" label="提报主体" style="width:950px;float:left;padding-right:50px;">
+            <el-form-item label-width="140px" label="提报主体" style="width:950px;float:left;padding-right:50px;" prop="principal">
               <gsb-select v-model="apply.principal" dicKey="tm_principal" labelField="label" valueField="value">
               <gsb-select v-model="apply.principal" dicKey="tm_principal" labelField="label" valueField="value">
               </gsb-select>
               </gsb-select>
             </el-form-item>
             </el-form-item>

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

@@ -359,6 +359,9 @@
       } else if (!this.apply.applyAddr) {
       } else if (!this.apply.applyAddr) {
         that.$message.warning("请填写执照详细地址");
         that.$message.warning("请填写执照详细地址");
         return;
         return;
+      } else if (!this.apply.principal) {
+        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
@@ -401,6 +404,9 @@
             colorizedPicUrl: d_tm.colorizedPicUrl,
             colorizedPicUrl: d_tm.colorizedPicUrl,
             remark: d_order.remark
             remark: d_order.remark
           };
           };
+
+          console.log('前端打印接收后端的数据： ', JSON.stringify(d_apply));
+
           var apply = {
           var apply = {
             type: d_apply ? d_apply.type : "",
             type: d_apply ? d_apply.type : "",
             applyName: d_apply ? d_apply.applyName : "",
             applyName: d_apply ? d_apply.applyName : "",

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

@@ -273,7 +273,7 @@
             <el-form-item label-width="140px" label="电子邮箱" style="width:950px;float:left;padding-right:50px;">
             <el-form-item label-width="140px" label="电子邮箱" style="width:950px;float:left;padding-right:50px;">
               <el-input v-model="apply.email"> </el-input>
               <el-input v-model="apply.email"> </el-input>
             </el-form-item>
             </el-form-item>
-            <el-form-item label-width="140px" label="提报主体" style="width:950px;float:left;padding-right:50px;">
+            <el-form-item label-width="140px" label="提报主体" style="width:950px;float:left;padding-right:50px;" prop="principal">
               <gsb-select v-model="apply.principal" dicKey="tm_principal" labelField="label" valueField="value">
               <gsb-select v-model="apply.principal" dicKey="tm_principal" labelField="label" valueField="value">
               </gsb-select>
               </gsb-select>
             </el-form-item>
             </el-form-item>

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

@@ -960,8 +960,11 @@
       if (this.apply.applyName) {
       if (this.apply.applyName) {
         this.$root.showMask();
         this.$root.showMask();
         this.$root.getReq("/web/orderCtl/getCustomerInfoByCompanyName", { companyName: this.apply.applyName }).then(d => {
         this.$root.getReq("/web/orderCtl/getCustomerInfoByCompanyName", { companyName: this.apply.applyName }).then(d => {
-          console.log(d);
+          console.log('---------------', d);
           if (d && d.code == 1 && d.data) {
           if (d && d.code == 1 && d.data) {
+
+            console.log('===========', d.data.principal);
+
             var data = d.data;
             var data = d.data;
             if (data.applyAddr) {
             if (data.applyAddr) {
               this.apply.applyAddr = data.applyAddr;
               this.apply.applyAddr = data.applyAddr;
@@ -1039,6 +1042,8 @@
       } else if (!this.apply.applyAddr) {
       } else if (!this.apply.applyAddr) {
         that.$message.warning("请填写执照详细地址");
         that.$message.warning("请填写执照详细地址");
         return;
         return;
+      } else if (!this.apply.principal) {
+        that.$message.warning("请选择提报主体");
       }
       }
       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