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

小小儁爺

20 小时以前 c4d59de5b8132c70ae4dc64e4309fc6d761b111d

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

 .env.production

@@ -6,4 +6,7 @@

# 文件下载地址   下载数据模板地址
# 本地服务器
VUE_APP_BASE_API_FILE = 'http://192.168.1.21:9000/'
# VUE_APP_BASE_API_FILE = 'http://121.196.36.24:8048/'

# 阿鲁克客户
VUE_APP_BASE_API_FILE = 'http://192.168.21.19:8002/'

 src/views/produce/reportCorrect.vue

@@ -34,10 +34,13 @@
            <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.orderno" 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-form-item v-show="isExpandForm" 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;">
@@ -108,10 +111,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"
@@ -136,6 +139,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="产品编码"
@@ -328,6 +342,12 @@
        <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.m_po }}
          </div>
          <!--          <el-input v-model="dialogForm.postcode" style="width: 200px" />-->
        </el-form-item>
@@ -561,6 +581,7 @@
      tableHeight: 0,
      form: {
        wkshopcode: '',
        orderno: '',
        wo_code: '', // 工单编码
        partnumber: '', // 产品编码
        partname: '', // 产品名称
@@ -715,7 +736,7 @@
        reportuser: this.form.reportuser,
        stepcode: this.form.stepcode,
        reportdate: tempDate,

        orderno: this.form.orderno,
        prop: this.form.prop, // 排序字段
        order: this.form.order, // 排序字段
        page: this.form.page, // 第几页
@@ -742,6 +763,7 @@
    reset() {
      this.form.wkshopcode = ''
      this.form.wo_code = ''
      this.form.orderno = ''
      this.form.partnumber = ''
      this.form.partname = ''
      this.form.partspec = ''
@@ -766,6 +788,7 @@
      if (res.code === '200') {
        this.dialogForm.id = row.id
        this.dialogForm.sbid = row.sbid
        this.dialogForm.m_po = row.m_po
        this.dialogForm.wo_code = row.wo_code
        this.dialogForm.partnumber = row.partnumber
        this.dialogForm.partname = row.partname
@@ -874,7 +897,7 @@
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 85
        this.tableHeight = this.mainHeight - 255
        this.tableHeight = this.mainHeight - 295
        this.$refs.tableDataRef.doLayout()
      })
    }

 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()
      })
    }

 src/views/produce/stepReport.vue

@@ -75,16 +75,24 @@
                    :name="'produceCode'+item.code"
                    placeholder="请扫描或输入"
                    style="width: 300px"

                    @keyup.enter.native="val=>enterNative(val,'produceCode' + item.code)"
                  />
                </el-form-item>

                <el-form-item label="订单号" style=" display: flex;">
                  <el-input
                    v-model="form.orderno"
                    placeholder="请输入"
                    style="width: 200px"
                    @keyup.enter.native="val=>enterNative(val,'produceCode' + item.code)"
                  />
                </el-form-item>

                <el-form-item label="产品编码" style=" display: flex;">
                  <el-input
                    v-model="form.partcode"
                    placeholder="请输入"
                    style="width: 200px"

                    @keyup.enter.native="val=>enterNative(val,'produceCode' + item.code)"
                  />
                </el-form-item>
@@ -92,18 +100,16 @@
                  <el-input
                    v-model="form.partname"
                    placeholder="请输入"

                    style="width: 200px"
                    @keyup.enter.native="val=>enterNative(val,'produceCode' + item.code)"
                  />
                </el-form-item>
                <el-form-item label="车间名称" style=" display: flex;">
                <el-form-item v-show="isExpandForm" label="车间名称" style=" display: flex;">
                  <el-select
                    v-model="form.wkshopcode"
                    filterable
                    :popper-append-to-body="false"
                    style="width: 200px"

                    placeholder="请选择"
                  >
                    <el-option
@@ -130,21 +136,21 @@
            </el-form>
            <div
              class="bodyTopFormExpand"
              style="height:5px"
              style="height:10px"
            >
              <!--          <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"-->
              <!--          />-->
              <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>

@@ -154,10 +160,10 @@
              :key="'tableDataRef'+item.code"
              class="tableFixed"
              :data="tableData"
              :height="tableHeight+50"
              :height="isExpandForm?(tableHeight+10):(tableHeight+50)+'px'"
              border
              row-class-name="custom-row"
              :style="{width: 100+'%',height:tableHeight+'px'}"
              :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px',}"
              highlight-current-row
              :header-cell-style="headerCellStyle()"
              :cell-style="cellStyle()"
