1.递交

loulijun2021

2024-05-06 46528c3843ce67038ddb2e00dd3d3998c206a69e

 src/views/produce/reportCorrect.vue

@@ -11,6 +11,22 @@
          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>
@@ -20,7 +36,7 @@
            <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-form-item v-show="isExpandForm" label="产品规格" style=" display: flex;">
              <el-input v-model="form.partspec" placeholder="请输入" style="width: 200px" />
            </el-form-item>

@@ -28,9 +44,18 @@
              <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-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"
@@ -107,26 +132,33 @@
            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="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="工序名称"
@@ -134,13 +166,35 @@
            sortable="custom"
            min-width="110"
          />
          <!--          <el-table-column-->
          <!--            prop="step_price"-->
          <!--            label="工序单价"-->
          <!--            show-overflow-tooltip-->
          <!--            sortable="custom"-->
          <!--            min-width="110"-->
          <!--          />-->
          <el-table-column
            prop="step_price"
            label="工序单价"
            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="报工班组"
@@ -267,12 +321,17 @@
        </el-form-item>
        <el-form-item label="工序单价" class="dialogFormItem">
          <div style="width: 200px;">
            {{ dialogForm.unprice }}
            {{ dialogForm.unprice ? dialogForm.unprice : '/' }}
          </div>
        </el-form-item>
        <el-form-item label="报工班组" class="dialogFormItem">
        <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">
@@ -280,7 +339,7 @@
            {{ dialogForm.username }}
          </div>
        </el-form-item>
        <el-form-item label="合格数量" prop="report_qty" class="dialogFormItem">
        <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,'')"
@@ -401,7 +460,7 @@
import { handleDatetime } from '@/utils/global'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import { DefectPermissions } from '@/api/GeneralBasicData'
import { DefectPermissions, PrentOrganizationNoCompany } from '@/api/GeneralBasicData'
import { MesOrderStepModelSearch, MesOrderStepUpdateSeave, MesOrderStepVerifySearch } from '@/api/WorkOrder'

export default {
@@ -417,6 +476,7 @@
      mainHeight: 0,
      tableHeight: 0,
      form: {
        wkshopcode: '',
        wo_code: '', // 工单编码
        partnumber: '', // 产品编码
        partname: '', // 产品名称
@@ -431,7 +491,7 @@
      },
      total: 10,
      tableData: [],

      wkshopcodeArr: [],
      dialogVisible: false,
      dialogForm: {
        'id': '',
@@ -457,6 +517,8 @@
        'report_date': '',
        'report_qty': '',
        'report_dvalue': '',
        wx_code: '',
        wx_name: '',
        children: []
      },
      tableDataDialog: [],
@@ -479,8 +541,13 @@

    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
@@ -492,6 +559,7 @@
        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,
@@ -523,6 +591,7 @@
    },
    // 重置
    reset() {
      this.form.wkshopcode = ''
      this.form.wo_code = ''
      this.form.partnumber = ''
      this.form.partname = ''
@@ -568,6 +637,9 @@
        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 => {
@@ -626,24 +698,25 @@
            '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.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('调整失败！')
          // }
          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('调整失败！')
          }
        }
      })
    },
@@ -677,4 +750,23 @@
  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>