班组bug

src/utils/request.js

@@ -42,7 +42,7 @@ const service = axios.create({
 let loadingInstance = null
 function startLoading() {
   loadingInstance = Loading.service({
-    fullscreen: false,
+    fullscreen: true,
     text: '拼命加载中...',
     background: 'rgba(0, 0, 0, 0.1)'
   })

src/views/group/base/groupTeam/components/workerTeamAdd.vue

@@ -2,11 +2,7 @@
   <el-form ref="form" :rules="rules" label-width="100px" :model="form">
     <el-form-item label="员工" prop="workerId" v-if='!isEdit'>
       <el-select v-model="form.workerId" placeholder="请选择" filterable style="width: 100%;" @change="selectWorker()">
-        <el-option
+        <el-option v-for="item in workerList" :key="item.id" :label="item.name" :value="item.id">
-          v-for="item in workerList"
-          :key="item.id"
-          :label="item.name"
-          :value="item.id">
         </el-option>
       </el-select>
     </el-form-item>

src/views/group/monitoring/groupTeamView/components/groupTeamViewDetail.vue

@@ -9,18 +9,15 @@
           </el-col>
           <el-col :span="6">
             <p class="boldTitle">车间名称</p>
-            <p class="lightText">{{ (queryParams.roomNameDict || queryParams.roomNameDict === 0) ? getDictDataLabel('workshop',queryParams.roomNameDict) : '-' }}</p>
+            <p class="lightText">{{ (queryParams.roomNameDict || queryParams.roomNameDict === 0) ?
+      getDictDataLabel('workshop', queryParams.roomNameDict) : '-' }}</p>
           </el-col>
           <el-col :span="6">
             <p class="boldTitle">班组名称</p>
             <p class="lightText">{{ queryParams.teamName ? queryParams.teamName : '-' }}</p>
           </el-col>
         </el-row>
-        <base-table
+        <base-table :table-props="tableProps" :table-data="tableData" :max-height="tableH" :page="1" :limit="1000000" />
-          :table-props="tableProps"
-          :table-data="tableData"
-          :max-height="tableH"
-        />
       </div>
     </el-drawer>
   </div>
@@ -47,7 +44,7 @@ const tableProps = [
   },
   {
     prop: 'workTime',
-    label: '工作时长'
+    label: '工作时长(h)'
   }
 ]
 export default {
@@ -83,10 +80,12 @@ export default {
 <style lang="scss" scoped>
 .box {
   padding: 0 32px;
+
   .topBox {
     padding-bottom: 30px;
     margin-bottom: 30px;
     border-bottom: 1px solid #E9E9E9;
+
     .boldTitle {
       font-size: 14px;
       font-weight: 600;
@@ -94,6 +93,7 @@ export default {
       margin: 0;
       margin-bottom: 10px;
     }
+
     .lightText {
       font-size: 14px;
       font-weight: 400;

src/views/group/monitoring/teamProduction/components/searchArea.vue

@@ -2,12 +2,10 @@
   <el-form :inline="true" class="demo-form-inline">
     <span class="blue-block"></span>
     <el-form-item label="班次信息">
-      <el-select v-model="queryParams.classesId" placeholder="班次信息" style="width: 200px;" size="small" clearable>
+      <el-select v-model="queryParams.classesId" placeholder="班次信息" style="width: 200px;" size="small" clearable
-        <el-option
+        filterable>
-          v-for="item in classesArr"
+        <el-option v-for="item in classesArr" :key="item.id"
-          :key="item.id"
+          :label="(item.roomName ? item.roomName : '') + '-' + item.name" :value="item.id">
-          :label="(item.roomName?item.roomName:'')+'-'+item.name"
-          :value="item.id">
           <span>{{ item.roomName }}-{{ item.name }}</span>
         </el-option>
       </el-select>
@@ -15,15 +13,9 @@
     <el-form-item label="班组信息">
       <el-input v-model="queryParams.teamName" placeholder="班组信息" style="width: 200px;" clearable></el-input>
     </el-form-item>
-    <el-form-item label="上班时间">
+    <el-form-item label="上班日期">
-      <el-date-picker
+      <el-date-picker v-model="queryParams.tiemStr" type="daterange" format='yyyy-MM-dd' value-format='yyyy-MM-dd'
-        v-model="queryParams.tiemStr"
+        range-separator='-' style="width: 250px;" size="small">
-        type="daterange"
-        format='yyyy-MM-dd'
-        value-format='yyyy-MM-dd'
-        range-separator='-'
-        style="width: 250px;"
-        size="small">
       </el-date-picker>
     </el-form-item>
     <el-form-item>
@@ -69,6 +61,7 @@ export default {
     font-size: 16px;
     color: #0B58FF;
   }
+
   .el-input__prefix .el-icon-date {
     font-size: 16px;
     color: #0B58FF;
@@ -83,6 +76,7 @@ export default {
   background: #E8E8E8;
   vertical-align: middle;
 }
+
 .demo-form-inline {
   .blue-block {
     display: inline-block;

src/views/group/monitoring/teamProduction/components/teamProductionDetail.vue

@@ -1,12 +1,8 @@
 <template>
   <div>
-    <el-drawer title="查看详情" :visible.sync="visible" size="70%" :wrapperClosable='false' @closed="closeDrawer">
+    <el-drawer title="生产情况" :visible.sync="visible" size="70%" @closed="closeDrawer" :show-close='false'>
       <div class="box">
-        <base-table
+        <base-table :table-props="tableProps" :table-data="tableData" :max-height="tableH" />
-          :table-props="tableProps"
-          :table-data="tableData"
-          :max-height="tableH"
-        />
       </div>
     </el-drawer>
   </div>

src/views/group/monitoring/teamProduction/index.vue

@@ -8,28 +8,13 @@
       @headBtnClick="buttonClick"
     /> -->
     <!-- 列表 -->
-    <base-table
+    <base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps" :table-data="list"
-      :page="queryParams.pageNo"
+      :max-height="tableH">
-      :limit="queryParams.pageSize"
+      <method-btn v-if="tableBtn.length" slot="handleBtn" :width="80" label="操作" :method-list="tableBtn"
-      :table-props="tableProps"
+        @clickBtn="handleClick" />
-      :table-data="list"
-      :max-height="tableH"
-    >
-      <method-btn
-        v-if="tableBtn.length"
-        slot="handleBtn"
-        :width="80"
-        label="操作"
-        :method-list="tableBtn"
-        @clickBtn="handleClick"
-      />
     </base-table>
-    <pagination
+    <pagination :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" :total="total"
-      :page.sync="queryParams.pageNo"
+      @pagination="getList" />
-      :limit.sync="queryParams.pageSize"
-      :total="total"
-      @pagination="getList"
-    />
     <!-- 查看生产情况 -->
     <team-production-detail v-if='paramVisible' ref='schedulingMonitoringDetail' />
   </div>
@@ -86,38 +71,6 @@ export default {
   name: 'GroupTeamScheduling',
   data() {
     return {
-      formConfig: [
-        {
-          type: 'select',
-          label: '班次信息',
-          selectOptions: [],
-          param: 'classesId'
-        },
-        {
-          type: 'input',
-          label: '班组信息',
-          placeholder: '班组信息',
-          param: 'teamName'
-        },
-        {
-          type: 'datePicker',
-          label: '上班日期',
-          dateType: 'daterange',
-          format: 'yyyy-MM-dd',
-          valueFormat: 'yyyy-MM-dd',
-          rangeSeparator: '-',
-          // valueFormat: "timestamp",
-          param: 'tiemStr',
-          defaultSelect: '',
-          width: 250
-        },
-        {
-          type: 'button',
-          btnName: '查询',
-          name: 'search',
-          color: 'primary'
-        }
-      ],
       // 查询参数
       queryParams: {
         pageNo: 1,
@@ -130,8 +83,9 @@ export default {
       tableBtn: [
         this.$auth.hasPermi('base:team-production:detail')
           ? {
-              type: 'detail',
+            type: 'productionDetail',
-              btnName: '详情'
+            btnName: '查看',
+            showTip: '生产情况'
           }
           : undefined
       ].filter((v) => v),