1.存货档案修改

loulijun2021

2023-02-14 b46bc2dba51a3885a68e4c58316b41a31ea16bb2

 src/views/scgl/scdd.vue

@@ -4,11 +4,13 @@

      <div class="bodyTopButtonGroup" style="justify-content: space-between">
        <el-button
          v-waves
          icon="el-icon-refresh-right"
          @click="syncERP"
        >同步ERP
        </el-button>
        <el-button
          v-waves
          icon="el-icon-switch-button"
          @click="orderClose"
        >关闭订单
@@ -21,7 +23,7 @@
          :model="form"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label="订单状态" style=" display: flex;">
@@ -49,29 +51,39 @@
            <el-form-item label="产品名称" style=" display: flex;">
              <el-input v-model="form.partname" style="width: 200px" placeholder="请输入" />
            </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" style="width: 200px" placeholder="请输入" />
            </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.creatuser" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item label="预计开工时间" label-width="100px" style=" display: flex;font-size: 14px;margin-top: 3px">
            <el-form-item
              v-show="isExpandForm"
              label="预计开工时间"
              label-width="100px"
              style="display: flex;font-size: 14px;align-items: center"
            >
              <el-date-picker
                v-model="form.paystartdate"
                type="daterange"
                range-separator="~"
                class="timeMini"
                size="mini"
                style="width: 250px;display: flex;line-height: 34px;height: 34px;font-size: 14px!important;"
                style="width: 200px;display: flex;line-height: 34px;height: 34px;"
                :clearable="false"
                start-placeholder="开始日期"
                end-placeholder="结束日期"
              />
              <!--              font-size: 14px!important;-->
              <!--              :picker-options="expireTimeOption"-->

            </el-form-item>
            <el-form-item label="预计完工时间" label-width="100px" style=" display: flex;font-size: 14px;margin-top: 3px">
            <el-form-item
              v-show="isExpandForm"
              label="预计完工时间"
              label-width="100px"
              style=" display: flex;font-size: 14px;align-items: center"
            >
              <el-date-picker
                v-model="form.payenddate"
                type="daterange"
@@ -79,7 +91,7 @@
                class="timeMini"
                range-separator="~"
                start-placeholder="开始日期"
                style="width: 250px;display: flex;line-height: 34px ;height: 34px ;font-size: 14px !important;"
                style="width: 200px;display: flex;line-height: 34px ;height: 34px ;"
                end-placeholder="结束日期"
                size="mini"
              />
@@ -95,54 +107,50 @@
              <!--              />-->
            </el-form-item>
          </div>
          <div style="min-height: 100px">
            <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2;justify-content: end">
              <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
              <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
            </div>
            <!--                      <div v-if="!isIpad" style="display: flex;align-items: start; margin-top: 15px;z-index: 2">-->
            <!--                        <el-button-->
            <!--                          type="primary"-->
            <!--                          icon="el-icon-refresh-right"-->
            <!--                          @click="reset('update')"-->
            <!--                        >同步ERP-->
            <!--                        </el-button>-->
            <!--                        <el-button-->
            <!--                          type="primary"-->
            <!--                          icon="el-icon-switch-button"-->
            <!--                          @click="orderClose"-->
            <!--                        >关闭订单-->
            <!--                        </el-button>-->
            <!--                      </div>-->
            <!--                      <div v-if="isIpad" style="display: flex;flex-direction: column;align-items: end">-->
            <!--                        <el-button-->
            <!--                          type="primary"-->
            <!--                          icon="el-icon-refresh-right"-->
            <!--                          style="margin: 10px 0"-->
            <!--                          @click="reset('update')"-->
            <!--                        >同步ERP-->
            <!--                        </el-button>-->
            <!--                        <el-button-->
            <!--                          type="primary"-->
            <!--                          icon="el-icon-switch-button"-->
            <!--                          @click="orderClose"-->
            <!--                        >关闭订单-->
            <!--                        </el-button>-->
            <!--                      </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="search">查询</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="tableHeight+'px'"
          :height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
          border
          :row-class-name="tableRowClassName"
          :style="{width: 100+'%',height:tableHeight+'px',}"
          :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px',}"
          highlight-current-row
          :header-cell-style="this.$headerCellStyle"
          :cell-style="this.$cellStyle"
          @sort-change="sortChange"
          @row-click="rowClick"
        >
          <!--          <el-table-column-->
          <!--            type="selection"-->
@@ -156,9 +164,9 @@
              <el-radio
                v-model="radioSelectedId"
                :label="row.id"
                style="color: transparent;padding-left: 15px; margin-right: -25px;"
                @change.native="getCurrentRow(row.id)"
                style="color: transparent;padding-left: 10px;"
              />
              <!--              @change.native="getCurrentRow(row.id)"-->
            </template>
          </el-table-column>
          <el-table-column
