pp

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

@@ -447,6 +447,11 @@
               <div style="display:inline-block;padding-left:10px;">{{apply.identityCard}}</div>
             </div>
             <div style="clear:both"></div>
+            <div style="width: 35%;margin-bottom: 5px;display:inline-block;">
+              <div style="width:120px;display:inline-block;text-align: right">提报主体:</div>
+              <div style="display:inline-block;padding-left:10px;">{{apply.principal}}</div>
+            </div>
+            <div style="clear:both"></div>
           </div>
           <h4>材料信息</h4>
           <div>

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

@@ -53,7 +53,6 @@
         fkey: 0,
         isIndeterminate: false,
         checkAll: false,
-        principalGlobal: "",
         checkedNcl: [],
         ncl: ["01", "02", "03", "04", "05", "06", "07", "08", "09",
           "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24",
@@ -407,7 +406,6 @@
           };
 
           console.log('前端打印接收后端的数据： ', JSON.stringify(d_apply));
-          console.log('全局打印', this.principalGlobal);
 
           var apply = {
             type: d_apply ? d_apply.type : "",

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

@@ -451,6 +451,11 @@
               <div style="display:inline-block;padding-left:10px;">{{apply.identityCard}}</div>
             </div>
             <div style="clear:both"></div>
+            <div style="width: 35%;margin-bottom: 5px;display:inline-block;">
+              <div style="width:120px;display:inline-block;text-align: right">提报主体:</div>
+              <div style="display:inline-block;padding-left:10px;">{{apply.principal}}</div>
+            </div>
+            <div style="clear:both"></div>
           </div>
           <h4>材料信息</h4>
           <div>

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

@@ -110,6 +110,11 @@
                 <el-input  v-model="apply.email" > </el-input>
               </el-form-item>
               <div style="clear:both;"></div>
+              <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>
+              </el-form-item>
+              <div style="clear:both;"></div>
               <!-- <el-form-item  label-width="140px" label="座机电话" style="width:950px;float:left;padding-right:50px;" prop="creditCode">
                 <el-input v-model="apply.creditCode"></el-input>
               </el-form-item> -->

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

@@ -192,6 +192,7 @@
           identityCardPic: "",
           sealAuthorizeStuff: "",
           descUrl: "",
+          principal: "",
         },
         applyrules: {
           type: [
@@ -224,6 +225,9 @@
           email: [
             { required: true, message: '请输入电子邮箱' }
           ],
+          principal: [
+            { type: 'string', required: true, message: '请选择委托主体', trigger: 'change' }
+          ],
         },
         order: {},
         qrcode: "",
@@ -322,7 +326,10 @@
       } else if (!this.apply.applyAddr) {
         that.$message.warning("请填写执照详细地址");
         return;
-      }
+      } else if (!this.apply.principal) {
+        that.$message.warning("请选择提报类型");
+        return;
+      } 
       that.$root.showMask();
       var params = this.apply.type + ";" + this.apply.applyName + ";" + this.apply.identityCard + ";" + this.form.tmFormType
         + ";" + this.form.colorizedPicUrl + ";" + this.form.picUrl + ";" + this.apply.applyAddr;
@@ -373,6 +380,7 @@
             customerContact: d_customer ? d_customer.customerContact : "",
             mobile: d_customer ? d_customer.mobile : "",
             email: d_customer ? d_customer.email : "",
+            principal: d_tm.principal ? d_tm.principal : "",
             businessLicensePic: d_apply ? d_apply.businessLicensePic : "",
             identityCardPic: d_apply ? d_apply.identityCardPic : "",
             sealAuthorizeStuff: