1.报工调整40%

loulijun2021

2023-10-07 15269f028f3616176449a0d44103ac7649054b82

1.报工调整40%

 src/api/WorkOrder.js

@@ -116,6 +116,7 @@
    data
  })
}

// 生产开报工扫码获取工单对应工序任务(自制)
export function MesOrderStepSearch(data) {
  return request({
@@ -124,6 +125,7 @@
    params: data
  })
}

// 生产开报工扫码获取工单对应工序任务(外协)
export function MesOrderWxStepSearch(data) {
  return request({
@@ -132,6 +134,7 @@
    params: data
  })
}

// 生产开报工扫码获取工单对应工序任务(不良)
export function MesOrderNgStepSearch(data) {
  return request({
@@ -140,6 +143,7 @@
    params: data
  })
}

// 生产开报工扫码获取工单对应工序任务(不良明细)
export function MesOrderNgSubStepSearch(data) {
  return request({
@@ -148,6 +152,7 @@
    params: data
  })
}

// 生产开报工：报工/外协(发料/收料)时条件判断及数据返回接口
export function MesOrderStepStart(data) {
  return request({
@@ -156,6 +161,7 @@
    params: data
  })
}

// 生产开报工,报工提交
export function SavaMesOrderStepReport(data) {
  return request({
@@ -164,6 +170,7 @@
    data
  })
}

// 生产开报工,发料提交
export function SavaMesOrderStepOut(data) {
  return request({
@@ -172,6 +179,7 @@
    data
  })
}

// 生产开报工,收料提交
export function SavaMesOrderStepIn(data) {
  return request({
@@ -180,6 +188,7 @@
    data
  })
}

// 不良处理,提交
export function EditOrderNgStepSeave(data) {
  return request({
@@ -188,3 +197,30 @@
    data
  })
}

// 生产执行,报工调整列表数据查询接口
export function MesOrderStepVerifySearch(data) {
  return request({
    url: 'WorkOrder/MesOrderStepVerifySearch',
    method: 'get',
    params: data
  })
}

// 生产执行,报工调整获取选定报工记录的不良数据
export function MesOrderStepModelSearch(data) {
  return request({
    url: 'WorkOrder/MesOrderStepModelSearch',
    method: 'get',
    params: data
  })
}

// 生产执行,报工调整数据提交
export function MesOrderStepUpdateSeave(data) {
  return request({
    url: 'WorkOrder/MesOrderStepUpdateSeave',
    method: 'post',
    data
  })
}

 src/views/produce/reportCorrect.vue

