1.优化代码2.修改实施部提出的bug3.生产开报工外协列表自动弹窗实现部分

loulijun2021

2022-07-11 9b825939b7f0a7439d704b379812362dd95697fc

 src/views/scgl/scdd.vue

@@ -13,6 +13,7 @@
            <el-form-item label="订单状态" style=" display: flex;">
              <el-select
                v-model="form.erporderstus"
                filterable
                :popper-append-to-body="false"
                style="width: 200px"
                placeholder="请选择"
@@ -30,14 +31,7 @@
            </el-form-item>

            <el-form-item label="产品编码" style=" display: flex;">
              <el-select v-model="form.partcode" :popper-append-to-body="false" style="width: 200px" placeholder="请选择">
                <el-option
                  v-for="item in OrgTypeArr"
                  :key="item.code"
                  :label="item.name"
                  :value="item.code"
                />
              </el-select>
              <el-input v-model="form.partcode" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item label="产品名称" style=" display: flex;">
              <el-input v-model="form.partname" style="width: 200px" placeholder="请输入" />
@@ -48,10 +42,16 @@
            <el-form-item label="交付时间" style=" display: flex;">
              <el-date-picker
                v-model="form.paydate"
                type="date"
                style="width: 200px"
                placeholder="选择日期"
                type="daterange"
                range-separator="~"
                size="mini"
                style="width: 240px"
                :clearable="false"
                start-placeholder="开始日期"
                end-placeholder="结束日期"
              />
              <!--              :picker-options="expireTimeOption"-->

            </el-form-item>
            <el-form-item label="创建人员" style=" display: flex;">
              <el-input v-model="form.creatuser" style="width: 200px" placeholder="请输入" />
@@ -59,15 +59,60 @@
            <el-form-item label="创建时间" style=" display: flex;">
              <el-date-picker
                v-model="form.createdate"
                type="date"
                style="width: 200px"
                placeholder="选择日期"
                type="daterange"
                :clearable="false"
                range-separator="~"
                start-placeholder="开始日期"
                style="width: 240px"
                end-placeholder="结束日期"
                size="mini"
              />
              <!--              :picker-options="expireTimeOption"-->
              <!--              <el-date-picker-->
              <!--                v-model="form.createdate"-->
              <!--                type="date"-->
              <!--                size="mini"-->
              <!--                :clearable="false"-->
              <!--                style="width: 200px;"-->
              <!--                format="yyyy-MM-dd"-->
              <!--                placeholder="选择日期"-->
              <!--              />-->
            </el-form-item>
          </div>
          <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
            <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 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="!isFullscreen" 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="isFullscreen" 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>
        </el-form>
      </div>
@@ -76,12 +121,14 @@
        <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>
        <!--        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">新增</el-button>-->
        <!--        <el-button type="primary" icon="el-icon-upload2" @click="upload">导入</el-button>-->
@@ -90,7 +137,7 @@
      <div class="elTableDiv">
        <el-table
          :data="tableData"
          :height="tableHeight"
          :height="tableHeight+'px'"
          border
          stripe
          :style="{width: 100+'%',height:tableHeight+'px',}"
@@ -105,12 +152,14 @@
          <!--          />-->
          <el-table-column
            width="50"
            fixed
          >
            <template scope="scope">
            <template slot-scope="{row}">
              <el-radio
                v-model="radioSelected"
                :label="row.wo"
                style="color: #fff;padding-left: 10px; margin-right: -25px;"
                @change.native="getCurrentRow(scope.row)"
                @change.native="getCurrentRow(row.wo)"
              />
            </template>
          </el-table-column>
@@ -126,24 +175,29 @@
            width="110"
          >
            <template slot-scope="{row}">
              <div v-if="row.status==='CREATING'">进行中</div>
              <div v-if="row.status==='NEW'">未开始</div>
              <div v-if="row.status==='NEW'">新订单</div>
              <div v-if="row.status==='CREATING'">创建中</div>
              <div v-if="row.status==='CREATED'">已创建</div>
              <div v-if="row.status==='CLOSED'">已关闭</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="wo"
            label="订单编号"
            sortable="custom"
            width="150"
          />
          <el-table-column
            prop="partcode"
            label="产品编码"
            sortable="custom"
            width="150"
          />
          <el-table-column
            prop="partname"
            label="产品名称"
            sortable="custom"
            width="150"
          />
          <el-table-column
            prop="partspec"
