Merge remote-tracking branch 'origin/dev' into dev

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

@@ -17,10 +17,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="工作单元编号" prop="workstationCode">
+      <el-form-item label="工作单元" prop="workstationName">
         <el-input
-          v-model="queryParams.workstationCode"
-          placeholder="请输入工作单元编号"
+          v-model="queryParams.workstationName"
+          placeholder="请输入工作单元"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -34,12 +34,12 @@
         />
       </el-form-item>
       <el-form-item label="异常时间" prop="abnormalTime">
-        <el-date-picker clearable
+        <el-input
           v-model="queryParams.abnormalTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择异常时间">
-        </el-date-picker>
+          placeholder="请输入异常时间"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <!-- <el-form-item label="单据状态" prop="abnormalStatus">
         <el-select v-model="queryParams.abnormalStatus" placeholder="请选择单据状态" clearable>
@@ -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="workstationId" />
+      <el-table-column label="作业单元" align="center" prop="workstationName" />
       <!-- <el-table-column label="工作单元名称" align="center" prop="workstationName" /> -->
       <el-table-column label="异常类型" align="center" prop="abnormalType" >
          <template slot-scope="scope">
@@ -306,7 +306,22 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        abnormalReportId: null,        batchNumber: null,        processId: null,        processCode: null,        processName: null,        workstationId: null,        workstationCode: null,        workstationName: null,        abnormalType: null,        abnormalReason: null,        abnormalTime: null,        abnormalStatus: null,        createBy: null,        createTime: null,        updateBy: null,        updateTime: null      };
+        abnormalReportId: null,        
+        batchNumber: null,        
+        processId: null,        
+        processCode: null,        
+        processName: null,        
+        workstationId: null,        
+        workstationCode: null,        
+        workstationName: null,        
+        abnormalType: null,        
+        abnormalReason: null,        
+        abnormalTime: null,        
+        abnormalStatus: null,        
+        createBy: null,        
+        createTime: null,        
+        updateBy: null,        
+        updateTime: null      };
       this.resetForm("form");
     },
     /** 搜索按钮操作 */