代码提交

src/views/EquipmentServicing/index.vue

@@ -7,7 +7,7 @@
       :model="searchParams"
       :rules="searchFormRules"
       :inline="true"
-      label-width="auto" size="small"
+      label-width="100px" size="small"
     >
       <el-card class="search-box">
         <el-row  type="flex">
@@ -17,7 +17,7 @@
                 v-model.trim="searchParams.deviceCode"
                 placeholder="请输入装备编码"
                 clearable
-                style="width:240px"
+                style="width:200px"
               />
             </el-form-item>
           </el-col>
@@ -31,7 +31,7 @@
                 value-format="yyyy-MM-dd"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
-                style="width: 240px"
+                style="width: 200px"
               />
             </el-form-item>
           </el-col>
@@ -45,12 +45,27 @@
                 value-format="yyyy-MM-dd"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
-                style="width: 240px"
+                style="width: 200px"
               />
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" style="text-align: right; margin-top: 10px" >
+          <el-col :span="6" class="flex-center" style="text-align: left !important;">
+            <el-form-item label="维保告警" prop="alert" style="margin-bottom: 0 !important;">
+              <el-select
+                style="width: 200px"
+                v-model="searchParams.alert"
+                placeholder="选择选项"
+                clearable
+              >
+                <el-option label="已超期" value="已超期"/>
+                <el-option label="一月内到期" value="一月内到期"/>
+                <el-option label="正常" value="一月内到期"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="4" style="text-align: right; margin-top: 10px" >
             <el-button type="primary" icon="el-icon-search" size="mini" class="primary-lease" @click="onSearch" >查询
             </el-button>
             <el-button icon="el-icon-refresh" size="mini" class="primary-lease" @click="onReset">重置</el-button>
@@ -75,9 +90,10 @@
           <el-table-column prop="itemTypeModel" label="装备型号" align="center"/>
           <el-table-column prop="deviceCode" label="装备编码" align="center"/>
           <el-table-column prop="qcUser" label="维保人" align="center" width="120"/>
+          <el-table-column prop="upCheckTime" label="上次维保日期" align="center"/>
           <el-table-column prop="nextCheckTime" label="下次维保日期" align="center"/>
           <el-table-column prop="phonenumber" label="维保人联系方式" align="center"/>
-          <el-table-column prop="updateTime" label="更新时间" align="center"/>
+
           <el-table-column prop="alert" label="维保告警" align="center">
             <template slot-scope="scope">
               <el-tag v-if="scope.row.alert == '正常'" size="mini">正常</el-tag>
@@ -429,7 +445,8 @@ export default {
         createEndTime: '',
         maId: '',
         pageSize: 10,
-        pageNum: 1
+        pageNum: 1,
+        alert:''
       },
 
       // 表单数据

src/views/business/warehouse/details.vue

@@ -144,6 +144,7 @@
               v-model="scope.row.useTime"
               type="date"
               format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
               style="width: 100%"
               placeholder="选择日期"
               :picker-options="{

src/views/toolsManage/toolsLedger/index.vue

@@ -267,7 +267,7 @@ export default {
           label: '管理模式',
           prop: 'manageMode',
           render: (h, { row }) => {
-            return row.manageMode == '1' ? h('span', {}, '数量管理') : h('span', {}, '编码管理')
+            return row.manageMode == '1' ? h('span', {}, '数量工具') : h('span', {}, '编码工具')
           },
         },
         {