@@ -154,37 +208,40 @@
          <el-table-column
            prop="qty"
            label="订单数量"
            width="150"
            sortable="custom"
          />
          <el-table-column
            prop="wkshp_name"
            label="生成车间"
            label="生产车间"
            sortable="custom"
            width="150"
          />
          <el-table-column
            prop="paydate"
            label="要求交付时间"
            sortable="custom"
            show-overflow-tooltip
            width="160"
          />
          <el-table-column
            prop="createuser"
            label="创建人员"
            sortable="custom"
            width="150"
          />
          <el-table-column
            prop="createdate"
            label="创建时间"
            show-overflow-tooltip
            width="160"
            sortable="custom"
          />
          <el-table-column
            label="操作"
            fixed="right"
          >
            <template slot-scope="{row}">
              <div class="operationClass">
                <el-button type="text" @click="edit('edit',row)">编辑</el-button>
                <!--                <el-button type="text" @click="del(row)">删除</el-button>-->
                <el-button type="text" @click="edit('edit',row)">下达</el-button>
              </div>
            </template>
          </el-table-column>
@@ -204,66 +261,91 @@
    </div>

    <el-dialog
      :title="operation==='add'?'新增':'编辑'"
      :title="operation==='add'?'新增':'下达'"
      :visible.sync="dialogVisible"
      width="50%"
      width="800px"
      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-item label="订单状态" prop="OrgCode">
          <el-select
            v-model="form.partcode"
        <!--        <el-form-item label="订单状态" prop="erporderstus">-->
        <!--          <el-select-->
        <!--            v-model="dialogForm.erporderstus"-->
        <!--            disabled-->
        <!--            :popper-append-to-body="false"-->
        <!--            style="width: 200px"-->
        <!--            placeholder="请选择"-->
        <!--          >-->
        <!--            <el-option-->
        <!--              v-for="item in erporderstusArr"-->
        <!--              :key="item.code"-->
        <!--              :label="item.name"-->
        <!--              :value="item.code"-->
        <!--            />-->
        <!--          </el-select>-->
        <!--        </el-form-item>-->
        <el-form-item label="订单编号" prop="erpordercode">
          <el-input v-model="dialogForm.erpordercode" disabled style="width: 200px" />
        </el-form-item>
        <el-form-item label="产品编码" prop="partcode">
          <el-input v-model="dialogForm.partcode" disabled style="width: 200px" />
        </el-form-item>
        <el-form-item label="产品名称" prop="partname">
          <el-input v-model="dialogForm.partname" disabled style="width: 200px" />
        </el-form-item>

        <el-form-item label="产品规格" prop="partspec">
          <el-input v-model="dialogForm.partspec" disabled style="width: 200px" />
        </el-form-item>
        <el-form-item label="生产车间" prop="wkshopname">
          <el-input v-model="dialogForm.wkshopname" disabled style="width: 200px" />
        </el-form-item>
        <el-form-item label="所属仓库" prop="warehousename">
          <el-input v-model="dialogForm.warehousename" disabled style="width: 200px" />
        </el-form-item>
        <el-form-item label="订单数量" prop="erpqty">
          <el-input v-model="dialogForm.erpqty" disabled style="width: 200px" />
        </el-form-item>
        <el-form-item label="已下单数" prop="relse_qty">
          <el-input
            v-model="dialogForm.relse_qty"
            disabled
            :popper-append-to-body="false"
            style="width: 220px"
            placeholder="请选择"
          >
            <el-option
              v-for="item in OrgTypeArr"
              :key="item.code"
              :label="item.name"
              :value="item.code"
            />
          </el-select>
        </el-form-item>
        <el-form-item label="订单编号" prop="OrgCode">
          <el-input v-model="dialogForm.OrgCode" disabled style="width: 220px" />
        </el-form-item>
        <el-form-item label="产品编码" prop="OrgName">
          <el-input v-model="dialogForm.OrgName" disabled style="width: 220px" />
        </el-form-item>
        <el-form-item label="产品名称" prop="OrgName">
          <el-input v-model="dialogForm.OrgName" disabled style="width: 220px" />
        </el-form-item>
        <el-form-item label="订单数量" prop="OrgName">
          <el-input v-model="dialogForm.OrgName" disabled style="width: 220px" />
        </el-form-item>
        <el-form-item label="产品规格" prop="OrgName">
          <el-input v-model="dialogForm.OrgName" disabled style="width: 220px" />
        </el-form-item>
        <el-form-item label="下达数量" prop="OrgName">
          <el-input v-model="dialogForm.OrgName" style="width: 220px" />
        </el-form-item>
        <el-form-item label="下单数量" prop="OrgName">
          <el-input v-model="dialogForm.OrgName" style="width: 220px" />
        </el-form-item>
        <el-form-item label="交付时间" prop="OrgName">
          <el-date-picker
            v-model="dialogForm.OrgName"
            type="date"
            style="width: 220px"
            placeholder="选择日期"
            oninput="value=value.replace(/[^0-9.]/g,'')"
            style="width: 200px"
          />
          <!--          <el-input v-model="dialogForm.OrgName" style="width: 220px" />-->
        </el-form-item>
        <el-form-item label="下单数量" prop="markqty">
          <el-input
            v-model="dialogForm.markqty"
            oninput="value=value.replace(/[^0-9.]/g,'')"
            style="width: 200px"
          />
        </el-form-item>
        <el-form-item label="下单单数" prop="ordernum">
          <el-input
            v-model="dialogForm.ordernum"
            oninput="value=value.replace(/[^0-9.]/g,'')"
            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>
      <span slot="footer" class="dialog-footer">
        <div class="footerButton">
          <el-button @click="dialogVisibleCancel">取 消</el-button>
          <el-button type="primary" @click="dialogVisibleConfirm">确 定</el-button>
          <el-button type="primary" @click="dialogVisibleConfirm">下 达</el-button>
        </div>
      </span>
    </el-dialog>
