1.生产进度报表提交

loulijun2021

2023-05-11 3d73201f0830320c703cfb3d36b47976eb3d94e7

1.生产进度报表提交

 src/api/reportManager.js

@@ -159,3 +159,21 @@
  })
}

// ç”Ÿäº§è¿›åº¦æŠ¥è¡¨æŸ¥è¯¢
export function ProductionScheduleReportSearch(data) {
  return request({
    url: 'ReportManager/ProductionScheduleReportSearch',
    method: 'get',
    params: data
  })
}

// ç”Ÿäº§è¿›åº¦æŠ¥è¡¨å¯¼å‡º
export function ProductionScheduleReportExcelSearch(data) {
  return request({
    url: 'ReportManager/ProductionScheduleReportExcelSearch',
    method: 'get',
    params: data
  })
}


 src/router/index.js

@@ -160,7 +160,7 @@
        name: 'produceOrderCancel',
        code: '1070',
        component: () => import('@/views/produceManager/produceOrder'),
        meta: { code: '1070', title: 'ERP生产订单', icon: '', keepAlive: true }
        meta: { code: '1070', title: '生产订单', icon: '', keepAlive: true }
      }
    ]
  },
@@ -321,6 +321,13 @@
        code: '1096',
        component: () => import('@/views/reportManager/installationLampList'),
        meta: { code: '1096', title: '安灯报表', icon: '', keepAlive: true }
      },
      {
        path: 'produceSchedule',
        name: 'produceScheduleCancel',
        code: '1098',
        component: () => import('@/views/reportManager/produceSchedule'),
        meta: { code: '1098', title: '生产进度报表', icon: '', keepAlive: true }
      }
    ]
  },
@@ -452,14 +459,14 @@
        name: 'workOrderCancel',
        code: '1071',
        component: () => import('@/views/produceManager/workOrder'),
        meta: { code: '1071', title: 'MES工单', icon: '', keepAlive: true }
        meta: { code: '1071', title: '工单', icon: '', keepAlive: true }
      },
      {
        path: 'workOrderBatchClose',
        name: 'workOrderBatchCloseCancel',
        code: '1074',
        component: () => import('@/views/produceManager/workOrderBatchClose'),
        meta: { code: '1074', title: 'MES工单批量关闭', icon: '', keepAlive: true }
        meta: { code: '1074', title: '工单批量关闭', icon: '', keepAlive: true }
      }
    ]
  },
