营房修改

src/views/barracksManagement/flats/index.vue

@@ -355,7 +355,7 @@
     <el-dialog
       :title="title"
       :visible.sync="open"
-      width="1190px"
+      width="1200px"
       append-to-body
     >
       <el-form
@@ -365,7 +365,8 @@
         label-width="110px"
         :inline="true"
       >
-        <el-form-item label="单位" prop="unitId" style="margin-left:25px">
+      <div class="jiben">个人信息</div>
+        <el-form-item label="单位" prop="unitId">
           <!-- <el-input v-model="form.unitId" placeholder="请输入单位" /> -->
           <treeselect
             v-model="form.unitId"
@@ -375,7 +376,7 @@
             @select="selectPeo"
           />
         </el-form-item>
-        <el-form-item label="人员" prop="peopleId" style="margin-left:-50px">
+        <el-form-item label="人员" prop="peopleId" >
            <el-select
                 v-model="form.peopleId"
                 placeholder="请选择人员"
@@ -390,18 +391,12 @@
                 />
               </el-select>
         </el-form-item>
-        <el-form-item label="出生时间" style="margin-left:8px" prop="birthDate" placeholder="请选择出生时间">
-          <el-date-picker
-            clearable
-            size="small"
-            v-model="form.birthDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-          >
-          </el-date-picker>
+         <el-form-item label="部职别" prop="duty" style="margin-left:-5px">
+          <el-input v-model="form.duty" />
         </el-form-item>
+       
 
-        <el-form-item label="军衔" prop="rankId" style="margin-left:25px">
+        <el-form-item label="军衔" prop="rankId" >
            <!-- <el-input  v-model="form.rankId" class="zhufnag" :disabled="true" /> -->
           <!-- <el-input v-model="form.rankName" placeholder="请输入军衔" /> -->
           <el-select v-model="form.rankId" :disabled="true" placeholder="请选择军衔"  >
@@ -416,7 +411,7 @@
           </el-select>
          
         </el-form-item>
-        <el-form-item label="军衔时间" prop="rankDate" style="margin-left:-50px">
+        <el-form-item label="军衔时间" prop="rankDate" >
           <el-date-picker
             clearable
             size="small"
@@ -426,13 +421,23 @@
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="住房待遇等级" prop="grade" class="zhufnag" style="margin-left:35px">
-          <el-input v-model="form.grade" class="zhufnag" />
+         <el-form-item label="出生时间" style="margin-left:13px" prop="birthDate" placeholder="请选择出生时间">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.birthDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+          >
+          </el-date-picker>
         </el-form-item>
-        <el-form-item label="配偶现住房" prop="pCeace" style="margin-left:25px">
-          <el-input v-model="form.pCeace" />
+        <el-form-item label="住房待遇等级" prop="grade" style="margin-left:0px" >
+          <el-input v-model="form.grade"  />
         </el-form-item>
-        <el-form-item label="入伍年月" prop="enlistDate" style="margin-left:-50px">
+        <!-- <el-form-item label="配偶现住房" prop="pCeace" style="margin-left:25px">
+          <el-input v-model="form.pCeace" />
+        </el-form-item> -->
+        <el-form-item label="入伍年月" prop="enlistDate" style="margin-left:0px">
           <el-date-picker
             clearable
             size="small"
@@ -442,46 +447,62 @@
           >
           </el-date-picker>
         </el-form-item>
-
-        <el-form-item label="申请住房户型" prop="houseType" style="margin-left:26px">
+        <el-form-item label="结婚时间" prop="pTime" style="margin-left:13px" >
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.pTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+          >
+          </el-date-picker>
+        </el-form-item>
+       <el-form-item
+          label="享受相应住房待遇职级时间"
+          prop="jobDate"
+          label-width="200px"
+          style="margin-left:-90px"
+          
+        >
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.jobDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="申请住房户型" prop="houseType" style="margin-left:15px" >
           <!-- <el-select v-model="form.houseType" placeholder="请选择申请住房户型" class="zhufnag">
             <el-option label="请选择字典生成" value="" class="zhufnag" /> -->
           <el-input v-model="form.houseType" class="zhufnag" />
           <!-- </el-select> -->
         </el-form-item>
-        <el-form-item label="部职别" prop="duty" style="margin-left:25px">
-          <el-input v-model="form.duty" />
-        </el-form-item>
-        <el-form-item label="参加工作时间" prop="jobTime" style="margin-left:-50px">
+       
+        
+        <el-form-item label="任现职级时间" prop="jobsDate" >
           <el-date-picker
             clearable
             size="small"
-            v-model="form.jobTime"
+            v-model="form.jobsDate"
             type="date"
             value-format="yyyy-MM-dd"
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="任现职级时间" prop="jobsDate" class="zhufnag"  style="margin-left:35px">
+        
+         <el-form-item label="地方普通高等学校入学时间" style="margin-left:-70px"  prop="entranceDate"  label-width="180px">
           <el-date-picker
             clearable
             size="small"
-            v-model="form.jobsDate"
+            v-model="form.entranceDate"
             type="date"
             value-format="yyyy-MM-dd"
           >
           </el-date-picker>
         </el-form-item>
