1.综合看板改为翻页形式

loulijun2021

2022-11-18 994a722829bd01de4b24f85c359b84dbf4047997

1.综合看板改为翻页形式

 src/views/jcsz/yhqd.vue

@@ -141,6 +141,7 @@
            prop="org_name"
            label="所属组织"
            min-width="110"
            show-tooltip-when-overflow
            sortable="custom"
          >
            <template slot-scope="{row}">

 src/views/kb/zhkb.vue

@@ -332,6 +332,7 @@

      leftTopData: [],
      tableData: [],
      tableDataTemp: [],
      tableDataRank: [],
      lineCodeArr: [],

@@ -408,7 +409,6 @@
      await this.getEcharts()
      await this.getTableDataRoll()
      await this.getTableDataRankRoll()
      await this.getMarqueeTipsContent()
      await this.getMarqueeTipsContent()
    },
    // 获取公告
@@ -489,31 +489,54 @@

    // 产线加工任务
    getTableDataRoll() {
      LineSearchBottomLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
        this.tableData = res.data
        this.number2 = this.tableData.length
      let startValue = 0 // 初始值
      const scale = 10// 刻度

        const divData = this.$refs.tableData.bodyWrapper
        // 拿到元素后，对元素进行定时增加距离顶部距离，实现滚动效果(此配置为每100毫秒移动1像素)
      LineSearchBottomLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
        this.tableDataTemp = res.data
        this.number2 = res.data.length

        this.tableData = this.tableDataTemp.slice(startValue, startValue + scale)

        const loop = Math.floor(this.tableDataTemp.length / scale)// 需要循环的次数
        let nowLoop = 0// 当前循环的次数

        this.TableDataRollTask = setInterval(() => {
          // 元素自增距离顶部1像素
          divData.scrollTop += 1
          // divData.scrollTop += divData.scrollHeight / this.tableData.length
          // 判断元素是否滚动到底部(可视高度+距离顶部=整个高度)
          if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) {
            // 重置table距离顶部距离
            divData.scrollTop = 0
            LineSearchBottomLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
              this.tableData = res.data
              this.number2 = this.tableData.length
              if (this.tableData.length > 10) {
                clearInterval(this.TableDataRollTask)
                this.getTableDataRoll()
              }
            })
          startValue = startValue + scale
          this.tableData = this.tableDataTemp.slice(startValue, startValue + scale)
          if (nowLoop === loop) {
            clearInterval(this.TableDataRollTask)
            this.getTableDataRoll()
          }
        }, this.tableData.length <= 10 ? 1000 * 3 : 100)
          nowLoop++
        }, 1000 * 10)
      })

      // LineSearchBottomLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
      //   this.tableData = res.data
      //   this.number2 = this.tableData.length
      //
      //   const divData = this.$refs.tableData.bodyWrapper
      //   // 拿到元素后，对元素进行定时增加距离顶部距离，实现滚动效果(此配置为每100毫秒移动1像素)
      //   this.TableDataRollTask = setInterval(() => {
      //     // 元素自增距离顶部1像素
      //     divData.scrollTop += 1
      //     // divData.scrollTop += divData.scrollHeight / this.tableData.length
      //     // 判断元素是否滚动到底部(可视高度+距离顶部=整个高度)
      //     if (divData.clientHeight + divData.scrollTop === divData.scrollHeight) {
      //       // 重置table距离顶部距离
      //       divData.scrollTop = 0
      //       LineSearchBottomLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
      //         this.tableData = res.data
      //         this.number2 = this.tableData.length
      //         if (this.tableData.length > 10) {
      //           clearInterval(this.TableDataRollTask)
      //           this.getTableDataRoll()
      //         }
      //       })
      //     }
      //   }, this.tableData.length <= 10 ? 1000 * 3 : 100)
      // })
    },
    // 当日完工产品数量排行
    getTableDataRankRoll() {

 src/views/scgl/gd.vue

@@ -38,10 +38,10 @@
              </el-select>
            </el-form-item>
            <el-form-item label="订单编号" style=" display: flex;">
              <el-input v-model="form.mesordercode" placeholder="请输入" style="width: 200px"/>
              <el-input v-model="form.mesordercode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="源单单号" style="display: flex;">
              <el-input v-model="form.sourceorder" style="width: 200px" placeholder="请输入"/>
              <el-input v-model="form.sourceorder" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item label="单据类型" style=" display: flex;">
              <el-select
@@ -60,16 +60,16 @@
              </el-select>
            </el-form-item>
            <el-form-item v-show="isExpandForm" label-width="70px" label="产品编码" style=" display: flex;">
              <el-input v-model="form.partcode" style="width: 200px" placeholder="请输入"/>
              <el-input v-model="form.partcode" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="产品名称" style=" display: flex;">
              <el-input v-model="form.partname" style="width: 200px" placeholder="请输入"/>
              <el-input v-model="form.partname" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="产品规格" style=" display: flex;">
              <el-input v-model="form.partspec" style="width: 200px" placeholder="请输入"/>
              <el-input v-model="form.partspec" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="创建人员" style=" display: flex;">
              <el-input v-model="form.creatuser" style="width: 200px" placeholder="请输入"/>
              <el-input v-model="form.creatuser" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label-width="70px" label="创建时间" style=" display: flex;">
              <!--              <el-date-picker-->
@@ -231,6 +231,7 @@
            label="生产车间"
            sortable="custom"
            width="120"
            show-tooltip-when-overflow
          >
            <template slot-scope="{row}">
              <div v-if="row.wkshp_name">{{ row.wkshp_name }}</div>
@@ -326,7 +327,7 @@
                  />
                </el-tooltip>
                <el-tooltip v-del-tab-index class="item" effect="dark" content="删除" placement="top">
                  <i class="el-icon-delete" @click="del(row)"/>
                  <i class="el-icon-delete" @click="del(row)" />
                </el-tooltip>
              </div>
            </template>
@@ -464,7 +465,7 @@
        </el-form-item>

        <el-form-item label="工单编号" prop="mesordercode">
          <el-input v-model="dialogForm.mesordercode" :disabled="operation!=='add'" style="width: 200px"/>
          <el-input v-model="dialogForm.mesordercode" :disabled="operation!=='add'" style="width: 200px" />
        </el-form-item>
        <div style="display: flex">
          <el-form-item label="工单类型" prop="mesorderstus">
@@ -533,13 +534,13 @@
          </el-select>
        </el-form-item>
        <el-form-item v-if="operation!=='add'" label="产品名称" prop="partname">
          <el-input v-model="dialogForm.partname" disabled style="width: 200px"/>
          <el-input v-model="dialogForm.partname" disabled style="width: 200px" />
        </el-form-item>
        <el-form-item label="产品编码">
          <el-input v-model="dialogForm.partcode" disabled style="width: 200px"/>
          <el-input v-model="dialogForm.partcode" disabled style="width: 200px" />
        </el-form-item>
        <el-form-item label="产品规格" prop="partspec">
          <el-input v-model="dialogForm.partspec" disabled style="width: 200px"/>
          <el-input v-model="dialogForm.partspec" disabled style="width: 200px" />
        </el-form-item>
        <div style="display: flex">
          <div style="display: flex;flex-wrap: nowrap">
@@ -851,20 +852,20 @@
              </el-select>
            </el-form-item>
            <el-form-item v-show="isExpandDialog" label="订单编号" style=" display: flex;">
              <el-input v-model="sourceForm.erpordercode" placeholder="请输入" style="width: 200px"/>
              <el-input v-model="sourceForm.erpordercode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item v-show="isExpandDialog" label="产品编码" style=" display: flex;">
              <el-input v-model="sourceForm.partcode" style="width: 200px" placeholder="请输入"/>
              <el-input v-model="sourceForm.partcode" style="width: 200px" placeholder="请输入" />
            </el-form-item>

            <el-form-item v-show="isExpandDialog" label="产品名称" style=" display: flex;">
              <el-input v-model="sourceForm.partname" style="width: 200px" placeholder="请输入"/>
              <el-input v-model="sourceForm.partname" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandDialog" label="产品规格" style=" display: flex;">
              <el-input v-model="sourceForm.partspec" style="width: 200px" placeholder="请输入"/>
              <el-input v-model="sourceForm.partspec" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandDialog" label="创建人员" style=" display: flex;">
              <el-input v-model="sourceForm.creatuser" style="width: 200px" placeholder="请输入"/>
              <el-input v-model="sourceForm.creatuser" style="width: 200px" placeholder="请输入" />
            </el-form-item>

          </div>
@@ -1140,7 +1141,7 @@
          >
            <!--            <div id="qrCode0" ref="qrCodeDiv0" />-->
          </div>
          <div style="background-color: #fff;width: 20px;height:120px; position: absolute;right: 0"/>
          <div style="background-color: #fff;width: 20px;height:120px; position: absolute;right: 0" />
          <div
            style="z-index: 10;background-color:transparent;width: 120px;height:120px; position: absolute;right: 21px"
          />
@@ -1171,7 +1172,7 @@
            align="center"
          >
            <template slot-scope="{row}">
              <div :id="'qrCode'+row.seq" :ref="'qrCodeDiv'+row.seq" class="tableColumn"/>
              <div :id="'qrCode'+row.seq" :ref="'qrCodeDiv'+row.seq" class="tableColumn" />
            </template>
          </el-table-column>
          <el-table-column
@@ -1211,18 +1212,15 @@
          />
        </el-table>

        <!--        <div v-if="formApprove.m_po" style="display: flex;margin-top: 20px;align-content: center;height: 130px;line-height: 130px;">-->
        <!--          <div style="font-size: 18px;font-weight: bolder">源单单号：</div>-->
        <!--          <div id="qrCodeSource" ref="qrCodeSource" style="width: 130px;height: 130px;overflow: hidden" />-->
        <!--        </div>-->

        <div v-if="formApprove.m_po" style="display: flex;margin-top: 20px;align-content: center;height: 130px;line-height: 130px;">
          <div style="font-size: 18px;font-weight: bolder">源单单号：</div>
          <div id="qrCodeSource" ref="qrCodeSource" style="width: 130px;height: 130px;overflow: hidden"/>
        </div>

        <div v-if="formApprove.m_po" style="margin-top: 5px;">
<!--          <svg-icon icon-class="UP" style="color:#000;margin-left: 130px;font-size: 50px;background-color: #FFFFFF"></svg-icon>-->
          <img src="../../assets/images/UP.png" alt="" style="margin-left: 107px;">
            <div style="font-size: 18px;font-weight: bolder;">根据单号扫码入库，用PDA扫描此二维码</div>
        </div>

        <!--        <div v-if="formApprove.m_po" style="margin-top: 5px;">-->
        <!--          <img src="../../assets/images/UP.png" alt="" style="margin-left: 107px;">-->
        <!--          <div style="font-size: 18px;font-weight: bolder;">根据单号扫码入库，用PDA扫描此二维码</div>-->
        <!--        </div>-->

      </div>
      <span slot="footer" class="dialog-footer">
@@ -1277,8 +1275,10 @@
                style="display: flex;height: 96px;border-bottom:1px solid #000;
              justify-content: center;align-items: center;position: relative"
              >
                <div id="qrCode2" ref="qrCodeDiv2"
                     style="overflow-y: hidden;height:60px;position: absolute;left: 14px;"
                <div
                  id="qrCode2"
                  ref="qrCodeDiv2"
                  style="overflow-y: hidden;height:60px;position: absolute;left: 14px;"
                />
              </div>
              <div
@@ -1336,8 +1336,10 @@
                style="display: flex;height: 96px;border-bottom:1px solid #000;
              justify-content: center;align-items: center;position: relative"
              >
                <div id="qrCode2" ref="qrCodeDiv2"
                     style="overflow-y: hidden;height:60px;position: absolute;left: 14px;"
                <div
                  id="qrCode2"
                  ref="qrCodeDiv2"
                  style="overflow-y: hidden;height:60px;position: absolute;left: 14px;"
                />
              </div>
              <div
@@ -1395,8 +1397,10 @@
                style="display: flex;height: 60px;border-bottom:1px solid #000;
              justify-content: center;align-items: center;position: relative"
              >
                <div id="qrCode2" ref="qrCodeDiv2"
                     style="overflow-y: hidden;height:60px;position: absolute;left: 14px;"
                <div
                  id="qrCode2"
                  ref="qrCodeDiv2"
                  style="overflow-y: hidden;height:60px;position: absolute;left: 14px;"
                />
              </div>
              <div
@@ -1467,11 +1471,11 @@
      @close="handleCloseRoute"
    >
      <div>
        <i class="el-icon-s-comment" style="color:#42b983;"/> 产品名称：{{ dialogFormRoute.projectName }}
        <i class="el-icon-s-comment" style="color:#42b983;" /> 产品名称：{{ dialogFormRoute.projectName }}
      </div>
      <el-divider/>
      <el-divider />
      <div style="margin-bottom: 10px">
        <i class="el-icon-s-operation" style="color:#42b983;"/> 工艺路线集合
        <i class="el-icon-s-operation" style="color:#42b983;" /> 工艺路线集合
      </div>

      <div class="myCheckboxGroup">
@@ -1495,9 +1499,9 @@
        </div>
      </div>

      <el-divider/>
      <el-divider />
      <div>
        <i class="el-icon-s-operation" style="color:#42b983;"/> 默认工艺路线
        <i class="el-icon-s-operation" style="color:#42b983;" /> 默认工艺路线
      </div>
      <div style="margin-top: 20px">
        <el-select
@@ -1515,9 +1519,9 @@
          />
        </el-select>
      </div>
      <el-divider/>
      <el-divider />
      <div style="margin-bottom: 10px">
        <i class="el-icon-s-operation" style="color:#42b983;"/> 工序列表
        <i class="el-icon-s-operation" style="color:#42b983;" /> 工序列表
      </div>
      <div style="overflow-y: scroll">
        <el-table
@@ -1551,11 +1555,11 @@
          >
            <template slot-scope="{row}">
              <div v-if="row.enable==='Y'">
                <svg-icon icon-class="circleYes" style="margin-right: 2px"/>
                <svg-icon icon-class="circleYes" style="margin-right: 2px" />
                是
              </div>
              <div v-if="row.enable==='N'">
                <svg-icon icon-class="circleNo" style="margin-right: 2px"/>
                <svg-icon icon-class="circleNo" style="margin-right: 2px" />
                否
              </div>
            </template>
@@ -2285,12 +2289,12 @@
        })
      }
    },
    //生成源单单号二维码
    bindQRCodeSource(text){
    // 生成源单单号二维码
    bindQRCodeSource(text) {
      new QRCode(this.$refs['qrCodeSource'], {
        text: text,
        width: 130 ,
        height: 130 ,
        width: 130,
        height: 130,
        // colorDark: '#333333', // 二维码颜色
        colorDark: '#000', // 二维码颜色
        colorLight: '#ffffff', // 二维码背景色