diff --git a/src/views/certificate/certificateReturnManage/certificateAtake/index.vue b/src/views/certificate/certificateReturnManage/certificateAtake/index.vue
index c290004..e7ef36c 100644
--- a/src/views/certificate/certificateReturnManage/certificateAtake/index.vue
+++ b/src/views/certificate/certificateReturnManage/certificateAtake/index.vue
@@ -108,14 +108,14 @@
       <el-dialog :title="title+''" :visible.sync="open" width="700px" append-to-body>
         <el-form ref="baseForm" :model="baseForm" :rules="baseFormRules" label-width="80px">
           <el-row>
-            <el-col :span="12">
+            <el-col :span="24">
                 <el-form-item label="姓名" prop="name">
                     <el-select
                       v-model="baseForm.name"
                       placeholder="请选择"
                       filterable
                       clearable
-                      style="width: 240px"
+                      style="width: 100%"
                       @change="handleSelectChange"
                     >
                       <el-option
@@ -155,34 +155,29 @@
         </div>
       </el-dialog>
 
-      <el-dialog :title="title2+''" :visible.sync="open2" width="700px" append-to-body>
-        <el-tabs v-model="activeName">
-            <!-- 基础设置 -->
-            <el-tab-pane label="" name="baseSetting" style="height: 100px;">
-                <el-form ref="baseForm" :model="baseForm" :rules="baseFormRules2" label-width="80px">
-                  <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="出境日期" prop="exitTime">
-                            <el-date-picker
-                                v-model="baseForm.exitTime"
-                                type="date"
-                                placeholder="选择日期"
-                                format="yyyy-MM-dd" style="width: 100%;"
-                                value-format="yyyy-MM-dd"></el-date-picker>
-                        </el-form-item>
-                        <el-form-item label="入境日期" prop="entryTime">
-                            <el-date-picker
-                                v-model="baseForm.entryTime"
-                                type="date"
-                                placeholder="选择日期"
-                                format="yyyy-MM-dd" style="width: 100%;"
-                                value-format="yyyy-MM-dd"></el-date-picker>
-                        </el-form-item>
-                    </el-col>
-                  </el-row>
-                </el-form>
-            </el-tab-pane>
-        </el-tabs>
+      <el-dialog :title="title2+''" :visible.sync="open2" width="700px" append-to-body> 
+        <el-form ref="baseForm" :model="baseForm" :rules="baseFormRules2" label-width="80px">
+          <el-row>
+            <el-col :span="24">
+                <el-form-item label="出境日期" prop="exitTime">
+                    <el-date-picker
+                        v-model="baseForm.exitTime"
+                        type="date"
+                        placeholder="选择日期"
+                        format="yyyy-MM-dd" style="width: 100%;"
+                        value-format="yyyy-MM-dd"></el-date-picker>
+                </el-form-item>
+                <el-form-item label="入境日期" prop="entryTime">
+                    <el-date-picker
+                        v-model="baseForm.entryTime"
+                        type="date"
+                        placeholder="选择日期"
+                        format="yyyy-MM-dd" style="width: 100%;"
+                        value-format="yyyy-MM-dd"></el-date-picker>
+                </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form> 
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="submitFormset">确 定</el-button>
           <el-button @click="cancel2">取 消</el-button>
diff --git a/src/views/certificate/certificateReturnManage/safetyInstructions/index.vue b/src/views/certificate/certificateReturnManage/safetyInstructions/index.vue
index 08a6cd2..3788144 100644
--- a/src/views/certificate/certificateReturnManage/safetyInstructions/index.vue
+++ b/src/views/certificate/certificateReturnManage/safetyInstructions/index.vue
@@ -95,12 +95,12 @@
               </el-form-item>
             </el-col>  
             <el-col :span="24">
-              <el-form-item label="文本内容" prop="content">
-                <el-input v-model="baseForm.content" :autosize="{ minRows: 4, maxRows: 8}" type="textarea" placeholder="请输入文本内容" maxlength="200"></el-input>
+              <el-form-item label="文本内容" prop="content" :rules="[{ required: baseForm.type==1,message: '文本内容不能为空', trigger: 'change' }]">
+                <el-input v-model="baseForm.content" :autosize="{ minRows: 4, maxRows: 8}" type="textarea" placeholder="请输入文本内容" maxlength="800"  show-word-limit></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="附件上传">
+              <el-form-item label="附件上传" prop="fileList" :rules="[{ required: baseForm.type==2,message: '附件不能为空', trigger: 'change' }]">
               <el-upload
                 ref="upload"
                 :limit="1"
@@ -182,9 +182,9 @@
                     type: [
                         { required: true, message: "使用类型不能为空", trigger: "change" }
                     ],
-                    content: [
-                        { required: true, message: "文本内容不能为空", trigger: "change" }
-                    ]
+                    // content: [
+                    //     { required: true,message: "文本内容不能为空", trigger: "change" }
+                    // ]
                 },
                 //导入参数
                 upload: {