1.新增报工记录页面

小小儁爺

2025-03-20 5b7bc2b1d4b2bad72a64651be0607de5cce578e3

1.新增报工记录页面

 src/api/ReportManager.js

@@ -116,3 +116,21 @@
    params: data
  })
}

// æŠ¥å·¥è®°å½•åˆ—表数据查询
export function MesOrderStepReportSearch(data) {
  return request({
    url: 'ReportManager/MesOrderStepReportSearch',
    method: 'get',
    params: data
  })
}

// æŠ¥å·¥è®°å½•åˆ—表数据导出
export function MesOrderStepReportExcelSearch(data) {
  return request({
    url: 'ReportManager/MesOrderStepReportExcelSearch',
    method: 'get',
    params: data
  })
}

 src/router/index.js

@@ -544,6 +544,12 @@
        code: '0706',
        component: () => import('@/views/statistic/repairDetailList'),
        meta: { code: '0706', title: '维修明细报表', icon: '', keepAlive: true }
      }, {
        path: 'reportRecord',
        name: 'reportRecordCancel',
        code: '0707',
        component: () => import('@/views/statistic/reportRecord'),
        meta: { code: '0707', title: '报工记录', icon: '', keepAlive: true }
      }

    ]

 src/views/statistic/reportRecord.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,657 @@