@@ -613,14 +620,14 @@
    ]
  },

  // 18.其它ERP集成
  // 18.其它集成
  {
    path: '/otherErp',
    component: Layout,
    redirect: '/otherErp/InventoryList',
    name: '其他产品ERP集成',
    name: '其他产品集成',
    code: '2018',
    meta: { code: '2018', title: '其他产品ERP集成', icon: 'erpjc' },
    meta: { code: '2018', title: '其他产品集成', icon: 'erpjc' },
    alwaysShow: true,
    children: [
      {
@@ -1052,13 +1059,13 @@
        name: 'produceOrderCancel',
        code: '1070',
        component: () => import('@/views/produceManager/produceOrder'),
        meta: { code: '1070', title: 'ERP生产订单', icon: '', keepAlive: true }
        meta: { code: '1070', title: '生产订单', icon: '', keepAlive: true }
      }, {
        path: 'workOrder',
        name: 'workOrderCancel',
        code: '1071',
        component: () => import('@/views/produceManager/workOrder'),
        meta: { code: '1071', title: 'MES工单', icon: '', keepAlive: true }
        meta: { code: '1071', title: '工单', icon: '', keepAlive: true }
      }, {
        path: 'workOrderDispatch',
        name: 'workOrderDispatchCancel',
@@ -1076,7 +1083,7 @@
        name: 'workOrderBatchCloseCancel',
        code: '1074',
        component: () => import('@/views/produceManager/workOrderBatchClose'),
        meta: { code: '1074', title: 'MES工单批量关闭', icon: '', keepAlive: true }
        meta: { code: '1074', title: '工单批量关闭', icon: '', keepAlive: true }
      }, {
        path: 'capacityPlanning',
        name: 'capacityPlanningCancel',
@@ -1170,6 +1177,12 @@
    alwaysShow: true,
    children: [
      {
        path: 'produceSchedule',
        name: 'produceScheduleCancel',
        code: '1098',
        component: () => import('@/views/reportManager/produceSchedule'),
        meta: { code: '1098', title: '生产进度报表', icon: '', keepAlive: true }
      }, {
        path: 'groupSalaryList',
        name: 'groupSalaryListCancel',
        code: '1090',

 src/views/reportManager/produceSchedule.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,535 @@
<template>
  <div>
    <div class="body" :style="{height:mainHeight+'px'}">
      <div class="bodyTopButtonGroup" style="justify-content: space-between">
        <el-button v-waves type="primary" icon="el-icon-download" @click="download">导出</el-button>
        <!--        <el-button v-waves icon="el-icon-download" @click="upload">导入</el-button>-->
      </div>

      <div class="bodyTopFormGroup">
        <el-form
          ref="form"
          :model="form"
          label-width="100px"
          inline
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label="工单状态" style=" display: flex;">
              <el-select v-model="form.status" style="width: 200px" placeholder="请选择">
                <el-option
                  v-for="item in statusArr"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value"
                />
              </el-select>
            </el-form-item>
            <el-form-item label="工单编号" style=" display: flex;">
              <el-input v-model="form.wocode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="工艺路线编码" style=" display: flex;">
              <el-input v-model="form.routecode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="工艺路线名称" style=" display: flex;">
              <el-input v-model="form.routename" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="产品编码" style=" display: flex;">
              <el-input v-model="form.partcode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="产品名称" style=" display: flex;">
              <el-input v-model="form.partname" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="规格型号" style=" display: flex;">
              <el-input v-model="form.partspec" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="单据日期" style="display: flex;align-items: center">
              <el-date-picker
                v-model="form.lm_date"
                type="daterange"
                range-separator="~"
                class="timeMini"
                size="mini"
                style="width: 200px;display: flex;line-height: 34px;height: 34px;"
                :clearable="false"
                start-placeholder="开始日期"
                end-placeholder="结束日期"
              />
            </el-form-item>
          </div>
          <div
            class="bodySearchReset"
            :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
          >
            <el-button v-waves type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>
        </el-form>
        <div
          class="bodyTopFormExpand"
        >
          <svg-icon
            v-show="mouseHoverType==='mouseout'"
            style="cursor: pointer"
            :icon-class="!isExpandForm?'doubleDown3':'doubleUp3'"
            @mouseenter="mouseHoverType=$event.type"
          />
          <svg-icon
            v-show="mouseHoverType==='mouseenter'"
            style="cursor: pointer"
            :icon-class="!isExpandForm?'doubleDown':'doubleUp'"
            @click="isExpandForm=!isExpandForm"
            @mouseout="mouseHoverType=$event.type"
          />
        </div>
      </div>

      <div class="elTableDiv">
        <el-table
          ref="tableDataRef"
          class="tableFixed"
          :data="tableData"
          :height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
          border
          :row-class-name="tableRowClassName"
          :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px',}"
          highlight-current-row
          :header-cell-style="this.$headerCellStyle"
          :cell-style="this.$cellStyle"
          @sort-change="sortChange"
        >
          <el-table-column
            prop="RowNum"
            width="50"
            fixed
            label="序号"
          />
          <el-table-column
            prop="lm_date"
            label="单据日期"
            width="105"
            sortable="custom"
          >
            <template slot-scope="{row}">
              <div v-if="row.lm_date">{{ row.lm_date.substring(0, 11) }}</div>
              <div v-else>/</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="status"
            label="工单状态"
            width="105"
            sortable="custom"
          />
          <el-table-column
            prop="wo_code"
            label="工单编号"
            min-width="150"
            show-tooltip-when-overflow
            sortable="custom"
          />
          <el-table-column
            prop="partcode"
            label="产品编码"
            width="105"
            show-tooltip-when-overflow
            sortable="custom"
          />
          <el-table-column
            prop="partname"
            label="产品名称"
            min-width="150"
            show-tooltip-when-overflow
            sortable="custom"
          />
          <el-table-column
            prop="partpesc"
            label="产品规格"
            width="105"
            show-tooltip-when-overflow
            sortable="custom"
          >
            <template slot-scope="{row}">
              <div v-if="row.partpesc">{{ row.partpesc }}</div>
              <div v-else>/</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="route_code"
            label="工艺路线编码"
            width="130"
            show-tooltip-when-overflow
            sortable="custom"
          />
          <el-table-column
            prop="route_name"
            label="工艺路线名称"
            width="130"
            show-tooltip-when-overflow
            sortable="custom"
          />
          <el-table-column
            prop="plan_qty"
            label="任务数量"
            width="105"
            show-tooltip-when-overflow
            sortable="custom"
          />
          <el-table-column
            prop="concat_name"
            label="生产进度"
            width="521"
            sortable="custom"
            show-tooltip-when-overflow
          >
            <template slot-scope="{row}">
              <div style="width: 900px;display: flex;overflow-x: auto;overflow-y: hidden">
                <div
                  v-for="item in row.concat_name.split(',')"
                  :key="item+row.wo_code"
                  style="display: flex;align-items: center;"
                >
                  <!--                  padding:0px 0px 10px 0px;-->

                  <div style="position: relative;display: flex;flex-direction: column;width: 80px;text-align: center;align-items: center;margin-left: 5px">
                    <div style="width: 80px;">{{ item.split('/')[0] }}</div>
                    <el-progress
                      :text-inside="true"
                      :stroke-width="20"
                      color="#2FD04F"
                      define-back-color="rgba(144,147,153,0.5)"
                      :percentage="parseFloat((parseFloat(item.split('/')[1])*100/parseFloat(row.plan_qty)).toFixed(2))"
                      style="width: 80px;margin: 0 2px"
                    />

                    <div style="position: absolute;top:22px;">{{ parseFloat(item.split('/')[1]) }}/{{ row.plan_qty }}</div>

                  </div>

                </div>
              </div>

            </template>
          </el-table-column>

          <!--          <el-table-column-->
          <!--            label="操作"-->
          <!--            width="120"-->
          <!--            fixed="right"-->
          <!--          >-->
          <!--            <template slot-scope="{row}">-->
          <!--              <div class="operationClass">-->
          <!--                <el-tooltip class="item" effect="dark" content="编辑" placement="top">-->
          <!--                  <i class="el-icon-edit-outline" @click="edit('edit',row)" />-->
          <!--                </el-tooltip>-->
          <!--                <el-tooltip v-del-tab-index class="item" effect="dark" content="删除" placement="top">-->
          <!--                  <i class="el-icon-delete" @click="del(row)" />-->
          <!--                </el-tooltip>-->
          <!--              </div>-->
          <!--            </template>-->
          <!--          </el-table-column>-->
        </el-table>
      </div>
      <!--分页-->
      <pagination
        :total="total"
        :page.sync="form.page"
        :limit.sync="form.rows"
        align="right"
        layout="total,prev, pager, next,sizes"
        popper-class="select_bottom"
        @pagination="getProductionScheduleReportSearch"
      />
    </div>

  </div>
</template>

<script>
import Pagination from '@/components/Pagination'
import { handleDatetime } from '@/utils/global'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import {
  DefectDetailsReportExcelSearch,
  ProductionScheduleReportExcelSearch,
  ProductionScheduleReportSearch
} from '@/api/reportManager'

export default {
  name: 'Zzjg',
  components: {
    Pagination
  },
  directives: { elDragDialog, waves },
  data() {
    return {
      mouseHoverType: 'mouseout',
      isExpandForm: false,
      mainHeight: 0,
      tableHeight: 0,
      form: {
        status: '', // å·¥å•çŠ¶æ€
        wocode: '', // å·¥å•ç¼–号
        routecode: '', // å·¥è‰ºè·¯çº¿ç¼–码
        routename: '', // å·¥è‰ºè·¯çº¿åç§°
        partcode: '', // äº§å“ç¼–码
        partname: '', // äº§å“åç§°
        partspec: '', // è§„格型号
        lm_date: '', // å•æ®æ—¥æœŸ
        prop: 'lm_date', // æŽ’序字段
        order: 'desc', // æŽ’序字段
        page: 1, // ç¬¬å‡ é¡µ
        rows: 20 // æ¯é¡µå¤šå°‘条
      },
      statusArr: [
        { label: '未开始', value: 'NOSTART' },
        { label: '执行中', value: 'START' },
        { label: '已完成', value: 'CLOSED' }
      ],

      total: 10,
      tableData: []

    }
  },

  created() {
    this.getProductionScheduleReportSearch()
  },
  mounted() {
    window.addEventListener('resize', this.getHeight)
    this.getHeight()
  },
  methods: {
    async getProductionScheduleReportSearch() {
      let tempDate = this.form.lm_date
      if (tempDate.length > 0) {
        tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
      }
      const data = {
        status: this.form.status,
        wocode: this.form.wocode,
        routecode: this.form.routecode,
        routename: this.form.routename,
        partcode: this.form.partcode,
        partname: this.form.partname,
        partspec: this.form.partspec,
        lm_date: tempDate,
        prop: this.form.prop,
        order: this.form.order,
        page: this.form.page,
        rows: this.form.rows
      }

      const res = await ProductionScheduleReportSearch(data)
      this.tableData = res.data
      this.total = res.count
    },

    // å¯¼å‡º
    async download() {
      let tempDate = this.form.lm_date
      if (tempDate.length > 0) {
        tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
      }
      const data = {
        status: this.form.status,
        wocode: this.form.wocode,
        routecode: this.form.routecode,
        routename: this.form.routename,
        partcode: this.form.partcode,
        partname: this.form.partname,
        partspec: this.form.partspec,
        lm_date: tempDate
      }

      const { data: res } = await ProductionScheduleReportExcelSearch(data)
      window.location.href = res
    },
    // æŽ’序改变时
    sortChange({ column, prop, order }) {
      if (order === 'descending') {
        order = 'desc'
      } else if (order === 'ascending') {
        order = 'asc'
      } else {
        order = 'desc'
      }
      this.form.order = order
      this.form.prop = prop
      this.getProductionScheduleReportSearch()
    },
    // æŸ¥è¯¢
    search() {
      this.getProductionScheduleReportSearch()
    },
    // é‡ç½®
    reset() {
      this.form.status = ''
      this.form.wocode = ''
      this.form.routecode = ''
      this.form.routename = ''
      this.form.partcode = ''
      this.form.partname = ''
      this.form.partspec = ''
      this.form.lm_date = ''
      this.getProductionScheduleReportSearch()
    },

    // èŽ·å–页面高度
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 85
        this.tableHeight = this.mainHeight - 255
        this.$refs.tableDataRef.doLayout()
      })
    },
    tableRowClassName({ row, rowIndex }) {
      return 'custom-row'
    }
  }
}
</script>

<!--公共页面样式-->
<style lang="scss" scoped>
$main_color: #42b983;

::v-deep .el-range__icon {
  line-height: 28px !important;
}

::v-deep .el-range-separator {
  line-height: 28px !important;
}

::v-deep .el-range-input {
  font-size: 14px;
}

::v-deep .el-range-separator {
  display: flex;
  justify-content: center;
  align-items: center;
}

::v-deep .el-button--text {
  font-size: 14px;
  cursor: pointer;
}

.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
  color: $main_color;
  cursor: pointer;
}

.el-icon-edit-outline {
  margin-right: 15px;
}

::v-deep .el-button--primary, .el-button--default, .el-button--info {
  height: 34px;
  display: flex;
  align-items: center;
  padding: 0 15px;
}

::v-deep .el-button--primary {
  //background-color: $main_color !important;
}

::v-deep .el-button--default {
  background-color: #f8f8fa;
  border: none;
}

::v-deep .el-input__inner {
  height: 34px;
  line-height: 34px;
  //color: #a7a7a7;
}

::v-deep .el-dialog__body {
  padding: 20px 100px !important;
}

::v-deep .dialogVisibleRoles .el-dialog__body {
  padding: 20px 20px !important;
}

::v-deep .importPickerClass .el-dialog__body {
  padding: 20px 20px !important;
}

::v-deep .el-dialog__footer {
  display: flex;
  justify-content: flex-end;
}

::v-deep .el-table .caret-wrapper {
  transform: scale(0.8);
}

::v-deep .cell {
  display: flex;
  align-items: center;
  justify-content: space-between;
}

::v-deep .el-table::before {
  height: 0;
}

::v-deep .el-table__body-wrapper {
  background-color: #f8f8fa;
}

::v-deep .el-table__body .el-table__row.hover-row td {
  background-color: #eaecef;
}

::v-deep .el-form--inline .el-form-item__label {
  color: #a7a7a7;
}

.body ::v-deep .el-divider {
  border: 1px solid #eee;
  width: 99%;
  margin: 10px auto;
}

.body ::v-deep .el-form-item {
  margin-bottom: 0;
}

.userDialogVisible ::v-deep .el-form-item {
  margin-bottom: 0;
}

::v-deep .el-select__caret {
  display: flex;
  align-items: center;
  justify-content: center;
}

.tableFixed {
  ::v-deep .el-table__fixed-right {
    height: 100% !important;
  }

  ::v-deep .el-table__fixed {
    height: 100% !important;
  }
}

::v-deep .el-progress-bar__innerText{
  display: none !important;
}
</style>
<style>

.el-table .custom-row {
  background: #f8f8fa;
}
</style>