军车审批字体颜色，疗养管理审批颜色

src/views/medicalhealth/recuperate/index.vue

@@ -314,10 +314,17 @@
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="单位" align="center" prop="unitId" />
-      <el-table-column label="人员名称" align="center" prop="peopleId" />
+      <el-table-column label="单位" align="center" prop="unitName" />
+      <el-table-column label="人员名称" align="center" prop="peopleName" />
       <el-table-column label="岗位" align="center" prop="job" />
-      <el-table-column label="疗养类型" align="center" prop="type" />
+      <el-table-column label="疗养类型" align="center" prop="type">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.convalescent_type"
+            :value="scope.row.type"
+          />
+        </template>
+      </el-table-column>
       <el-table-column label="疗养天数" align="center" prop="number" />
       <el-table-column
         label="开始时间"
@@ -343,7 +350,7 @@
       <el-table-column
         label="一级审批人"
         align="center"
-        prop="createtime"
+        prop="peopleName1"
         width="130"
       />
       <el-table-column
@@ -351,11 +358,23 @@
         align="center"
         prop="updatetime"
         width="150"
-      />
+      >
+        <template slot-scope="scope">
+          <span v-if="scope.row.status1 == '1'" style="color: #13ce66"
+            >通过</span
+          >
+          <span v-if="scope.row.status1 == '0'" style="color: #00eaff"
+            >驳回</span
+          >
+          <span v-if="scope.row.status1 == '2'" style="color: #ffba00"
+            >未审批</span
+          >
+        </template>
+      </el-table-column>
       <el-table-column
         label="二级审批人"
         align="center"
-        prop="unitId1"
+        prop="peopleName2"
         width="130"
       />
       <el-table-column
@@ -363,11 +382,23 @@
         align="center"
         prop="unitId2"
         width="150"
-      />
+      >
+        <template slot-scope="scope">
+          <span v-if="scope.row.status2 == '1'" style="color: #13ce66"
+            >通过</span
+          >
+          <span v-if="scope.row.status2 == '0'" style="color: #00eaff"
+            >驳回</span
+          >
+          <span v-if="scope.row.status2 == '2'" style="color: #ffba00"
+            >未审批</span
+          >
+        </template>
+      </el-table-column>
       <el-table-column
         label="三级审批人"
         align="center"
-        prop="unitId3"
+        prop="peopleName3"
         width="130"
       />
       <el-table-column
@@ -375,7 +406,19 @@
         align="center"
         prop="peopleId1"
         width="150"
-      />
+      >
+        <template slot-scope="scope">
+          <span v-if="scope.row.status3 == '1'" style="color: #13ce66"
+            >通过</span
+          >
+          <span v-if="scope.row.status3 == '0'" style="color: #00eaff"
+            >驳回</span
+          >
+          <span v-if="scope.row.status3 == '2'" style="color: #ffba00"
+            >未审批</span
+          >
+        </template>
+      </el-table-column>
       <!-- <el-table-column label="申请时间" align="center" prop="peopleId2" /> -->
       <!-- <el-table-column label="更新时间" align="center" prop="peopleId3" /> -->
       <!-- <el-table-column label="整体审批状态" align="center" prop="status" /> -->
@@ -387,7 +430,11 @@
         fixed="right"
       >
         <template slot-scope="scope">
-          <el-button size="btk" type="text" @click="handleshenpi1(scope.row)"
+          <el-button
+            v-if="scope.row.common == '1'"
+            size="btk"
+            type="text"
+            @click="handleshenpi1(scope.row)"
             >审批</el-button
           >
           <el-button
@@ -448,9 +495,6 @@
           </el-select>
         </el-form-item>
         <el-form-item label="疗养类型" prop="type">
-          <!-- <el-select v-model="form.type" placeholder="">
-            <el-option label="请选择字典生成" value="" />
-          </el-select> -->
           <el-select v-model="form.type" placeholder="请选择疗养类型">
             <el-option
               v-for="(item, i) in liaoYang"
@@ -490,36 +534,65 @@
           <treeselect
             v-model="form.unitId1"
             :options="deptOptions"
-            placeholder="请选择单位"
-            @select="selectPeo2"
+            placeholder="请选择一级审批单位"
+            @select="selectPeo1"
           />
         </el-form-item>
         <el-form-item label="一级审批人" prop="peopleId1">