@@ -172,6 +180,7 @@
            label="订单状态"
            sortable="custom"
            width="110"
            show-tooltip-when-overflow
          >
            <template slot-scope="{row}">
              <div v-if="row.status==='NEW'">新订单</div>
@@ -183,6 +192,7 @@
          <el-table-column
            prop="wo"
            label="订单编号"
            show-tooltip-when-overflow
            sortable="custom"
            min-width="150"
          />
@@ -190,6 +200,7 @@
            prop="partcode"
            label="产品编码"
            sortable="custom"
            show-tooltip-when-overflow
            min-width="150"
          />
          <el-table-column
@@ -197,11 +208,13 @@
            label="产品名称"
            sortable="custom"
            min-width="150"
            show-tooltip-when-overflow
          />
          <el-table-column
            prop="partspec"
            label="产品规格"
            sortable="custom"
            show-tooltip-when-overflow
            min-width="110"
          >
            <template slot-scope="{row}">
@@ -213,17 +226,20 @@
            prop="qty"
            label="订单数量"
            width="150"
            show-tooltip-when-overflow
            sortable="custom"
          />
          <el-table-column
            prop="relse_qty"
            label="已下单数量"
            show-tooltip-when-overflow
            width="150"
            sortable="custom"
          />
          <el-table-column
            prop="wkshp_name"
            label="生产车间"
            show-tooltip-when-overflow
            sortable="custom"
            width="150"
          >
@@ -234,27 +250,42 @@
          </el-table-column>
          <el-table-column
            prop="planstartdate"
            show-tooltip-when-overflow
            label="预计开工时间"
            sortable="custom"
            width="130"
          >
            <template slot-scope="{row}">
              <div v-if="row.planstartdate">{{ row.planstartdate.substring(0,11) }}</div>
              <div v-if="row.planstartdate">{{ row.planstartdate.substring(0, 11) }}</div>
              <div v-else>/</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="planenddate"
            label="预计完工时间"
            show-tooltip-when-overflow
            sortable="custom"
            width="130"
          >
            <template slot-scope="{row}">
              <div v-if="row.planenddate">{{ row.planenddate.substring(0,11) }}</div>
              <div v-if="row.planenddate">{{ row.planenddate.substring(0, 11) }}</div>
              <div v-else>/</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="saleOrderDeliveryDate"
            label="预计交付日期"
            sortable="custom"
            show-tooltip-when-overflow
            width="130"
          >
            <template slot-scope="{row}">
              <div v-if="row.saleOrderDeliveryDate">{{ row.saleOrderDeliveryDate.substring(0, 11) }}</div>
              <div v-else>/</div>
            </template>
          </el-table-column>
          <el-table-column
            show-tooltip-when-overflow
            prop="createuser"
            label="创建人员"
            sortable="custom"
@@ -269,10 +300,11 @@
            prop="createdate"
            label="创建时间"
            width="130"
            show-tooltip-when-overflow
            sortable="custom"
          >
            <template slot-scope="{row}">
              <div v-if="row.createdate">{{ row.createdate.substring(0,11) }}</div>
              <div v-if="row.createdate">{{ row.createdate.substring(0, 11) }}</div>
              <div v-else>/</div>
            </template>
          </el-table-column>
@@ -284,8 +316,13 @@
            <template slot-scope="{row}">
              <div class="operationClass">
                <el-tooltip class="item" effect="dark" content="下达" placement="top">
                  <!--                <el-button type="text" @click="edit('edit',row)">下达</el-button>-->
                  <i class="el-icon-bottom" style="color:#42b983;cursor: pointer;margin-left: 5px" @click="edit('edit',row)" />
                  <!--                <el-button v-waves type="text" @click="edit('edit',row)">下达</el-button>-->
                  <i
                    class="el-icon-bottom"
                    :style="{color:$store.state.settings.theme}"
                    style="cursor: pointer;margin-left: 5px"
                    @click="edit('edit',row)"
                  />
                </el-tooltip>
              </div>
            </template>
@@ -305,15 +342,16 @@
    </div>

    <el-dialog
      v-el-drag-dialog
      :title="operation==='add'?'新增':'下达'"
      :visible.sync="dialogVisible"
      width="800px"
      width="860px"
      top="15vh"
      :close-on-click-modal="false"
      @closed="handleClose"
      @close="handleClose"
    >
      <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
      <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="106px">
        <!--        <el-form-item label="订单状态" prop="erporderstus">-->
        <!--          <el-select-->
        <!--            v-model="dialogForm.erporderstus"-->
