工装夹具优化

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

@@ -103,7 +103,7 @@
       <el-table-column label="编批单号" align="center" prop="batchNumber" />
       <el-table-column label="工序编号" align="center" prop="processCode" />
       <el-table-column label="工序名称" align="center" prop="processName" />
-      <el-table-column label="作业单元编号" align="center" prop="workstationCode" />
+      <el-table-column label="作业单元" align="center" prop="workstationId" />
       <!-- <el-table-column label="工作单元名称" align="center" prop="workstationName" /> -->
       <el-table-column label="异常类型" align="center" prop="abnormalType" >
          <template slot-scope="scope">
@@ -176,8 +176,8 @@
         </el-form-item>
           </el-col>
         <el-col :span="12">
-        <el-form-item label="作业单元编号" prop="workstationCode">
-          <el-input v-model="form.workstationCode" placeholder="请输入工作单元编号" />
+        <el-form-item label="作业单元" prop="workstationId">
+          <el-input v-model="form.workstationId" placeholder="请输入工作单元" />
         </el-form-item>
         </el-col>
         </el-row>
@@ -267,7 +267,17 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        batchNumber: null,        processId: null,        processCode: null,        processName: null,        workstationId: null,        workstationCode: null,        workstationName: null,        abnormalType: null,        abnormalReason: null,        abnormalTime: null,        abnormalStatus: null,      },
+        batchNumber: null,        
+        processId: null,        
+        processCode: null,        
+        processName: null,        
+        workstationId: null,        
+        workstationCode: null,       
+        workstationName: null,        
+        abnormalType: null,        
+        abnormalReason: null,        
+        abnormalTime: null,        
+        abnormalStatus: null,      },
       // 表单参数
       form: {},
       // 表单校验

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

@@ -143,7 +143,7 @@
       <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">