loulijun2021
2023-10-09 259e0d2cd27e83912f29936bd057127ccc31dbdc
1.生产进度报表100%
已添加1个文件
已修改2个文件
已删除1个文件
3225 ■■■■ 文件已修改
src/api/ReportManager.js 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/router/index.js 76 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/produce/stepReport_back.vue 2712 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/statistic/workOrderProcess.vue 418 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/ReportManager.js
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
import request from '@/utils/request'
// ç”Ÿäº§è¿›åº¦æŠ¥è¡¨
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
@@ -395,44 +395,44 @@
    ]
  },
  // {
  //   path: '/statistic',
  //   component: Layout,
  //   redirect: '/statistic/reportList',
  //   name: '统计报表',
  //   code: '1004',
  //   meta: { code: '1004', title: '统计报表', icon: 'quality' },
  //   alwaysShow: true, // å½“children只有一个时,也显示父菜单
  //   children: [
  //     {
  //       path: 'reportList',
  //       name: 'reportListCancel',
  //       code: '1040',
  //       component: () => import('@/views/statistic/reportList'),
  //       meta: { code: '1040', title: '报工记录', icon: '', keepAlive: true }
  //     },
  //     {
  //       path: 'monthReport',
  //       name: 'monthReportCancel',
  //       code: '1041',
  //       component: () => import('@/views/statistic/monthReport'),
  //       meta: { code: '1041', title: '月度统计', icon: '', keepAlive: true }
  //     }, {
  //       path: 'workOrderProcess',
  //       name: 'workOrderProcessCancel',
  //       code: '1042',
  //       component: () => import('@/views/statistic/workOrderProcess'),
  //       meta: { code: '1042', title: '工单进度', icon: '', keepAlive: true }
  //     }, {
  //       path: 'inProcessList',
  //       name: 'inProcessListCancel',
  //       code: '1043',
  //       component: () => import('@/views/statistic/inProcessList'),
  //       meta: { code: '1043', title: '在制列表', icon: '', keepAlive: true }
  //     }
  //
  //   ]
  // },
  {
    path: '/statistic',
    component: Layout,
    redirect: '/statistic/reportList',
    name: '统计报表',
    code: '07',
    meta: { code: '0701', title: '统计报表', icon: 'quality' },
    alwaysShow: true, // å½“children只有一个时,也显示父菜单
    children: [
      {
        path: 'reportList',
        name: 'reportListCancel',
        code: '1040',
        component: () => import('@/views/statistic/reportList'),
        meta: { code: '1040', title: '报工记录', icon: '', keepAlive: true }
      },
      {
        path: 'monthReport',
        name: 'monthReportCancel',
        code: '1041',
        component: () => import('@/views/statistic/monthReport'),
        meta: { code: '1041', title: '月度统计', icon: '', keepAlive: true }
      }, {
        path: 'workOrderProcess',
        name: 'workOrderProcessCancel',
        code: '0701',
        component: () => import('@/views/statistic/workOrderProcess'),
        meta: { code: '0701', title: '生产进度', icon: '', keepAlive: true }
      }, {
        path: 'inProcessList',
        name: 'inProcessListCancel',
        code: '1043',
        component: () => import('@/views/statistic/inProcessList'),
        meta: { code: '1043', title: '在制列表', icon: '', keepAlive: true }
      }
    ]
  },
  {
    path: '/systemSetting',
src/views/produce/stepReport_back.vue
ÎļþÒÑɾ³ý
src/views/statistic/workOrderProcess.vue
@@ -1,11 +1,423 @@
<template />
<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.wkshopcode" placeholder="请输入" style="width: 200px" />-->
            <!--            </el-form-item>-->
            <el-form-item label="车间名称" style=" display: flex;">
              <el-input v-model="form.wkshopname" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item 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="工单编号"
            width="155"
            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="产品名称"
            width="155"
            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="wkshp_code"-->
          <!--            label="车间编码"-->
          <!--            width="130"-->
          <!--            show-tooltip-when-overflow-->
          <!--            sortable="custom"-->
          <!--          />-->
          <el-table-column
            prop="wkshp_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="生产进度"
            min-width="521"
            sortable="custom"
          >
            <!--            show-tooltip-when-overflow-->
            <template slot-scope="{row}">
              <div style="min-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:10px">
                    <div style="width: 80px;" class="ellipsis">{{ 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 {
  ProductionScheduleReportExcelSearch,
  ProductionScheduleReportSearch
} from '@/api/ReportManager'
export default {
  name: 'WorkOrderProcess'
  name: 'Zzjg',
  components: {
    Pagination
  },
  directives: { elDragDialog, waves },
  data() {
    return {
      mouseHoverType: 'mouseout',
      isExpandForm: false,
      mainHeight: 0,
      tableHeight: 0,
      form: {
        status: '', // å·¥å•状态
        wocode: '', // å·¥å•编号
        wkshopcode: '', // å·¥è‰ºè·¯çº¿ç¼–码
        wkshopname: '', // å·¥è‰ºè·¯çº¿åç§°
        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,
        wkshopcode: this.form.wkshopcode,
        wkshopname: this.form.wkshopname,
        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,
        wkshopcode: this.form.wkshopcode,
        wkshopname: this.form.wkshopname,
        partcode: this.form.partcode,
        partname: this.form.partname,
        partspec: this.form.partspec,
        lm_date: tempDate
      }
      const res = await ProductionScheduleReportExcelSearch(data)
      // console.log(res)
      window.location.href = res.data
    },
    // æŽ’序改变时
    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.wkshopcode = ''
      this.form.wkshopname = ''
      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 scoped lang="scss">
::v-deep .el-select__caret {
  display: flex;
  align-items: center;
  justify-content: center;
}
<style scoped>
::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-progress-bar__innerText{
  display: none !important;
}
</style>