1.修改bug

loulijun2021

2022-07-19 d71436544198b7b051115662fc9cf4b12ce0cda3

 src/views/scgl/scdd.vue

@@ -29,7 +29,6 @@
            <el-form-item label="订单编号" style=" display: flex;">
              <el-input v-model="form.erpordercode" placeholder="请输入" style="width: 200px" />
            </el-form-item>

            <el-form-item label="产品编码" style=" display: flex;">
              <el-input v-model="form.partcode" style="width: 200px" placeholder="请输入" />
            </el-form-item>
@@ -39,9 +38,13 @@
            <el-form-item 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 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;">
              <el-date-picker
                v-model="form.paydate"
                v-model="form.paystartdate"
                type="daterange"
                range-separator="~"
                size="mini"
@@ -53,12 +56,9 @@
              <!--              :picker-options="expireTimeOption"-->

            </el-form-item>
            <el-form-item label="创建人员" style=" display: flex;">
              <el-input v-model="form.creatuser" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item label="创建时间" style=" display: flex;">
            <el-form-item label="预计完工时间" label-width="100px" style=" display: flex;">
              <el-date-picker
                v-model="form.createdate"
                v-model="form.payenddate"
                type="daterange"
                :clearable="false"
                range-separator="~"
@@ -174,8 +174,8 @@
          >
            <template slot-scope="{row}">
              <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==='CREATING'">部分下达</div>
              <div v-if="row.status==='CREATED'">全部下达</div>
              <div v-if="row.status==='CLOSED'">已关闭</div>
            </template>
          </el-table-column>
@@ -222,8 +222,14 @@
            width="150"
          />
          <el-table-column
            prop="paydate"
            label="要求交付时间"
            prop="planstartdate"
            label="预计开工时间"
            sortable="custom"
            width="160"
          />
          <el-table-column
            prop="planenddate"
            label="预计完工时间"
            sortable="custom"
            width="160"
          />
@@ -360,6 +366,7 @@
import Pagination from '@/components/Pagination'
import { ClosedErpOrder, ErpOrderSearch, MarkSaveErpOrder } from '@/api/scgl'
import { handleDatatime, handleDatetime } from '@/utils/global'
import { SeaveSearchErpOrder } from '@/api/ErpSyncMes'

const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
@@ -389,8 +396,10 @@
        partcode: '', // 产品编码
        partname: '', // 产品名称
        partspec: '', // 产品规格
        paydate: '', // 交付时间
        creatuser: '', // 创建人员
        // paystartdate: '', // 交付时间
        paystartdate: '', // 预计开工时间
        payenddate: '', // 预计完工时间
        createdate: '', // 创建时间
        prop: 'createdate', // 排序字段
        order: 'desc', // 排序字段
@@ -399,8 +408,8 @@
      },
      erporderstusArr: [
        { code: 'NEW', name: '新订单' },
        { code: 'CREATING', name: '创建中' },
        { code: 'CREATED', name: '已创建' },
        { code: 'CREATING', name: '部分下达' },
        { code: 'CREATED', name: '全部下达' },
        { code: 'CLOSED', name: '已关闭' }
      ],
      total: 10,
@@ -410,7 +419,7 @@
      dialogForm: {
        partname: '', // 产品名称
        partspec: '', // 产品规格
        paydate: '', // 交付时间
        // paystartdate: '', // 预计开工时间
        wkshopname: '', // 车间名称
        warehousename: '', // 仓库名称

@@ -460,12 +469,12 @@
  methods: {
    async getErpOrderSearch() {
      console.log(this.form, 1)
      let tempDate2 = this.form.paydate
      let tempDate2 = this.form.paystartdate
      if (tempDate2.length > 0) {
        tempDate2 = handleDatetime(tempDate2[0]) + '~' + handleDatetime(tempDate2[1])
      }

      let tempDate = this.form.createdate
      let tempDate = this.form.payenddate
      if (tempDate.length > 0) {
        tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
      }
@@ -476,10 +485,11 @@
        partcode: this.form.partcode, // 产品编码
        partname: this.form.partname, // 产品名称
        partspec: this.form.partspec, // 产品规格
        paydate: tempDate2, // 交付时间
        paystartdate: tempDate2, // 交付时间
        payenddate: tempDate, // 交付时间
        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, // 第几页
@@ -505,7 +515,7 @@
      this.getErpOrderSearch()
    },
    // 同步ERP
    async  syncERP() {
    syncERP() {
      const loading = this.$loading({
        lock: true,
        text: '正在同步ERP，请稍等...',
@@ -513,17 +523,23 @@
        customClass: 'osloading',
        background: 'rgba(0, 0, 0, 0.7)'
      })
      setTimeout(() => {
        loading.close()
      }, 2000)

      // const res = await xxx()
      // if (res.code==='200'){
      setTimeout(() => {
        loading.close()
        this.getErpOrderSearch()
      }, 2000)
      // }
      SeaveSearchErpOrder().then(res => {
        console.log(res, 11)
        if (res.code === '200') {
          setTimeout(() => {
            this.getErpOrderSearch()
            loading.close()
            this.$message.success('同步成功！')
          }, 2000)
        }
        // else if (res.code === '300') {
        //   setTimeout(() => {
        //     loading.close()
        //     this.$message.error('同步失败！')
        //   }, 10000)
        // }
      })
    },
    // 查询
    search() {
@@ -536,7 +552,8 @@
      this.form.partcode = ''
      this.form.partname = ''
      this.form.partspec = ''
      this.form.paydate = ''
      this.form.paystartdate = ''
      this.form.payenddate = ''
      this.form.creatuser = ''
      this.form.createdate = ''
      this.getErpOrderSearch()