@@ -1,11 +1,439 @@
<template />
<template>
  <div>
    <div class="body" :style="{height:mainHeight+'px'}">

      <div class="bodyTopFormGroup" style="margin-top: 10px;">
        <el-form
          ref="form"
          :model="form"
          label-width="100px"
          inline
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label="工单编码" style=" display: flex;">
              <el-input v-model="form.wo_code" 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" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item 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;">
              <el-input v-model="form.reportuser" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="报工时间" style=" display: flex;">
              <el-input v-model="form.reportdate" placeholder="请输入" style="width: 200px" />
            </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="getMesOrderStepVerifySearch">查询</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="custom-row"
          :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px',}"
          highlight-current-row

          :header-cell-style="this.$headerCellStyle"
          :cell-style="this.$cellStyle"
          @sort-change="sortChange"
        >
          <!--          :row-key="getRowKey"-->
          <!--          <el-table-column-->
          <!--            type="selection"-->
          <!--            width="50"-->
          <!--            :reserve-selection="true"-->
          <!--            fixed-->
          <!--          />-->
          <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="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="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="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-column
            label="操作"
            width="100"
            fixed="right"
          >
            <template slot-scope="{row}">
              <div class="operationClass">
                <el-button
                  type="text"
                  style="cursor: pointer;font-size: 14px"
                  @click="reportAdjust(row)"
                >报工调整
                </el-button>

              </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,jumper"
        popper-class="select_bottom"
        @pagination="getMesOrderStepVerifySearch"
      />
    </div>

    <el-dialog
      v-el-drag-dialog
      title="报工调整"
      :visible.sync="dialogVisible"
      width="800px"
      :close-on-click-modal="false"
      top="15vh"
      @closed="handleClose"
      @close="handleClose"
    >
      <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
        <el-divider content-position="left">工单信息</el-divider>

        <el-form-item label="工单编号">
          <el-input v-model="dialogForm.postcode" style="width: 200px" />
        </el-form-item>
        <el-form-item label="" prop="postname">
          <el-input v-model="dialogForm.postname" style="width: 200px" />
        </el-form-item>
        <el-form-item label="描述">
          <el-input
            v-model="dialogForm.description"
            type="textarea"
            style="width: 200px"
          />
        </el-form-item>
        <el-form-item required label="岗位状态">
          <el-radio-group v-model="dialogForm.status">
            <el-radio label="Y">正常</el-radio>
            <el-radio label="N">停用</el-radio>
          </el-radio-group>
        </el-form-item>
      </el-form>
      <span slot="footer" class="dialog-footer">
        <div class="footerButton">
          <el-button v-waves @click="dialogVisibleCancel">取 消</el-button>
          <el-button
            v-waves
            type="primary"
            :loading="$store.state.app.buttonIsDisabled"
            :disabled="$store.state.app.buttonIsDisabled"
            @click="dialogVisibleConfirm"
          >确 定</el-button>
        </div>
      </span>
    </el-dialog>

  </div>
</template>

<script>
import Pagination from '@/components/Pagination'
import {
  AddUpdatePost, RoleAssignedUserBatchAdd,
  RoleAssignedUserBatchCancel,
  RoleAssignedUserData

} from '@/api/basicSettings'
import { handleDatetime, validateCode } from '@/utils/global'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import arrayToTree from 'array-to-tree'
import { GroupsPermissions, PostPermissions, PrentOrganization, RolePermissions } from '@/api/GeneralBasicData'
import { MesOrderStepModelSearch, MesOrderStepVerifySearch } from '@/api/WorkOrder'

export default {
  name: 'ReportCorrect'
  name: 'Zzjg',
  components: {
    Pagination
  },
  directives: { elDragDialog, waves },
  data() {
    return {
      mouseHoverType: 'mouseout',
      isExpandForm: false,
      mainHeight: 0,
      tableHeight: 0,
      form: {
        wo_code: '', // 工单编码
        partnumber: '', // 产品编码
        partname: '', // 产品名称
        partspec: '', // 产品规格
        reportuser: '', // 报工人员
        reportdate: '', // 报工时间

        prop: 'report_date', // 排序字段
        order: 'desc', // 排序字段
        page: 1, // 第几页
        rows: 20 // 每页多少条
      },
      total: 10,
      tableData: [],

      dialogVisible: false,
      dialogForm: {

      },
      tableDataDialog: [],
      totalDialog: 10

    }
  },
  created() {
  },
  mounted() {
    window.addEventListener('resize', this.getHeight)
    this.getHeight()

    this.getMesOrderStepVerifySearch()
  },
  methods: {
    // 报工调整列表查询
    async getMesOrderStepVerifySearch() {
      let tempDate = this.form.reportdate
      if (tempDate.length > 0) {
        tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
      }
      const data = {
        wo_code: this.form.wo_code,
        partnumber: this.form.partnumber,
        partname: this.form.partname,
        partspec: this.form.partspec,
        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 MesOrderStepVerifySearch(data)
      this.tableData = res.data
      this.total = res.count
    },
    // 排序改变时
    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.getMesOrderStepVerifySearch()
    },
    // 重置
    reset() {
      this.form.wo_code = ''
      this.form.partnumber = ''
      this.form.partname = ''
      this.form.partspec = ''
      this.form.reportuser = ''
      this.form.reportdate = ''
      this.getMesOrderStepVerifySearch()
    },

    // 报工调整
    async reportAdjust(row) {
      const data = {
        wo_code: row.wo_code,
        step_code: row.step_code,
        step_type: row.steptype,
        isbott: row.first_choke,
        isend: row.last_choke,
        id: row.id,
        sbid: row.sbid
      }
      const res = await MesOrderStepModelSearch(data)
      if (res.code === '200') {

        // this.dialogVisible=true
      }
    },

    // 对话框关闭事件
    handleClose() {
      // this.form.flag = 'TRUE'
    },
    getRowKey(row) {
      return row.partnumber
    },

    // 对话框取消
    dialogVisibleCancel() {
      this.dialogVisible = false
    },
    // 对话框确认
    async dialogVisibleConfirm() {

    },
    // 获取页面高度
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 85
        this.tableHeight = this.mainHeight - 205
        this.$refs.tableDataRef.doLayout()
      })
    }
  }
}
</script>

