Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

src/views/mes/cal/holiday/itemIndex.vue

@@ -3,10 +3,10 @@
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-row>
         <el-col span="8">
-          <el-form-item label="工作单元ID" prop="workunitId">
+          <el-form-item label="工作单元编码" prop="workunitCode">
             <el-input
-              v-model="queryParams.workunitId"
-              placeholder="请输入工作单元ID"
+              v-model="queryParams.workunitCode"
+              placeholder="请输入工作单元编码"
               clearable
               style="width: 240px"
               @keyup.enter.native="handleQuery"
@@ -65,7 +65,6 @@
     </el-form>
     <el-table v-loading="loading" :data="tmToolRequestItemList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="工作单元ID" align="center" prop="workunitId" />
       <el-table-column label="工作单元编码" align="center" prop="workunitCode" />
       <el-table-column label="工作单元名称" align="center" prop="workunitName" />
       <el-table-column label="班次" align="center" prop="shiftName" />