loulijun2021
2022-12-12 17f529afef9f804f228857f6b47d0a446e55a707
1.综合看板兼容八道工序样式排版
已修改6个文件
243 ■■■■■ 文件已修改
src/views/bbgl/rygz.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/jcsz/yhqd.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/kb/zhkb.vue 125 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/kb/zhkbc.vue 101 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/zzmx/jpgj.vue 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
vue.config.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/bbgl/rygz.vue
@@ -188,13 +188,13 @@
            </template>
          </el-table-column>
          <el-table-column
            prop="usermoney"
            prop="moneys"
            label="个人记件工资"
            width="130"
            min-width="130"
            sortable="custom"
          >
            <template slot-scope="{row}">
              <div v-if="row.usermoney">{{ row.usermoney }} 元</div>
              <div v-if="row.moneys">{{ row.moneys }} 元</div>
              <div v-else>/</div>
            </template>
          </el-table-column>
@@ -359,12 +359,12 @@
      const sums = []
      columns.forEach((column, index) => {
        if (index === 10) {
        if (index === 9) {
          sums[index] = '总价'
          return
        }
        const values = data.map(item => Number(item[column.property]))
        if (column.property === 'usermoney') {
        if (column.property === 'moneys') {
          sums[index] = values.reduce((prev, curr) => {
            const value = Number(curr)
            if (!isNaN(value)) {
src/views/jcsz/yhqd.vue
@@ -314,7 +314,7 @@
            @change="dialogCascaderChange"
          />
        </el-form-item>
        <el-form-item label="所属班组" prop="groupcode">
        <el-form-item label="所属班组">
          <el-select
            v-model="dialogForm.groupcode"
            :popper-append-to-body="false"
src/views/kb/zhkb.vue
@@ -28,7 +28,11 @@
          <div class="kb_left_top kb_pd10">
            <div class="kb_left_top02">
              <div v-for="item in lineContent3" :key="item.workcode" class="kb_left_top_block">
              <div
                v-for="item in lineContent3"
                :key="item.workcode+JSON.stringify(item.children[0])"
                class="kb_left_top_block"
              >
                <div class="kb_block02 kb_pd10">
                  <div>
                    <div>销售单号:{{ item.saleordercode }}</div>
@@ -458,6 +462,125 @@
    getShopSearchLine() {
      let length, count
      LineSearchTopLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
        this.lineContent = res.data // 调用接口返回的数据
        this.number1 = this.lineContent.length // 产线加工中任务  单数
        const newData = []
        if (this.lineContent.length > 0) {
          this.lineContent.forEach(item => {
            if (item.children.length > 5) {
              newData.push({
                workcode: item.workcode,
                partname: item.partname,
                partnumber: item.partnumber,
                partspec: item.partspec,
                qty: item.qty,
                saleordercode: item.saleordercode,
                uom: item.uom,
                children: item.children.slice(0, 5)
              })
              newData.push({
                workcode: item.workcode,
                partname: item.partname,
                partnumber: item.partnumber,
                partspec: item.partspec,
                qty: item.qty,
                saleordercode: item.saleordercode,
                uom: item.uom,
                children: item.children.slice(5, 8)
              })
            } else {
              newData.push({
                workcode: item.workcode,
                partname: item.partname,
                partnumber: item.partnumber,
                partspec: item.partspec,
                qty: item.qty,
                saleordercode: item.saleordercode,
                uom: item.uom,
                children: item.children
              })
            }
          })
          console.log(newData.length, 9777)
        }
        this.lineContent = newData
        length = this.lineContent.length
        count = Math.ceil(length / 3) // 需要轮播的组数   3个为一组
        this.lineContent3 = this.lineContent.slice(0, 3)
      })
      let start = 0
      this.ShopSearchLineTask = setInterval(() => {
        if (Math.floor(start / 3) === count && count !== 0) {
          start = 0
          LineSearchTopLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
            this.lineContent = res.data // 调用接口返回的数据
            this.number1 = this.lineContent.length // 产线加工中任务  单数
            const newData = []
            if (this.lineContent.length > 0) {
              this.lineContent.forEach(item => {
                if (item.children.length > 5) {
                  newData.push({
                    workcode: item.workcode,
                    partname: item.partname,
                    partnumber: item.partnumber,
                    partspec: item.partspec,
                    qty: item.qty,
                    saleordercode: item.saleordercode,
                    uom: item.uom,
                    children: item.children.slice(0, 5)
                  }
                  )
                  newData.push({
                    workcode: item.workcode,
                    partname: item.partname,
                    partnumber: item.partnumber,
                    partspec: item.partspec,
                    qty: item.qty,
                    saleordercode: item.saleordercode,
                    uom: item.uom,
                    children: item.children.slice(5, 8)
                  })
                } else {
                  newData.push({
                    workcode: item.workcode,
                    partname: item.partname,
                    partnumber: item.partnumber,
                    partspec: item.partspec,
                    qty: item.qty,
                    saleordercode: item.saleordercode,
                    uom: item.uom,
                    children: item.children
                  })
                }
              })
            }
            this.lineContent = newData
            length = this.lineContent.length
            count = Math.ceil(length / 3) // 需要轮播的组数   3个为一组
            this.lineContent3 = this.lineContent.slice(0, 3)
          })
        } else if (count === 0) {
          clearInterval(this.ShopSearchLineTask)
          this.getShopSearchLine()
        }
        this.lineContent3 = this.lineContent.slice(start, start + 3)
        start = start + 3
      }, 1000 * 3)
    },
    // 产线加工中任务   备份方法
    getShopSearchLine2() {
      let length, count
      LineSearchTopLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
        this.lineContent = res.data
        length = this.lineContent.length
        count = Math.ceil(length / 3) // 需要轮播的组数   3个为一组
src/views/kb/zhkbc.vue
@@ -3,7 +3,7 @@
    <div class="kb_dashboard">
      <div class="kb_header">
        <div class="flex_c_c kb_header_text">
          下料车间看板
          {{ ShopArr[0] == 21 ? '下料车间看板' : ShopArr[0] == 22 ? '金工车间看板' : ShopArr[0] == 23 ? '抛光车间看板' : '装配车间看板' }}
        </div>
        <div class="kb_headerPic" />
        <div class="kb_headTime">
@@ -455,15 +455,59 @@
      }, 1000 * 30)
    },
    // 产线加工中任务
    // 产线加工中任务
    getShopSearchLine() {
      let length, count
      LineSearchTopLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
        this.lineContent = res.data
        this.lineContent = res.data // 调用接口返回的数据
        this.number1 = this.lineContent.length // 产线加工中任务  单数
        const newData = []
        if (this.lineContent.length > 0) {
          this.lineContent.forEach(item => {
            if (item.children.length > 5) {
              newData.push({
                workcode: item.workcode,
                partname: item.partname,
                partnumber: item.partnumber,
                partspec: item.partspec,
                qty: item.qty,
                saleordercode: item.saleordercode,
                uom: item.uom,
                children: item.children.slice(0, 5)
              })
              newData.push({
                workcode: item.workcode,
                partname: item.partname,
                partnumber: item.partnumber,
                partspec: item.partspec,
                qty: item.qty,
                saleordercode: item.saleordercode,
                uom: item.uom,
                children: item.children.slice(5, 8)
              })
            } else {
              newData.push({
                workcode: item.workcode,
                partname: item.partname,
                partnumber: item.partnumber,
                partspec: item.partspec,
                qty: item.qty,
                saleordercode: item.saleordercode,
                uom: item.uom,
                children: item.children
              })
            }
          })
          console.log(newData.length, 9777)
        }
        this.lineContent = newData
        length = this.lineContent.length
        count = Math.ceil(length / 3) // 需要轮播的组数   3个为一组
        this.lineContent3 = this.lineContent.slice(0, 3)
        this.number1 = this.lineContent.length
      })
      let start = 0
@@ -471,17 +515,60 @@
        if (Math.floor(start / 3) === count && count !== 0) {
          start = 0
          LineSearchTopLeftData({ shopcode: this.ShopArr.join(',') }).then(res => {
            this.lineContent = res.data
            this.lineContent = res.data // 调用接口返回的数据
            this.number1 = this.lineContent.length // 产线加工中任务  单数
            const newData = []
            if (this.lineContent.length > 0) {
              this.lineContent.forEach(item => {
                if (item.children.length > 5) {
                  newData.push({
                    workcode: item.workcode,
                    partname: item.partname,
                    partnumber: item.partnumber,
                    partspec: item.partspec,
                    qty: item.qty,
                    saleordercode: item.saleordercode,
                    uom: item.uom,
                    children: item.children.slice(0, 5)
                  }
                  )
                  newData.push({
                    workcode: item.workcode,
                    partname: item.partname,
                    partnumber: item.partnumber,
                    partspec: item.partspec,
                    qty: item.qty,
                    saleordercode: item.saleordercode,
                    uom: item.uom,
                    children: item.children.slice(5, 8)
                  })
                } else {
                  newData.push({
                    workcode: item.workcode,
                    partname: item.partname,
                    partnumber: item.partnumber,
                    partspec: item.partspec,
                    qty: item.qty,
                    saleordercode: item.saleordercode,
                    uom: item.uom,
                    children: item.children
                  })
                }
              })
            }
            this.lineContent = newData
            length = this.lineContent.length
            count = Math.ceil(length / 3) // 需要轮播的组数   3个为一组
            this.lineContent3 = this.lineContent.slice(0, 3)
            this.number1 = this.lineContent.length
          })
        } else if (count === 0) {
          clearInterval(this.ShopSearchLineTask)
          this.getShopSearchLine()
        }
        this.lineContent3 = this.lineContent.slice(start, start + 3)
        start = start + 3
      }, 1000 * 3)
