111

src/components/clueManagement/guestDialogBox.vue

@@ -270,15 +270,6 @@
                             </el-form-item>
                         </div>
                     </el-col>
-                    <template v-for='(item,index) in EconomicCapabilityS'>
-                        <el-col :span="8" :key="index" v-if='item.isShow'>
-                            <div class="MyEditForm-item">
-                                <el-form-item :label="item.Name">
-                                    <el-input v-model="item.Content" type="text" maxlength="50"></el-input>
-                                </el-form-item>
-                            </div>
-                        </el-col>
-                    </template>
 </el-row>
 
 <el-col :span="24">
@@ -289,9 +280,6 @@
     </div>
 </el-col>
 </el-form>
-<div class="_addPassengerEconomicCapability">
-    <span v-for="(item, index) in EconomicCapabilityS" :key="index" @click="addEconomicCapability(item)" :class="{_active:item.isShow}">{{item.Name}}</span>
-</div>
 </div>
 
 <div class="form-box" v-if="show">
@@ -491,11 +479,26 @@
                         </el-form-item>
                     </div>
                 </el-col>
+                
+                <template v-for='(item,index) in EconomicCapabilityS'>
+                        <el-col :span="8" :key="index" v-if='item.isShow'>
+                            <div class="MyEditForm-item">
+                                <el-form-item :label="item.Name">
+                                    <el-input v-model="item.Content" type="text" maxlength="50"></el-input>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                    </template>
 
-            </el-form>
 
-        </el-collapse-item>
-    </el-collapse>
+<div class="_addPassengerEconomicCapability">
+    <span v-for="(item, index) in EconomicCapabilityS" :key="index" @click="addEconomicCapability(item)" :class="{_active:item.isShow}">{{item.Name}}</span>
+</div>
+
+</el-form>
+
+</el-collapse-item>
+</el-collapse>
 
 </div>
 <div slot="footer" class="dialog-footer">
@@ -592,129 +595,6 @@
                 DutyTypeList: [],
                 UnitTypeList: [],
                 rules: {
-                    /* DutyType: [{
-                        required: true,
-                        message: '请选择职务类型',
-                        trigger: 'change'
-                    }],
-                    UnitType: [{
-                        required: true,
-                        message: '请选择单位类型',
-                        trigger: 'change'
-                    }],
-                    TravelType: [{
-                        required: true,
-                        message: '请选择出游类型',
-                        trigger: 'change'
-                    }],
-                    IdCard: [{
-                        required: true,
-                        message: "请填身份证号码",
-                        trigger: "blur"
-                    }],
-                    SurName: [{
-                        required: true,
-                        message: "请填写中文姓",
-                        trigger: "blur"
-                    }],
-                    Name: [{
-                        required: true,
-                        message: "请填写中文名",
-                        trigger: "blur"
-                    }],
-                    Sex: [{
-                        required: true,
-                        message: "请填选择性别",
-                        trigger: "change"
-                    }],
-                    ESurName: [{
-                        required: true,
-                        message: "请填写英文姓",
-                        trigger: "blur"
-                    }, {
-                        pattern: /^[a-zA-Z]/,
-                        message: "请输入英文姓"
-                    }],
-                    EName: [{
-                        required: true,
-                        message: "请填写英文名",
-                        trigger: "blur"
-                    }, {
-                        pattern: /^[a-zA-Z]/,
-                        message: "请输入英文姓"
-                    }],
-                    Birthday: [{
-                        required: true,
-                        message: "请填选择出生日期",
-                        trigger: "blur"
-                    }],
-                    PassportNo: [{
-                        required: true,
-                        message: "请填写护照号",
-                        trigger: "blur"
-                    }, {
-                        pattern: /^[0-9a-zA-Z]+$/,
-                        message: "正确的护照号"
-                    }],
-                    PassportIssued: [{
-                        required: true,
-                        message: "请选择签发日期",
-                        trigger: "blur"
-                    }],
-                    PassportExpiry: [{
-                        required: true,
-                        message: "请选择过期日",
-                        trigger: "blur"
-                    }],
-                    AddressDetail: [{
-                        required: true,
-                        message: "请输入详细地址",
-                        trigger: "blur"
-                    }],
-                    Address: [{
-                        required: true,
-                        message: "请输入家庭居住地",
-                        trigger: "blur"
-                    }],
-                    PassportAddress: [{
-                        required: true,
-                        message: "请填写签发地",
-                        trigger: "blur"
-                    }],
-                    MobilePhone: [{
-                        validator: checkPhone,
-                        trigger: 'blur'
-                    }],
-                    Nationality: [{
-                        required: true,
-                        message: "请选择国籍",
-                        trigger: "change"
-                    }],
-                    BirthdayAddress: [{
-                        required: true,
-                        message: "请填写出生地",
-                        trigger: "change"
-                    }],
-                    IdentityType: [{
-                        required: true,
-                        message: "请选择身份确认",
-                        trigger: "change"
-                    }],
-                    HistoryRecord: [{
-                        required: true,
-                        message: "请选择出境记录",
-                        trigger: "change"
-                    }],
-                    Duty: [{
-                        required: true,
-                        message: "请选择职务",
-                        trigger: "change"
-                    }],
-                    Marriage: [{
-                        required: true,
-                        message: "请选择婚姻",
-                        trigger: "change"
-                    }], */
                     ClueName: [{
                         required: true,
                         message: '请填写名称',