Merge branch 'master-joke' into 'master'

乙方运维页面优化(调整用户基本信息顺序)

乙方运维页面优化(调整用户基本信息顺序)

See merge request !1018

@@ -105,18 +105,6 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="8">
-                    <el-form-item label="犯罪记录证明" prop="hasProof" class="form-class">
-                        <el-input v-model="ruleForm.hasProof" :readonly="isAdmin()"></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                    <el-form-item label="籍贯" prop="nativePlace" class="form-class">
-                        <el-input v-model="ruleForm.nativePlace" :readonly="isAdmin()"></el-input>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row :gutter="5">
-                <el-col :span="8">
                     <el-form-item label="入党时间" prop="partyDate" class="form-class">
                         <el-date-picker
                                 v-model="ruleForm.partyDate"
@@ -129,6 +117,13 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="8">
+                    <el-form-item label="籍贯" prop="nativePlace" class="form-class">
+                        <el-input v-model="ruleForm.nativePlace" :readonly="isAdmin()"></el-input>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+            <el-row :gutter="5">
+                <el-col :span="8">
                     <el-form-item label="政治面貌" prop="politicsStatus" class="form-class">
                         <el-input v-model="ruleForm.politicsStatus" :readonly="isAdmin()"></el-input>
                     </el-form-item>
@@ -141,8 +136,12 @@
                         </el-radio-group>
                     </el-form-item>
                 </el-col>
+                <el-col :span="8">
+                    <el-form-item label="犯罪记录证明" prop="hasProof" class="form-class">
+                        <el-input v-model="ruleForm.hasProof" :readonly="isAdmin()"></el-input>
+                    </el-form-item>
+                </el-col>
             </el-row>
-
             <el-row :gutter="">
                 <el-col :span="12">
                     <el-form-item label="获得证书" prop="post">
@@ -154,7 +153,13 @@
                         <el-input v-model="ruleForm.post"  :readonly="isAdmin()"></el-input>
                     </el-form-item>
                 </el-col>
-
+            </el-row>
+            <el-row :gutter="5">
+                <el-col :span="24">
+                    <el-form-item label="岗位职责" prop="responsibility" class="form-textarea">
+                        <el-input v-model="ruleForm.responsibility" type="textarea" :readonly="isAdmin()"></el-input>
+                    </el-form-item>
+                </el-col>
             </el-row>
             <div style="text-align: center;padding-top: 10px" v-if="!isAdmin()">
                 <el-button type="primary" size="mini" @click="saveUser()">保存基本信息</el-button>