人员进出字段修改

src/views/peopleChuRu/bdglLeave/index.vue

@@ -85,7 +85,15 @@
           <span>{{ parseTime(scope.row.endTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="请假类型" align="center" prop="leaveType" />
+      <el-table-column label="请假类型" align="center" prop="leaveType" :formatter="qingJia"
+      >
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.Leave_type"
+            :value="scope.row.leaveType"
+          />
+        </template>
+      </el-table-column>
       <el-table-column label="请假原因" align="center" prop="leaveReason" />
       <el-table-column
         label="离队时间"
@@ -99,7 +107,14 @@
         prop="returnTime"
         width="100"
       />
-      <el-table-column label="是否归队" align="center" prop="isReturn" />
+      <el-table-column label="是否归队" align="center" prop="isReturn" >
+         <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.sys_is"
+            :value="scope.row.isReturn"
+          />
+        </template>
+      </el-table-column>
       <el-table-column
         label="一级审批人"
         align="center"
@@ -231,7 +246,7 @@
       <el-table-column
         label="总审批状态"
         align="center"
-        prop="rejoin"
+        prop="contents"
         width="100"
       />
       <el-table-column
@@ -292,11 +307,13 @@
         label-width="80px"
         inline
       >
+        <div class="jiben">基本信息</div>
+
         <el-form-item label="单位" prop="unitId">
           <treeselect
             v-model="form.unitId"
             :options="deptOptions"
-            placeholder="选择单位"
+            placeholder="请选择单位"
             @select="selectPeo"
             @open="blurSelect"
           />
@@ -314,6 +331,7 @@
               :label="item.name"
               :value="item.id"
               @click.native="qingRen(item.name)"
+              class="input_xiala"
             >
             </el-option>
           </el-select>
@@ -349,6 +367,7 @@
               :key="item.dictCode"
               :label="item.dictLabel"
               :value="item.dictValue"
+              class="input_xiala"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -390,6 +409,7 @@
               :label="item.userName"
               :value="item.userId"
               @click.native="oneRen(item.userName)"
+              class="input_xiala"
             >
             </el-option>
           </el-select>
@@ -408,6 +428,7 @@
               :label="item.userName"
               :value="item.userId"
               @click.native="twoRen(item.userName)"
+              class="input_xiala"
             >
             </el-option>
           </el-select>
@@ -426,6 +447,7 @@
               :label="item.userName"
               :value="item.userId"
               @click.native="thereRen(item.userName)"
+              class="input_xiala"
             >
             </el-option>
           </el-select>
@@ -444,6 +466,7 @@
               :label="item.userName"
               :value="item.userId"
               @click.native="fourRen(item.userName)"
+              class="input_xiala"
             >
             </el-option>
           </el-select>
@@ -711,6 +734,7 @@ export default {
   components: {
     Treeselect,
   },
+   dicts: ["Leave_type", "sys_is"],
   data() {
     return {
       // 审批按钮状态 审批按钮状态1 修改为0,超级审批状态2

src/views/peopleChuRu/peopleBorrow/index.vue

@@ -175,12 +175,13 @@
         label-width="80px"
         inline
       >
+      <div class="jiben">基本信息</div>
         <el-form-item label="单位" prop="unitId">
           <!-- <el-input v-model="form.unitName" placeholder="请输入单位" /> -->
           <treeselect
             v-model="form.unitId"
             :options="deptOptions"
-            placeholder="选择单位"
+            placeholder="请选择单位"
             @select="selectPeo"
             @open="blurSelect"
           />
@@ -200,6 +201,7 @@
               @click.native="
                 jieRen(item.name, item.rankId, item.jobTitle, item)
               "
+              class="input_xiala"
             >
             </el-option>
           </el-select>
@@ -536,6 +538,7 @@ export default {
   height: 36px; */
   background: transparent;
   color: #fff;
+  border-color: #fff;
 }
 /* 单位框背景颜色 */
 ::v-deep .vue-treeselect__control {
@@ -543,9 +546,10 @@ export default {
 }
 /* 基本信息背景 */
 .jiben {
-  width: 920px;
+  width: 700px;
   height: 32px;
   background-image: url(../../../images/小标题底.png);
+  background-size: 700px;
   margin-bottom: 25px;
   color: #fff;
   padding-left: 16px;

src/views/system/user/index.vue

@@ -67,6 +67,7 @@
                 :key="dict.value"
                 :label="dict.label"
                 :value="dict.value"
+                class="input_xiala"
               />
             </el-select>
           </el-form-item>