小小儁爺
2024-10-16 b6adac94a183008795725233d2dde157d4e65f28
1.工序报工、报工调整、报工审核 新增销售单号 字段
已修改3个文件
76 ■■■■ 文件已修改
src/views/produce/reportCorrect.vue 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/produce/reportVerify.vue 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/produce/stepReport.vue 32 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/produce/reportCorrect.vue
@@ -30,10 +30,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.socode" 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;">
@@ -117,6 +120,17 @@
            min-width="160"
            show-overflow-tooltip
          />
          <el-table-column
            prop="saleOrderCode"
            label="销售单号"
            sortable="custom"
            min-width="160"
            show-overflow-tooltip
          >
            <template slot-scope="{row}">
              {{ row.saleOrderCode?row.saleOrderCode:'/' }}
            </template>
          </el-table-column>
          <el-table-column
            prop="partnumber"
            label="产品编码"
@@ -482,6 +496,7 @@
      tableHeight: 0,
      form: {
        wkshopcode: '',
        socode: '', // 销售单号
        wo_code: '', // 工单编码
        partnumber: '', // 产品编码
        partname: '', // 产品名称
@@ -566,6 +581,7 @@
      const data = {
        wkshopcode: this.form.wkshopcode,
        wo_code: this.form.wo_code,
        socode: this.form.socode,
        partnumber: this.form.partnumber,
        partname: this.form.partname,
        partspec: this.form.partspec,
@@ -597,6 +613,7 @@
    // 重置
    reset() {
      this.form.wkshopcode = ''
      this.form.socode = ''
      this.form.wo_code = ''
      this.form.partnumber = ''
      this.form.partname = ''
src/views/produce/reportVerify.vue
@@ -51,7 +51,10 @@
            <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.socode" 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 +118,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 +159,17 @@
            min-width="160"
            show-overflow-tooltip
          />
          <el-table-column
            prop="saleOrderCode"
            label="销售单号"
            sortable="custom"
            min-width="160"
            show-overflow-tooltip
          >
            <template slot-scope="{row}">
              {{ row.saleOrderCode?row.saleOrderCode:'/' }}
            </template>
          </el-table-column>
          <el-table-column
            prop="partnumber"
            label="产品编码"
@@ -356,6 +370,7 @@
      tableHeight: 0,
      form: {
        wkshopcode: '',
        socode: '', // 销售单号
        wo_code: '', // 工单编码
        partnumber: '', // 产品编码
        partname: '', // 产品名称
@@ -407,6 +422,7 @@
      const data = {
        wkshopcode: this.form.wkshopcode,
        wo_code: this.form.wo_code,
        socode: this.form.socode,
        reviewstatus: this.form.reviewstatus,
        partnumber: this.form.partnumber,
        partname: this.form.partname,
@@ -441,6 +457,7 @@
    reset() {
      this.form.wkshopcode = ''
      this.form.wo_code = ''
      this.form.socode = ''
      this.form.partnumber = ''
      this.form.partname = ''
      this.form.partspec = ''
@@ -518,7 +535,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
@@ -74,8 +74,7 @@
                    v-model="workOrderCurrentValue"
                    :name="'produceCode'+item.code"
                    placeholder="请扫描或输入"
                    style="width: 300px"
                    style="width: 200px"
                    @keyup.enter.native="val=>enterNative(val,'produceCode' + item.code)"
                  />
                </el-form-item>
@@ -83,8 +82,7 @@
                  <el-input
                    v-model="form.partcode"
                    placeholder="请输入"
                    style="width: 200px"
                    style="width: 150px"
                    @keyup.enter.native="val=>enterNative(val,'produceCode' + item.code)"
                  />
                </el-form-item>
@@ -93,7 +91,15 @@
                    v-model="form.partname"
                    placeholder="请输入"
                    style="width: 200px"
                    style="width: 150px"
                    @keyup.enter.native="val=>enterNative(val,'produceCode' + item.code)"
                  />
                </el-form-item>
                <el-form-item label="销售单号" style=" display: flex;">
                  <el-input
                    v-model="form.socode"
                    placeholder="请输入"
                    style="width: 150px"
                    @keyup.enter.native="val=>enterNative(val,'produceCode' + item.code)"
                  />
                </el-form-item>
@@ -102,8 +108,7 @@
                    v-model="form.wkshopcode"
                    filterable
                    :popper-append-to-body="false"
                    style="width: 200px"
                    style="width: 150px"
                    placeholder="请选择"
                  >
                    <el-option
@@ -206,6 +211,17 @@
                show-tooltip-when-overflow
                sortable="custom"
              />
              <el-table-column
                prop="saleOrderCode"
                label="销售单号"
                sortable="custom"
                min-width="160"
                show-overflow-tooltip
              >
                <template slot-scope="{row}">
                  {{ row.saleOrderCode?row.saleOrderCode:'/' }}
                </template>
              </el-table-column>
              <el-table-column
                prop="partcode"
                label="产品编码"
@@ -911,6 +927,7 @@
      tableHeight: 0,
      form: {
        wkshopcode: '',
        socode: '', // 销售单号
        wocode: '', // 工单号
        partcode: '', // 产品编码
        partname: '', // 产品名称
@@ -1634,6 +1651,7 @@
    },
    reset() {
      this.form.wkshopcode = ''
      this.form.socode = ''
      this.form.wocode = ''
      this.form.workOrderCurrentValue = ''
      this.form.partcode = ''