排班计划和节假日设置

d641516e · 沈翠玲 · a466808a · d641516e · d641516e
Commit d641516e authored Jun 25, 2024 by 沈翠玲
Hide whitespace changes
Inline Side-by-side

Showing with 119 additions and 51 deletions

itemIndex.vue src/views/mes/cal/holiday/itemIndex.vue +63 -29

multi.vue src/views/mes/cal/team/calTeamSelect/multi.vue +56 -22

No files found.
--- a/src/views/mes/cal/holiday/itemIndex.vue
+++ b/src/views/mes/cal/holiday/itemIndex.vue
 <template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="工作单元ID" prop="workunitId">
+      <el-row>
-        <el-input
+        <el-col span="8">
-          v-model="queryParams.workunitId"
+          <el-form-item label="工作单元ID" prop="workunitId">
-          placeholder="请输入工作单元ID"
+            <el-input
-          clearable
+              v-model="queryParams.workunitId"
-          style="width: 240px"
+              placeholder="请输入工作单元ID"
-          @keyup.enter.native="handleQuery"
+              clearable
-        />
+              style="width: 240px"
-      </el-form-item>
+              @keyup.enter.native="handleQuery"
-       <el-form-item label="班次" prop="shiftName">
+            />
-        <el-select
+          </el-form-item>
-          v-model="queryParams.shiftName"
+        </el-col>
-          clearable
+        <el-col span="8">
-          placeholder="请选择班次"
+          <el-form-item label="班次" prop="shiftName">
-        >
+            <el-select
-          <el-option
+              v-model="queryParams.shiftName"
-            v-for="dict in dict.type.SHIFT_TYPE"
+              clearable
-            :key="dict.value"
+              style="width: 240px"
-            :label="dict.label"
+              placeholder="请选择班次"
-            :value="dict.label"
+            >
-          >
+              <el-option
-          </el-option>
+                v-for="dict in dict.type.SHIFT_TYPE"
-        </el-select>
+                :key="dict.value"
-      </el-form-item>
+                :label="dict.label"
-      <el-form-item>
+                :value="dict.label"
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+              >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+              </el-option>
-      </el-form-item>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col span="8">
+          <el-form-item label="车间名称" label-width="100px" prop="workshopName">
+            <el-input
+              v-model="queryParams.workshopName"
+              placeholder="请输入车间名称"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col span="8">
+          <el-form-item label="工作中心名称" label-width="100px" prop="workstationName">
+            <el-input
+              v-model="queryParams.workstationName"
+              placeholder="请输入工作中心名称"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col span="4">
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
    </el-form>
    <el-table v-loading="loading" :data="tmToolRequestItemList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center" />
@@ -41,7 +74,8 @@
          {{ scope.row.isWork == '1'? '工作': '休息' }}
        </template>
      </el-table-column>
-      <el-table-column label="工作单元名称" align="center" prop="workunitName" />
+      <el-table-column label="车间名称" align="center" prop="workshopName" />
+      <el-table-column label="工作中心名称" align="center" prop="workstationName" />
      <el-table-column label="工作开始时间" align="center" prop="startTime" />
      <el-table-column label="工作结束时间" align="center" prop="endTime" />
      <el-table-column label="工作休息开始时间" align="center" prop="breakStartTime" />

--- a/src/views/mes/cal/team/calTeamSelect/multi.vue
+++ b/src/views/mes/cal/team/calTeamSelect/multi.vue
 <template>
  <el-dialog title="工作单元选择" v-if="showFlag" :visible.sync="showFlag" :modal=false width="80%">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="工作单元编号" label-width="300rpx" prop="workunitCode">
+      <el-row>
-        <el-input
+        <el-col span="8">
-          v-model="queryParams.workunitCode"
+          <el-form-item label="工作单元编号" label-width="100px" prop="workunitCode">
-          placeholder="请输入工作单元编号"
+            <el-input
-          clearable
+              v-model="queryParams.workunitCode"
-          @keyup.enter.native="handleQuery"
+              placeholder="请输入工作单元编号"
-        />
+              clearable
-      </el-form-item>
+              @keyup.enter.native="handleQuery"
-      <el-form-item label="工作单元名称" label-width="300rpx" prop="workunitName">
+            />
-        <el-input
+          </el-form-item>
-          v-model="queryParams.workunitName"
+        </el-col>
-          placeholder="请输入工作单元名称"
+        <el-col span="8">
-          clearable
+          <el-form-item label="工作单元名称" label-width="100px" prop="workunitName">
-          @keyup.enter.native="handleQuery"
+            <el-input
-        />
+              v-model="queryParams.workunitName"
-      </el-form-item>
+              placeholder="请输入工作单元名称"
-      <el-form-item>
+              clearable
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+              @keyup.enter.native="handleQuery"
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            />
-      </el-form-item>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col span="8">
+          <el-form-item label="车间名称" label-width="100px" prop="workshopName">
+            <el-input
+              v-model="queryParams.workshopName"
+              placeholder="请输入车间名称"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col span="8">
+          <el-form-item label="工作中心名称" label-width="100px" prop="workstationName">
+            <el-input
+              v-model="queryParams.workstationName"
+              placeholder="请输入工作中心名称"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col span="4">
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
    </el-form>
    <el-table v-loading="loading" :data="workunitList" @selection-change="handleSelectionChange" height="600px">
      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="工作单元ID" width="100" align="center" prop="workunitId">
-      </el-table-column>
      <el-table-column label="工作单元编码" align="center" prop="workunitCode" />
      <el-table-column label="工作单元名称" align="center" prop="workunitName" />
+      <el-table-column label="车间名称" width="100" align="center" prop="workshopName">
+      </el-table-column>
+      <el-table-column label="工作中心名称" width="100" align="center" prop="workstationName">
+      </el-table-column>
      <el-table-column label="开始时间" align="center" prop="createTime" />
      <el-table-column label="更新时间" align="center" prop="updateTime" />
    </el-table>
@@ -75,6 +107,8 @@ export default {
        pageSize: 10,
        workunitCode: null,
        workunitName: null,
+        workshopName: null,
+        workstationName: null,
        planId: this.$attrs.planId || null
      },
    };