@@ -374,22 +412,31 @@
            style="width: 200px"
          />
        </el-form-item>

        <!--        <el-form-item label="交付时间" prop="">-->
        <!--          <el-date-picker-->
        <!--            v-model="dialogForm.markqty"-->
        <!--            type="date"-->
        <!--            style="width: 200px"-->
        <!--            placeholder="选择日期"-->
        <!--          />-->
        <!--          <el-input v-model="dialogForm.OrgName" style="width: 200px" />-->
        <!--        </el-form-item>-->
        <el-form-item label="预计交付日期" prop="saleOrderDeliveryDate">
          <el-date-picker
            v-model="dialogForm.saleOrderDeliveryDate"
            type="date"
            size="mini"
            :clearable="false"
            class="dateMini"
            :picker-options="pickerOptions"
            format="yyyy-MM-dd"
            placeholder="选择日期"
            :disabled="dialogForm.saleOrderDeliveryDateIsDisabled"
          />
        </el-form-item>

      </el-form>
      <span slot="footer" class="dialog-footer">
        <div class="footerButton">
          <el-button @click="dialogVisibleCancel">取 消</el-button>
          <el-button type="primary" :disabled="sendButtonIsDisabled" @click="dialogVisibleConfirm">下 达</el-button>
          <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>
@@ -401,6 +448,8 @@
import { ClosedErpOrder, ErpOrderSearch, MarkSaveErpOrder } from '@/api/scgl'
import { handleDatetime } from '@/utils/global'
import { SeaveSearchErpOrder } from '@/api/ErpSyncMes'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'

