src/api/ReportManager.js

@@ -179,3 +179,31 @@
    params: data
  })
}

// å…¥åº“记录表头
export function InStorageRecordMainSearch(data) {
  return request({
    url: 'ReportManager/InStorageRecordMainSearch',
    method: 'get',
    params: data
  })
}

// å…¥åº“记录表体
export function InStorageRecordSubSearch(data) {
  return request({
    url: 'ReportManager/InStorageRecordSubSearch',
    method: 'get',
    params: data
  })
}

// å…¥åº“记录删除
export function DeleteInStorageRecord(data) {
  return request({
    url: 'ReportManager/DeleteInStorageRecord',
    method: 'post',
    data
  })
}


 src/router/index.js

@@ -604,6 +604,13 @@
        code: '0708',
        component: () => import('@/views/statistic/storageRecord'),
        meta: { code: '0708', title: '入库记录', icon: '', keepAlive: true }
      },
      {
        path: 'storageRecord2',
        name: 'storageRecord2',
        code: '0709',
        component: () => import('@/views/statistic/storageRecord2'),
        meta: { code: '0709', title: '入库记录', icon: '', keepAlive: true }
      }

    ]

 src/views/produce/productWarehouse2.vue

@@ -639,7 +639,7 @@
    },
    // èŽ·å–单据编号(入库单号)、流水号
    async getProductInHouseOrderCodeSearch() {
      const { data: res } = await ProductInHouseOrderCodeSearch({ rightcode: '0604' })
      const { data: res } = await ProductInHouseOrderCodeSearch({ rightcode: '0605' })
      this.form.hbillno = res[0]
      this.form.incbit = res[1]
    },