-          <el-input v-model="form.peopleId1" placeholder="请输入备注" />
+          <!-- <el-input v-model="form.peopleId1" placeholder="请输入备注" /> -->
+          <el-select v-model="form.peopleId1" placeholder="请选择一级审批人">
+            <el-option
+              v-for="(item, i) in renYuan1"
+              :key="i"
+              :label="item.name"
+              :value="item.id"
+              @click.native="qingRen1(item.name)"
+            >
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="二级审批单位" prop="unitId2">
-          <!-- <el-input v-model="form.unitId2" placeholder="请输入备注" /> -->
           <treeselect
             v-model="form.unitId2"
             :options="deptOptions"
-            placeholder="请选择单位"
-            @select="selectPeo3"
+            placeholder="请选择二级审批单位"
+            @select="selectPeo2"
           />
         </el-form-item>
         <el-form-item label="二级审批人" prop="peopleId2">
-          <el-input v-model="form.peopleId2" placeholder="请输入备注" />
+          <!-- <el-input v-model="form.peopleId2" placeholder="请输入备注" /> -->
+          <el-select v-model="form.peopleId2" placeholder="请选择二级审批人">
+            <el-option
+              v-for="(item, i) in renYuan2"
+              :key="i"
+              :label="item.name"
+              :value="item.id"
+              @click.native="qingRen2(item.name)"
+            >
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="三级审批单位" prop="unitId3">
           <!-- <el-input v-model="form.peopleId2" placeholder="请输入备注" /> -->
           <treeselect
             v-model="form.unitId3"
             :options="deptOptions"
-            placeholder="请选择单位"
-            @select="selectPeo4"
+            placeholder="请选择三级审批单位"
+            @select="selectPeo3"
           />
         </el-form-item>
         <el-form-item label="三级审批人" prop="peopleId3">
-          <el-input v-model="form.peopleId3" placeholder="请输入备注" />
+          <!-- <el-input v-model="form.peopleId3" placeholder="请输入备注" /> -->
+          <el-select v-model="form.peopleId3" placeholder="请选择三级审批人">
+            <el-option
+              v-for="(item, i) in renYuan3"
+              :key="i"
+              :label="item.name"
+              :value="item.id"
+              @click.native="qingRen3(item.name)"
+            >
+            </el-option>
+          </el-select>
         </el-form-item>
         <div class="jiben">备注</div>
         <el-form-item prop="remark">
@@ -529,15 +602,6 @@
             placeholder="请输入内容"
           />
         </el-form-item>
-
-        <!-- <el-form-item label="整体审批状态">
-          <el-radio-group v-model="form.status">
-            <el-radio label="1">请选择字典生成</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="岗位" prop="job">
-          <el-input v-model="form.job" placeholder="请输入岗位" />
-        </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -639,19 +703,36 @@ export default {
       deptOptions: [],
       // 人员列表
       renYuan: [],
+      // 人员列表1
+      renYuan1: [],
+      // 人员列表2
+      renYuan2: [],
+      // 人员列表3
+      renYuan3: [],
     };
   },
   created() {
     this.getList();
     getDicts("convalescent_type").then((response) => {
-      console.log(response);
       this.liaoYang = response.data;
     });
   },
   methods: {
     // 人员姓名选中
     qingRen(name) {
-      this.$set(this.form, this.form.peopleName, name);
+      this.form.peopleName = name;
+    },
+    // 人员姓名选中1
+    qingRen1(name) {
+      this.form.peopleName1 = name;
+    },
+    // 人员姓名选中2
+    qingRen2(name) {
+      this.form.peopleName2 = name;
+    },
+    // 人员姓名选中3
+    qingRen3(name) {
+      this.form.peopleName3 = name;
     },
     // 获取人员
     getRen(id) {
@@ -659,47 +740,47 @@ export default {
         this.renYuan = response.data;
       });
     },