<template>
  <div>
    <div class="body" :style="{height:mainHeight+'px'}">
      <div class="bodyTopButtonGroup">
        <el-button v-waves type="primary" icon="el-icon-download" @click="download">导出</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.wkshopcode"
                filterable
                :popper-append-to-body="false"
                style="width: 200px"
                placeholder="请选择"
              >
                <el-option
                  v-for="item in wkshopcodeArr"
                  :key="item.torg_code"
                  :label="item.torg_name"
                  :value="item.torg_code"
                />
              </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.partnumber" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="产品名称" style=" display: flex;">
              <el-input v-model="form.partname" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="规格型号" style=" display: flex;">
              <el-input v-model="form.partspec" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="工序名称" style=" display: flex;">
              <el-input v-model="form.stepname" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="报工设备" style=" display: flex;">
              <el-select
                v-model="form.eqpcode"
                filterable
                :popper-append-to-body="false"
                style="width: 200px"
                placeholder="请选择"
              >
                <el-option
                  v-for="item in eqpArr"
                  :key="item.code"
                  :label="item.name"
                  :value="item.code"
                />
              </el-select>
              <!--              <el-input v-model="form.eqpcode" style="width: 200px" placeholder="请输入" />-->
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="报工人员" style=" display: flex;">
              <el-input v-model="form.reportuser" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="报工时间" style="display: flex;align-items: center">
              <el-date-picker
                v-model="form.reportdate"
                type="daterange"
                range-separator="~"
                class="timeMini"
                size="mini"
                style="width: 200px;display: flex;line-height: 34px;height: 34px;"
                :clearable="false"
                start-placeholder="开始日期"
                end-placeholder="结束日期"
              />
              <!--              font-size: 14px!important;-->
              <!--              :picker-options="expireTimeOption"-->

            </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+80)+'px'"
          border
          :row-class-name="tableRowClassName"
          :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+80)+'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="wo_code"
            label="报工工单"
            sortable="custom"
            min-width="160"
            show-overflow-tooltip
          />
          <el-table-column
            prop="partnumber"
            label="产品编码"
            show-overflow-tooltip
            sortable="custom"
            min-width="110"
          />
          <el-table-column
            prop="partname"
            label="产品名称"
            sortable="custom"
            show-overflow-tooltip
            min-width="110"
          />
          <el-table-column
            prop="wkshp_name"
            label="车间名称"
            sortable="custom"
            show-overflow-tooltip
            min-width="110"
          />
          <el-table-column
            prop="task_qty"
            label="任务数量"
            sortable="custom"
            show-overflow-tooltip
            min-width="110"
          />
          <!--          <el-table-column-->
          <!--            prop="wkshp_name"-->
          <!--            label="车间名称"-->
          <!--            show-overflow-tooltip-->
          <!--            sortable="custom"-->
          <!--            min-width="110"-->
          <!--          />-->
          <!--          <el-table-column-->
          <!--            prop="eqp_name"-->
          <!--            label="设备名称"-->
          <!--            sortable="custom"-->
          <!--            show-overflow-tooltip-->
          <!--            min-width="110"-->
          <!--          />-->
          <el-table-column
            prop="stepname"
            label="工序名称"
            show-overflow-tooltip
            sortable="custom"
            min-width="110"
          />
          <!--          <el-table-column-->
          <!--            prop="step_price"-->
          <!--            label="工序单价"-->
          <!--            show-overflow-tooltip-->
          <!--            sortable="custom"-->
          <!--            min-width="110"-->
          <!--          />-->
          <el-table-column
            prop="steptype"
            label="工序类型"
            show-overflow-tooltip
            sortable="custom"
            min-width="110"
          >
            <template slot-scope="{row}">
              {{ row.steptype === 'Z' ? '自制' : '外协' }}
            </template>
          </el-table-column>
          <el-table-column
            prop="wx_name"
            label="设备/供应商"
            show-overflow-tooltip
            sortable="custom"
            min-width="125"
          >
            <template slot-scope="{row}">
              {{ row.steptype === 'Z' ?(row.eqp_name?row.eqp_name:'/'): row.wx_name }}
            </template>
          </el-table-column>
          <el-table-column
            prop="usergroup_name"
            label="报工班组"
            show-overflow-tooltip
            min-width="110"
            sortable="custom"
          >
            <template slot-scope="{row}">
              {{ row.usergroup_name ? row.usergroup_name : '/' }}
            </template>
          </el-table-column>
          <el-table-column
            prop="usercode"
            label="人员编码"
            show-overflow-tooltip
            min-width="110"
            sortable="custom"
          />
          <el-table-column
            prop="username"
            label="报工人员"
            show-overflow-tooltip
            min-width="110"
            sortable="custom"
          />
          <el-table-column
            prop="report_qty"
            label="合格数量"
            show-overflow-tooltip
            sortable="custom"
            min-width="110"
          />
          <el-table-column
            prop="ng_qty"
            label="不良数量"
            show-overflow-tooltip
            min-width="110"
            sortable="custom"
          />
          <el-table-column
            prop="laborbad_qty"
            label="工废数量"
            min-width="110"
            show-overflow-tooltip
            sortable="custom"
          />
          <el-table-column
            prop="materielbad_qty"
            label="料废数量"
            show-overflow-tooltip
            min-width="110"
            sortable="custom"
          />
          <el-table-column
            prop="report_date"
            label="报工时间"
            min-width="160"
            show-overflow-tooltip
            sortable="custom"
          />

        </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="getMesOrderStepReportSearch"
      />
    </div>

    <el-dialog
      v-el-drag-dialog
      :title="operation==='add'?'新增':'人员明细'"
      :visible.sync="dialogVisible"
      width="800px"
      :close-on-click-modal="false"
      top="15vh"
      @closed="handleClose"
      @close="handleClose"
    >
      <div style="height: 300px;width: 100%;background-color: aliceblue;padding:20px">
        <el-tag
          v-for="tag in tagArr"
          :key="tag.name"
          type="success"
          style="margin-right: 15px;min-width: 80px;text-align: center"
        >
          {{ tag }}
        </el-tag>
      </div>
      <span slot="footer" class="dialog-footer">
        <div class="footerButton">
          <el-button v-waves @click="dialogVisible=false">返 å›ž</el-button>
          <!--          <el-button v-waves @click="dialogVisibleCancel">取 æ¶ˆ</el-button>-->
          <!--          <el-button v-waves type="primary" @click="dialogVisibleConfirm">ç¡® å®š</el-button>-->
        </div>
      </span>
    </el-dialog>

    <!--导入组件-->
    <import-picker
      ref="importPickerFunc"
      class="importPickerClass"
      :shows.sync="shows"
      :title="title_value"
      :colos="colos"
      :code="code"
    />

  </div>
</template>

<script>
import Pagination from '@/components/Pagination'
import { getCookie } from '@/utils/auth'
import ImportPicker from '@/components/ImportPicker'
import { handleDatetime, validateCode } from '@/utils/global'
import {
  GroupSalaryReportSearchUser, MesOrderStepReportExcelSearch, MesOrderStepReportSearch
} from '@/api/ReportManager'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import { EqpPermissions, PrentOrganizationNoCompany } from '@/api/GeneralBasicData'

