1.递交

loulijun2021

2023-04-14 7651d8d17f9819c7864624e058b6810521049ba7

1.递交

 src/views/kb/ckgl.vue

@@ -10,14 +10,9 @@
      <div class="kb_header">
        <div class="flex_c_c kb_header_text">
          <div id="topBarLeft" style="width:600px;height:100%" />
          仓库管理数字化看板
          仓库管理看板
          <div id="topBarRight" style="width:600px;height:100%;transform:rotate(180deg);" />
        </div>

        <div class="kb_headTime" style="left: 85px">
          <span>浙江新凯迪数字科技股份有限公司</span>
        </div>

        <div class="kb_headTime">
          <span>{{ headTime }}</span>
        </div>
@@ -343,7 +338,6 @@

  data() {
    return {
      onLine: navigator.onLine, // 监听网络是否在线

      headTime: '',
      tableDataTop: [],
@@ -369,14 +363,9 @@
    // 两小时看板刷新一次
    setInterval(() => {
      window.location.reload()
    }, 1000 * 60 * 60 * 10)
    }, 1000 * 60 * 120)
  },
  mounted() {
    // 监听网络是否在线
    window.addEventListener('online', this.updateOnlineStatus)
    window.addEventListener('offline', this.updateOnlineStatus)
    this.updateOnlineStatus({ type: this.onLine ? 'online' : 'offline', isFirst: true })

    this.getTopBar()

    this.getWareHouseTopLeftData()
@@ -384,33 +373,8 @@
    this.getEcharts()
    this.setStarsRef()
  },
  beforeDestroy() {
    window.removeEventListener('online', this.updateOnlineStatus)
    window.removeEventListener('offline', this.updateOnlineStatus)
  },

  methods: {
    // 更新网络状态
    updateOnlineStatus(e) {
      if (e.isFirst) {
        // console.log('x')
      } else {
        const loading = this.$loading({
          lock: true,
          text: '断网了，正在拼命联网中，请检查网络是否正常...',
          spinner: 'el-icon-loading',
          customClass: 'osloading',
          background: 'rgba(0, 0, 0, 0.7)'
        })
        const { type } = e
        this.onLine = type === 'online'
        if (this.onLine) {
          loading.close()
          this.$message.success('网络连接成功！')
        } else {
          this.$message.error('网络掉线，请关注网络状态！')
        }
      }
    },
    setStarsRef() {
      const starNodes = Array.from(this.$refs.starsRef.children)
      starNodes.forEach(item => {

 src/views/scgl/gd.vue

@@ -1257,9 +1257,9 @@
                <el-form-item label="打印人员:" class="formContent">
                  {{ username }}
                </el-form-item>
                <el-form-item label="打印时间:" class="formContent">
                  {{ formApprove.lm_date }}
                </el-form-item>
<!--                <el-form-item label="打印时间:" class="formContent">-->
<!--                  {{ formApprove.lm_date }}-->
<!--                </el-form-item>-->
              </div>
            </el-form>
          </div>

 src/views/scgl/sckbg.vue

@@ -761,7 +761,9 @@
            >
              <template slot-scope="{row}">
                <div class="operationClass">
                  <el-button v-if="(row.isVisible===1&&!userIsSave)||row.isVisible===2" v-waves type="text" @click="userSave(row)">保存</el-button>
                  <el-button v-if="(row.isVisible===1&&!userIsSave)||row.isVisible===2" v-waves type="text"
                             @click="userSave(row)">保存
                  </el-button>
                  <el-button v-if="row.isVisible===1" v-waves type="text" @click="userCancel(row)">取消</el-button>
                  <el-button v-if="row.isVisible===0" v-waves type="text" @click="userDel(row)">删除</el-button>
                  <el-button v-if="row.isVisible===0" v-waves type="text" @click="editRatio(row)">修改比例</el-button>
@@ -1720,13 +1722,16 @@
          orderstepqrcode: orderstepqrcode,
          SelectType: ''
        }
        const res = await MesOrderStepStart(data)
        MesOrderStepStart(data).then(res => {
        if (res.code === '200' && res.count === 0) {
          await this.ZZstart(res.data)
            this.ZZstart(res.data)
          } else if (res.code === '200' && res.count === 1) {
            this.ZZreport(res.data)
        }
        if (res.code === '200' && res.count === 1) {
          await this.ZZreport(res.data)
        }
        }).catch(e => {
          this.form.orderstepqrcode = ''
        })

      }
      if (belong === 'WXproduceCode') {
        const orderstepqrcode = this.WXform.orderstepqrcode
@@ -1735,13 +1740,16 @@
          orderstepqrcode: orderstepqrcode,
          SelectType: this.WXSelected// OUT、IN
        }
        const res = await MesOrderStepStart(data)
        MesOrderStepStart(data).then(res => {
        if (res.code === '200' && res.count === 2) {
          await this.WXsend(res.data)
            this.WXsend(res.data)
          } else if (res.code === '200' && res.count === 3) {
            this.WXback(res.data)
        }
        if (res.code === '200' && res.count === 3) {
          await this.WXback(res.data)
        }
        }).catch(e => {
          this.WXform.orderstepqrcode = ''
        })

      }

      if (belong === 'badProduceCode') {
@@ -1944,7 +1952,8 @@
      this.$refs.tableDataRef.doLayout()
    },
    calculatedValue() {
      const total = 100; let value = 0
      const total = 100;
      let value = 0
      this.userTableData.forEach(item => {
        item.ratio = parseFloat((100 / this.userTableData.length).toFixed(2))
        value += item.ratio
@@ -2239,7 +2248,10 @@
              eqpcode: this.dialogForm.eqpcode, // 设备编码
              usergroupcode: this.dialogForm.usergroupcode, // 班组编码
              // reportuser: reportuser, // 报工人员
              reportuser: this.dialogForm.reckway === 'group' ? this.userTableData : [{ usercode: this.dialogForm.operation, ratio: 100 }],
              reportuser: this.dialogForm.reckway === 'group' ? this.userTableData : [{
                usercode: this.dialogForm.operation,
                ratio: 100
              }],
              taskqty: this.dialogForm.planqty, // 任务数量
              // startqty: this.dialogForm.startqty, // 开工数量
              startqty: this.dialogForm.reportqty, // 开工数量