车间异常单，改工装夹具bug

src/api/mes/qc/report.js

+import request from '@/utils/request'
+
+// 查询车间异常单列表
+export function listReport(query) {
+  return request({
+    url: '/qc/report/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询车间异常单详细
+export function getReport(abnormalReportId) {
+  return request({
+    url: '/qc/report/' + abnormalReportId,
+    method: 'get'
+  })
+}
+
+// 新增车间异常单
+export function addReport(data) {
+  return request({
+    url: '/qc/report',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改车间异常单
+export function updateReport(data) {
+  return request({
+    url: '/qc/report',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除车间异常单
+export function delReport(abnormalReportId) {
+  return request({
+    url: '/qc/report/' + abnormalReportId,
+    method: 'delete'
+  })
+}

src/views/mes/qc/abnormal/index.vue

 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="异常类型" prop="abnormalType">
-        <el-select v-model="queryParams.abnormalType" placeholder="请选择异常类型" clearable>
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
+        <el-form-item label="异常类型" prop="abnormalType">
+        <el-input
+          v-model="queryParams.abnormalType"
+          placeholder="请输入异常类型"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="异常原因" prop="abnormalReason">
         <el-input

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

@@ -63,7 +63,7 @@
           v-hasPermi="['md:maintenance:add']"
         >创建</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -72,7 +72,7 @@
           @click="handleView"
           v-hasPermi="['md:maintenance:query']"
         >查看</el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -233,10 +233,8 @@
         </el-form-item>
         <el-form-item label="存放位置" prop="location">
           <el-input 
-          v-model="form.location" 
-           readonly="readonly"
-          
-          ></el-input>
+          v-model="form.location" placeholder="请选择维护类型"
+        ></el-input>
         </el-form-item>
         <el-form-item label="维护人" prop="processPerson">
           <el-input v-model="form.processPerson" readonly="readonly" />

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

@@ -163,13 +163,20 @@
       </el-table-column>
       <el-table-column label="操作" width="120" fixed="right" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['mes:tm:tool:edit']"
-          >修改</el-button>
+          >修改</el-button> -->
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-query"
+            @click="handleView(scope.row)"
+            v-hasPermi="['mes:tm:tool:query']"
+          >查看</el-button>
           <el-button
             size="mini"
             type="text"
@@ -191,7 +198,11 @@
 
     <!-- 添加或修改工装夹具清单对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="form" 
+      :model="form" 
+      :rules="rules" 
+      :disabled="form.toolId&&optType!='edit'"
+      label-width="120px">
         <el-row>
           <el-col :span="12">
             <el-form-item label="工装夹具类型" prop="toolTypeId">
@@ -263,15 +274,16 @@
           </el-col>
           <el-col :span="12">
             <el-form-item  label="数量" prop="quantity">
-              <el-input v-if="form.codeFlag=='Y'" readonly v-model="form.quantity" />
-              <el-input-number :min="0" @blur="onQuantityChanged" v-else v-model="form.quantity" placeholder="请输入数量" />
+              <!-- <el-input v-if="form.codeFlag=='Y'" readonly v-model="form.quantity" /> -->
+              <!-- <el-input-number :min="0" @blur="onQuantityChanged" v-else v-model="form.quantity"  /> -->
+               <el-input-number :min="0" @blur="onQuantityChanged" disabled v-model="form.quantity"  />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="可用数量" prop="quantityAvail">
-              <el-input v-model="form.quantityAvail" readonly placeholder="请输入可用数量" />
+              <el-input v-model="form.quantityAvail" readonly  />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -405,7 +417,11 @@ export default {
         ],
         quantity: [
           { required: true, message: "数量不能为空", trigger: "blur" }
-        ],
+        ],       nextMaintenPeriod: [
+          { required: true, message: "最低寿命不能为空", trigger: "blur" }
+        ],        lifeTime: [
+          { required: true, message: "剩余寿命不能为空", trigger: "blur" }
+        ],     
       }
     };
   },
@@ -448,8 +464,8 @@ export default {
         toolTypeId: null,
         toolTypeCode: null,
         toolTypeName: null,
-        quantity: null,
-        quantityAvail: null,
+        quantity: '1',
+        quantityAvail: '1',
         maintenType: 'REGULAR',
         nextMaintenPeriod: null,
         nextMaintenDate: null,
@@ -581,8 +597,8 @@ export default {
       if(row != undefined && row != null){
         this.form.itemId = row.itemId;
         this.form.itemCode = row.itemCode;
-        this.form.itemName = row.itemName;
-        this.form.specification = row.specification;
+        this.form.toolName = row.itemName;
+        this.form.spec = row.specification;
         this.form.sapItemCode = row.sapItemCode;
          this.form.unitOfMeasure = row.unitOfMeasure;
       }