前后:注册可以上传护照

src/dashoo.cn/backend/api/business/register/oilcorporateinfo.go

@@ -65,6 +65,8 @@ type OilCorporateInfo struct {
 	LinkHouseNo      string    `xorm:"comment('通信地址-门牌号') VARCHAR(10)"`
 	LinkZipCode      string    `xorm:"comment('通信地址-邮编') VARCHAR(20)"`
 	HseTraining      string    `xorm:"comment('是否需要进行HSE审查培训') VARCHAR(2)"`
+	CardNoType1      int	   `xorm:"comment('法人有效证件类型,0身份证,1护照') INT(2)"`
+	CardNoType2      int	   `xorm:"comment('联系人有效证件类型,0身份证,1护照') INT(2)"`
 	CreateOn         time.Time `xorm:"DATETIME"`
 	CreateUserId     int       `xorm:"INT(10)"`
 	CreateBy         string    `xorm:"VARCHAR(50)"`

src/dashoo.cn/frontend_web/src/pages/index.vue

@@ -215,23 +215,35 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="法定代表人姓名" label-width="150px" style="width: 100%" prop="LegalPerson">
-              <el-input v-model="formData.LegalPerson" readonly></el-input>
+            <el-form-item label="有效证件类型" label-width="150px" style="width: 100%;">
+              <el-select  v-model="formData.CardNoType1" disabled placeholder="请选择有效证件类型" label-width="150px" style="width: 100%">
+                <el-option :key=0 label="身份证" :value=0 ></el-option>
+                <el-option :key=1 label="护照" :value=1 ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="法定代表人身份证号" label-width="150px" style="width: 100%" prop="LegalPersonId">
-              <el-input v-model="formData.LegalPersonId"  readonly></el-input>
+            <el-form-item v-if="formData.CardNoType1" label="联系人护照编号" label-width="150px" style="width: 100%" prop="LegalPersonId">
+              <el-input v-model="formData.LegalPersonId" readonly></el-input>
+            </el-form-item>
+            <el-form-item v-else label="法定代表人身份证号" label-width="150px" style="width: 100%" prop="LegalPersonId">
+              <el-input v-model="formData.LegalPersonId" readonly></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="法定代表人身份证扫描件" label-width="170px" prop="LegalPersonImg">
-              <div class="block" style="overflow: auto;">
+            <el-form-item label="有效证件扫描件"
+                          label-width="170px"
+                          prop="LegalPersonImg">
+              <div class="block"
+                   style="overflow: auto;">
                 <template>
                   <el-row>
-                    <el-col :span="12" v-for="(url, index) in urlList" :key="index">
+                    <el-col :span="12"
+                            v-for="(url, index) in urlList"
+                            :key="index">
                       <span @click="bigImg(url)">
-                        <el-image  style="width: 170px; height: 100px; cursor: pointer" :src="url"></el-image>
+                        <el-image style="width: 170px; height: 100px; cursor: pointer"
+                                  :src="url"></el-image>
                       </span>
                     </el-col>
                   </el-row>
@@ -245,17 +257,28 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="联系人身份证号" label-width="150px" style="width: 100%" prop="ContactId">
-              <el-input v-model="formData.ContactId" readonly></el-input>
+            <el-form-item label="有效证件类型" label-width="150px" style="width: 100%;">
+              <el-select v-model="formData.CardNoType2" disabled placeholder="请选择有效证件类型" label-width="150px" style="width: 100%">
+                <el-option :key=0 label="身份证" :value=0 ></el-option>
+                <el-option :key=1 label="护照" :value=1 ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="联系人身份证扫描件" label-width="170px" prop="ContactImg">
+            <el-form-item v-if="formData.CardNoType2" label="联系人护照编号" label-width="150px" style="width: 100%" prop="ContactId">
+              <el-input v-model="formData.ContactId"  readonly></el-input>
+            </el-form-item>
+            <el-form-item v-else label="联系人身份证号" label-width="150px" style="width: 100%" prop="ContactId">
+              <el-input v-model="formData.ContactId"  readonly></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="有效证件扫描件" label-width="170px" prop="ContactImg">
               <div class="block" style="overflow: auto;">
                 <template>
                   <el-row>
                     <el-col :span="12" v-for="(url, index) in urlList2" :key="index">
-                      <span @click="bigImg(url)">
+                      <span @click="bigImg1(url)">
                         <el-image style="width: 170px; height: 100px; cursor: pointer" :src="url"></el-image>
                       </span>
                     </el-col>
@@ -376,11 +399,17 @@
 
     <!--点击图片放大区域-->
     <el-dialog
-      title="法定代表人身份证扫描件"
+      title="法定代表人有效证件扫描件"
       :visible.sync="legalPersonImgVisible"
       width="40%">
       <el-image :src="bigUrl"></el-image>
     </el-dialog>
+    <el-dialog
+      title="联系人有效证件扫描件"
+      :visible.sync="legalPersonImg1Visible"
+      width="40%">
+      <el-image :src="bigUrl"></el-image>
+    </el-dialog>
   </div>
 </template>
 
@@ -408,6 +437,7 @@
         dialogVisible: false,
         invoiceVisible: false,
         legalPersonImgVisible: false,
+        legalPersonImg1Visible: false,
         tabindex: '',
         activeName: 'first',
         currentDate: new Date(),
@@ -506,7 +536,9 @@
           LinkStreet: '',
           LinkHouseNo: '',
           LinkZipCode: '',
-          HseTraining: ''
+          HseTraining: '',
+          CardNoType1: 0,
+          CardNoType2: 0
         },
         formDataInvoice: {
           Id: '',
@@ -824,6 +856,10 @@
         this.bigUrl = url
         this.legalPersonImgVisible = true
       },