@@ -733,7 +733,7 @@
      })

      const data = {
        'rightcode': '0604', // åŠŸèƒ½ç¼–号
        'rightcode': '0605', // åŠŸèƒ½ç¼–号
        'incbit': this.form.incbit, // æµæ°´å·
        'TableData': [
          [

 src/views/produce/reportCorrect.vue

@@ -1,777 +1,792 @@
<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-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.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 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;">

              <el-input v-model="form.reportuser" placeholder="请输入" style="width: 200px" />

            </el-form-item>

            <el-form-item v-show="isExpandForm" label="报工时间" style=" display: flex;">

              <el-date-picker

                v-model="form.reportdate"

                type="daterange"

                range-separator="~"

                class="timeMini"

                size="mini"

                style="width: 200px;"

                :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="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"

        >

          <!--          <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="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="110"

          >

            <template slot-scope="{row}">

              {{ row.wx_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="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="1080px"

      :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="工单编号" class="dialogFormItem">

          <div style="width: 200px;">

            {{ dialogForm.wo_code }}

          </div>

          <!--          <el-input v-model="dialogForm.postcode" style="width: 200px" />-->

        </el-form-item>

        <el-form-item label="产品编码" class="dialogFormItem">

          <div style="width: 200px;">

            {{ dialogForm.partnumber }}

          </div>

          <!--          <el-input v-model="dialogForm.postname" style="width: 200px" />-->

        </el-form-item>

        <el-form-item label="产品名称" class="dialogFormItem">

          <div style="width: 200px;">

            {{ dialogForm.partname }}

          </div>

        </el-form-item>

        <el-form-item label="产品规格" class="dialogFormItem">

          <div style="width: 200px;">

            {{ dialogForm.partspec ? dialogForm.partspec : '/' }}

          </div>

        </el-form-item>

        <el-form-item label="生产工序" class="dialogFormItem">

          <div style="width: 200px;">

            {{ dialogForm.step_name }}

          </div>

        </el-form-item>

        <el-form-item label="工序单价" class="dialogFormItem">

          <!--          <div style="width: 200px;">-->

          <!--            {{ dialogForm.unprice ? dialogForm.unprice : '/' }}-->

          <!--          </div>-->

          <el-input

            v-model="dialogForm.unprice"

            oninput="value=value.replace(/[^0-9.]/g,'')"

            style="width: 200px"

          />

        </el-form-item>

        <el-form-item v-if="dialogForm.flw_type==='Z'" label="报工班组" class="dialogFormItem">

          <div style="width: 200px;" class="ellipsis">

            {{ dialogForm.usergroup_name ? dialogForm.usergroup_name : '/' }}

          </div>

        </el-form-item>

        <el-form-item v-if="dialogForm.flw_type!=='Z'" label="供应商" class="dialogFormItem">

          <div style="width: 200px;" class="ellipsis">

            {{ dialogForm.wx_name }}

          </div>

        </el-form-item>

        <el-form-item label="报工人员" class="dialogFormItem">

          <div style="width: 200px;" class="ellipsis">

            {{ dialogForm.username }}

          </div>

        </el-form-item>

        <el-form-item :label="dialogForm.flw_type==='Z'?'合格数量':'收料数量'" prop="report_qty" class="dialogFormItem">

          <el-input

            v-model="dialogForm.report_qty"

            oninput="value=value.replace(/[^0-9]/g,'')"

            style="width: 200px"

          />

        </el-form-item>



        <el-divider content-position="left">报工情况</el-divider>



        <el-table

          ref="tableDataDialogRef"

          key="tableDataDialogKey"

          :data="tableDataDialog"

          border

          row-class-name="custom-row"

          height="200"

          style="width: 100%;margin-top: 15px;"

          highlight-current-row

          :header-cell-style="this.$headerCellStyle"

          :cell-style="this.$cellStyle"

        >

          <el-table-column

            type="index"

            label="序号"

            align="center"

            width="50"

          />

          <el-table-column

            prop="stepcode"

            show-tooltip-when-overflow

            label="缺陷编码/名称"

            align="center"

            min-width="400"

          >

            <template slot-scope="{row}">

              <el-select

                v-model="row.defect_code"

                style="width: 100%"

                placeholder="请选择"

                multiple

                filterable

              >

                <!--                collapse-tags-->

                <el-option

                  v-for="item in defectArr"

                  :key="item.code"

                  :label="item.name"

                  :value="item.code"

                />

              </el-select>

            </template>

          </el-table-column>



          <el-table-column

            prop="defect_qty"

            label="不良数量"

            align="center"

          >

            <template slot-scope="{row}">

              <el-input

                v-model="row.defect_qty"

                placeholder="请输入数量"

                oninput="value=value.replace(/[^0-9]/g,'')"

                style="width: 100%"

              />

            </template>

          </el-table-column>

          <el-table-column

            prop="laborbad_qty"

            label="工废数量"

            align="center"

          >

            <template slot-scope="{row}">

              <el-input

                v-model="row.laborbad_qty"

                placeholder="请输入数量"

                oninput="value=value.replace(/[^0-9]/g,'')"

                style="width: 100%"

              />

            </template>

          </el-table-column>

          <el-table-column

            prop="materielbad_qty"

            label="料废数量"

            align="center"

          >

            <template slot-scope="{row}">

              <el-input

                v-model="row.materielbad_qty"

                placeholder="请输入数量"

                oninput="value=value.replace(/[^0-9]/g,'')"

                style="width: 100%"

              />

            </template>

          </el-table-column>

        </el-table>



      </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 { handleDatetime } from '@/utils/global'

import elDragDialog from '@/directive/el-drag-dialog'

import waves from '@/directive/waves'

import { DefectPermissions, PrentOrganizationNoCompany } from '@/api/GeneralBasicData'

import { MesOrderStepModelSearch, MesOrderStepUpdateSeave, MesOrderStepVerifySearch } from '@/api/WorkOrder'



export default {

  name: 'ReportCorrect',

  components: {

    Pagination

  },

  directives: { elDragDialog, waves },

  data() {

    return {

      mouseHoverType: 'mouseout',

      isExpandForm: false,

      mainHeight: 0,

      tableHeight: 0,

      form: {

        wkshopcode: '',

        wo_code: '', // å·¥å•ç¼–码

        partnumber: '', // äº§å“ç¼–码

        partname: '', // äº§å“åç§°

        partspec: '', // äº§å“è§„æ ¼

        reportuser: '', // æŠ¥å·¥äººå‘˜

        reportdate: '', // æŠ¥å·¥æ—¶é—´



        prop: 'report_date', // æŽ’序字段

        order: 'desc', // æŽ’序字段

        page: 1, // ç¬¬å‡ é¡µ

        rows: 20 // æ¯é¡µå¤šå°‘条

      },

      total: 10,

      tableData: [],

      wkshopcodeArr: [],

      dialogVisible: false,

      dialogForm: {

        'id': '',

        'sbid': '',

        'wo_code': '',

        'partnumber': '',

        partname: '',

        partspec: '',

        usergroup_name: '',

        username: '',

        'task_qty': '',

        'wkshp_code': '',

        'eqp_code': '',

        'step_seq': '',

        'step_code': '',

        'step_name': '',

        'flw_type': '',

        'first_choke': '',

        'last_choke': '',

        'unprice': '',

        'groupcode': '',

        'usercode': '',

        'report_date': '',

        'report_qty': '',

        'report_dvalue': '',

        wx_code: '',

        wx_name: '',

        children: []

      },

      tableDataDialog: [],



      defectArr: [], // ä¸è‰¯ç¼ºé™·



      dialogFormRules: {

        report_qty: [

          { required: true, message: '请输入合格数量', trigger: ['blur', 'change'] }

        ]

      }



    }

  },

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

  },

  mounted() {

    window.addEventListener('resize', this.getHeight)

    this.getHeight()



    this.getMesOrderStepVerifySearch()

    this.getDefectPermissions()

    this.getPrentOrganizationNoCompany()

  },

  methods: {

    async getPrentOrganizationNoCompany() {

      const { data: res } = await PrentOrganizationNoCompany()

      this.wkshopcodeArr = res

    },

    async getDefectPermissions() {

      const { data: res3 } = await DefectPermissions() // ç¼ºé™·

      this.defectArr = res3

    },

    // æŠ¥å·¥è°ƒæ•´åˆ—表查询

    async getMesOrderStepVerifySearch() {

      let tempDate = this.form.reportdate

      if (tempDate.length > 0) {

        tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])

      }

      const data = {

        wkshopcode: this.form.wkshopcode,

        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.wkshopcode = ''

      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.dialogForm.id = row.id

        this.dialogForm.sbid = row.sbid

        this.dialogForm.wo_code = row.wo_code

        this.dialogForm.partnumber = row.partnumber

        this.dialogForm.partname = row.partname

        this.dialogForm.partspec = row.partspec

        this.dialogForm.task_qty = row.task_qty

        this.dialogForm.wkshp_code = row.wkshp_code

        this.dialogForm.eqp_code = row.eqp_code

        this.dialogForm.step_seq = row.step_seq

        this.dialogForm.step_code = row.step_code

        this.dialogForm.step_name = row.stepname

        this.dialogForm.flw_type = row.steptype

        this.dialogForm.first_choke = row.first_choke

        this.dialogForm.last_choke = row.last_choke

        this.dialogForm.unprice = row.step_price

        this.dialogForm.groupcode = row.usergroup_code

        this.dialogForm.usercode = row.usercode

        this.dialogForm.usergroup_name = row.usergroup_name

        this.dialogForm.username = row.username

        this.dialogForm.report_date = row.report_date

        this.dialogForm.report_qty = row.report_qty

        this.dialogForm.report_qty2 = row.report_qty // old值



        this.dialogForm.wx_code = row.wx_code

        this.dialogForm.wx_name = row.wx_name



        if (res.data.length > 0) {

          res.data.forEach(i => {

            i.defect_code = i.defect_code.split(',')

            i.defect_qty2 = i.defect_qty

            i.laborbad_qty2 = i.laborbad_qty

            i.materielbad_qty2 = i.materielbad_qty

          })

        }

        this.tableDataDialog = res.data



        this.dialogVisible = true

      }

    },

    // å¯¹è¯æ¡†å…³é—­äº‹ä»¶

    handleClose() {

      this.tableDataDialog = []

    },

    // å¯¹è¯æ¡†å–消

    dialogVisibleCancel() {

      this.dialogVisible = false

    },

    // å¯¹è¯æ¡†ç¡®è®¤

    async dialogVisibleConfirm() {

      this.$refs.dialogForm.validate(async valid => {

        if (valid) {

          const children = []



          this.tableDataDialog.forEach(i => {

            children.push({

              ng_id: i.id,

              ng_sbid: i.record_id,

              ng_qty: parseFloat(i.defect_qty),

              ng_dvalue: parseFloat(i.defect_qty) - parseFloat(i.defect_qty2),

              laborbad_qty: parseFloat(i.laborbad_qty),

              laborbad_dvalue: parseFloat(i.laborbad_qty) - parseFloat(i.laborbad_qty2),

              materielbad_qty: parseFloat(i.materielbad_qty),

              materielbad_dvalue: parseFloat(i.materielbad_qty) - parseFloat(i.materielbad_qty2),

              bad_money: 0,

              badmoney_dvalue: 0

            })

          })

          const data = {

            'id': this.dialogForm.id,

            'sbid': this.dialogForm.sbid,

            'wo_code': this.dialogForm.wo_code,

            'partnumber': this.dialogForm.partnumber,

            'task_qty': this.dialogForm.task_qty,

            'wkshp_code': this.dialogForm.wkshp_code,

            'eqp_code': this.dialogForm.eqp_code,

            'step_seq': this.dialogForm.step_seq,

            'step_code': this.dialogForm.step_code,

            'flw_type': this.dialogForm.flw_type,

            'first_choke': this.dialogForm.first_choke,

            'last_choke': this.dialogForm.last_choke,

            'unprice': this.dialogForm.unprice,

            'groupcode': this.dialogForm.groupcode,

            'usercode': this.dialogForm.usercode,

            wxcode: this.dialogForm.wx_code,

            'report_date': this.dialogForm.report_date,

            'report_qty': parseFloat(this.dialogForm.report_qty),

            'report_dvalue': parseFloat(this.dialogForm.report_qty) - parseFloat(this.dialogForm.report_qty2),

            children

          }

          // console.log(JSON.stringify(data), 12)

          // console.log(JSON.parse(JSON.stringify(data)), 12)

          this.$store.state.app.buttonIsDisabled = true

          const res = await MesOrderStepUpdateSeave([data])

          if (res.code === '200') {

            this.$notify.success('调整成功！')

            await this.getMesOrderStepVerifySearch()

            this.$store.state.app.buttonIsDisabled = false

            this.dialogVisible = false

          } else {

            this.$store.state.app.buttonIsDisabled = false

            this.$notify.error('调整失败！')

          }

        }

      })

    },

    // èŽ·å–页面高度

    getHeight() {

      this.$nextTick(() => {

        this.mainHeight = window.innerHeight - 85

        this.tableHeight = this.mainHeight - 205

        this.$refs.tableDataRef.doLayout()

      })

    }

  }

}

</script>



<style scoped lang="scss">

.dialogFormItem {

  margin: 0 10px 0 0;

}



::v-deep .el-dialog .el-divider__text {

  font-weight: bolder !important;

}



::v-deep .el-dialog .el-form-item__label {

  font-weight: lighter !important;

}



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

}



</style>

<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-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.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 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;">
              <el-input v-model="form.reportuser" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="报工时间" style=" display: flex;">
              <el-date-picker
                v-model="form.reportdate"
                type="daterange"
                range-separator="~"
                class="timeMini"
                size="mini"
                style="width: 200px;"
                :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="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"
        >
          <!--          <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="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="110"
          >
            <template slot-scope="{row}">
              {{ row.wx_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="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="inhouseqty"
            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="1080px"
      :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="工单编号" class="dialogFormItem">
          <div style="width: 200px;">
            {{ dialogForm.wo_code }}
          </div>
          <!--          <el-input v-model="dialogForm.postcode" style="width: 200px" />-->
        </el-form-item>
        <el-form-item label="产品编码" class="dialogFormItem">
          <div style="width: 200px;">
            {{ dialogForm.partnumber }}
          </div>
          <!--          <el-input v-model="dialogForm.postname" style="width: 200px" />-->
        </el-form-item>
        <el-form-item label="产品名称" class="dialogFormItem">
          <div style="width: 200px;">
            {{ dialogForm.partname }}
          </div>
        </el-form-item>
        <el-form-item label="产品规格" class="dialogFormItem">
          <div style="width: 200px;">
            {{ dialogForm.partspec ? dialogForm.partspec : '/' }}
          </div>
        </el-form-item>
        <el-form-item label="生产工序" class="dialogFormItem">
          <div style="width: 200px;">
            {{ dialogForm.step_name }}
          </div>
        </el-form-item>
        <el-form-item label="工序单价" class="dialogFormItem">
          <!--          <div style="width: 200px;">-->
          <!--            {{ dialogForm.unprice ? dialogForm.unprice : '/' }}-->
          <!--          </div>-->
          <el-input
            v-model="dialogForm.unprice"
            oninput="value=value.replace(/[^0-9.]/g,'')"
            style="width: 200px"
          />
        </el-form-item>
        <el-form-item v-if="dialogForm.flw_type==='Z'" label="报工班组" class="dialogFormItem">
          <div style="width: 200px;" class="ellipsis">
            {{ dialogForm.usergroup_name ? dialogForm.usergroup_name : '/' }}
          </div>
        </el-form-item>
        <el-form-item v-if="dialogForm.flw_type!=='Z'" label="供应商" class="dialogFormItem">
          <div style="width: 200px;" class="ellipsis">
            {{ dialogForm.wx_name }}
          </div>
        </el-form-item>
        <el-form-item label="报工人员" class="dialogFormItem">
          <div style="width: 200px;" class="ellipsis">
            {{ dialogForm.username }}
          </div>
        </el-form-item>
        <el-form-item :label="dialogForm.flw_type==='Z'?'合格数量':'收料数量'" prop="report_qty" class="dialogFormItem">
          <el-input
            v-model="dialogForm.report_qty"
            oninput="value=value.replace(/[^0-9]/g,'')"
            style="width: 200px"
          />
        </el-form-item>

        <el-divider content-position="left">报工情况</el-divider>

        <el-table
          ref="tableDataDialogRef"
          key="tableDataDialogKey"
          :data="tableDataDialog"
          border
          row-class-name="custom-row"
          height="200"
          style="width: 100%;margin-top: 15px;"
          highlight-current-row
          :header-cell-style="this.$headerCellStyle"
          :cell-style="this.$cellStyle"
        >
          <el-table-column
            type="index"
            label="序号"
            align="center"
            width="50"
          />
          <el-table-column
            prop="stepcode"
            show-tooltip-when-overflow
            label="缺陷编码/名称"
            align="center"
            min-width="400"
          >
            <template slot-scope="{row}">
              <el-select
                v-model="row.defect_code"
                style="width: 100%"
                placeholder="请选择"
                multiple
                filterable
              >
                <!--                collapse-tags-->
                <el-option
                  v-for="item in defectArr"
                  :key="item.code"
                  :label="item.name"
                  :value="item.code"
                />
              </el-select>
            </template>
          </el-table-column>

          <el-table-column
            prop="defect_qty"
            label="不良数量"
            align="center"
          >
            <template slot-scope="{row}">
              <el-input
                v-model="row.defect_qty"
                placeholder="请输入数量"
                oninput="value=value.replace(/[^0-9]/g,'')"
                style="width: 100%"
              />
            </template>
          </el-table-column>
          <el-table-column
            prop="laborbad_qty"
            label="工废数量"
            align="center"
          >
            <template slot-scope="{row}">
              <el-input
                v-model="row.laborbad_qty"
                placeholder="请输入数量"
                oninput="value=value.replace(/[^0-9]/g,'')"
                style="width: 100%"
              />
            </template>
          </el-table-column>
          <el-table-column
            prop="materielbad_qty"
            label="料废数量"
            align="center"
          >
            <template slot-scope="{row}">
              <el-input
                v-model="row.materielbad_qty"
                placeholder="请输入数量"
                oninput="value=value.replace(/[^0-9]/g,'')"
                style="width: 100%"
              />
            </template>
          </el-table-column>
        </el-table>

      </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 { handleDatetime } from '@/utils/global'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import { DefectPermissions, PrentOrganizationNoCompany } from '@/api/GeneralBasicData'
import { MesOrderStepModelSearch, MesOrderStepUpdateSeave, MesOrderStepVerifySearch } from '@/api/WorkOrder'

export default {
  name: 'ReportCorrect',
  components: {
    Pagination
  },
  directives: { elDragDialog, waves },
  data() {
    return {
      mouseHoverType: 'mouseout',
      isExpandForm: false,
      mainHeight: 0,
      tableHeight: 0,
      form: {
        wkshopcode: '',
        wo_code: '', // å·¥å•ç¼–码
        partnumber: '', // äº§å“ç¼–码
        partname: '', // äº§å“åç§°
        partspec: '', // äº§å“è§„æ ¼
        reportuser: '', // æŠ¥å·¥äººå‘˜
        reportdate: '', // æŠ¥å·¥æ—¶é—´

        prop: 'report_date', // æŽ’序字段
        order: 'desc', // æŽ’序字段
        page: 1, // ç¬¬å‡ é¡µ
        rows: 20 // æ¯é¡µå¤šå°‘条
      },
      total: 10,
      tableData: [],
      wkshopcodeArr: [],
      dialogVisible: false,
      dialogForm: {
        'id': '',
        'sbid': '',
        'wo_code': '',
        'partnumber': '',
        partname: '',
        partspec: '',
        usergroup_name: '',
        username: '',
        'task_qty': '',
        'wkshp_code': '',
        'eqp_code': '',
        'step_seq': '',
        'step_code': '',
        'step_name': '',
        'flw_type': '',
        'first_choke': '',
        'last_choke': '',
        'unprice': '',
        'groupcode': '',
        'usercode': '',
        'report_date': '',
        'report_qty': '',
        'report_dvalue': '',
        wx_code: '',
        wx_name: '',
        children: []
      },
      tableDataDialog: [],

      defectArr: [], // ä¸è‰¯ç¼ºé™·

      dialogFormRules: {
        report_qty: [
          { required: true, message: '请输入合格数量', trigger: ['blur', 'change'] }
        ]
      }

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

    this.getMesOrderStepVerifySearch()
    this.getDefectPermissions()
    this.getPrentOrganizationNoCompany()
  },
  methods: {
    async getPrentOrganizationNoCompany() {
      const { data: res } = await PrentOrganizationNoCompany()
      this.wkshopcodeArr = res
    },
    async getDefectPermissions() {
      const { data: res3 } = await DefectPermissions() // ç¼ºé™·
      this.defectArr = res3
    },
    // æŠ¥å·¥è°ƒæ•´åˆ—表查询
    async getMesOrderStepVerifySearch() {
      let tempDate = this.form.reportdate
      if (tempDate.length > 0) {
        tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
      }
      const data = {
        wkshopcode: this.form.wkshopcode,
        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.wkshopcode = ''
      this.form.wo_code = ''
      this.form.partnumber = ''
      this.form.partname = ''
      this.form.partspec = ''
      this.form.reportuser = ''
      this.form.reportdate = ''
      this.getMesOrderStepVerifySearch()
    },

    // æŠ¥å·¥è°ƒæ•´
    async reportAdjust(row) {
      if (parseFloat(row.inhouseqty) > 0) {
        return this.$message.info('此记录已入库，不允许报工调整，请先删除入库记录！')
      }

      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.dialogForm.id = row.id
        this.dialogForm.sbid = row.sbid
        this.dialogForm.wo_code = row.wo_code
        this.dialogForm.partnumber = row.partnumber
        this.dialogForm.partname = row.partname
        this.dialogForm.partspec = row.partspec
        this.dialogForm.task_qty = row.task_qty
        this.dialogForm.wkshp_code = row.wkshp_code
        this.dialogForm.eqp_code = row.eqp_code
        this.dialogForm.step_seq = row.step_seq
        this.dialogForm.step_code = row.step_code
        this.dialogForm.step_name = row.stepname
        this.dialogForm.flw_type = row.steptype
        this.dialogForm.first_choke = row.first_choke
        this.dialogForm.last_choke = row.last_choke
        this.dialogForm.unprice = row.step_price
        this.dialogForm.groupcode = row.usergroup_code
        this.dialogForm.usercode = row.usercode
        this.dialogForm.usergroup_name = row.usergroup_name
        this.dialogForm.username = row.username
        this.dialogForm.report_date = row.report_date
        this.dialogForm.report_qty = row.report_qty
        this.dialogForm.report_qty2 = row.report_qty // old值

        this.dialogForm.wx_code = row.wx_code
        this.dialogForm.wx_name = row.wx_name

        if (res.data.length > 0) {
          res.data.forEach(i => {
            i.defect_code = i.defect_code.split(',')
            i.defect_qty2 = i.defect_qty
            i.laborbad_qty2 = i.laborbad_qty
            i.materielbad_qty2 = i.materielbad_qty
          })
        }
        this.tableDataDialog = res.data

        this.dialogVisible = true
      }
    },
    // å¯¹è¯æ¡†å…³é—­äº‹ä»¶
    handleClose() {
      this.tableDataDialog = []
    },
    // å¯¹è¯æ¡†å–消
    dialogVisibleCancel() {
      this.dialogVisible = false
    },
    // å¯¹è¯æ¡†ç¡®è®¤
    async dialogVisibleConfirm() {
      this.$refs.dialogForm.validate(async valid => {
        if (valid) {
          const children = []

          this.tableDataDialog.forEach(i => {
            children.push({
              ng_id: i.id,
              ng_sbid: i.record_id,
              ng_qty: parseFloat(i.defect_qty),
              ng_dvalue: parseFloat(i.defect_qty) - parseFloat(i.defect_qty2),
              laborbad_qty: parseFloat(i.laborbad_qty),
              laborbad_dvalue: parseFloat(i.laborbad_qty) - parseFloat(i.laborbad_qty2),
              materielbad_qty: parseFloat(i.materielbad_qty),
              materielbad_dvalue: parseFloat(i.materielbad_qty) - parseFloat(i.materielbad_qty2),
              bad_money: 0,
              badmoney_dvalue: 0
            })
          })
          const data = {
            'id': this.dialogForm.id,
            'sbid': this.dialogForm.sbid,
            'wo_code': this.dialogForm.wo_code,
            'partnumber': this.dialogForm.partnumber,
            'task_qty': this.dialogForm.task_qty,
            'wkshp_code': this.dialogForm.wkshp_code,
            'eqp_code': this.dialogForm.eqp_code,
            'step_seq': this.dialogForm.step_seq,
            'step_code': this.dialogForm.step_code,
            'flw_type': this.dialogForm.flw_type,
            'first_choke': this.dialogForm.first_choke,
            'last_choke': this.dialogForm.last_choke,
            'unprice': this.dialogForm.unprice,
            'groupcode': this.dialogForm.groupcode,
            'usercode': this.dialogForm.usercode,
            wxcode: this.dialogForm.wx_code,
            'report_date': this.dialogForm.report_date,
            'report_qty': parseFloat(this.dialogForm.report_qty),
            'report_dvalue': parseFloat(this.dialogForm.report_qty) - parseFloat(this.dialogForm.report_qty2),
            children
          }
          // console.log(JSON.stringify(data), 12)
          // console.log(JSON.parse(JSON.stringify(data)), 12)
          this.$store.state.app.buttonIsDisabled = true
          const res = await MesOrderStepUpdateSeave([data])
          if (res.code === '200') {
            this.$notify.success('调整成功！')
            await this.getMesOrderStepVerifySearch()
            this.$store.state.app.buttonIsDisabled = false
            this.dialogVisible = false
          } else {
            this.$store.state.app.buttonIsDisabled = false
            this.$notify.error('调整失败！')
          }
        }
      })
    },
    // èŽ·å–页面高度
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 85
        this.tableHeight = this.mainHeight - 205
        this.$refs.tableDataRef.doLayout()
      })
    }
  }
}
</script>

<style scoped lang="scss">
.dialogFormItem {
  margin: 0 10px 0 0;
}

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

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

::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;
}