@@ -206,6 +212,17 @@
                show-tooltip-when-overflow
                sortable="custom"
              />
              <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="partcode"
                label="产品编码"
@@ -423,6 +440,9 @@
        <el-divider v-if="activeName==='不良待处理'" content-position="left">待处理信息</el-divider>
        <el-form-item label="工单编号" class="dialogFormItem">
          <div class="dialogFormItemDiv">{{ dialogForm.wo_code }}</div>
        </el-form-item>
        <el-form-item label="订单号" class="dialogFormItem">
          <div class="dialogFormItemDiv">{{ dialogForm.orderno? dialogForm.orderno:'/' }}</div>
        </el-form-item>
        <el-form-item label="产品编码" class="dialogFormItem">
          <div class="dialogFormItemDiv">{{ dialogForm.partnumber }}</div>
@@ -982,11 +1002,14 @@
  directives: { elDragDialog, waves },
  data() {
    return {
      mouseHoverType: 'mouseout',
      isExpandForm: false,
      mainHeight: 0,
      tableHeight: 0,
      form: {
        wkshopcode: '',
        wocode: '', // 工单号
        orderno: '', // 订单号
        partcode: '', // 产品编码
        partname: '', // 产品名称
        partspec: '', // 产品规格
@@ -1014,6 +1037,7 @@
      dialogForm: {
        'wo_code': '',
        'partnumber': '',
        'orderno': '',
        'partname': '',
        'partspec': '',
        'seq': '',
@@ -1285,6 +1309,7 @@
        res = res.data
        this.dialogForm.wo_code = res.data1.wo_code
        this.dialogForm.partnumber = res.data1.partnumber
        this.dialogForm.orderno = res.data1.orderno
        this.dialogForm.partname = res.data1.partname
        this.dialogForm.partspec = res.data1.partspec
        this.dialogForm.seq = res.data1.seq
@@ -1327,6 +1352,7 @@
        res = res.data
        this.dialogForm.wo_code = res.wo_code
        this.dialogForm.partnumber = res.partnumber
        this.dialogForm.orderno = res.orderno
        this.dialogForm.partname = res.partname
        this.dialogForm.partspec = res.partspec
        this.dialogForm.seq = res.seq
@@ -1368,6 +1394,7 @@
      this.dialogForm = {
        'wo_code': '',
        'partnumber': '',
        'orderno': '',
        'partname': '',
        'partspec': '',
        'seq': '',
@@ -1726,6 +1753,7 @@
    reset() {
      this.form.wkshopcode = ''
      this.form.wocode = ''
      this.form.orderno = ''
      this.form.workOrderCurrentValue = ''
      this.form.partcode = ''
      this.form.partname = ''

 src/views/workOrder/workOrderList.vue

@@ -533,6 +533,7 @@

      <div class="elTableDiv">
        <el-table
          ref="tableDataRef2"
          :data="tableDataDetail"
          border
          height="210px"
@@ -2795,7 +2796,7 @@
        // createdate: '', // 创建时间
        datatype: 'ED', // 日期类型(计划开工(PS)、计划完工(PE)、预计交付(ED)、创建日期(CT))
        timeValue: [], // 查询日期
        prop: 'lm_date', // 排序字段
        prop: 'partspec', // 排序字段  lm_date
        order: 'desc', // 排序字段
        page: 1, // 第几页
        rows: 20 // 每页多少条
@@ -3045,7 +3046,7 @@

      routecodeArr: [], //

      sourceType: false, // 工序的数据来源
      sourceType: true, // 工序的数据来源

      mesSetting: JSON.parse(localStorage.getItem('mesSetting')),

@@ -3841,7 +3842,9 @@

          this.stepSelectedValue = this.stepTableData.map(i => i.stepcode)
        } else {
          await this.getBasicProcessData()
          // await this.getBasicProcessData()
          console.log('执行')
          this.sourceTypeChange(this.sourceType)
        }
      }

@@ -3988,11 +3991,13 @@

      this.dialogForm.routecode = ''

      this.sourceType = false
      this.sourceType = true

      this.stepSelectedValue = []
      this.stepTableData = []
      this.$refs.dialogForm.clearValidate()
      this.$refs.tableDataRef.doLayout()
      this.$refs.tableDataRef2.doLayout()
    },
    // 对话框取消
    dialogVisibleCancel() {