+      bigImg1 (url) {
+        this.bigUrl = url
+        this.legalPersonImg1Visible = true
+      },
       initDataregister (Id) {
         let _this = this
         const params = {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/companyaudit/index.vue

@@ -204,16 +204,23 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="法定代表人身份证号"
-                          label-width="150px"
-                          style="width: 100%"
-                          prop="LegalPersonId">
-              <el-input v-model="formData.LegalPersonId"
-                        readonly></el-input>
+            <el-form-item label="有效证件类型" label-width="150px" style="width: 100%;">
+              <el-select  v-model="formData.CardNoType1" disabled placeholder="请选择有效证件类型" label-width="150px" style="width: 100%">
+                <el-option :key=0 label="身份证" :value=0 ></el-option>
+                <el-option :key=1 label="护照" :value=1 ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item v-if="formData.CardNoType1" label="联系人护照编号" label-width="150px" style="width: 100%" prop="LegalPersonId">
+              <el-input v-model="formData.LegalPersonId" readonly></el-input>
+            </el-form-item>
+            <el-form-item v-else label="法定代表人身份证号" label-width="150px" style="width: 100%" prop="LegalPersonId">
+              <el-input v-model="formData.LegalPersonId" readonly></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="法定代表人身份证扫描件"
+            <el-form-item label="有效证件扫描件"
                           label-width="170px"
                           prop="LegalPersonImg">
               <div class="block"
@@ -243,16 +250,23 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="联系人身份证号"
-                          label-width="150px"
-                          style="width: 100%"
-                          prop="ContactId">
-              <el-input v-model="formData.ContactId"
-                        readonly></el-input>
+            <el-form-item label="有效证件类型" label-width="150px" style="width: 100%;">
+              <el-select v-model="formData.CardNoType2" disabled placeholder="请选择有效证件类型" label-width="150px" style="width: 100%">
+                <el-option :key=0 label="身份证" :value=0 ></el-option>
+                <el-option :key=1 label="护照" :value=1 ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="联系人身份证扫描件"
+            <el-form-item v-if="formData.CardNoType2" label="联系人护照编号" label-width="150px" style="width: 100%" prop="ContactId">
+              <el-input v-model="formData.ContactId"  readonly></el-input>
+            </el-form-item>
+            <el-form-item v-else label="联系人身份证号" label-width="150px" style="width: 100%" prop="ContactId">
+              <el-input v-model="formData.ContactId"  readonly></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="有效证件扫描件"
                           label-width="170px"
                           prop="ContactImg">
               <div class="block"
@@ -262,7 +276,7 @@
                     <el-col :span="12"
                             v-for="(url, index) in urlList2"
                             :key="index">
-                      <span @click="bigImg(url)">
+                      <span @click="bigImg1(url)">
                         <el-image style="width: 170px; height: 100px; cursor: pointer"
                                   :src="url"></el-image>
                       </span>
@@ -351,11 +365,16 @@
     </el-dialog>
 
     <!--点击图片放大区域-->
-    <el-dialog title="法定代表人身份证扫描件"
+    <el-dialog title="法定代表人有效证件扫描件"
                :visible.sync="legalPersonImgVisible"
                width="40%">
       <el-image :src="bigUrl"></el-image>
     </el-dialog>
+    <el-dialog title="联系人有效证件扫描件"
+               :visible.sync="legalPersonImg1Visible"
+               width="40%">
+      <el-image :src="bigUrl"></el-image>
+    </el-dialog>
   </div>
 </template>
 
@@ -376,6 +395,7 @@ export default {
       },
       bigUrl: '',
       legalPersonImgVisible: false,
+      legalPersonImg1Visible: false,
       currentItemCount: 0,
       currentPage: 1,
       size: 10,
@@ -444,7 +464,9 @@ export default {
         LinkStreet: '',
         LinkHouseNo: '',
         LinkZipCode: '',
-        HseTraining: ''
+        HseTraining: '',
+        CardNoType1: 0,
+        CardNoType2: 0
       }
     }
   },
@@ -476,6 +498,10 @@ export default {
       this.bigUrl = url
       this.legalPersonImgVisible = true
     },