src/views/zzmx/jpgj.vue
@@ -533,6 +533,7 @@
        partcode: '',
        routecode: '',
        stepcode: '',
        steptype: '',
        page: 1,
        rows: 10,
        prop: 'eqpcode',
@@ -669,11 +670,13 @@
    },
    async getEqpTable(val) {
      if (typeof val === 'string') {
        this.eqpTable.steptype = this.stepDialogArr.find(item => item.name === val).flag
        this.eqpTable.partcode = this.dialogForm.partcode
        this.eqpTable.routecode = this.dialogForm.routecode
        this.eqpTable.stepcode = this.stepDialogArr.find(item => item.name === val).code
        // } else if (typeof val === 'number') {
      } else {
        this.eqpTable.steptype = this.stepDialogArr[0].flag
        this.eqpTable.partcode = this.dialogForm.partcode
        this.eqpTable.routecode = this.dialogForm.routecode
        this.eqpTable.stepcode = this.stepDialogArr[0].code
vue.config.js
@@ -51,7 +51,7 @@
    proxy: {
      [process.env.VUE_APP_BASE_API]: {
        target: 'http://121.196.36.24:8005', // 请求的第三⽅接⼝地址      本地服务器(灵翔)
        // target: 'http://192.168.2.138:8001', // 请求的第三⽅接⼝地址   客户服务器(灵翔)
        // target: 'http://192.168.0.230:8001', // 请求的第三⽅接⼝地址   客户服务器(灵翔)
        changeOrigin: true, // 请求跨域时,需 配置此项
        pathRewrite: { // 路径重写,替换target中的请求地址
          ['^' + process.env.VUE_APP_BASE_API]: '/api/'