维护保养，台账bug

src/api/mes/tm/maintenance.js

@@ -42,3 +42,10 @@ export function delMaintenance(toolMaintenanceId) {
     method: 'Post'
   })
 }
+// 删除台账维护
+export function delMaintenan(toolMaintenanceId) {
+  return request({
+    url: '/md/maintenance/' + toolMaintenanceId,
+    method: 'delete'
+  })
+}
\ No newline at end of file

src/components/TmTool/index.vue

@@ -102,7 +102,7 @@
           >
         </template>
       </el-table-column>
-            <el-table-column label="编号" align="center" prop="toolCode" >
+            <el-table-column label="物料编号" align="center" prop="toolCode" >
       </el-table-column>
       <el-table-column label="名称" align="center" prop="toolName" :show-overflow-tooltip="true">
         <template slot-scope="scope">
@@ -117,8 +117,7 @@
       <el-table-column label="型号" align="center" prop="spec" :show-overflow-tooltip="true"/>
       <el-table-column label="类型" align="center" prop="toolTypeName" />
       <el-table-column label="库存数量" align="center" prop="quantity" />
-      
-      
+      <el-table-column label="可用数量" align="center" prop="quantityAvail" />
     </el-table>
 
     <pagination

src/views/mes/tm/maintenance/index.vue

@@ -120,12 +120,8 @@
       <el-table-column label="工装夹具名称" align="center" prop="toolName" />
       <el-table-column label="SN编码" align="center" prop="toolCode" />
       <el-table-column label="存放位置" align="center" prop="location" />
+      <el-table-column label="维护人" align="center" prop="processPerson" />
       
- <el-table-column label="维护状态" align="center" prop="processStatus">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.mes_tool_status" :value="scope.row.processStatus"/>
-        </template>
-      </el-table-column>
       
         <el-table-column label="开始时间" align="center" prop="startTime" />
         <el-table-column label="结束时间" align="center" prop="endTime" />
@@ -175,7 +171,7 @@
           <el-input v-model="form.itemCode" placeholder="请输入物料编码" />
         </el-form-item> -->
          <el-form-item label="物料编码" prop="itemCode">
-              <el-input v-model="form.itemCode" placeholder="请选择品牌" readonly="readonly" >
+              <el-input v-model="form.itemCode" placeholder="请选择物料号" readonly="readonly" >
                 <el-button
                   slot="append"
                   icon="el-icon-search"
@@ -271,7 +267,7 @@
         <el-form-item label="维护后状态" prop="processStatus">
               <el-select v-model="form.processStatus" placeholder="请选择分维护后状态">
                 <el-option
-                  v-for="dict in dict.type.mes_tool_status"
+                  v-for="dict in dict.type.mes_to_status"
                   :key="dict.value"
                   :label="dict.label"
                   :value="dict.value"
@@ -297,11 +293,11 @@
 </template>
 
 <script>
-import { listMaintenance, getMaintenance, delMaintenance, addMaintenance, updateMaintenance } from "@/api/mes/tm/maintenance";
+import { listMaintenance, getMaintenance, delMaintenance, addMaintenance, updateMaintenance,delMaintenan } from "@/api/mes/tm/maintenance";
 import BrandSelect from "@/components/TmTool/index.vue";
 export default {
   components: {BrandSelect},
-   dicts: ['mes_maintenance_status','mes_course_type','mes_tool_status'],
+   dicts: ['mes_maintenance_status','mes_course_type','mes_to_status'],
   name: "Maintenance",
   data() {
     return {
@@ -504,7 +500,7 @@ export default {
     handleDe(row) {
       const toolMaintenanceId = row.toolMaintenanceId || this.ids;
       this.$modal.confirm('是否确认删除台账维护编号为"' + toolMaintenanceId + '"的数据项？').then(function() {
-        return delMaintenance(toolMaintenanceId);
+        return delMaintenan(toolMaintenanceId);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");

src/views/mes/tm/tool/index.vue

@@ -125,9 +125,8 @@
 
     <el-table v-loading="loading" :data="toolList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="编号" width="80" align="center" prop="toolCode" >
-      </el-table-column>
-      <el-table-column label="名称" min-width="180" align="center" prop="toolName" :show-overflow-tooltip="true">
+       <el-table-column label="物料编码" width="80" align="center" prop="itemCode" />
+       <el-table-column label="名称" min-width="180" align="center" prop="toolName" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <el-button
             type="text"
@@ -136,17 +135,22 @@
           >{{scope.row.toolName}}</el-button>
         </template>
       </el-table-column>
+      <el-table-column label="编号" width="80" align="center" prop="toolCode" >
+      </el-table-column>
+      
+      
+      
       <el-table-column label="品牌" width="80" align="center" prop="brand" :show-overflow-tooltip="true"/>
       <el-table-column label="型号" width="80" align="center" prop="spec" :show-overflow-tooltip="true"/>
       <el-table-column label="类型" width="80" align="center" prop="toolTypeName" />
       <el-table-column label="库存数量" width="100" align="center" prop="quantity" />
-      <el-table-column label="可用数量" width="100" align="center" prop="quantityAvail" />
+     
       <el-table-column label="保养维护类型" width="120" align="center" prop="maintenType">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.mes_mainten_type" :value="scope.row.maintenType"/>
         </template>
       </el-table-column>
-      <el-table-column label="最低寿命" width="100px" align="center" prop="nextMaintenPeriod" />
+      <el-table-column label="剩余寿命" width="100px" align="center" prop="lifeTime" />
       <el-table-column label="下次保养日期" align="center" prop="nextMaintenDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.nextMaintenDate, '{y}-{m}-{d}') }}</span>
@@ -201,13 +205,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="工装夹具名称" prop="toolName">
-              <el-input v-model="form.toolName" placeholder="请输入工装夹具名称" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
             <el-col :span="12">
           <el-form-item label="物料编码" prop="itemCode">
               <el-input v-model="form.itemCode" placeholder="请选择物料编码">
@@ -223,6 +220,14 @@
               ></BrandSelect>
             </el-form-item>
         </el-col>
+         
+        </el-row>
+        <el-row>
+           <el-col :span="12">
+            <el-form-item label="工装夹具名称" prop="toolName">
+              <el-input v-model="form.toolName" placeholder="请输入工装夹具名称" />
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="存放位置" prop="location">
               <el-input v-model="form.location" placeholder="请输入存放位置" />