修改耗材过期api ,人力资源模块多出一页加滚动条，增加删除按钮的修改

src/api/medicalhealth/consumeguoqi.js

@@ -19,10 +19,15 @@ export function consumeXiaoHui(data) {
     })
 }
 
-export function consumeXiaoHuiaa(data) {
-    return request({
-        url: '/medicalhealth/consumeputins',
-        method: 'put',
-        data: data
-    })
-}
+
+
+
+
+
+// export function consumeXiaoHuiaa(data) {
+//     return request({
+//         url: '/medicalhealth/consumeputins',
+//         method: 'put',
+//         data: data
+//     })
+// }

src/views/medicalhealth/consumeguoqi/index.vue

@@ -248,10 +248,6 @@ import {
   exportBdgldurgputin,
   exportYao,
 } from "@/api/medicalhealth/bdgldurgputin";
-import {
-  exportYaoPing,
-  exportYaoPingXiaoHui,
-} from "@/api/medicalhealth/consumeputin";
 
 import { consumeGuoQi, consumeXiaoHui } from "@/api/medicalhealth/consumeguoqi";
 export default {

src/views/peopleManage/examination/index.vue

@@ -251,164 +251,170 @@
       append-to-body
       :close-on-click-modal="false"
     >
-      <el-form
-        ref="form"
-        :model="form"
-        :rules="rules"
-        :inline="true"
-        label-width="120px"
-      >
-        <div class="jiben">基本信息</div>
-        <el-form-item label="政审对象" prop="peopleId">
-          <el-select
-            v-model="form.peopleId"
-            clearable
-            @change="peopleIdfun"
-            ref="peopleId"
-            placeholder="请输入政审对象"
-          >
-            <el-option
-              v-for="dict in peopleIds"
-              :key="dict.id"
-              :label="dict.name"
-              :value="dict.id"
-              style="width: 200px; height: 36px"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="性别" prop="sex">
-          <el-select v-model="form.sex" clearable placeholder="请输入性别">
-            <el-option
-              v-for="dict in sexList"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="dict.dictValue"
-              style="width: 200px; height: 36px"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="出生年月" prop="birthDate">
-          <el-date-picker
-            clearable
-            size="small"
-            v-model="form.birthDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择出生年月"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item label="党团情况" prop="partyId">
-          <el-select
-            v-model="form.partyId"
-            clearable
-            placeholder="请输入党团情况"
-          >
-            <el-option
-              v-for="dict in partyIds"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="parseInt(dict.dictValue)"
-              style="width: 200px; height: 36px"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="民族" prop="nationId">
-          <el-select v-model="form.nationId" clearable placeholder="请输入民族">
-            <el-option
-              v-for="dict in nationIds"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="parseInt(dict.dictValue)"
-              style="width: 200px; height: 36px"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="籍贯" prop="origin">
-          <el-input v-model="form.origin" placeholder="请输入籍贯" />
-        </el-form-item>
-        <el-form-item label="入伍年月" prop="enlistDate">
-          <el-date-picker
-            clearable
-            size="small"
-            v-model="form.enlistDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择入伍年月"
-          ></el-date-picker>
-        </el-form-item>
-        <div class="jiben">奖惩情况</div>
-        <el-form-item label prop="prize">
-          <el-input
-            v-model="form.prize"
-            type="textarea"
-            placeholder="请输入内容"
-          />
-        </el-form-item>
-        <div class="jiben">入伍简介</div>
-        <el-form-item label prop="enlistdesc">
-          <el-input
-            v-model="form.enlistdesc"
-            type="textarea"
-            placeholder="请输入内容"
-          />
-        </el-form-item>
-        <div class="jiben">政治思想态度</div>
-        <el-form-item label prop="politicsAttitude">
-          <el-input
-            v-model="form.politicsAttitude"
-            type="textarea"
-            placeholder="请输入内容"
-          />
-        </el-form-item>
-        <div class="jiben">参加组织情况</div>
-        <el-form-item label prop="organization">
-          <el-input
-            v-model="form.organization"
-            type="textarea"
-            placeholder="请输入内容"
-          />
-        </el-form-item>
-        <div class="jiben">家庭成员情况</div>
-        <el-form-item label prop="family">
-          <el-input
-            v-model="form.family"
-            type="textarea"
-            placeholder="请输入内容"
-          />
-        </el-form-item>
-        <div class="jiben">社会关系情况</div>
-        <el-form-item label prop="socialRelations">
-          <el-input
-            v-model="form.socialRelations"
-            type="textarea"
-            placeholder="请输入内容"
-          />
-        </el-form-item>
-        <div class="jiben">配偶家庭情况</div>
-        <el-form-item label prop="family2">
-          <el-input
-            v-model="form.family2"
-            type="textarea"
-            placeholder="请输入内容"
-          />
-        </el-form-item>
-        <div class="jiben">本人自我鉴定</div>
-        <el-form-item label prop="selfIdentification">
-          <el-input
-            v-model="form.selfIdentification"
-            type="textarea"
-            placeholder="请输入内容"
-          />
-        </el-form-item>
-        <div class="jiben">单位审查报告</div>
-        <el-form-item label prop="unitExamination">
-          <el-input
-            v-model="form.unitExamination"
-            type="textarea"
-            placeholder="请输入内容"
-          />
-        </el-form-item>
-      </el-form>
+      <div class="userAgree" style="overflow: -Scroll; overflow-x: hidden">
+        <el-form
+          ref="form"
+          :model="form"
+          :rules="rules"
+          :inline="true"
+          label-width="120px"
+        >
+          <div class="jiben">基本信息</div>
+          <el-form-item label="政审对象" prop="peopleId">
+            <el-select
+              v-model="form.peopleId"
+              clearable
+              @change="peopleIdfun"
+              ref="peopleId"
+              placeholder="请输入政审对象"
+            >
+              <el-option
+                v-for="dict in peopleIds"
+                :key="dict.id"
+                :label="dict.name"
+                :value="dict.id"
+                style="width: 200px; height: 36px"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="性别" prop="sex">
+            <el-select v-model="form.sex" clearable placeholder="请输入性别">
+              <el-option
+                v-for="dict in sexList"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="dict.dictValue"
+                style="width: 200px; height: 36px"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="出生年月" prop="birthDate">
+            <el-date-picker
+              clearable
+              size="small"
+              v-model="form.birthDate"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择出生年月"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item label="党团情况" prop="partyId">
+            <el-select
+              v-model="form.partyId"
+              clearable
+              placeholder="请输入党团情况"
+            >
+              <el-option
+                v-for="dict in partyIds"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="parseInt(dict.dictValue)"
+                style="width: 200px; height: 36px"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="民族" prop="nationId">
+            <el-select
+              v-model="form.nationId"
+              clearable
+              placeholder="请输入民族"
+            >
+              <el-option
+                v-for="dict in nationIds"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="parseInt(dict.dictValue)"
+                style="width: 200px; height: 36px"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="籍贯" prop="origin">
+            <el-input v-model="form.origin" placeholder="请输入籍贯" />
+          </el-form-item>
+          <el-form-item label="入伍年月" prop="enlistDate">
+            <el-date-picker
+              clearable
+              size="small"
+              v-model="form.enlistDate"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择入伍年月"
+            ></el-date-picker>
+          </el-form-item>
+          <div class="jiben">奖惩情况</div>
+          <el-form-item label prop="prize">
+            <el-input
+              v-model="form.prize"
+              type="textarea"
+              placeholder="请输入内容"
+            />
+          </el-form-item>
+          <div class="jiben">入伍简介</div>
+          <el-form-item label prop="enlistdesc">
+            <el-input
+              v-model="form.enlistdesc"
+              type="textarea"
+              placeholder="请输入内容"
+            />
+          </el-form-item>
+          <div class="jiben">政治思想态度</div>
+          <el-form-item label prop="politicsAttitude">
+            <el-input
+              v-model="form.politicsAttitude"
+              type="textarea"
+              placeholder="请输入内容"
+            />
+          </el-form-item>
+          <div class="jiben">参加组织情况</div>
+          <el-form-item label prop="organization">
+            <el-input
+              v-model="form.organization"
+              type="textarea"
+              placeholder="请输入内容"
+            />
+          </el-form-item>
+          <div class="jiben">家庭成员情况</div>
+          <el-form-item label prop="family">
+            <el-input
+              v-model="form.family"
+              type="textarea"
+              placeholder="请输入内容"
+            />
+          </el-form-item>
+          <div class="jiben">社会关系情况</div>
+          <el-form-item label prop="socialRelations">
+            <el-input
+              v-model="form.socialRelations"
+              type="textarea"
+              placeholder="请输入内容"
+            />
+          </el-form-item>
+          <div class="jiben">配偶家庭情况</div>
+          <el-form-item label prop="family2">
+            <el-input
+              v-model="form.family2"
+              type="textarea"
+              placeholder="请输入内容"
+            />
+          </el-form-item>
+          <div class="jiben">本人自我鉴定</div>
+          <el-form-item label prop="selfIdentification">
+            <el-input
+              v-model="form.selfIdentification"
+              type="textarea"
+              placeholder="请输入内容"
+            />
+          </el-form-item>
+          <div class="jiben">单位审查报告</div>
+          <el-form-item label prop="unitExamination">
+            <el-input
+              v-model="form.unitExamination"
+              type="textarea"
+              placeholder="请输入内容"
+            />
+          </el-form-item>
+        </el-form>
+      </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -696,7 +702,7 @@ export default {
 </script>
 <style scoped>
 ::v-deep .el-dialog {
-  width: 1030px !important;
+  width: 1070px !important;
   background-color: #004d86;
 }
 
@@ -769,9 +775,9 @@ export default {
   color: #fff;
 }
 ::v-deep .el-dialog__body {
-  padding: 30px 0px 30px 25px !important;
+  padding: 30px 0px 30px 38px !important;
 }
 ::v-deep .el-dialog__footer {
-  padding: 20px 25px !important;
+  padding: 20px 52px !important;
 }
 </style>

src/views/peopleManage/people/index.vue

@@ -791,390 +791,406 @@
       append-to-body
       :close-on-click-modal="false"
     >
-      <el-form
-        ref="form"
-        :model="form"
-        :rules="rules"
-        :inline="true"
-        label-width="120px"
-      >
-        <div class="jiben">基本信息</div>
-        <div class="div-box-title1">
-          <span>个人信息</span>
-          <img src="@/assets/images/虚线.png" alt />
-        </div>
-        <div style="width: 100%; display: flex; flex-direction: row">
-          <div>
-            <el-row>
-              <el-form-item label="姓名" prop="name">
-                <el-input v-model="form.name" placeholder />
-              </el-form-item>
-              <el-form-item label="身份证号" prop="idcard">
-                <el-input
-                  v-model="form.idcard"
-                  placeholder
-                  @blur="idcardfun()"
-                />
-              </el-form-item>
-            </el-row>
-            <el-row>
-              <el-form-item label="民族" prop="nationId">
-                <el-select v-model="form.nationId" clearable placeholder>
-                  <el-option
-                    v-for="dict in nationIds"
-                    :key="dict.dictValue"
-                    :label="dict.dictLabel"
-                    :value="parseInt(dict.dictValue)"
-                    style="width: 200px; height: 36px"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="性别" prop="sex">
-                <el-select v-model="form.sex" clearable placeholder>
-                  <el-option
-                    v-for="dict in sexList"
-                    :key="dict.dictValue"
-                    :label="dict.dictLabel"
-                    :value="dict.dictValue"
+      <div class="userAgree" style="overflow: -Scroll; overflow-x: hidden">
+        <el-form
+          ref="form"
+          :model="form"
+          :rules="rules"
+          :inline="true"
+          label-width="120px"
+        >
+          <div class="jiben">基本信息</div>
+          <div class="div-box-title1">
+            <span>个人信息</span>
+            <img src="@/assets/images/虚线.png" alt />
+          </div>
+          <div style="width: 100%; display: flex; flex-direction: row">
+            <div>
+              <el-row>
+                <el-form-item label="姓名" prop="name">
+                  <el-input v-model="form.name" placeholder />
+                </el-form-item>
+                <el-form-item label="身份证号" prop="idcard">
+                  <el-input
+                    v-model="form.idcard"
+                    placeholder
+                    @blur="idcardfun()"
+                  />
+                </el-form-item>
+              </el-row>
+              <el-row>
+                <el-form-item label="民族" prop="nationId">
+                  <el-select v-model="form.nationId" clearable placeholder>
+                    <el-option
+                      v-for="dict in nationIds"
+                      :key="dict.dictValue"
+                      :label="dict.dictLabel"
+                      :value="parseInt(dict.dictValue)"
+                      style="width: 200px; height: 36px"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="性别" prop="sex">
+                  <el-select v-model="form.sex" clearable placeholder>
+                    <el-option
+                      v-for="dict in sexList"
+                      :key="dict.dictValue"
+                      :label="dict.dictLabel"
+                      :value="dict.dictValue"
+                      style="width: 200px; height: 36px"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-row>
+              <el-row>
+                <el-form-item label="年龄" prop="age">
+                  <el-input v-model="form.age" placeholder />
+                </el-form-item>
+                <el-form-item label="出生年月" prop="birthDate">
+                  <el-date-picker
+                    clearable
+                    size="small"
+                    v-model="form.birthDate"
+                    type="date"
+                    value-format="yyyy-MM-dd"
+                    placeholder
                     style="width: 200px; height: 36px"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-row>
-            <el-row>
-              <el-form-item label="年龄" prop="age">
-                <el-input v-model="form.age" placeholder />
-              </el-form-item>
-              <el-form-item label="出生年月" prop="birthDate">
-                <el-date-picker
-                  clearable
-                  size="small"
-                  v-model="form.birthDate"
-                  type="date"
-                  value-format="yyyy-MM-dd"
-                  placeholder
-                  style="width: 200px; height: 36px"
-                ></el-date-picker>
-              </el-form-item>
-            </el-row>
-            <el-row>
-              <el-form-item label="籍贯" prop="origin">
-                <el-input v-model="form.origin" placeholder />
-              </el-form-item>
-              <el-form-item label="家庭住址" prop="live">
-                <el-input v-model="form.live" placeholder />
+                  ></el-date-picker>
+                </el-form-item>
+              </el-row>
+              <el-row>
+                <el-form-item label="籍贯" prop="origin">
+                  <el-input v-model="form.origin" placeholder />
+                </el-form-item>
+                <el-form-item label="家庭住址" prop="live">
+                  <el-input v-model="form.live" placeholder />
+                </el-form-item>
+              </el-row>
+            </div>
+            <div style="margin-left: 50px; display: flex">
+              <div class="pictureUploading-img">
+                <img src="@/assets/images/提示.png" alt />
+              </div>
+              <el-form-item prop="pictureUploading" class="personphoto">
+                <imageUpload
+                  :limit="1"
+                  v-model="form.avatar"
+                  style="height: 200px"
+                />
               </el-form-item>
-            </el-row>
-          </div>
-          <div style="margin-left: 50px; display: flex">
-            <div class="pictureUploading-img">
-              <img src="@/assets/images/提示.png" alt />
             </div>
-            <el-form-item prop="pictureUploading" class="personphoto">
-              <imageUpload
-                :limit="1"
-                v-model="form.avatar"
-                style="height: 200px"
-              />
+          </div>
+          <el-row>
+            <el-form-item label="血型" prop="bloodType">
+              <el-select v-model="form.bloodType" clearable placeholder>
+                <el-option
+                  v-for="dict in bloodType"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="政治面貌" prop="partyId">
+              <el-select v-model="form.partyId" clearable placeholder>
+                <el-option
+                  v-for="dict in partyIds"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="parseInt(dict.dictValue)"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="党团时间" prop="partyDate">
+              <el-date-picker
+                clearable
+                size="small"
+                v-model="form.partyDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder
+              ></el-date-picker>
+            </el-form-item>
+          </el-row>
+          <el-row>
+            <el-form-item label="健康情况" prop="healthy">
+              <el-select v-model="form.healthy" clearable placeholder>
+                <el-option
+                  v-for="dict in healthy"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
             </el-form-item>
+            <el-form-item label="保障卡号" prop="guaranteeCardNo">
+              <el-input v-model="form.guaranteeCardNo" placeholder />
+            </el-form-item>
+            <el-form-item label="工资卡号" prop="payrollCardNo">
+              <el-input v-model="form.payrollCardNo" placeholder />
+            </el-form-item>
+          </el-row>
+          <div class="div-box-title1">
+            <span>婚姻信息</span>
+            <img src="@/assets/images/虚线.png" alt />
           </div>
-        </div>
-        <el-row>
-          <el-form-item label="血型" prop="bloodType">
-            <el-select v-model="form.bloodType" clearable placeholder>
+          <el-row>
+            <el-form-item label="婚姻情况" prop="marryList">
+              <el-select v-model="form.marryList" clearable placeholder>
+                <el-option
+                  v-for="dict in marryList"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="子女情况" prop="childrenList">
+              <el-select v-model="form.childrenList" clearable placeholder>
+                <el-option
+                  v-for="dict in childrenList"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-row>
+          <div class="div-box-title1">
+            <span>学历教育</span>
+            <img src="@/assets/images/虚线.png" alt />
+          </div>
+          <el-form-item label="学历" prop="educationId">
+            <el-select v-model="form.educationId" clearable placeholder>
               <el-option
-                v-for="dict in bloodType"
+                v-for="dict in educationId"
                 :key="dict.dictValue"
                 :label="dict.dictLabel"
-                :value="dict.dictValue"
+                :value="parseInt(dict.dictValue)"
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="政治面貌" prop="partyId">
-            <el-select v-model="form.partyId" clearable placeholder>
+          <el-form-item label="学位" prop="degreeId">
+            <el-select v-model="form.degreeId" clearable placeholder>
               <el-option
-                v-for="dict in partyIds"
+                v-for="dict in degree"
                 :key="dict.dictValue"
                 :label="dict.dictLabel"
                 :value="parseInt(dict.dictValue)"
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="党团时间" prop="partyDate">
+          <el-form-item label="入学时间" prop="admissionTime">
             <el-date-picker
               clearable
               size="small"
-              v-model="form.partyDate"
+              v-model="form.admissionTime"
               type="date"
               value-format="yyyy-MM-dd"
               placeholder
             ></el-date-picker>
           </el-form-item>
-        </el-row>
-        <el-row>
-          <el-form-item label="健康情况" prop="healthy">
-            <el-select v-model="form.healthy" clearable placeholder>
+          <el-form-item label=" 专业" prop="major">
+            <el-input v-model="form.major" placeholder />
+          </el-form-item>
+          <el-form-item label="毕业时间" prop="graduationDate">
+            <el-date-picker
+              clearable
+              size="small"
+              v-model="form.graduationDate"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item label="毕业学校" prop="school">
+            <el-input v-model="form.school" placeholder />
+          </el-form-item>
+          <div class="div-box-title1">
+            <span>联系方式</span>
+            <img src="@/assets/images/虚线.png" alt />
+          </div>
+          <el-form-item label="手机型号" prop="mobilePhoneModel">
+            <el-input v-model="form.mobilePhoneModel" placeholder />
+          </el-form-item>
+          <el-form-item label="手机号码" prop="phone">
+            <el-input v-model="form.phone" placeholder />
+          </el-form-item>
+          <el-form-item label="手机号码2" prop="phoneStandby">
+            <el-input v-model="form.phoneStandby" placeholder />
+          </el-form-item>
+          <div class="jiben">职务信息</div>
+          <el-form-item label="军人证号" prop="military">
+            <el-input v-model="form.military" placeholder />
+          </el-form-item>
+          <el-form-item label="人员类别" prop="classId">
+            <el-select v-model="form.classId" clearable placeholder>
               <el-option
-                v-for="dict in healthy"
+                v-for="dict in classId"
                 :key="dict.dictValue"
                 :label="dict.dictLabel"
-                :value="dict.dictValue"
+                :value="parseInt(dict.dictValue)"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="单位" prop="deptId">
+            <el-select v-model="form.deptId" ref="deptId" clearable placeholder>
+              <el-option
+                v-for="dict in unitId"
+                :key="dict.deptId"
+                :label="dict.deptName"
+                :value="dict.deptId"
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="保障卡号" prop="guaranteeCardNo">
-            <el-input v-model="form.guaranteeCardNo" placeholder />
+          <el-form-item label="部职别" prop="duty">
+            <el-input v-model="form.duty" placeholder />
           </el-form-item>
-          <el-form-item label="工资卡号" prop="payrollCardNo">
-            <el-input v-model="form.payrollCardNo" placeholder />
+          <el-form-item label="入伍时间" prop="enlistDate">
+            <el-date-picker
+              clearable
+              size="small"
+              v-model="form.enlistDate"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder
+            ></el-date-picker>
           </el-form-item>
-        </el-row>
-        <div class="div-box-title1">
-          <span>婚姻信息</span>
-          <img src="@/assets/images/虚线.png" alt />
-        </div>
-        <el-row>
-          <el-form-item label="婚姻情况" prop="marryList">
-            <el-select v-model="form.marryList" clearable placeholder>
+          <el-form-item label="入伍地点" prop="enlistaddress">
+            <el-input v-model="form.enlistaddress" placeholder />
+          </el-form-item>
+          <el-form-item label="职务层级" prop="postId">
+            <el-select v-model="form.postId" clearable placeholder>
+              <el-option
+                v-for="dict in postIds"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="parseInt(dict.dictValue)"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="现职务层级时间" prop="postDate">
+            <el-date-picker
+              clearable
+              size="small"
+              v-model="form.postDate"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item label="军衔" prop="rankId">
+            <el-select v-model="form.rankId" clearable placeholder>
               <el-option
-                v-for="dict in marryList"
+                v-for="dict in rankIds"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="parseInt(dict.dictValue)"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="现军衔" prop="nowMilitaryRank">
+            <el-select v-model="form.nowMilitaryRank" clearable placeholder>
+              <el-option
+                v-for="dict in rankIds"
                 :key="dict.dictValue"
                 :label="dict.dictLabel"
                 :value="dict.dictValue"
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="子女情况" prop="childrenList">
-            <el-select v-model="form.childrenList" clearable placeholder>
+          <el-form-item label="现军衔时间" prop="rankDate">
+            <el-date-picker
+              clearable
+              size="small"
+              v-model="form.rankDate"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item label="是否编制" prop="authorizedStrength">
+            <el-select v-model="form.authorizedStrength" clearable placeholder>
               <el-option
-                v-for="dict in childrenList"
+                v-for="dict in authorizedStrength"
                 :key="dict.dictValue"
                 :label="dict.dictLabel"
                 :value="dict.dictValue"
               ></el-option>
             </el-select>
           </el-form-item>
-        </el-row>
-        <div class="div-box-title1">
-          <span>学历教育</span>
-          <img src="@/assets/images/虚线.png" alt />
-        </div>
-        <el-form-item label="学历" prop="educationId">
-          <el-select v-model="form.educationId" clearable placeholder>
-            <el-option
-              v-for="dict in educationId"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="parseInt(dict.dictValue)"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="学位" prop="degreeId">
-          <el-select v-model="form.degreeId" clearable placeholder>
-            <el-option
-              v-for="dict in degree"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="parseInt(dict.dictValue)"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="入学时间" prop="admissionTime">
-          <el-date-picker
-            clearable
-            size="small"
-            v-model="form.admissionTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item label=" 专业" prop="major">
-          <el-input v-model="form.major" placeholder />
-        </el-form-item>
-        <el-form-item label="毕业时间" prop="graduationDate">
-          <el-date-picker
-            clearable
-            size="small"
-            v-model="form.graduationDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item label="毕业学校" prop="school">
-          <el-input v-model="form.school" placeholder />
-        </el-form-item>
-        <div class="div-box-title1">
-          <span>联系方式</span>
-          <img src="@/assets/images/虚线.png" alt />
-        </div>
-        <el-form-item label="手机型号" prop="mobilePhoneModel">
-          <el-input v-model="form.mobilePhoneModel" placeholder />
-        </el-form-item>
-        <el-form-item label="手机号码" prop="phone">
-          <el-input v-model="form.phone" placeholder />
-        </el-form-item>
-        <el-form-item label="手机号码2" prop="phoneStandby">
-          <el-input v-model="form.phoneStandby" placeholder />
-        </el-form-item>
-        <div class="jiben">职务信息</div>
-        <el-form-item label="军人证号" prop="military">
-          <el-input v-model="form.military" placeholder />
-        </el-form-item>
-        <el-form-item label="人员类别" prop="classId">
-          <el-select v-model="form.classId" clearable placeholder>
-            <el-option
-              v-for="dict in classId"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="parseInt(dict.dictValue)"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="单位" prop="deptId">
-          <el-select v-model="form.deptId" ref="deptId" clearable placeholder>
-            <el-option
-              v-for="dict in unitId"
-              :key="dict.deptId"
-              :label="dict.deptName"
-              :value="dict.deptId"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="部职别" prop="duty">
-          <el-input v-model="form.duty" placeholder />
-        </el-form-item>
-        <el-form-item label="入伍时间" prop="enlistDate">
-          <el-date-picker
-            clearable
-            size="small"
-            v-model="form.enlistDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item label="入伍地点" prop="enlistaddress">
-          <el-input v-model="form.enlistaddress" placeholder />
-        </el-form-item>
-        <el-form-item label="职务层级" prop="postId">
-          <el-select v-model="form.postId" clearable placeholder>
-            <el-option
-              v-for="dict in postIds"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="parseInt(dict.dictValue)"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="现职务层级时间" prop="postDate">
-          <el-date-picker
-            clearable
-            size="small"
-            v-model="form.postDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item label="军衔" prop="rankId">
-          <el-select v-model="form.rankId" clearable placeholder>
-            <el-option
-              v-for="dict in rankIds"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="parseInt(dict.dictValue)"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="现军衔" prop="nowMilitaryRank">
-          <el-select v-model="form.nowMilitaryRank" clearable placeholder>
-            <el-option
-              v-for="dict in rankIds"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="dict.dictValue"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="现军衔时间" prop="rankDate">
-          <el-date-picker
-            clearable
-            size="small"
-            v-model="form.rankDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item label="是否编制" prop="authorizedStrength">
-          <el-select v-model="form.authorizedStrength" clearable placeholder>
-            <el-option
-              v-for="dict in authorizedStrength"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="dict.dictValue"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="命令号" prop="command">
-          <el-input v-model="form.command" placeholder />
-        </el-form-item>
-        <el-form-item label="待遇级别" prop="treatmentLevel">
-          <el-input v-model="form.treatmentLevel" placeholder />
-        </el-form-item>
-        <el-form-item label="现待遇级别时间" prop="rankUpgradeTime">
-          <el-date-picker
-            clearable
-            size="small"
-            v-model="form.rankUpgradeTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item label="专业是否对口" prop="isBianzhi">
-          <el-select v-model="form.isBianzhi" clearable placeholder>
-            <el-option
-              v-for="dict in authorizedStrength"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="dict.dictValue"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="工作时间" prop="jobTime">
-          <el-date-picker
-            clearable
-            size="small"
-            v-model="form.jobTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder
-          ></el-date-picker>
-        </el-form-item>
-        <div class="jiben">
-          家庭信息 <span @click="tiaddfun" class="zengJia">+</span>
-        </div>
-        <el-row
-          style="padding-top: 20px; margin-top: 10px; margin-bottom: 20px"
-          v-for="(item, index) in jtlist"
-          :key="index"
-        >
-          <el-form-item label="姓名">
-            <el-input v-model="item.name" placeholder />
+          <el-form-item label="命令号" prop="command">
+            <el-input v-model="form.command" placeholder />
+          </el-form-item>
+          <el-form-item label="待遇级别" prop="treatmentLevel">
+            <el-input v-model="form.treatmentLevel" placeholder />
           </el-form-item>
-          <el-form-item label="与本人关系" prop="characterRelationship">
-            <el-input v-model="item.characterRelationship" placeholder />
+          <el-form-item label="现待遇级别时间" prop="rankUpgradeTime">
+            <el-date-picker
+              clearable
+              size="small"
+              v-model="form.rankUpgradeTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder
+            ></el-date-picker>
           </el-form-item>
-          <el-form-item label="联系电话" prop="phoneNumber">
-            <el-input v-model="item.phoneNumber" placeholder />
+          <el-form-item label="专业是否对口" prop="isBianzhi">
+            <el-select v-model="form.isBianzhi" clearable placeholder>
+              <el-option
+                v-for="dict in authorizedStrength"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="dict.dictValue"
+              ></el-option>
+            </el-select>
           </el-form-item>
-          <el-form-item label="单位" prop="unitName">
-            <el-input v-model="item.unitName" placeholder />
+          <el-form-item label="工作时间" prop="jobTime">
+            <el-date-picker
+              clearable
+              size="small"
+              v-model="form.jobTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder
+            ></el-date-picker>
           </el-form-item>
-          <el-button
+          <div class="jiben">家庭信息</div>
+          <!-- <span @click="tiaddfun" class="zengJia">+</span> -->
+          <el-row
+            style="padding-top: 20px; margin-top: 10px; margin-bottom: 20px"
+            v-for="(item, index) in jtlist"
+            :key="index"
+          >
+            <el-form-item label="姓名">
+              <el-input v-model="item.name" placeholder />
+            </el-form-item>
+            <el-form-item label="与本人关系" prop="characterRelationship">
+              <el-input v-model="item.characterRelationship" placeholder />
+            </el-form-item>
+            <el-form-item label="联系电话" prop="phoneNumber">
+              <el-input v-model="item.phoneNumber" placeholder />
+            </el-form-item>
+            <el-form-item label="单位" prop="unitName">
+              <el-input v-model="item.unitName" placeholder />
+            </el-form-item>
+            <el-form-item>
+              <el-button
+                type="primary"
+                icon="el-icon-plus"
+                size="mini"
+                @click="tiaddfun"
+                v-if="index == jtlist.length - 1"
+              ></el-button>
+              <el-button
+                type="danger"
+                icon="el-icon-delete"
+                size="mini"
+                v-if="index > 0"
+                @click="jtDelete(index)"
+              ></el-button>
+            </el-form-item>
+            <!-- <el-button
             type="danger"
             icon="el-icon-delete"
             size="mini"
@@ -1182,29 +1198,30 @@
             style="height: 36px; margin-left: 575px"
             v-if="index != 0"
             >删除</el-button
+          >  -->
+          </el-row>
+          <div class="jiben">培训经历</div>
+          <el-form-item label prop="training">
+            <el-input v-model="form.training" type="textarea" placeholder />
+          </el-form-item>
+          <div class="jiben">奖惩情况</div>
+          <el-form-item label prop="prize">
+            <el-input v-model="form.prize" type="textarea" placeholder />
+          </el-form-item>
+          <div class="jiben">简历</div>
+          <el-form-item
+            label
+            label-width="0px"
+            class="laborcontractuploading"
+            prop="laborContractUploading"
           >
-        </el-row>
-        <div class="jiben">培训经历</div>
-        <el-form-item label prop="training">
-          <el-input v-model="form.training" type="textarea" placeholder />
-        </el-form-item>
-        <div class="jiben">奖惩情况</div>
-        <el-form-item label prop="prize">
-          <el-input v-model="form.prize" type="textarea" placeholder />
-        </el-form-item>
-        <div class="jiben">简历</div>
-        <el-form-item
-          label
-          label-width="0px"
-          class="laborcontractuploading"
-          prop="laborContractUploading"
-        >
-          <fileUpload v-model="form.laborContractUploading" class="m-l-20" />
-        </el-form-item>
-        <!-- <el-form-item label prop="readmeFile">
+            <fileUpload v-model="form.laborContractUploading" class="m-l-20" />
+          </el-form-item>
+          <!-- <el-form-item label prop="readmeFile">
           <el-input v-model="form.readmeFile" type="textarea" placeholder />
         </el-form-item>-->
-      </el-form>
+        </el-form>
+      </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -1844,7 +1861,7 @@ export default {
 </script>
 <style scoped>
 ::v-deep .el-dialog {
-  width: 1030px !important;
+  width: 1100px !important;
   background-color: #004d86;
 }
 
@@ -2025,5 +2042,13 @@ export default {
 ::v-deep .el-tree-node__content {
   height: 32px;
 }
-
+::v-deep .el-dialog__body {
+  padding: 0px 0px;
+  padding-top: 30px;
+  padding-bottom: 30px;
+  padding-left: 50px;
+}
+::v-deep .el-dialog__footer {
+  padding-right: 60px;
+}
 </style>