Преглед изворни кода

人员请假类型字体颜色,

sunyanqiang пре 3 година
родитељ
комит
80cdc7869f

+ 1 - 1
src/views/medicalhealth/antiepidemicarchives/index.vue

@@ -13,7 +13,7 @@
           placeholder="请输入防疫品名称"
           clearable
           size="small"
-          @keyup.enter.native="handleQuery"
+          @input="handleQuery"
         />
       </el-form-item>
       <!-- <el-form-item label="品牌" prop="durgBrand">

+ 2 - 2
src/views/medicalhealth/bdgldurgarchives/index.vue

@@ -13,7 +13,7 @@
           placeholder="请输入药品名称"
           clearable
           size="small"
-          @keyup.enter.native="handleQuery"
+          @input="handleQuery"
         />
       </el-form-item>
       <!-- <el-form-item label="品牌" prop="durgBrand">
@@ -205,7 +205,7 @@
       <el-table-column label="出库数量" align="center" prop="putOut" />
       <el-table-column label="过期数量" align="center" prop="overdue" />
       <!-- <el-table-column label="备注" align="center" prop="remarks" /> -->
-      <el-table-column label="录入人(创建人)" align="center" prop="adminId" />
+      <el-table-column label="录入人" align="center" prop="userName" />
       <el-table-column
         label="操作"
         align="center"

+ 11 - 6
src/views/militaryvehicleManagement/thebus/index.vue

@@ -199,9 +199,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>
 
@@ -298,6 +296,7 @@
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.date1, "{y}-{m}-{d}") }}</span>
         </template>
+        <!-- :formatter="vehiclePresence" -->
       </el-table-column>
       <!-- 车辆在位情况1:在位,2:值班,3:出车,4待修 -->
       <el-table-column
@@ -305,8 +304,14 @@
         align="center"
         prop="status"
         width="100"
-        :formatter="vehiclePresence"
-      />
+      >
+        <template slot-scope="scope">
+          <span v-if="scope.row.status == 1" style="color: #13ce66">在位</span>
+          <span v-if="scope.row.status == 2" style="colo: #00eaff">值班</span>
+          <span v-if="scope.row.status == 3" style="color: #ff4949">出车</span>
+          <span v-if="scope.row.status == 4" style="color: #ffba00">待修</span>
+        </template>
+      </el-table-column>
       <el-table-column label="所在位置" align="center" prop="position" />
       <el-table-column
         label="是否上牌"
@@ -973,6 +978,6 @@ export default {
   color: #bdbdbd4f !important;
 }
 ::v-deep .el-input__inner {
-    border: 1px solid white !important;
+  border: 1px solid white !important;
 }
 </style>