永康嘉持电器有限公司前端
小小儁爺
2025-03-11 c26deaa0190c0ed42b398f3e5696013127a6c10f
1.看板修改
已修改6个文件
203 ■■■■ 文件已修改
src/utils/myEcharts.js 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/kanbanManager/cj.vue 158 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/kanbanManager/ckgl.vue 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/kanbanManager/zhkb.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/workOrder/produceOrderList.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/workOrder/workOrderList.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/utils/myEcharts.js
@@ -2104,12 +2104,13 @@
  return option
}
export function all02(data) {
export function all02(data, title) {
  return {
    backgroundColor: 'transparent',
    // tooltip: {},
    title: {
      text: '每月订单数量/出库数量',
      text: title,
      // text: '每月订单数量/出库数量',
      left: '50%',
      top: '0%',
      textAlign: 'center',
src/views/kanbanManager/cj.vue
@@ -29,7 +29,7 @@
            </div>
            <div
              class="lineContent horn"
              style="height: 450px;display: flex;flex-direction: column;justify-content: space-between"
              style="height: 880px;display: flex;flex-direction: column;justify-content: space-between"
            >
              <el-table
                ref="tableDataLeftCenterRef"
@@ -38,7 +38,7 @@
                style="width: 100%;"
                :header-cell-style="headerCellStyle"
                :cell-style="cellStyle"
                height="500"
                height="930"
              >
                <el-table-column
@@ -54,7 +54,7 @@
                <el-table-column
                  prop="partname"
                  label="产品名称"
                  width="160"
                  width="400"
                />
                <el-table-column
                  prop="partspec"
@@ -80,16 +80,16 @@
                  label="不良数量"
                  width="120"
                />
                <el-table-column
                  prop="laborbad_qty"
                  label="工废数量"
                  width="120"
                />
                <el-table-column
                  prop="materielbad_qty"
                  label="料废数量"
                  width="120"
                />
                <!--                <el-table-column-->
                <!--                  prop="laborbad_qty"-->
                <!--                  label="工废数量"-->
                <!--                  width="120"-->
                <!--                />-->
                <!--                <el-table-column-->
                <!--                  prop="materielbad_qty"-->
                <!--                  label="料废数量"-->
                <!--                  width="120"-->
                <!--                />-->
                <el-table-column
                  prop="seq"
                  label="工序顺序"
@@ -116,27 +116,27 @@
        </div>
        <!--        下边-->
        <div style="display: flex;justify-content: space-between;margin-top: 15px;">
          <div style="width: 1000px;">
            <div class="smallTitle">
              <svg-icon icon-class="blcs" class="svg_class" />
              质量不良(近一周)
            </div>
            <div class="lineContent horn" style="height: 380px;display: flex;justify-content: space-between">
              <div id="cjzl03" class="flex_c_c" style="width: 100%;height:100%" />
        <!--        <div style="display: flex;justify-content: space-between;margin-top: 15px;">-->
        <!--          <div style="width: 1000px;">-->
        <!--            <div class="smallTitle">-->
        <!--              <svg-icon icon-class="blcs" class="svg_class" />-->
        <!--              质量不良(近一周)-->
        <!--            </div>-->
        <!--            <div class="lineContent horn" style="height: 380px;display: flex;justify-content: space-between">-->
        <!--              <div id="cjzl03" class="flex_c_c" style="width: 100%;height:100%" />-->
            </div>
          </div>
          <div style="width: 850px;">
            <div class="smallTitle">
              <svg-icon icon-class="ckkc" class="svg_class" />
              不良统计(近一月)
            </div>
            <div class="lineContent horn" style="height: 380px;display: flex;justify-content: space-between">
              <div id="cjzl04" class="flex_c_c" style="width: 100%;height:100%" />
            </div>
          </div>
        </div>
        <!--            </div>-->
        <!--          </div>-->
        <!--          <div style="width: 850px;">-->
        <!--            <div class="smallTitle">-->
        <!--              <svg-icon icon-class="ckkc" class="svg_class" />-->
        <!--              不良统计(近一月)-->
        <!--            </div>-->
        <!--            <div class="lineContent horn" style="height: 380px;display: flex;justify-content: space-between">-->
        <!--              <div id="cjzl04" class="flex_c_c" style="width: 100%;height:100%" />-->
        <!--            </div>-->
        <!--          </div>-->
        <!--        </div>-->
      </div>
    </div>
  </div>
@@ -202,13 +202,13 @@
            WorkShopProduceTopData({ wkshopcode: this.wkshopcode.join(',') }).then(res => {
              this.tableDataCenterTop = res.data
              if (this.tableDataCenterTop.length > 11) {
              if (this.tableDataCenterTop.length > 22) {
                clearInterval(timer)
                this.getWorkShopProduceTopData()
              }
            })
          }
        }, this.tableDataCenterTop.length <= 11 ? 1000 * 15 : 200)
        }, this.tableDataCenterTop.length <= 22 ? 1000 * 15 : 200)
      })
    },