export default {
  name: 'Zzjg',
  components: {
    Pagination, ImportPicker
  },
  directives: { elDragDialog, waves },
  data() {
    return {
      mouseHoverType: 'mouseout',
      isExpandForm: false,
      mainHeight: 0,
      tableHeight: 0,
      form: {
        wkshopcode: '',
        wocode: '', // å·¥å•ç¼–号
        partnumber: '', // äº§å“ç¼–码
        partname: '', // äº§å“åç§°
        partspec: '', // è§„格型号
        stepname: '', // å·¥åºåç§°
        style: '', // æ“ä½œç±»åž‹
        eqpcode: '', // ç¼ºé™·åç§°
        reportuser: '', // æ“ä½œäººå‘˜
        reportdate: '', // æ“ä½œæ—¶é—´
        prop: 'report_date', // æŽ’序字段
        order: 'desc', // æŽ’序字段
        page: 1, // ç¬¬å‡ é¡µ
        rows: 20 // æ¯é¡µå¤šå°‘条
      },
      styleArr: [
        { code: 'B', name: '报工' },
        { code: 'S', name: '收料' }
      ],
      // groupArr: [],
      wkshopcodeArr: [],
      total: 10,
      tableData: [],
      dialogVisible: false,
      tagArr: [], //
      dialogForm: {
        OrgType: '',
        OrgCode: '',
        OrgName: '',
        SupUnit: ''// ä¸Šçº§å•ä½
      },
      operation: '',
      dialogFormRules: {
        OrgType: [
          { required: true, message: '请输入选择类型', trigger: ['blur', 'change'] }
        ],
        OrgCode: [
          { required: true, validator: validateCode, trigger: ['blur', 'change'] }
        ],
        OrgName: [
          { required: true, message: '请输入名称', trigger: ['blur', 'change'] }
        ]

      },
      eqpArr: [],

      title_value: '数据导入 / ç‚¹æ£€éƒ¨ä½',
      code: '4',
      shows: false

    }
  },
  watch: {
    shows() {
      if (!this.shows) {
        this.getMesOrderStepReportSearch()
      }
    }
  },
  created() {
    this.handleRequest()
  },
  mounted() {
    window.addEventListener('resize', this.getHeight)
    this.getHeight()
  },
  methods: {
    handleRequest() {
      this.getMesOrderStepReportSearch().then(res => {
        if (res.code === '200') {
          this.getPrentOrganizationNoCompany()
          this.getEqpPermissions()
        }
      })
    },
    async getEqpPermissions() {
      const { data: res4 } = await EqpPermissions() // è®¾å¤‡
      this.eqpArr = res4
    },

    async getPrentOrganizationNoCompany() {
      const { data: res } = await PrentOrganizationNoCompany()
      this.wkshopcodeArr = res
    },
    async getMesOrderStepReportSearch() {
      let tempDate = this.form.reportdate
      if (tempDate.length > 0) {
        tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
      }
      const data = {
        wkshopcode: this.form.wkshopcode,
        wocode: this.form.wocode,
        partnumber: this.form.partnumber,
        partname: this.form.partname,
        partspec: this.form.partspec,
        stepname: this.form.stepname,
        eqpcode: this.form.eqpcode,
        reportuser: this.form.reportuser,
        reportdate: tempDate,
        prop: this.form.prop,
        order: this.form.order,
        page: this.form.page,
        rows: this.form.rows
      }

      const res = await MesOrderStepReportSearch(data)
      this.tableData = res.data
      this.total = res.count

      return { code: res.code }
    },

    // async getMesOrderStepReportSelectUserGroup() {
    //   const { data: res } = await MesOrderStepReportSelectUserGroup()
    //   this.groupArr = 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.getMesOrderStepReportSearch()
    },
    async download() {
      let tempDate = this.form.reportdate
      if (tempDate.length > 0) {
        tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
      }

      const data = {
        wkshopcode: this.form.wkshopcode,
        wocode: this.form.wocode,
        partnumber: this.form.partnumber,
        partname: this.form.partname,
        partspec: this.form.partspec,
        stepname: this.form.stepname,
        eqpcode: this.form.eqpcode,
        reportuser: this.form.reportuser,
        reportdate: tempDate
      }

      const { data: res } = await MesOrderStepReportExcelSearch(data)
      window.location.href = res
    },
    // æŸ¥è¯¢
    search() {
      this.getMesOrderStepReportSearch()
    },
    // å¯¼å…¥æŒ‰é’®
    upload() {
      this.shows = true
      this.$refs.importPickerFunc.newDataFunc()
    },
    colos() {
      this.shows = false
    },
    // é‡ç½®
    reset() {
      this.form.wkshopcode = ''
      this.form.wocode = ''
      this.form.partnumber = ''
      this.form.partname = ''
      this.form.partspec = ''
      this.form.stepname = ''
      this.form.eqpcode = ''
      this.form.reportuser = ''
      this.form.reportdate = ''
      this.getMesOrderStepReportSearch()
    },

    // æ–°å¢žæŒ‰é’®
    add(operation) {
      this.operation = operation
      this.dialogVisible = true
    },
    // ä¿®æ”¹æŒ‰é’®
    async edit(operation, row) {
      this.operation = operation
      this.dialogVisible = true

      const res = await GroupSalaryReportSearchUser({ id: row.id })
      this.tagArr = res.data.map(r => r.reportuser)
      // this.tagArr = ['楼李俊', '张三', '李四']
      // this.$nextTick(() => {
      //   this.dialogForm.OrgCode = row.org_code
      //   this.dialogForm.OrgName = row.org_name
      //   this.dialogForm.SupUnit = row.parent_id
      // })
    },
    // åˆ é™¤æŒ‰é’®
    async del(row) {
      // this.$confirm('是否确认删除?', '提示', {
      //   confirmButtonText: '确定',
      //   cancelButtonText: '取消',
      //   type: 'warning'
      // }).then(() => {
      //   DeleteOrganization({ orgid: row.code }).then(res => {
      //     if (res.code === '200') {
      //       this.$message.success('删除成功!')
      //       if (this.form.page > 1 && this.tableData.length === 1) {
      //         this.form.page--
      //       }
      //       this.getMesOrderStepReportSearch()
      //     }
      //   })
      // }).catch(() => {
      //   this.$message.info('已取消删除')
      // })
    },
    // å¯¹è¯æ¡†å…³é—­äº‹ä»¶
    handleClose() {
      this.dialogForm.OrgType = ''
      this.dialogForm.OrgCode = ''
      this.dialogForm.OrgName = ''
      this.dialogForm.SupUnit = ''
      this.$refs.dialogForm.clearValidate()
    },
    // å¯¹è¯æ¡†å–消
    dialogVisibleCancel() {
      this.dialogVisible = false
    },
    // å¯¹è¯æ¡†ç¡®è®¤
    dialogVisibleConfirm() {
      this.$refs.dialogForm.validate(valid => {
        if (valid) {
          const data = {
            OrganCode: this.dialogForm.OrgCode,
            OrganName: this.dialogForm.OrgName,
            OperType: this.operation === 'add' ? 'Add' : 'Update',
            Operator: getCookie('admin')
          }
          // AddUpdateOrganization(data).then(res => {
          //   if (res.code === '200') {
          //     this.$message.success(this.operation === 'add' ? '添加成功！' : '修改成功！')
          //     this.dialogVisible = false
          //     this.getMesOrderStepReportSearch()
          //   } else {
          //     this.$message.error(this.operation === 'add' ? '添加失败！' : '修改失败！')
          //   }
          // })
        }
      })
    },
    // èŽ·å–页面高度
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 85
        this.tableHeight = this.mainHeight - 295
        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;
}

::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>
<style>

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

 vue.config.js

@@ -52,9 +52,8 @@
    },
    proxy: {
      [process.env.VUE_APP_BASE_API]: {
        // target: 'http://121.196.36.24:8032', // æœ¬åœ°
        // target: 'http://192.168.1.237:8000', // è¯·æ±‚的第三⽅接⼝地址    å®¢æˆ·
        target: 'http://192.168.3.27:8000', // è¯·æ±‚的第三⽅接⼝地址       æœ¬åœ°å¼€å‘服务器  æ²£æ²£
        target: 'http://121.196.36.24:8032', // æœ¬åœ°
        // target: 'http://192.168.3.27:8000', // è¯·æ±‚的第三⽅接⼝地址     æœ¬åœ°å¼€å‘服务器  æ²£æ²£
        changeOrigin: true, // è¯·æ±‚跨域时，需 é…ç½®æ­¤é¡¹
        pathRewrite: { // è·¯å¾„重写,替换target中的请求地址
          ['^' + process.env.VUE_APP_BASE_API]: '/api/'