1.工艺模式 生产工单带工序改为默认历史最新2.生产执行新增 订单号字段

小小儁爺

14 小时以前 c4d59de5b8132c70ae4dc64e4309fc6d761b111d

 src/views/produce/reportVerify.vue

@@ -51,7 +51,11 @@
            <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-form-item label="订单号" style=" display: flex;">
              <el-input v-model="form.orderno" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="产品编码" style=" display: flex;">
              <el-input v-model="form.partnumber" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="产品名称" style=" display: flex;">
@@ -115,10 +119,10 @@
          ref="tableDataRef"
          class="tableFixed"
          :data="tableData"
          :height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
          :height="isExpandForm?tableHeight:(tableHeight+80)+'px'"
          border
          row-class-name="custom-row"
          :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px',}"
          :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+80)+'px',}"
          highlight-current-row
          :header-cell-style="this.$headerCellStyle"
          :cell-style="this.$cellStyle"
@@ -156,6 +160,17 @@
            min-width="160"
            show-overflow-tooltip
          />
          <el-table-column
            prop="m_po"
            label="订单号"
            min-width="160"
            show-tooltip-when-overflow
            sortable="custom"
          >
            <template slot-scope="{row}">
              {{ row.m_po?row.m_po:'/' }}
            </template>
          </el-table-column>
          <el-table-column
            prop="partnumber"
            label="产品编码"
@@ -363,6 +378,7 @@
      tableHeight: 0,
      form: {
        wkshopcode: '',
        orderno: '', //
        wo_code: '', // 工单编码
        partnumber: '', // 产品编码
        partname: '', // 产品名称
@@ -427,7 +443,7 @@
        reportuser: this.form.reportuser,
        stepname: this.form.stepname,
        reportdate: tempDate,

        orderno: this.form.orderno,
        prop: this.form.prop, // 排序字段
        order: this.form.order, // 排序字段
        page: this.form.page, // 第几页
@@ -454,6 +470,7 @@
    reset() {
      this.form.wkshopcode = ''
      this.form.wo_code = ''
      this.form.orderno = ''
      this.form.partnumber = ''
      this.form.partname = ''
      this.form.partspec = ''
@@ -531,7 +548,7 @@
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 85
        this.tableHeight = this.mainHeight - 255
        this.tableHeight = this.mainHeight - 295
        this.$refs.tableDataRef.doLayout()
      })
    }