123

igirl-channel-web/app/front/vues/pages/selftmreg/selftmreg.html

@@ -37,7 +37,7 @@
               <div class="categoryFrom-jieshao" @click="announcementsType = true">如何选择商标类型？</div>
               <div class="categoryFrom-jieshao" @click="announcementsType = true">如何选择商标类型？</div>
             </el-form-item>
             </el-form-item>
             <div style="clear:both;"></div>
             <div style="clear:both;"></div>
-            <el-form-item label="商标名称" style="width:845px;float:left" prop="name" v-if="form.tmFormType != 4">
+            <el-form-item label="商标名称" style="width:860px;float:left" prop="name" v-if="form.tmFormType != 4">
               <el-input v-model="form.name" style="width:330px" placeholder="请输入商标名称"></el-input><span
               <el-input v-model="form.name" style="width:330px" placeholder="请输入商标名称"></el-input><span
                 v-if="form.tmFormType == 5"
                 v-if="form.tmFormType == 5"
                 style="font-size:14px;font-family:PingFangSC-Regular;font-weight:400;color:rgba(99,101,105,1);margin-left: 10px">及图</span>
                 style="font-size:14px;font-family:PingFangSC-Regular;font-weight:400;color:rgba(99,101,105,1);margin-left: 10px">及图</span>
@@ -307,11 +307,11 @@
             <el-form-item v-if="apply.customerType==\'person\'" label-width="140px" label="姓名"
             <el-form-item v-if="apply.customerType==\'person\'" label-width="140px" label="姓名"
               style="width:493px;float:left;padding-right:50px;" prop="name">
               style="width:493px;float:left;padding-right:50px;" prop="name">
               <!-- <el-input placeHolder="请输入身份证姓名" v-model="apply.name"></el-input> -->
               <!-- <el-input placeHolder="请输入身份证姓名" v-model="apply.name"></el-input> -->
-              <gsb-selectperson v-if="currentUser" @input="selectpersoninput" allowcreate="true" showhistory="false"
+              <gsb-selectpersonCJT v-if="currentUser" @input="selectpersoninput" allowcreate="true" showhistory="false"
                  size="medium" v-model="apply.name"
                  size="medium" v-model="apply.name"
                 refMethod="getCompanyInfoByLikeName" autoComplete="true" isFilter="true" refModel="tool"
                 refMethod="getCompanyInfoByLikeName" autoComplete="true" isFilter="true" refModel="tool"
                 labelField="entName" valueField="entName" style="position:relative;width:100%;" placeHolder="请输入身份证姓名">
                 labelField="entName" valueField="entName" style="position:relative;width:100%;" placeHolder="请输入身份证姓名">
-              </gsb-selectperson>
+              </gsb-selectpersonCJT>
               <gsb-selectperson v-if="!currentUser" frombrowser="true" @input="selectpersoninput" allowcreate="true"
               <gsb-selectperson v-if="!currentUser" frombrowser="true" @input="selectpersoninput" allowcreate="true"
                 showhistory="false"  size="medium" v-model="apply.name"
                 showhistory="false"  size="medium" v-model="apply.name"
                 refMethod="getCompanyInfoByLikeName" autoComplete="true" isFilter="true" refModel="tool"
                 refMethod="getCompanyInfoByLikeName" autoComplete="true" isFilter="true" refModel="tool"

igirl-channel-web/app/front/vues/pages/selftmreg/selftmreg.js

@@ -545,9 +545,9 @@
         })
         })
       }
       }
       if (obj.flag == "sfz") {
       if (obj.flag == "sfz") {
-        var word2pic = { word: this.form.name };
-        var word2pic = this.$root.copyParams(word2pic, "pic2pdf", "/action/tmTools/springBoard");
-        this.$root.postReq("/web/trademark/tmqueryCtl/doPost", word2pic).then(function (d) {
+        var pic2pdf = { 'key': obj.result };
+        var pic2pdf = this.$root.copyParams(pic2pdf, "pic2pdf", "/action/tmTools/springBoard");
+        this.$root.postReq("/web/trademark/tmqueryCtl/doPost", pic2pdf).then(function (d) {
           that.loading1 = false;
           that.loading1 = false;
           that.loading2 = false;
           that.loading2 = false;
           that.loading3 = false;
           that.loading3 = false;