@@ -222,51 +222,51 @@
        this.wkshopcode = [code]
      }
      this.wkshopcode.forEach(i => {
        const aa = this.wkshopArr.find(j => j.torg_code === i).torg_name
        this.legendData.push(aa)
      })
      // this.wkshopcode.forEach(i => {
      //   const aa = this.wkshopArr.find(j => j.torg_code === i).torg_name
      //   this.legendData.push(aa)
      // })
      //
      // const res4 = await WorkShopProduceBottomLeftData({ wkshopcode: this.wkshopcode.join(',') })
      // this.cjzl03_xData = res4.data[this.wkshopcode[0]].map(i => i.click_date)
      // for (const res4Key in res4.data) {
      //   if (this.wkshopcode.includes(res4Key)) {
      //     const bb = res4.data[res4Key].map(i => i.count)
      //     this.cjzl03_yData.push(bb)
      //   }
      // }
      // loadEcharts('cjzl03', cjzl03_2(this.cjzl03_xData, this.legendData, this.cjzl03_yData, true))
      // setInterval(() => {
      //   WorkShopProduceBottomLeftData({ wkshopcode: this.wkshopcode.join(',') }).then(res4 => {
      //     this.cjzl03_yData = []
      //
      //     this.cjzl03_xData = res4.data[this.wkshopcode[0]].map(i => i.click_date)
      //     for (const res4Key in res4.data) {
      //       if (this.wkshopcode.includes(res4Key)) {
      //         const bb = res4.data[res4Key].map(i => i.count)
      //         this.cjzl03_yData.push(bb)
      //       }
      //     }
      //     loadEcharts('cjzl03', cjzl03_2(this.cjzl03_xData, this.legendData, this.cjzl03_yData, true))
      //   })
      // }, 1000 * 50)
      //
      // const res5 = await WorkShopProduceBottomRightData({ wkshopcode: this.wkshopcode.join(',') })
      // this.RightBottom = res5.data
      // if (this.RightBottom.length > 0) {
      //   loadEcharts('cjzl04', cjzl04(this.RightBottom.map(i => i.name), this.RightBottom.map(i => i.cont)))
      // }
      //
      // setInterval(() => {
      //   WorkShopProduceBottomRightData({ wkshopcode: this.wkshopcode.join(',') }).then(res5 => {
      //     this.RightBottom = res5.data
      //     if (this.RightBottom.length > 0) {
      //       loadEcharts('cjzl04', cjzl04(this.RightBottom.map(i => i.name), this.RightBottom.map(i => i.cont)))
      //     }
      //   })
      // }, 1000 * 60)
      const res4 = await WorkShopProduceBottomLeftData({ wkshopcode: this.wkshopcode.join(',') })
      this.cjzl03_xData = res4.data[this.wkshopcode[0]].map(i => i.click_date)
      for (const res4Key in res4.data) {
        if (this.wkshopcode.includes(res4Key)) {
          const bb = res4.data[res4Key].map(i => i.count)
          this.cjzl03_yData.push(bb)
        }
      }
      loadEcharts('cjzl03', cjzl03_2(this.cjzl03_xData, this.legendData, this.cjzl03_yData, true))
      setInterval(() => {
        WorkShopProduceBottomLeftData({ wkshopcode: this.wkshopcode.join(',') }).then(res4 => {
          this.cjzl03_yData = []
          this.cjzl03_xData = res4.data[this.wkshopcode[0]].map(i => i.click_date)
          for (const res4Key in res4.data) {
            if (this.wkshopcode.includes(res4Key)) {
              const bb = res4.data[res4Key].map(i => i.count)
              this.cjzl03_yData.push(bb)
            }
          }
          loadEcharts('cjzl03', cjzl03_2(this.cjzl03_xData, this.legendData, this.cjzl03_yData, true))
        })
      }, 1000 * 50)
      const res5 = await WorkShopProduceBottomRightData({ wkshopcode: this.wkshopcode.join(',') })
      this.RightBottom = res5.data
      if (this.RightBottom.length > 0) {
        loadEcharts('cjzl04', cjzl04(this.RightBottom.map(i => i.name), this.RightBottom.map(i => i.cont)))
      }
      setInterval(() => {
        WorkShopProduceBottomRightData({ wkshopcode: this.wkshopcode.join(',') }).then(res5 => {
          this.RightBottom = res5.data
          if (this.RightBottom.length > 0) {
            loadEcharts('cjzl04', cjzl04(this.RightBottom.map(i => i.name), this.RightBottom.map(i => i.cont)))
          }
        })
      }, 1000 * 60)
      this.getWorkShopProduceTopData()
      await this.getWorkShopProduceTopData()
    },
    // 获取当前时间