const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
@@ -408,6 +457,7 @@
  components: {
    Pagination
  },
  directives: { elDragDialog, waves },
  data() {
    const validateName = (rule, value, callback) => {
      if (!value) {
@@ -421,7 +471,8 @@
      }
    }
    return {
      isIpad: false,
      mouseHoverType: 'mouseout',
      isExpandForm: false,
      mainHeight: 0,
      tableHeight: 0,
      form: {
@@ -435,7 +486,7 @@
        paystartdate: '', // 预计开工时间
        payenddate: '', // 预计完工时间
        createdate: '', // 创建时间
        prop: 'createdate', // 排序字段
        prop: 'wo', // 排序字段
        order: 'desc', // 排序字段
        page: 1, // 第几页
        rows: 20 // 每页多少条
@@ -467,7 +518,10 @@
        erpqty: '', // 订单数量
        markqty: '', // 下单数量
        ordernum: '', // 下单单数
        relse_qty: '' // 已下单数量
        relse_qty: '', // 已下单数量
        saleOrderDeliveryDate: '', // 预计交付日期

        saleOrderDeliveryDateIsDisabled: false// 预计交付日期字段是否可修改
      },
      operation: '',
      dialogFormRules: {
@@ -482,9 +536,18 @@
        ],
        ordernum: [
          { required: true, message: '请输入下单单数', trigger: ['blur', 'change'] }
        ],
        saleOrderDeliveryDate: [
          { required: true, message: '请选择预计交付日期', trigger: ['blur', 'change'] }
        ]

      },
      pickerOptions: {
        disabledDate(time) {
          return time.getTime() < Date.now() - 8.64e7
        }
      }

      // expireTimeOption: {
      //   disabledDate(time) {
      //     return time.getTime() > Date.now() - 8.64e6 // 如果没有后面的-8.64e6就是不可以选择今天的
@@ -597,6 +660,9 @@
    getCurrentRow(id) {
      this.radioSelectedId = id
    },
    rowClick(row) {
      this.radioSelectedId = row.id
    },
    // 订单关闭
    async orderClose() {
      if (this.radioSelectedId.length < 1) {
@@ -632,6 +698,10 @@
    },
    // 修改按钮
    edit(operation, row) {
      if (parseFloat(row.qty) === parseFloat(row.relse_qty)) {
        return this.$message.info('此工单已全部下达！')
      }

      this.operation = operation
      this.dialogVisible = true

@@ -646,6 +716,10 @@
        this.dialogForm.wkshopname = row.wkshp_name
        this.dialogForm.warehousecode = row.stck_code
        this.dialogForm.warehousename = row.stck_name

        this.dialogForm.saleOrderDeliveryDate = row.saleOrderDeliveryDate

        this.dialogForm.saleOrderDeliveryDateIsDisabled = this.dialogForm.saleOrderDeliveryDate !== null

        this.dialogForm.erpqty = row.qty
        this.dialogForm.markqty = parseFloat(row.qty) - parseFloat(row.relse_qty)
@@ -665,12 +739,15 @@
      this.dialogForm.warehousecode = ''
      this.dialogForm.warehousename = ''

      this.dialogForm.saleOrderDeliveryDate = ''

      this.dialogForm.erpqty = ''
      this.dialogForm.markqty = ''
      this.dialogForm.ordernum = ''
      this.dialogForm.relse_qty = ''

      this.sendButtonIsDisabled = false
      this.dialogForm.saleOrderDeliveryDateIsDisabled = false

      this.$refs.dialogForm.clearValidate()
    },
    // 对话框取消
@@ -679,15 +756,21 @@
    },
    // 对话框确认
    dialogVisibleConfirm() {
      this.dialogForm.markqty = parseFloat(this.dialogForm.markqty)
      this.dialogForm.erpqty = parseFloat(this.dialogForm.erpqty)
      this.dialogForm.relse_qty = parseFloat(this.dialogForm.relse_qty)
      this.dialogForm.ordernum = parseFloat(this.dialogForm.ordernum)
      if (this.dialogForm.markqty < 1 || this.dialogForm.markqty > this.dialogForm.erpqty - this.dialogForm.relse_qty) {
        return this.$message.info('下单数量超出可下单数的范围！')
      }

      if (this.dialogForm.ordernum < 1 || this.dialogForm.ordernum > this.dialogForm.markqty) {
        return this.$message.info('下单单数超出可下单单数的范围！')
      }

      this.$refs.dialogForm.validate(valid => {
        if (valid) {
          this.$store.state.app.buttonIsDisabled = true
          const data = {
            'erporderid': this.dialogForm.erporderid,
            // 'erporderstus': this.dialogForm.erporderstus,
@@ -698,14 +781,16 @@
            'erpqty': this.dialogForm.erpqty,
            'markqty': this.dialogForm.markqty,
            'ordernum': this.dialogForm.ordernum,
            'relse_qty': this.dialogForm.relse_qty
            'relse_qty': this.dialogForm.relse_qty,
            'saleOrderDeliveryDate': handleDatetime(this.dialogForm.saleOrderDeliveryDate) + ' 00:00:00'
          }
          this.sendButtonIsDisabled = true

          MarkSaveErpOrder(data).then(res => {
            if (res.code === '200') {
              this.$message.success('下达成功！')
              this.dialogVisible = false
              this.$message.success('下达成功！')
              this.getErpOrderSearch()
              this.$store.state.app.buttonIsDisabled = false
            } else {
              this.$message.error('下达失败！')
            }
@@ -717,12 +802,9 @@
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 85
        this.tableHeight = this.mainHeight - 260
        this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
        this.tableHeight = this.mainHeight - 250

        if (this.isIpad) {
          this.tableHeight = this.tableHeight - 20
        }
        this.$refs.tableDataRef.doLayout()
      })
    },
    tableRowClassName({ row, rowIndex }) {
@@ -735,29 +817,34 @@
<!--公共页面样式-->
<style lang="scss" scoped>
$main_color: #42b983;
::v-deep  .el-range-input{
  font-size: 14px !important;
::v-deep .el-range-input {
  //font-size: 14px !important;
}
::v-deep .el-range__icon{

::v-deep .el-range__icon {
  line-height: 28px !important;
}
::v-deep .el-range-separator{

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

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

::v-deep .el-range-separator {
  display: flex;
  justify-content: center;
  align-items: center;
}

.el-icon-share ,.el-icon-delete,.el-icon-edit-outline{
.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
  color: $main_color;
  cursor: pointer;
}
.el-icon-edit-outline{

.el-icon-edit-outline {
  margin-right: 15px;
}

@@ -818,8 +905,8 @@
  background-color: #f8f8fa;
}

::v-deep .el-table__body .el-table__row.hover-row td{
  background-color: #eaecef ;
::v-deep .el-table__body .el-table__row.hover-row td {
  background-color: #eaecef;
}

::v-deep .el-form--inline .el-form-item__label {
@@ -835,8 +922,40 @@
.body ::v-deep .el-form-item {
  margin-bottom: 0;
}

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

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

.tableFixed {
  ::v-deep .el-table__fixed-right {
    height: 100% !important;
  }

  ::v-deep .el-table__fixed {
    height: 100% !important;
  }
}

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

</style>
@@ -844,10 +963,13 @@
.el-table .custom-row {
  background: #f8f8fa;
}
</style>
<style>
.osloading{
  font-size: 40px;

.osloading {
  font-size: 26px !important;
}

.el-loading-text {
  font-size: 26px !important;
}
</style>