@@ -272,13 +354,12 @@

<script>
import Pagination from '@/components/Pagination'
import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
import { ErpOrderSearch } from '@/api/scgl'
import { ClosedErpOrder, ErpOrderSearch, MarkSaveErpOrder } from '@/api/scgl'
import { handleDatatime, handleDatetime } from '@/utils/global'

const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
  name: 'Zzjg',
  name: 'SCDD',
  components: {
    Pagination
  },
@@ -295,6 +376,7 @@
      }
    }
    return {
      isFullscreen: false,
      mainHeight: 0,
      tableHeight: 0,
      form: {
@@ -306,43 +388,66 @@
        paydate: '', // 交付时间
        creatuser: '', // 创建人员
        createdate: '', // 创建时间
        prop: 'partcode', // 排序字段
        prop: 'createdate', // 排序字段
        order: 'desc', // 排序字段
        page: 1, // 第几页
        rows: 20 // 每页多少条
      },
      erporderstusArr: [
        { code: 'CREATING', name: '进行中' },
        { code: 'NEW', name: '未开始' }
        { code: 'NEW', name: '新订单' },
        { code: 'CREATING', name: '创建中' },
        { code: 'CREATED', name: '已创建' },
        { code: 'CLOSED', name: '已关闭' }
      ],
      total: 10,
      radioSelected: '',
      tableData: [],
      dialogVisible: false,
      dialogForm: {
        OrgType: '',
        OrgCode: '',
        OrgName: '',
        SupUnit: ''// 上级单位
        partname: '', // 产品名称
        partspec: '', // 产品规格
        paydate: '', // 交付时间
        wkshopname: '', // 车间名称
        warehousename: '', // 仓库名称

        erporderstus: '', // 订单状态码
        erpordercode: '', // 订单编号
        partcode: '', // 产品编码
        wkshopcode: '', // 车间编码
        warehousecode: '', // 仓库编码

        erpqty: '', // 订单数量
        markqty: '', // 下单数量
        ordernum: '', // 下单单数
        relse_qty: '' // 已下单数量
      },
      operation: '',
      dialogFormRules: {
        OrgType: [
          { required: true, message: '请输入选择类型', trigger: ['blur', 'change'] }
        // OrgType: [
        //   { required: true, message: '请输入选择类型', trigger: ['blur', 'change'] }
        // ],
        // OrgCode: [
        //   { required: true, validator: validateName, trigger: ['blur', 'change'] }
        // ],
        markqty: [
          { required: true, message: '请输入下单数量', trigger: ['blur', 'change'] }
        ],
        OrgCode: [
          { required: true, validator: validateName, trigger: ['blur', 'change'] }
        ],
        OrgName: [
          { required: true, message: '请输入名称', trigger: ['blur', 'change'] }
        ordernum: [
          { required: true, message: '请输入下单单数', trigger: ['blur', 'change'] }
        ]

      }
      // expireTimeOption: {
      //   disabledDate(time) {
      //     return time.getTime() > Date.now() - 8.64e6 // 如果没有后面的-8.64e6就是不可以选择今天的
      //   }
      // }

    }
  },
  created() {
    this.getErpOrderSearch()
    // this.getPartSelect()// 获取产品编码信息
  },
  mounted() {
    window.addEventListener('resize', this.getHeight)
@@ -350,7 +455,35 @@
  },
  methods: {
    async getErpOrderSearch() {
      const res = await ErpOrderSearch(this.form)
      console.log(this.form, 1)
      let tempDate2 = this.form.paydate
      if (tempDate2.length > 0) {
        tempDate2 = handleDatetime(tempDate2[0]) + '~' + handleDatetime(tempDate2[1])
      }

      let tempDate = this.form.createdate
      if (tempDate.length > 0) {
        tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
      }

      const data = {
        erporderstus: this.form.erporderstus, // 订单状态码
        erpordercode: this.form.erpordercode, // 订单编号
        partcode: this.form.partcode, // 产品编码
        partname: this.form.partname, // 产品名称
        partspec: this.form.partspec, // 产品规格
        paydate: tempDate2, // 交付时间
        creatuser: this.form.creatuser, // 创建人员
        // createdate: this.form.createdate.toString().length > 0 ? handleDatetime(this.form.createdate) : '', // 创建时间
        createdate: tempDate,
        prop: this.form.prop, // 排序字段
        order: this.form.order, // 排序字段
        page: this.form.page, // 第几页
        rows: this.form.rows // 每页多少条

      }

      const res = await ErpOrderSearch(data)
      this.tableData = res.data
      this.total = res.count
    },
@@ -371,11 +504,8 @@
    search() {
      this.getErpOrderSearch()
    },
    upload() {

    },
    // 重置
    reset() {
    reset(val) {
      this.form.erporderstus = ''
      this.form.erpordercode = ''
      this.form.partcode = ''
@@ -385,10 +515,42 @@
      this.form.creatuser = ''
      this.form.createdate = ''
      this.getErpOrderSearch()
      if (val.length > 0) {
        this.$message.success('ERP已同步！')
      }
    },
    // 单选框选中获取当前行信息
    getCurrentRow(row) {
      console.log(row, 1)
    getCurrentRow(wo) {
      this.radioSelected = wo
    },
    // 订单关闭
    async orderClose() {
      if (this.radioSelected.length < 1) {
        return this.$message.info('请先选择订单！')
      }
      this.tableData.forEach(item => {
        if (item.wo === this.radioSelected) {
          if (item.status !== 'NEW') {
            return this.$message.info('此订单非新订单，无法关闭！')
          } else {
            this.$confirm('是否确认关闭订单?', '提示', {
              confirmButtonText: '确定',
              cancelButtonText: '取消',
              type: 'warning'
            }).then(() => {
              ClosedErpOrder({ erpordercode: this.radioSelected }).then(res => {
                if (res.code === '200') {
                  this.$message.success('订单关闭成功!')
                  this.getErpOrderSearch()
                  // this.radioSelected = ''
                }
              })
            }).catch(() => {
              this.$message.info('已取消关闭！')
            })
          }
        }
      })
    },
    // 新增按钮
    add(operation) {
@@ -401,34 +563,38 @@
      this.dialogVisible = true

      this.$nextTick(() => {
        this.dialogForm.OrgCode = row.org_code
        this.dialogForm.OrgName = row.org_name
        this.dialogForm.SupUnit = row.parent_id
      })
    },
    // 删除按钮
    async del(row) {
      this.$confirm('是否确认删除?', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        DeleteOrganization({ orgid: row.code }).then(res => {
          if (res.code === '200') {
            this.$message.success('删除成功!')
            this.getErpOrderSearch()
          }
        })
      }).catch(() => {
        this.$message.info('已取消删除')
        this.dialogForm.erporderstus = row.status
        this.dialogForm.erpordercode = row.wo
        this.dialogForm.partcode = row.partcode
        this.dialogForm.partname = row.partname
        this.dialogForm.partspec = row.partspec
        this.dialogForm.wkshopcode = row.wkshp_code
        this.dialogForm.wkshopname = row.wkshp_name
        this.dialogForm.warehousecode = row.stck_code
        this.dialogForm.warehousename = row.stck_name

        this.dialogForm.erpqty = row.qty
        this.dialogForm.markqty = parseFloat(row.qty) - parseFloat(row.relse_qty)
        this.dialogForm.ordernum = 1
        this.dialogForm.relse_qty = row.relse_qty
      })
    },
    // 对话框关闭事件
    handleClose() {
      this.dialogForm.OrgType = ''
      this.dialogForm.OrgCode = ''
      this.dialogForm.OrgName = ''
      this.dialogForm.SupUnit = ''
      this.dialogForm.erporderstus = ''
      this.dialogForm.erpordercode = ''
      this.dialogForm.partcode = ''
      this.dialogForm.partname = ''
      this.dialogForm.partspec = ''
      this.dialogForm.wkshopcode = ''
      this.dialogForm.wkshopname = ''
      this.dialogForm.warehousecode = ''
      this.dialogForm.warehousename = ''

      this.dialogForm.erpqty = ''
      this.dialogForm.markqty = ''
      this.dialogForm.ordernum = ''
      this.dialogForm.relse_qty = ''
      this.$refs.dialogForm.clearValidate()
    },
    // 对话框取消
@@ -437,21 +603,34 @@
    },
    // 对话框确认
    dialogVisibleConfirm() {
      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) {
          const data = {
            OrganCode: this.dialogForm.OrgCode,
            OrganName: this.dialogForm.OrgName,
            OperType: this.operation === 'add' ? 'Add' : 'Update',
            Operator: getCookie('admin')
            // 'erporderstus': this.dialogForm.erporderstus,
            'erpordercode': this.dialogForm.erpordercode,
            'partcode': this.dialogForm.partcode,
            'wkshopcode': this.dialogForm.wkshopcode,
            'warehousecode': this.dialogForm.warehousecode,
            'erpqty': this.dialogForm.erpqty,
            'markqty': this.dialogForm.markqty,
            'ordernum': this.dialogForm.ordernum,
            'relse_qty': this.dialogForm.relse_qty
          }
          AddUpdateOrganization(data).then(res => {
          console.log(data)
          MarkSaveErpOrder(data).then(res => {
            if (res.code === '200') {
              this.$message.success(this.operation === 'add' ? '添加成功！' : '修改成功！')
              this.$message.success('下达成功！')
              this.dialogVisible = false
              this.getErpOrderSearch()
            } else {
              this.$message.error(this.operation === 'add' ? '添加失败！' : '修改失败！')
              this.$message.error('下达失败！')
            }
          })
        }
@@ -462,6 +641,10 @@
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 250
        this.tableHeight = this.mainHeight - 100
        // this.isFullscreen = window.innerHeight < 800
        if (this.isFullscreen) {
          this.tableHeight = this.tableHeight - 50
        }
      })
    }
  }
@@ -632,4 +815,10 @@
  border-color: $main_color;
}

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

</style>