src/views/kanbanManager/ckgl.vue
@@ -53,15 +53,15 @@
                    <div class="ellipsis">{{ row.wo }}</div>
                  </template>
                </el-table-column>
                <el-table-column
                  prop="wkshp_name"
                  label="生产车间"
                  width="105"
                >
                  <template slot-scope="{row}">
                    <div class="ellipsis">{{ row.wkshp_name }}</div>
                  </template>
                </el-table-column>
                <!--                <el-table-column-->
                <!--                  prop="wkshp_name"-->
                <!--                  label="生产车间"-->
                <!--                  width="105"-->
                <!--                >-->
                <!--                  <template slot-scope="{row}">-->
                <!--                    <div class="ellipsis">{{ row.wkshp_name }}</div>-->
                <!--                  </template>-->
                <!--                </el-table-column>-->
                <el-table-column
                  prop="saleOrderCode"
                  label="销售订单号"
@@ -84,7 +84,7 @@
                <el-table-column
                  prop="materiel_name"
                  label="产品名称"
                  width="170"
                  width="275"
                >
                  <template slot-scope="{row}">
                    <div class="ellipsis">{{ row.materiel_name }}</div>
@@ -258,7 +258,7 @@
          <div style="height: 470px;">
            <div class="smallTitle">
              <svg-icon icon-class="ph" class="svg_class" />
              近一周采购待入库物料排行Top5
              近一月采购待入库物料排行Top5
            </div>
            <div class="lineContent horn" style="height: 410px">
              <div id="bar03" style="width: 100%;height:100%; " />
@@ -268,7 +268,7 @@
          <div style="height: 470px;margin-top: 30px;">
            <div class="smallTitle">
              <svg-icon icon-class="ph" class="svg_class" />
              近一周销售已发货产品排行Top5
              近一月销售已发货产品排行Top5
            </div>
            <div class="lineContent horn" style="height: 410px">
              <div id="bar04" style="width: 100%;height:100%;" />
src/views/kanbanManager/zhkb.vue
@@ -193,7 +193,7 @@
    async getAllApi() {
      // const { data: res } = await ShopSearch()
      const res = [
        { org_code: '2', org_name: '包装车间' }
        { org_code: '1', org_name: '包装车间' }
        // { org_code: '102', org_name: '挤出车间' }
      ]
      this.wkshopArr = res
src/views/workOrder/produceOrderList.vue
@@ -831,6 +831,10 @@
      }
      const res = await ErpOrderSearch(data)
      res.data.forEach(i => {
        i.planenddate = i.planenddate ? i.planenddate : handleDatetime(new Date())
        i.planstartdate = i.planstartdate ? i.planstartdate : handleDatetime(new Date())
      })
      this.tableData = res.data
      this.total = res.count
    },
src/views/workOrder/workOrderList.vue
@@ -8,11 +8,11 @@
          <el-button v-waves type="success" icon="el-icon-connection" @click="send">派发</el-button>
        </div>
        <el-button v-waves type="primary" @click="batchUpdate"><i
          class="el-icon-edit-outline"
          style="margin-right: 0;"
        /> 批量修改
        </el-button>
        <!--        <el-button v-waves type="primary" @click="batchUpdate"><i-->
        <!--          class="el-icon-edit"-->
        <!--          style="margin-right: 0;"-->
        <!--        /> 批量绑定-->
        <!--        </el-button>-->
      </div>
      <div class="bodyTopFormGroup">