<style scoped>
<style scoped lang="scss">
::v-deep .el-dialog .el-divider__text {
  font-weight: bolder !important;
}

</style>

 src/views/produce/stepReport.vue

@@ -316,8 +316,10 @@
      @close="handleClose"
    >
      <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="110px">
        <el-divider v-if="activeName==='生产列表'||activeName==='外协收料'||activeName==='不良待处理'" content-position="left">基本信息
        </el-divider>
        <!--        <el-divider v-if="activeName==='生产列表'||activeName==='外协收料'||activeName==='不良待处理'" content-position="left">基本信息</el-divider>-->
        <el-divider v-if="activeName==='生产列表'" content-position="left">报工信息</el-divider>
        <el-divider v-if="activeName==='外协收料'" content-position="left">收料信息</el-divider>
        <el-divider v-if="activeName==='不良待处理'" content-position="left">待处理信息</el-divider>
        <el-form-item label="工单编号" class="dialogFormItem">
          <div class="dialogFormItemDiv">{{ dialogForm.wo_code }}</div>
        </el-form-item>
@@ -490,7 +492,7 @@
          <el-input v-model="dialogForm.sqty" oninput="value=value.replace(/[^\d]/g,'')" style="width: 200px" />
        </el-form-item>

        <el-divider v-if="activeName==='生产列表'||activeName==='外协收料'" content-position="left">不良明细</el-divider>
        <el-divider v-if="activeName==='生产列表'||activeName==='外协收料'" content-position="left">不良明细信息</el-divider>
        <el-button
          v-if="activeName==='生产列表'||activeName==='外协收料'"
          v-waves
@@ -1110,6 +1112,7 @@
        this.dialogForm.eqpcode = res.eqpcode
        this.dialogForm.eqpname = res.eqpname

        if (this.activeName === '外协收料') {
        this.dialogForm.list = []
        res.list.forEach(i => {
          i.acceptQty = parseFloat(i.fqty) - parseFloat(i.sqty) - parseFloat(i.ng_qty) - parseFloat(i.laborbad_qty) - parseFloat(i.materielbad_qty)
@@ -1117,6 +1120,7 @@
            this.dialogForm.list.push(i)
          }
        })
        }

        // this.dialogForm.list = res.list

@@ -1461,4 +1465,12 @@
  justify-content: center;
}

::v-deep .el-dialog .el-form-item__label {
  font-weight: lighter !important;
}

::v-deep .el-dialog .el-divider__text {
  font-weight: bolder !important;
}

</style>

 src/views/workOrder/workOrderClose.vue

@@ -6,7 +6,7 @@
        <el-button v-waves icon="el-icon-switch-button" type="success" @click="orderClose()">工单关闭</el-button>
      </div>

      <div class="bodyTopFormGroup" style="margin-top: 10px;">
      <div class="bodyTopFormGroup">
        <el-form
          ref="form"
          :model="form"
@@ -2631,7 +2631,7 @@
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 85
        this.tableHeight = this.mainHeight - 245
        this.tableHeight = this.mainHeight - 295
        if (window.innerHeight < 769) {
          this.tableHeight = this.tableHeight - 20
        }