-        <!-- <el-form-item label="登记人" prop="adminId">
-          <el-input v-model="form.adminId" placeholder="请输入登记人" />
-        </el-form-item> -->
-        <el-form-item label="配偶姓名" prop="pName" style="margin-left:25px">
-          <el-input v-model="form.pName" />
-        </el-form-item>
-        <el-form-item label="配偶单位" prop="pUnit" style="margin-left:-50px">
-          <el-input v-model="form.pUnit" />
-        </el-form-item>
-        <el-form-item label="申请住房类别" prop="type" style="margin-left:10px">
+        <el-form-item label="申请住房类别" prop="type" style="margin-left:13px" >
           <el-select v-model="form.type" placeholder="请选择申请住房类别">
             <!-- <el-option label="请选择字典生成" value="" /> -->
             <el-option
@@ -493,30 +514,43 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="配偶户口所在地" prop="pAccount" label-width="130px" style="margin-left:10px">
-          <el-input v-model="form.pAccount" />
-        </el-form-item>
-        <el-form-item label="结婚时间" prop="pTime" style="margin-left:-50px">
+         <el-form-item label="参加工作时间" prop="jobTime" >
           <el-date-picker
             clearable
             size="small"
-            v-model="form.pTime"
+            v-model="form.jobTime"
             type="date"
             value-format="yyyy-MM-dd"
           >
           </el-date-picker>
         </el-form-item>
-          <el-form-item label="是否符合申请条件" prop="whether"  label-width="127px" style="margin-left:4px" >
-          <el-input v-model="form.whether" />
+        
+        <!-- <el-form-item label="登记人" prop="adminId">
+          <el-input v-model="form.adminId" placeholder="请输入登记人" />
+        </el-form-item> -->
+        <div class="jiben">配偶信息</div>
+        
+        <el-form-item label="配偶姓名" prop="pName">
+          <el-input v-model="form.pName" />
         </el-form-item>
-        <el-form-item label="配偶是否军队人员(含职工)" class="peious" style="margin-left:-45px"  label-width="180px" prop="whethers">
+         <el-form-item label="配偶单位" prop="pUnit" >
+          <el-input v-model="form.pUnit" />
+        </el-form-item>
+        
+        <el-form-item label="配偶现住房" prop="pCeace" style="margin-left:-10px">
+          <el-input v-model="form.pCeace" />
+        </el-form-item>
+        <el-form-item label="配偶是否军队人员(含职工)" style="margin-left:-70px"  label-width="180px" prop="whethers">
           <el-input v-model="form.whethers"  />
         </el-form-item>
-        <el-form-item
         
+        <el-form-item label="配偶户口所在地" prop="pAccount" style="margin-left:-20px" label-width="130px">
+          <el-input v-model="form.pAccount" />
+        </el-form-item>
+        <el-form-item
+          style="margin-left:-80px"
           label="配偶入伍或随军时间"
           prop="pTimeOne"
-          class="peious"
           label-width="180px"
         >
           <el-date-picker
@@ -528,35 +562,10 @@
           >
           </el-date-picker>
         </el-form-item>
-
-        <el-form-item label="地方普通高等学校入学时间"  prop="entranceDate" style="margin-left:-44px" class="peious" label-width="180px">
-          <el-date-picker
-            clearable
-            size="small"
-            v-model="form.entranceDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-          >
-          </el-date-picker>
-        </el-form-item>
-        
-      
-        <el-form-item
-          label="享受相应住房待遇职级时间"
-          prop="jobDate"
-          label-width="200px"
-          class="peious"
-          style="margin-left:130px"
-        >
-          <el-date-picker
-            clearable
-            size="small"
-            v-model="form.jobDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-          >
-          </el-date-picker>
-        </el-form-item>
+       <!-- <div class="jiben">条件</div> -->
+          <el-form-item label="是否符合申请条件" prop="whether" style="margin-left:-20px" label-width="127px" >
+          <el-input v-model="form.whether" />
+        </el-form-item>   
         <div class="jiben">备注</div>
         <el-form-item prop="remark">
           <el-input
@@ -744,11 +753,19 @@ export default {
     //   // });
     // },
     peopleIds(name,item){
-      console.log(item.rankId)
+      console.log(item)
       this.form.rankName=""
       this.form.peopleName=name
+      this.form.duty=item.duty
+      this.form.rankDate=item.rankDate
+      this.form.birthDate=item.birthDate
+      // this.form.grade=item.grade
+      this.form.enlistDate=item.enlistDate
+      // this.form.pTime=item.pTime
       this.form.rankId=item.rankId
-      console.log(this.form.rankId)
+      this.form.jobDate=item.jobDate
+      this.form.jobsDate=item.jobsDate
+      this.form.jobTime=item.jobTime
       this.ziDian1.forEach(item=>{
       if(this.form.rankId==item.dictSort)
         this.form.rankName=item.dictLabel
@@ -1064,9 +1081,9 @@ export default {
   width: 351px;
 }
 ::v-deep .el-form{
-  margin-left: 30px;
+  margin-left: 40px;
 }
 .jiben{
-  margin-left: -20px;
+  margin-left: -40px;
 }
 </style>