</style>

 src/views/produce/stepReport2.vue

@@ -472,6 +472,28 @@
          <el-input v-model="dialogForm.startqty" oninput="value=value.replace(/[^\d]/g,'')" style="width: 200px" />
        </el-form-item>

        <el-form-item
          v-if="(activeName==='生产列表'||activeName==='外协收料')&&rowData.isend === 'Y'"
          prop="stockcode"
          label="入库仓库"
          class="dialogFormItem"
        >
          <el-select
            v-model="dialogForm.stockcode"
            style="width:200px"
            placeholder="请选择"
            filterable
            :popper-append-to-body="false"
          >
            <el-option
              v-for="item in WareHouseArr"
              :key="item.code"
              :label="item.name"
              :value="item.code"
            />
          </el-select>
        </el-form-item>

        <el-form-item v-if="activeName==='外协发料'||activeName==='外协收料'" prop="wxcode" label="外协供方" class="dialogFormItem">
          <el-select
            v-model="dialogForm.wxcode"
@@ -883,8 +905,14 @@
  EditOrderNgStepSeave,
  MesOrderNgStepSearch,
  MesOrderNgSubStepSearch,
  MesOrderStepSearch, MesOrderStepStart,
  MesOrderWxStepSearch, SavaMesOrderStepIn, SavaMesOrderStepOut, SavaMesOrderStepReport
  MesOrderStepSearch,
  MesOrderStepStart,
  MesOrderWxStepSearch,
  ProductInHouseOrderCodeSearch,
  SavaMesOrderStepIn,
  SavaMesOrderStepOut,
  SavaMesOrderStepReport,
  TProductInHouseOrderSpSeave
} from '@/api/WorkOrder'
import {
  CustomerPermissions,
@@ -892,12 +920,12 @@
  EqpPermissions,
  GroupsPermissions,
  GroupsPersonPermissions,
  PersonPermissions, PrentOrganizationNoCompany
  PersonPermissions, PrentOrganizationNoCompany, WareHouse
} from '@/api/GeneralBasicData'
import { nanoid } from 'nanoid'
import { LabelBarCode } from '@/api/systemSetting'
import { getCookie } from '@/utils/auth'
import { handleDatetime2 } from '@/utils/global'
import { handleDatetime, handleDatetime2 } from '@/utils/global'
import QRCode from 'qrcodejs2'
export default {
  name: 'StepReport2',
@@ -959,6 +987,8 @@
        'eqpcode': '',
        'eqpname': '',

        stockcode: '',

        remarks: '', // å¤‡æ³¨
        inbarcode: '', // å…¥åº“条码
        defectlist: '', // ä¸è‰¯æ±‡æ€»
@@ -983,6 +1013,9 @@
        ],
        reportuser: [
          { required: true, message: '请选择报工人员', trigger: ['blur', 'change'] }
        ],
        stockcode: [
          { required: true, message: '请选择入库仓库', trigger: ['blur', 'change'] }
        ],
        startqty: [
          { required: true, message: '请输入合格数量', trigger: ['blur', 'change'] }
@@ -1050,7 +1083,8 @@
          console.log('执行了打印')
        }
      },
      xx: ''
      rowData: {},
      WareHouseArr: []
    }
  },
  activated() {
@@ -1067,8 +1101,14 @@
    this.tabClick()

    this.getAllSelectArr()

    this.getWareHouse()
  },
  methods: {
    async getWareHouse() {
      const { data: res } = await WareHouse()
      this.WareHouseArr = res
    },

    async getAllSelectArr() {
      const { data: res1 } = await GroupsPermissions()// ç­ç»„
@@ -1173,9 +1213,13 @@
    // æŠ¥å·¥
    report(row) {
      if (row) {
        this.rowData = row
        this.dialogForm.stockcode = this.rowData.stockcode
        this.getMesOrderStepStart('ZZ', '', row.wo_code, row.stepcode)
      } else {
        const temp = this.tableData.find(i => i.id === this.radioSelected)
        this.rowData = temp
        this.dialogForm.stockcode = this.rowData.stockcode
        this.getMesOrderStepStart('ZZ', '', temp.wo_code, temp.stepcode)
      }
    },
@@ -1191,9 +1235,13 @@
    // æ”¶æ–™
    takeIn(row) {
      if (row) {
        this.rowData = row
        this.dialogForm.stockcode = this.rowData.stockcode
        this.getMesOrderStepStart('WX', 'IN', row.wo_code, row.stepcode)
      } else {
        const temp = this.tableData.find(i => i.id === this.radioSelected)
        this.rowData = temp
        this.dialogForm.stockcode = this.rowData.stockcode
        this.getMesOrderStepStart('WX', 'IN', temp.wo_code, temp.stepcode)
      }
    },
@@ -1309,6 +1357,8 @@
        'eqpcode': '',
        'eqpname': '',

        stockcode: '',

        wxcode: '',
        outuser: '',
        fqty: '',
@@ -1399,6 +1449,11 @@
            if (res.code === '200') {
              this.$notify.success('报工成功！')
              // await this.search()

              // if (this.rowData.isend === 'Y') {
              //   await this.handleProductInHouseOrderSeave('B', inbarcode)
              // }

              await this.tabClick()
              this.$store.state.app.buttonIsDisabled = false
              this.dialogVisible = false
@@ -1507,6 +1562,11 @@
            const res = await SavaMesOrderStepIn(data)
            if (res.code === '200') {
              this.$notify.success('收料成功！')

              // if (this.rowData.isend === 'Y') {
              //   await this.handleProductInHouseOrderSeave('S', inbarcode)
              // }

              // await this.search()
              await this.tabClick()
              this.$store.state.app.buttonIsDisabled = false
@@ -1557,6 +1617,72 @@
      // this.$refs.qrCodeDiv2 = ''
    },

    async handleProductInHouseOrderSeave(type, inbarcode) {
      const { data: res2 } = await ProductInHouseOrderCodeSearch({ rightcode: '0605' })
      const TableDetailData = []

      TableDetailData.push({
        hbillno: res2[0], // --入库单号
        wocode: this.rowData.wo_code, //  --工单号
        rownumber: this.rowData.sbid.toString(), // --行号
        sourceVoucherId: this.rowData.mpoid.toString(), // --来源单据id
        sourceVoucherCode: this.rowData.m_po.toString(), // --来源单据编号
        SourceVoucherDetailId: this.rowData.sbid.toString(), // --来源单据明细id

        inbarcode: inbarcode, // --入库条码
        idinventory: this.rowData.materiel_id.toString(), //  --存货id
        inventorycode: this.rowData.partcode, // --存货编码
        idunit: this.rowData.unitid.toString(), // --计量单位id
        unitcode: this.rowData.unitcode, // --计量单位编码
        idwarehouse: this.WareHouseArr.find(i => i.code === this.dialogForm.stockcode).noid.toString(), //    --仓库id
        warehousecode: this.dialogForm.stockcode, // --仓库编码

        saleOrderId: this.rowData.saleOrderid.toString(), // --销售单id
        saleOrderCode: this.rowData.saleOrderCode, // --销售单号
        saleOrderDetailId: this.rowData.saleOrderDetailId.toString(), // --销售单明细id

        qty: type === 'B' ? this.dialogForm.startqty.toString() : this.dialogForm.sqty.toString(), // å…¥åº“数量
        stepcode: this.rowData.stepcode, // --工序编码
        style: type, // --报工类型
        status: '0' // --单据状态
      })

      const data = {
        'rightcode': '0605', // åŠŸèƒ½ç¼–号
        'incbit': res2[1], // æµæ°´å·
        'TableData': [
          [
            {
              'hbillno': res2[0], // å…¥åº“单号
              'madedate': handleDatetime(new Date()) + ' 00:00:00', // åˆ¶å•æ—¥æœŸï¼ˆå¹´æœˆæ—¥ 00:00:00）
              'hbdate': this.rowData.voucherdate,

              sourceVoucherId: this.rowData.mpoid.toString(),
              sourceVoucherCode: this.rowData.m_po.toString(),
              saleOrderCode: this.rowData.saleOrderCode.toString(),

              'iddepartment': this.rowData.dept_id.toString(), // éƒ¨é—¨id
              'departmentcode': this.rowData.wkshp_code, // éƒ¨é—¨ç¼–码

              'idwarehouse': this.WareHouseArr.find(i => i.code === this.dialogForm.stockcode).noid.toString(), // ä»“库id
              'warehousecode': this.dialogForm.stockcode, // ä»“库编码
              'status': '0', // å…¥åº“单状态：0(未审核) 1(已审核)
              PurchaseOrderCode: '', // é‡‡è´­è®¢å•å·
              'remark': '', // å¤‡æ³¨
              'create_user': localStorage.getItem('username'), // åˆ›å»ºäººå‘˜
              'create_date': handleDatetime2(new Date()),
              'check_user': '', // å®¡æ ¸äººå‘˜
              'check_date': ''// å®¡æ ¸æ—¶é—´
            }
          ],
          TableDetailData// è¡¨ä½“
        ]
      }

      // console.log(JSON.parse(JSON.stringify(data)))
      await TProductInHouseOrderSpSeave(data)
    },

    ZZprint2(username) {
      if (this.dialogForm.nextstepcode !== '') {
        this.qrForm.qrvalue = this.dialogForm.wo_code + ';' + this.dialogForm.nextstepcode

 src/views/statistic/storageRecord.vue

@@ -542,6 +542,7 @@
        if (row.create_date) { // è¯´æ˜Žç‚¹å‡»çš„æ—¶ å•è¡Œåˆ é™¤
          data = [
            {
              'repoid': row.repoid,
              'hbillno': row.hbillno,
              'salecode': row.salecode,
              'mo_no': row.mo_no,
@@ -558,6 +559,7 @@
        } else { // è¯´æ˜Žæ˜¯æ‰¹é‡åˆ é™¤
          this.multipleSelection.forEach(row => {
            data.push({
              'repoid': row.repoid,
              'hbillno': row.hbillno,
              'salecode': row.salecode,
              'mo_no': row.mo_no,

 src/views/statistic/storageRecord2.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,818 @@
<template>
  <div>
    <div class="body" :style="{height:mainHeight+'px'}">

      <!--      <div class="bodyTopButtonGroup">-->
      <!--          <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">新增</el-button>-->
      <!--          <el-button v-waves type="success" icon="el-icon-connection" @click="">派发</el-button>-->
      <!--      </div>-->

      <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.hbillno" placeholder="请输入" style="width: 200px" />
            </el-form-item>

            <el-form-item label="单据日期" style="display: flex;align-items: center">
              <el-date-picker
                v-model="form.hbdate"
                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>

            <el-form-item label="操作人员" style="display: flex;">
              <el-input v-model="form.username" style="width: 200px" placeholder="请输入" />
            </el-form-item>

            <el-form-item label="操作时间" style="display: flex;align-items: center">
              <el-date-picker
                v-model="form.userdate"
                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="getInStorageRecordMainSearch()">查询</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"
          @row-click="rowClick"
        >
          <el-table-column
            prop="rowNum"
            width="50"
            label="序号"
            fixed
          />

          <el-table-column
            prop="hbillno"
            label="入库单号"
            show-tooltip-when-overflow
            sortable="custom"
          />
          <el-table-column
            prop="hbilltype"
            label="单据类型"
            show-tooltip-when-overflow
            sortable="custom"
          />
          <el-table-column
            prop="hbdate"
            label="单据日期"
            show-tooltip-when-overflow
            sortable="custom"
          />

          <el-table-column
            prop="create_user"
            show-tooltip-when-overflow
            label="创建人员"
            sortable="custom"
          />
          <el-table-column
            prop="create_date"
            label="创建时间"
            show-tooltip-when-overflow
            sortable="custom"
          />
          <el-table-column
            label="操作"
            width="160"
            fixed="right"
          >
            <template slot-scope="{row}">
              <div class="operationClass">
                <el-tooltip v-del-tab-index class="item" effect="dark" content="删除" placement="top">
                  <i class="el-icon-delete" :style="{color:$store.state.settings.theme}" @click.stop="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,jumper"
        popper-class="select_bottom"
        @pagination="getInStorageRecordMainSearch"
      />

      <div class="elTableDiv">
        <el-table
          ref="tableDataRef2"
          :data="tableDataDetail"
          border
          height="210px"
          :row-class-name="tableRowClassName"
          highlight-current-row
          :header-cell-style="this.$headerCellStyle"
          :cell-style="this.$cellStyle"
        >
          <el-table-column
            width="50"
            prop="rownumber"
            label="序号"
            fixed
          />
          <el-table-column
            prop="stockname"
            label="入库仓库"
            width="160"
            show-tooltip-when-overflow
          >
            <template slot-scope="{row}">
              <div v-if="row.stockname">{{ row.stockname }}</div>
              <div v-else>/</div>
            </template>
          </el-table-column>

          <el-table-column
            prop="salecode"
            label="销售单号"
            min-width="160"
            show-tooltip-when-overflow
          >
            <template slot-scope="{row}">
              <div v-if="row.salecode">{{ row.salecode }}</div>
              <div v-else>/</div>
            </template>
          </el-table-column>

          <el-table-column
            prop="mo_no"
            label="订单编号"
            min-width="160"
            show-tooltip-when-overflow
          >
            <template slot-scope="{row}">
              <div v-if="row.mo_no">{{ row.mo_no }}</div>
              <div v-else>/</div>
            </template>
          </el-table-column>

          <el-table-column
            prop="wocode"
            label="工单编号"
            min-width="160"
            show-tooltip-when-overflow
          />

          <el-table-column
            prop="partcode"
            label="产品编码"
            width="160"
            show-tooltip-when-overflow
          />
          <el-table-column
            prop="partname"
            label="产品名称"
            width="160"
            show-tooltip-when-overflow
          />
          <el-table-column
            prop="partspec"
            label="产品规格"
            width="160"
            show-tooltip-when-overflow
          >
            <template slot-scope="{row}">
              <div v-if="row.partspec">{{ row.partspec }}</div>
              <div v-else>/</div>
            </template>
          </el-table-column>

          <el-table-column
            prop="unitname"
            label="单位名称"
            width="160"
            show-tooltip-when-overflow
          >
            <template slot-scope="{row}">
              <div v-if="row.unitname">{{ row.unitname }}</div>
              <div v-else>/</div>
            </template>
          </el-table-column>

          <!--          <el-table-column-->
          <!--            prop="wkshp_name"-->
          <!--            label="部门名称"-->
          <!--            width="160"-->
          <!--            show-tooltip-when-overflow-->
          <!--          >-->
          <!--            <template slot-scope="{row}">-->
          <!--              <div v-if="row.wkshp_name">{{ row.wkshp_name }}</div>-->
          <!--              <div v-else>/</div>-->
          <!--            </template>-->
          <!--          </el-table-column>-->

          <el-table-column
            prop="stepname"
            label="工序名称"
            min-width="160"
            show-tooltip-when-overflow
          >
            <template slot-scope="{row}">
              <div v-if="row.stepname">{{ row.stepname }}</div>
              <div v-else>/</div>
            </template>
          </el-table-column>

          <el-table-column
            prop="qty"
            label="入库数量"
            min-width="95"
            show-tooltip-when-overflow
          >
            <template slot-scope="{row}">
              <div v-if="row.qty">{{ row.qty }}</div>
              <div v-else>/</div>
            </template>
          </el-table-column>
          <!--          <el-table-column-->
          <!--            prop="plan_qty"-->
          <!--            label="工单数量"-->
          <!--            min-width="95"-->
          <!--            fixed="right"-->
          <!--            show-tooltip-when-overflow-->
          <!--          />-->
          <!--          <el-table-column-->
          <!--            prop="good_qty"-->
          <!--            label="完工数量"-->
          <!--            min-width="95"-->
          <!--            fixed="right"-->
          <!--            show-tooltip-when-overflow-->
          <!--          />-->
          <!--          <el-table-column-->
          <!--            prop="inhouseqty"-->
          <!--            label="已入库数量"-->
          <!--            min-width="95"-->
          <!--            fixed="right"-->
          <!--            show-tooltip-when-overflow-->
          <!--          />-->
          <!--          <el-table-column-->
          <!--            prop="stinhouseqty"-->
          <!--            label="待入库数量"-->
          <!--            min-width="130"-->
          <!--            fixed="right"-->
          <!--          >-->
          <!--            &lt;!&ndash;                    <template slot-scope="{row}">&ndash;&gt;-->
          <!--            &lt;!&ndash;                      <el-input-number v-model="row.stinhouseqty" :min="0" :max="row.good_qty" size="small" />&ndash;&gt;-->
          <!--            &lt;!&ndash;                    </template>&ndash;&gt;-->
          <!--          </el-table-column>-->
          <!--          <el-table-column-->
          <!--            label="操作"-->
          <!--            width="120"-->
          <!--            fixed="right"-->
          <!--          >-->
          <!--            <template slot-scope="{row}">-->
          <!--              <div class="operationClass">-->
          <!--                <el-tooltip v-del-tab-index class="item" effect="dark" content="SOP预览" placement="top">-->
          <!--                  <i-->
          <!--                    class="el-icon-files"-->
          <!--                    style="cursor: pointer;color:#42b983;margin-right: 15px"-->
          <!--                  />-->
          <!--                </el-tooltip>-->
          <!--              </div>-->
          <!--            </template>-->
          <!--          </el-table-column>-->
        </el-table>
      </div>
    </div>

  </div>
</template>

<script>
import Pagination from '@/components/Pagination'
import waves from '@/directive/waves'
import {
  DeleteInStorageRecord,
  InStorageRecordMainSearch,
  InStorageRecordSubSearch
} from '@/api/ReportManager'
import { handleDatetime, handleDatetime2 } from '@/utils/global'

export default {
  name: 'WorkOrderList',
  components: {
    Pagination
  },
  directives: { waves },
  data() {
    return {
      mouseHoverType: 'mouseout',
      mouseHoverTypeDialog: 'mouseout',
      isExpandForm: false,
      isIpad: false,
      mainHeight: 0,
      tableHeight: 0,
      username: '',
      form: {
        hbillno: '', // å…¥åº“单号
        hbdate: '', // å•æ®æ—¥æœŸ
        username: '', // æ“ä½œäººå‘˜
        userdate: '', // æ“ä½œæ—¶é—´
        prop: 'hbillno', // æŽ’序字段
        order: 'desc', // æŽ’序字段
        page: 1, // ç¬¬å‡ é¡µ
        rows: 20 // æ¯é¡µå¤šå°‘条
      },
      tableData: [],
      total: 10,
      tableDataDetail: []
    }
  },

  activated() {
    window.addEventListener('resize', this.getHeight)
    this.getHeight()
  },
  created() {
    this.getInStorageRecordMainSearch()
  },
  mounted() {
    window.addEventListener('resize', this.getHeight)
    this.getHeight()
  },
  methods: {
    async getInStorageRecordMainSearch() {
      let tempDate = this.form.hbdate
      if (tempDate.length > 0) {
        tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
      }
      let tempDate2 = this.form.userdate
      if (tempDate2.length > 0) {
        tempDate2 = handleDatetime(tempDate2[0]) + '~' + handleDatetime(tempDate2[1])
      }

      const data = {
        hbillno: '', // å…¥åº“单号
        hbdate: tempDate, // å•æ®æ—¥æœŸ
        username: '', // æ“ä½œäººå‘˜
        userdate: tempDate2, // æ“ä½œæ—¶é—´
        prop: this.form.prop, // æŽ’序字段
        order: this.form.order, // æŽ’序字段
        page: this.form.page, // ç¬¬å‡ é¡µ
        rows: this.form.rows // æ¯é¡µå¤šå°‘条
      }
      const res = await InStorageRecordMainSearch(data)
      if (res.code === '200') {
        this.tableData = res.data
        this.total = res.count

        if (res.data.length > 0) {
          await this.getInStorageRecordSubSearch(res.data[0].hbillno)
        } else {
          this.tableDataDetail = []
        }
      }
    },
    async getInStorageRecordSubSearch(hbillno) {
      const { data: res } = await InStorageRecordSubSearch({ hbillno })
      this.tableDataDetail = res
      console.log(123, this.tableDataDetail)
    },
    rowClick(row, event, column) {
      this.getInStorageRecordSubSearch(row.hbillno)
    },
    reset() {
      this.form.hbillno = ''
      this.form.hbdate = ''
      this.form.username = ''
      this.form.userdate = ''
      this.getInStorageRecordMainSearch()
    },
    async   del(row) {
      await this.getInStorageRecordSubSearch(row.hbillno)
      console.log(1111)
      this.$confirm('是否确认删除?', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        const data = []
        this.tableDataDetail.forEach(i => {
          data.push({
            'hbillno': i.hbillno, // å…¥åº“单号
            'inbarcode': i.inbarcode, // å…¥åº“条码
            'sourceVoucherId': i.mo_id.toString(), // æ¥æºå•æ®ID
            'sourceVoucherCode': i.mo_no, // æ¥æºå•æ®å·
            'sourceVoucherDetailId': i.sbid.toString(), // æ¥æºå•æ®æ˜Žç»†ID
            'wocode': i.wocode, // å·¥å•å·
            'stepcode': i.step_code, // å·¥åºç¼–码
            'style': i.style, // æŠ¥å·¥ç±»åž‹(B/S)
            'qty': i.qty.toString(), // å…¥åº“数量
            'idinventory': i.materiel_id.toString(), // å­˜è´§ID
            'idunit': i.unitid.toString(), // è®¡é‡å•ä½ID
            'idwarehouse': i.stockid.toString(), // ä»“库ID
            'create_user': localStorage.getItem('username'), // æ“ä½œäººå‘˜
            'create_date': handleDatetime2(new Date())// --操作时间
          })
        })
        // console.log(JSON.stringify(data))
        DeleteInStorageRecord(data).then(res => {
          if (res.code === '200') {
            this.$message.success('删除成功!')
            if (this.form.page > 1 && this.tableData.length === 1) {
              this.form.page--
            }
            this.getInStorageRecordMainSearch()
          }
        })
      }).catch(() => {
        this.$message.info('已取消删除')
      })
    },

    // æŽ’序改变时
    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.getStorageRecordSearch()
    },
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 85
        this.tableHeight = this.mainHeight - 450

        this.$refs.tableDataRef.doLayout()
        this.$refs.tableDataRef2.doLayout()
      })
    },
    tableRowClassName({ row, rowIndex }) {
      return 'custom-row'
    }
  }
}
</script>

<style lang="scss" scoped>
$main_color: #42b983;

.stepSelectedValueClass {
  ::v-deep input {
    //min-height: 34px !important;
    height: 68px !important;
  }
}

.dialogVisibleRoute {
  .myCheckboxGroup {
    display: flex;
    flex-wrap: wrap;

    .myCheckbox {
      //border: 1px solid $main_color;
      border: 1px solid #eee;
      display: flex;
      min-width: 100px;
      padding: 10px;
      margin: 10px 30px 0 0;
      border-radius: 5px;
      cursor: default;

      .myCheckboxInput {
        margin: 1px 5px 0 0;
        cursor: pointer;
      }

    }

    //.myCheckbox{
    //  border: 1px solid $main_color;
    //}

    input[type=checkbox] {
      cursor: pointer;
      position: relative;
      width: 14px;
      height: 14px;
      font-size: 14px;
    }

    input[type=checkbox]::after {
      position: absolute;
      top: 0;
      //color: rgb(130, 35, 35);
      color: $main_color;
      width: 14px;
      height: 14px;
      display: inline-block;
      visibility: visible;
      padding-left: 0px;
      text-align: center;
      content: ' ';
      border-radius: 3px
    }

    input[type=checkbox]:checked::after {
      //content: "✓";
      content: "√";
      color: #fff;
      font-size: 12px;
      font-weight: bold;
      background-color: $main_color;
    }
  }
}

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

.el-date-editor {
  font-size: 14px;
}

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

.sop {
  ::v-deep .el-dialog__body {
    padding: 50px 80px !important;
  }
}

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

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

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

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

::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
  margin: 10px 30px 0px 0;
}

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

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

.elTableDiv {
  ::v-deep .el-radio__label {
    display: none;
  }

}

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

//.dialogVisibleConfirmClass >>>.el-table--border, .el-table--fit {
//  border-bottom: 2px solid #000 ;
//  //outline: #000 solid 2px !important;
//}

.tableDataPrint ::v-deep div.cell {
  display: flex !important;
  align-items: center !important;
  justify-content: center !important;
}

.formContent {
  width: 240px;
}

</style>

<style>
.formContent .el-form-item__label {
  color: #000 !important;
}
</style>
<!--公共页面样式-->
<style lang="scss" scoped>
$main_color: #42b983;

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

::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--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;
}

.dateMini {
  ::v-deep .el-input__inner {
    line-height: 34px;
    height: 34px;
    width: 200px;
    display: flex;
    font-size: 14px !important;
    align-items: center !important;
  }

  ::v-deep .el-input__prefix {
    margin-top: -3px;
  }

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

::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;
  }
}
</style>
<style>
.el-table .custom-row {
  background: #f8f8fa;
}
</style>

 src/views/workOrder/workOrderList.vue

ÎļþÌ«´ó