+    bigImg1 (url) {
+      this.bigUrl = url
+      this.legalPersonImg1Visible = true
+    },
     initData () {
       let _this = this
       const params = {

src/dashoo.cn/frontend_web/src/pages/signup.vue

@@ -47,12 +47,23 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
-                  <el-form-item label="法定代表人身份证号" label-width="150px" style="width: 100%" prop="LegalPersonId">
+                  <el-form-item label="有效证件类型" :required="true" label-width="150px" style="width: 100%;">
+                    <el-select  v-model="formData.CardNoType1" placeholder="请选择有效证件类型" label-width="150px" style="width: 100%">
+                      <el-option :key=0 label="身份证" :value=0 ></el-option>
+                      <el-option :key=1 label="护照" :value=1 ></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item v-if="formData.CardNoType1" label="联系人护照编号" label-width="150px" style="width: 100%" prop="LegalPersonId">
+                    <el-input v-model="formData.LegalPersonId"  placeholder="请输入法定代表人护照编号"></el-input>
+                  </el-form-item>
+                  <el-form-item v-else label="法定代表人身份证号" label-width="150px" style="width: 100%" prop="LegalPersonId">
                     <el-input v-model="formData.LegalPersonId"  placeholder="请输入法定代表人身份证号"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
-                  <el-form-item label="上传身份证扫描件" label-width="150px" :prop="this.legalHaspic ? '' : 'LegalPersonImg'">
+                  <el-form-item label="上传有效证件扫描件" label-width="150px" :prop="this.legalHaspic ? '' : 'LegalPersonImg'">
                     <el-upload action="" ref="LegalPersonUpload"
                       list-type="picture-card"
                       :limit="this.limitNumb"
@@ -73,12 +84,23 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
-                  <el-form-item label="联系人身份证号" label-width="150px" style="width: 100%" prop="ContactId">
+                  <el-form-item label="有效证件类型" :required="true" label-width="150px" style="width: 100%;">
+                    <el-select v-model="formData.CardNoType2" placeholder="请选择有效证件类型" label-width="150px" style="width: 100%">
+                      <el-option :key=0 label="身份证" :value=0 ></el-option>
+                      <el-option :key=1 label="护照" :value=1 ></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item v-if="formData.CardNoType2" label="联系人护照编号" label-width="150px" style="width: 100%" prop="ContactId">
+                    <el-input v-model="formData.ContactId"  placeholder="请输入联系人护照编号"></el-input>
+                  </el-form-item>
+                  <el-form-item v-else label="联系人身份证号" label-width="150px" style="width: 100%" prop="ContactId">
                     <el-input v-model="formData.ContactId"  placeholder="请输入联系人身份证号"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
-                  <el-form-item label="上传身份证扫描件" label-width="150px" :prop="this.contactHaspic ? '' : 'ContactImg'">
+                  <el-form-item label="上传有效证件扫描件" label-width="150px" :prop="this.contactHaspic ? '' : 'ContactImg'">
                     <el-upload action="" ref="ContactUpload"
                       list-type="picture-card"
                       :limit="this.limitNumb"
@@ -235,25 +257,33 @@
       }
       var checkLegalPersonId = (rule, value, callback) => {
         if (value === '') {
-          callback(new Error('请输入正确格式的法定代表人身份证号'))
+          callback(new Error('请输入正确格式的法定代表人有效证号'))
         } else {
-          let re1 = /(^\d{18}$)|(^\d{17}(\d|X|x)$)/
-          if (!re1.test(this.formData.LegalPersonId)) {
-            callback(new Error('请输入正确格式的法定代表人身份证号'))
+          if (this.formData.CardNoType1 === 1) {
+              callback()
           } else {
-            callback()
+            let re1 = /(^\d{18}$)|(^\d{17}(\d|X|x)$)/
+            if (!re1.test(this.formData.LegalPersonId)) {
+              callback(new Error('请输入正确格式的法定代表人身份证号'))
+            } else {
+              callback()
+            }
           }
         }
       }
       var checkContactId = (rule, value, callback) => {
         if (value === '') {
-          callback(new Error('请输入正确格式的联系人身份证号'))
+          callback(new Error('请输入正确格式的联系人有效证号'))
         } else {
-          let re1 = /(^\d{18}$)|(^\d{17}(\d|X|x)$)/
-          if (!re1.test(this.formData.ContactId)) {
-            callback(new Error('请输入正确格式的联系人身份证号'))
-          } else {
+          if (this.formData.CardNoType2 === 1) {
             callback()
+          } else {
+            let re1 = /(^\d{18}$)|(^\d{17}(\d|X|x)$)/
+            if (!re1.test(this.formData.ContactId)) {
+              callback(new Error('请输入正确格式的联系人身份证号'))
+            } else {
+              callback()
+            }
           }
         }
       }
@@ -416,7 +446,9 @@
           LinkZipCode: '',
           HseTraining: '',
           CheckUnitId: '',
-          CheckUnitName: ''
+          CheckUnitName: '',
+          CardNoType1: 0,
+          CardNoType2: 0
         },
 
         rules: {
@@ -525,6 +557,12 @@
           }
         }
       },
+      CardNo1 (val) {
+        this.formData.CardNoType1 = val
+      },
+      CardNo2 (val) {
+        this.formData.CardNoType2 = val
+      },
       orgChange (val) {
         this.formData.CheckUserId = 0
         this.formData.CheckUserName = ''