-    // 获取人员
-    getRen2(id) {
+    // 获取人员1
+    getRen1(id) {
       getQuanBu(id).then((response) => {
-        this.renYuan = response.data;
+        this.renYuan1 = response.data;
       });
     },
-    // 获取人员
-    getRen3(id) {
+    // 获取人员2
+    getRen2(id) {
       getQuanBu(id).then((response) => {
-        this.renYuan = response.data;
+        this.renYuan2 = response.data;
       });
     },
-    // 获取人员
-    getRen4(id) {
+    // 获取人员3
+    getRen3(id) {
       getQuanBu(id).then((response) => {
-        this.renYuan = response.data;
+        this.renYuan3 = response.data;
       });
     },
     // 选择部门单位触发
     selectPeo(data) {
       this.form.unitId = data.id;
       this.form.unitName = data.label;
-      this.getRen(this.form.unitId, 0);
+      this.getRen(this.form.unitId);
     },
     // 一级审批单位触发
-    selectPeo2(data) {
+    selectPeo1(data) {
       this.form.unitId1 = data.id;
       this.form.unitName1 = data.label;
-      this.getRen(this.form.unitId, 0);
+      this.getRen1(this.form.unitId1);
     },
     // 二级审批单位触发
-    selectPeo3(data) {
+    selectPeo2(data) {
       this.form.unitId2 = data.id;
       this.form.unitName2 = data.label;
-      this.getRen(this.form.unitId, 0);
+      this.getRen2(this.form.unitId2);
     },
     // 三级审批单位触发
-    selectPeo4(data) {
+    selectPeo3(data) {
       this.form.unitId3 = data.id;
       this.form.unitName3 = data.label;
-      this.getRen(this.form.unitId, 0);
+      this.getRen3(this.form.unitId3);
     },
     // 获取部门列表
     getBuMeng() {
@@ -782,11 +863,16 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      console.log(row);
       this.getBuMeng();
       this.reset();
       const id = row.id || this.ids;
       getRecuperate(id).then((response) => {
         this.form = response.data;
+        this.getRen(this.form.unitId);
+        this.getRen1(this.form.unitId1);
+        this.getRen2(this.form.unitId2);
+        this.getRen3(this.form.unitId3);
         this.open = true;
         this.title = "修改疗养管理";
       });
@@ -797,13 +883,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateRecuperate(this.form).then((response) => {
-              this.msgSuccess("修改成功");
+              this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addRecuperate(this.form).then((response) => {
-              this.msgSuccess("新增成功");
+              this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });

src/views/militaryvehicleManagement/thebusApply/index.vue

@@ -33,9 +33,7 @@
           @click="handleQuery"
           >搜索</el-button
         > -->
-        <el-button  size="btr" @click="resetQuery"
-          >重置</el-button
-        >
+        <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -77,7 +75,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-        class="box"
+          class="box"
           type="warning"
           plain
           icon="el-icon-download"
@@ -123,7 +121,7 @@
       />
       <el-table-column label="营级审批状态" align="center" width="100">
         <template slot-scope="scope">
-          <el-col v-if="scope.row.unitPeopleState == 1" style="color: #ff4949"
+          <el-col v-if="scope.row.unitPeopleState == 1" style="color: #ffba00"
             >未处理</el-col
           >
           <el-col v-if="scope.row.unitPeopleState == 2" style="color: #13ce66"
@@ -145,7 +143,7 @@
       </el-table-column>
       <el-table-column label="初审状态" align="center">
         <template slot-scope="scope">
-          <el-col v-if="scope.row.chushenState == 1" style="color: #ff4949"
+          <el-col v-if="scope.row.chushenState == 1" style="color: #ffba00"
             >未处理</el-col
           >
           <el-col v-if="scope.row.chushenState == 2" style="color: #13ce66"
@@ -173,7 +171,7 @@
       />
       <el-table-column label="一级审批状态" align="center" width="100">
         <template slot-scope="scope">
-          <el-col v-if="scope.row.peopleoneState == 1" style="color: #ff4949"
+          <el-col v-if="scope.row.peopleoneState == 1" style="color: #ffba00"
             >未处理</el-col
           >
           <el-col v-if="scope.row.peopleoneState == 2" style="color: #13ce66"
@@ -201,7 +199,7 @@
       />
       <el-table-column label="二级审批状态" align="center" width="100">
         <template slot-scope="scope">
-          <el-col v-if="scope.row.peopletwoState == 1" style="color: #ff4949"
+          <el-col v-if="scope.row.peopletwoState == 1" style="color: #ffba00"
             >未处理</el-col
           >
           <el-col v-if="scope.row.peopletwoState == 2" style="color: #13ce66"
@@ -229,7 +227,7 @@
       />
       <el-table-column label="三级审批状态" align="center" width="100">
         <template slot-scope="scope">
-          <el-col v-if="scope.row.peoplethreeState == 1" style="color: #ff4949"
+          <el-col v-if="scope.row.peoplethreeState == 1" style="color: #ffba00"
             >未处理</el-col
           >
           <el-col v-if="scope.row.peoplethreeState == 2" style="color: #13ce66"
@@ -1571,7 +1569,7 @@ export default {
 ::v-deep .cell {
   display: flex !important;
 }
-.box{
+.box {
   background-color: #ffba00 !important;
 }
 </style>