Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyuji

2025-02-10 ec147c86b53a217cb034682d7e454a6eacda3aaa

Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

 north-glass-erp/northglass-erp/src/components/pp/PrintProcessStraight.vue

New file
@@ -0,0 +1,474 @@
<script setup>
import request from "@/utils/request"
import {ElDatePicker, ElMessage} from "element-plus"
import {nextTick, onMounted, onUnmounted, reactive, ref, watch} from "vue"
import {Search} from "@element-plus/icons-vue"
import {useRouter} from 'vue-router'
import {changeFilterEvent, filterChanged} from "@/hook"
import {useI18n} from 'vue-i18n'
import deepClone from "@/utils/deepClone";
import QRCode from "qrcode";
import companyInfo from "@/stores/sd/companyInfo";
import userInfo from "@/stores/userInfo"
import {add} from '@/utils/decimal'
//语言获取
const company = companyInfo()
const {t} = useI18n()
let router = useRouter()
let produceList = ref([])
let list = ref()
const details = ref([])
const user=userInfo()

let totalQuantity = 0;  // 用于记录总数量
let totalArea = 0;      // 用于记录总面积

const data = ref({
  printList: []
})

let props = defineProps({
  printList: null,
  printMerge: null,
  printLike: null,
  printProject:null
})

const {currentRoute} = useRouter()
const route = currentRoute.value
const printMerge = props.printMerge
const printProject = props.printProject

//打印时间
const currentTime = new Date();
const formattedTime = currentTime.getFullYear()
    + '-' + (currentTime.getMonth() + 1) + '-'
    + currentTime.getDate() + ' ' + currentTime.getHours() + ':'
    + currentTime.getMinutes();formattedTime

let merge = props.printMerge
if (merge == '') {
  merge = null
}
let like = props.printLike
if (like == '') {
  like = null
}
let name=company.companyName
data.value.printList = JSON.parse(props.printList)
let flowCardCount = ''
onMounted(() => {
      if(props.printProject!=null){
        request.post(`/processCard/getSelectPrintProject/${printProject}`).then((res) => {
          if (res.code == 200) {
            load(res.data.data)
            console.log(res.data)
          } else {
            ElMessage.warning(res.msg)
            router.push("/login")
          }
        })
      }else{
        request.post(`/processCard/getSelectPrinting/${merge}/${like}`, data.value).then((res) => {
          if (res.code == 200) {
            load(res.data.data)
          } else {
            ElMessage.warning(res.msg)
            router.push("/login")
          }
        })
      }


    }
)


const handleGetQRCode = async () => {
  let technologyNumber=''
  for (let i = 0; i < produceList.value.length; i++) {
    if (produceList.value[i].detail[0].qrcode!="" && produceList.value[i].detail[0].qrcode!=null){
      technologyNumber = produceList.value[i].detail[0].qrcode.toString(); // 转换为字符串以便处理每个字符,合并标签
    }else {
      technologyNumber = produceList.value[i].detail[0].technologyNumber.toString(); // 转换为字符串以便处理每个字符
    }
    produceList.value[i].detail[0]["qrcodeList"] = []; // 初始化一个空数组用来存储 QR Code

    const processId = produceList.value[i].detail[0].process_id;
    const url = `${processId}/${technologyNumber}`
    // 生成 QR Code 并存储到数组中
    const qrcodeData = await QRCode.toDataURL(url);
    produceList.value[i].detail[0]["qrcodeList"].push({
      qrcode: qrcodeData,
      technologyNumber: technologyNumber
    });

    // for (let j = 0; j < technologyNumber.length; j++) {
    //   const processId = produceList.value[i].detail[0].process_id;
    //   const url = `${processId}/${technologyNumber[j]}`;
    //   // 生成 QR Code 并存储到数组中
    //   const qrcodeData = await QRCode.toDataURL(url);
    //   produceList.value[i].detail[0]["qrcodeList"].push({
    //     qrcode: qrcodeData,
    //     technologyNumber: technologyNumber[j]
    //   });
    //
    // }
  }
};


//根据输入的数量重新汇总
const handleSummary = () => {
  for (let i = 0; i < produceList.value.length; i++) {
    //数量
    let totalQuantity = 0;
    //面积
    let totalArea = 0;
    //重量
    let totalWeight = 0;
    // 对每个集合中的 detailList 进行计算
    produceList.value[i].detailList.forEach(collection => {
      totalQuantity += collection.quantity * 1;
      //每个序号面积
      collection.total_area = parseFloat((collection.width * collection.height * collection.quantity / 1000000).toFixed(2))
      totalArea = add(totalArea, collection.total_area)
      totalWeight += collection.width * collection.height * collection.quantity / 1000000 * collection.separation * 2.5 * 1;
      //每个序号周长
      collection.perimeter = parseFloat(((collection.width * 2 + collection.height * 2) * collection.quantity / 1000).toFixed(3))
    });
    // 输出每个集合中的总数量
    produceList.value[i].detail[0].quantity = totalQuantity
    produceList.value[i].detail[0].gross_area = totalArea
    produceList.value[i].detail[0].weight = totalWeight
  }
}


const load = (data) => {
  produceList.value = deepClone(data)
  //处理单片厚度

  for (let j = 0; j < produceList.value.length; j++) {
    let sumWeight = 0
    produceList.value[j].detailList.forEach((item, index) => {
      // 解析 separation 字段的 JSON 字符串
      let separationObj = JSON.parse(item.separation);

      // 获取 thickness 的原始值
      let thicknessValue = separationObj.thickness;

      // 去除 'mm' 单位
      let thicknessWithoutUnit = thicknessValue.replace('mm', '');

      item.separation = thicknessWithoutUnit

      sumWeight += item.width * item.height * item.quantity / 1000000 * item.separation * 2.5 * 1;

    });
    produceList.value[j].detail[0].weight = sumWeight
  }
  //处理合并打印
  if (printMerge !== null && printMerge !== undefined && printMerge !== "") {

    produceList.value.forEach(item => {
      item.detail[0].technologyNumber = printMerge;
    });

    //合并打印工艺流程处理
    if (like == null) {
      let process = produceList.value[0].detail[0].process
      let indexOfJiaJiao = process.indexOf('夹胶');
      if (indexOfJiaJiao !== -1) {
        // 使用 substring 截取 "夹胶" 后面的部分，包括 "夹胶" 本身
        let afterJiaJiao = process.substring(indexOfJiaJiao).trim();
        produceList.value.forEach(item => {
          item.detail[0].process = afterJiaJiao
        })
      }

      let indexOfProceList = produceList.value[0].processList
      let getProceList = indexOfProceList.findIndex(item => item.process === '夹胶');

      if (getProceList !== -1) {
        // 使用 filter 方法过滤出 "夹胶" 及其之后的对象
        produceList.value[0].processList = indexOfProceList.filter((item, index) => index >= getProceList);
      }
    }
  }


  // produceList.value.forEach(item => {
  //   let technologyNumberMerge = printMerge.split('').join(',');
  //   item.detail[0].technologyNumberMerge = technologyNumberMerge
  // })
  //处理编号列
  //定义存放编号数组
  const s01Values = [];
  for (let i = 0; i < produceList.value.length; i++) {
    const s01Values = [];
    // 遍历 detailList 数组，提取 S01 值到 s01Values 数组
    if (produceList.value[i].detailList[0].other_columns != null
        || produceList.value[i].detailList[0].other_columns != undefined) {
      produceList.value[i].detailList.forEach(element => {
        const otherColumnsObject = JSON.parse(element.other_columns);
        const s01Value = otherColumnsObject.S01;
        s01Values.push(s01Value || ''); // 如果 S01 值为空，添加空字符串或者其他默认值
      });

      // 将 s01Values 中的值赋给每个订单详情对象的 s01Value 属性
      produceList.value[i].detailList.forEach((detail, index) => {
        detail.s01Value = index < s01Values.length ? s01Values[index] : ''; // 赋值给 s01Value 属性
      });
    }

  }
  //处理同配置打印
  handleGetQRCode()
  handleSummary()
  AreaQuantitySummary()
}

const AreaQuantitySummary = () => {

  for (let i = 0; i < produceList.value.length; i++) {
    // 遍历当前项目的 detail 数组
    for (let j = 0; j < produceList.value[i].detail.length; j++) {
      // 累加数量
      totalQuantity = add(totalQuantity,produceList.value[i].detail[j].quantity)
      // 累加面积
      totalArea = add(totalArea,produceList.value[i].detail[j].gross_area)
    }
  }

}
</script>

<template>
  <!--  <el-button id="printButton" @click="printFlowCard();">{{ $t('basicData.print') }}</el-button>-->
  <div id="printFlowCard">
    <table v-for="(item,id) in produceList" id="contentTable" :key="id" style="border-bottom: none">
      <thead>
      <tr v-for="(itemFlow,index) in item.detail" :key="index">
        <td  colspan="31">
          <div style="float: left;"><input style="border: none;font-size: 28px;width: 70px;margin: 5px  "/></div>
          <div id="bj" style="float: right;font-size: 28px">{{ id + 1 }}</div>
          <div>{{ company.companyName }}</div>
          <div>生产流程卡<span style="font-weight: bold" v-if="printProject!=null">({{ printProject }})</span></div>
          <div  style="font-weight: bolder;display: flex;justify-content:space-between">
            <div>
              打印人：{{user.user.userName}} &nbsp;&nbsp;
              时间：{{formattedTime}}
              &nbsp;&nbsp;
            </div>
            <div>
              流程卡号： {{
                itemFlow.process_id
              }}/{{ itemFlow.technologyNumber }} 共 {{ item.count }} 架
            </div>
          </div>
        </td>
      </tr>
      <tr v-for="(items,index) in item.detail" :key="index">
        <td class="tdNowrap">客户名称：</td>
        <td colspan="1" style="width: 200px;font-size: 17px">{{ items.customer_name }}</td>
        <td class="tdNowrap">磨边类型：</td>
        <td colspan="1" style="min-width: 100px">{{ items.edging_type }}</td>
        <td class="tdNowrap">工艺流程：</td>
        <td :colspan="1+item.processList.length*1"  style="width: 500px">{{ items.process }}</td>
      </tr>
      <tr v-for="(itemTr,index) in item.detail" :key="index">
        <td class="tdNowrap">项目名称：</td>
        <td colspan="1" style="font-size: 17px">{{ itemTr.project }}</td>
        <td class="tdNowrap">单片名称：</td>
        <td colspan="1">{{ itemTr.glass_child }}</td>
        <td class="tdNowrap">产品名称：</td>
        <td :colspan="1+item.processList.length*1">{{ itemTr.product_name }}</td>
      </tr>
      <tr>
        <td rowspan='2'>序号</td>
        <td rowspan='2' >宽*高</td>
        <td rowspan='2' >数量</td>
        <td rowspan='2'>备注</td>
        <td rowspan='2'>面积</td>
        <td v-for="(itemPr,index) in item.processList" :key="index" colspan="1">{{ itemPr.process }}</td>
      </tr>
      <tr>
        <template v-for=" n in item.processList.length">
          <td>{{ company.printLabel.printFlowCard.patch }}</td>
        </template>
      </tr>
      </thead>
      <tbody>

      <tr v-for="(itemDatile,index) in item.detailList" :key="index">
        <td>{{ itemDatile.order_number }}</td>
        <td style="font-size: 20px">{{ itemDatile.child_width }}</td>
        <td class="item" style="width: 60px;height: 100%">
          <input v-model="itemDatile.quantity" style="width: 100%;height: 100%;font-size: 17px"  @keyup="handleSummary()"/>
        </td>
        <td>{{ itemDatile.remarks }}</td>
        <td>{{ itemDatile.total_area }}</td>
        <template v-for=" n in item.processList.length">
          <td></td>
        </template>
      </tr>
      <tr style="height: 14px">
        <td v-for="(itemsum,index) in item.detail" :key="index" colspan="31">
          数量：
          <label>{{ itemsum.quantity }}</label>
          面积：
          <label>{{ itemsum.gross_area }}</label>
        </td>
      </tr>
      <tr v-for="(itemtextarea,index) in item.detail" :key="index">

        <td>完工签名</td>
        <td colspan="1"></td>
        <td colspan="1"></td>
        <td colspan="1"></td>
        <td colspan="1"></td>
        <template v-for=" n in item.processList.length">
          <td></td>
        </template>
      </tr>
      <tr>
        <td>生产日期</td>
        <td colspan="1"></td>
        <td colspan="1"></td>
        <td colspan="1"></td>
        <td colspan="1"></td>
        <template v-for=" n in item.processList.length">
          <td></td>
        </template>
      </tr>


      <tr v-for="(qrCodeItem,index) in item.detail" :key="index">
        <td colspan="31">
          <span style="display: flex;">
            <span v-for="(qrCodeItems,index) in qrCodeItem.qrcodeList" :key="index" style="display: flex;width: 35%">
            <div class='qrCode' style="width: 80px;height: 80px;">
            <img style="width: 97%;height: 97%;margin-top: 1px" :src=qrCodeItems.qrcode>
          </div>
          <span style="float: left;font-weight: bolder">{{
              qrCodeItem.process_id + "/" + qrCodeItems.technologyNumber
            }}</span>
          </span>
          </span>
        </td>

      </tr>
      </tbody>
      <tfoot>

      <tr v-for="(itemtextareas,index) in item.detail" :key="index">
        <td  colspan="31"  style="width: 480px;height: 150px ">
          <div style="width: 99%;height: 99%;text-align: left;margin-left: 10px"><textarea style="height: 99%;width: 99%;border: none;;font-size: 14px;overflow: hidden;text-align: left;vertical-align: middle">{{itemtextareas.processing_note}}</textarea>
          </div>
        </td>
      </tr>
      <tr style="border-bottom: none">
        <td colspan="31" style="text-align: left;border-bottom: none;">
          <div>
            <span>质检签名：</span>
            <span style="margin-left: 300px">生产签名：</span>
          </div>
        </td>
      </tr>
      </tfoot>
    </table>

  </div>

</template>

<style scoped>
* {
  margin: 0;
  padding: 0;
}

td,input{
  text-align: center;
}

#printFlowCard {
  text-align: center;
//font-weight: bolder; height: 600px;
}

#contentTable {
  border-collapse: collapse;
  border: 1px solid black;
  width: 100%;
}

#contentTable thead {
  font-size: 13px;
  font-weight: bolder;
}

#contentTable thead div {
  font-size: 15px;
  font-weight: bolder;
}

#contentTable tr td {
  border: 1px solid black;
  height: 18px;
  font-weight: bolder;
}

#contentTable tbody {
  white-space: nowrap;
}

.tdNowrap {
  white-space: nowrap;
}

#contentTable tfoot {
  font-size: 12px;
  font-weight: bolder;
}

input{
  border: none;
  background: none;
}

.nuber_xx span{
  font-size: 12px;
}


@media print {
    @page {
      margin: 10mm 10mm 5mm 10mm !important;
    }


  table {
    page-break-before: always;
    page-break-inside: auto;
  }

  thead {
    display: table-header-group;
    page-break-inside: avoid;
  }

  tfoot {
    display: table-footer-group;
    page-break-inside: avoid;
  }
}

.qrCode img {
  width: 100%;
  height: 100%;
}


</style>

 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue

@@ -10,6 +10,7 @@
import {VXETable} from "vxe-table";
import {addListener, toolbarButtonClickEvent} from "@/hook/mouseMove";
import PrintProcess from '@/components/pp/PrintProcess.vue'
import PrintProcessStraight from '@/components/pp/PrintProcessStraight.vue'
import PrintLabel from '@/views/pp/processCard/PrintLabel.vue'
import PrintCustomLabel from '@/components/pp/PrintCustomLabel.vue'
import PrintCustomLabelXJ from '@/components/pp/PrintCustomLabelXJ.vue'
@@ -33,6 +34,7 @@
const dialogTableVisibleLabel = ref(false)
const dialogTableVisibleLabelXJ = ref(false)
const dialogTableVisibleCustomLabel = ref(false)
const dialogTableVisibleStraight = ref(false)
const printVisible = ref(false)
let selectRecords = ref(null)
let titleStyleVisible = ref(false)
@@ -399,7 +401,12 @@
          printRow.value.printMergeVal = printMerge.value
          printRow.value.like = null
          // router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords),printMerge:printMergeVal}})
          dialogTableVisible.value = true
          if(company.companyName=='常州市吉利玻璃有限公司'){
            dialogTableVisibleStraight.value = true
          }else{
            dialogTableVisible.value = true
          }

          break
        }

@@ -576,7 +583,11 @@
          printRow.value.printMergeVal = printMerge.value
          printRow.value.like = "1"
          // router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords),printMerge:printMergeVal}})
          dialogTableVisible.value = true
          if(company.companyName=='常州市吉利玻璃有限公司'){
            dialogTableVisibleStraight.value = true
          }else{
            dialogTableVisible.value = true
          }
          break
        }
        case 'sortTable': {
@@ -759,6 +770,23 @@
          style="width: 100%;height: 100%"/>
    </el-dialog>

    <el-dialog
        id="sizePrintCalrd"
        v-model="dialogTableVisibleStraight"
        :title="$t('processCard.print')"
        destroy-on-close
        style="width: 75%;height:75% ">
      <template #header="{ close, titleId, titleClass }">
        <el-button v-print="printContent" :icon="Printer" circle @click="printNumber"/>
      </template>
      <print-process-straight
          id="child"
          :printLike="printRow.like"
          :printList="printRow.list"
          :printMerge="printRow.printMergeVal"
          style="width: 100%;height: 100%"/>
    </el-dialog>

    <!--    成品标签-->
    <el-dialog
        id="sizeCustom"

 north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue

@@ -14,12 +14,14 @@
import companyInfo from "@/stores/sd/companyInfo"
import {remove} from "xe-utils";
import PrintProcess from "@/components/pp/PrintProcess.vue";
import PrintProcessStraight from "@/components/pp/PrintProcessStraight.vue";
//语言获取
const {t} = useI18n()

let router = useRouter()
const dialogTableVisible = ref(false)
const dialogTableVisibleLabelXJTwo = ref(false)
const dialogTableVisibleStraight = ref(false)
let rowClickIndex = ref(null)


@@ -79,7 +81,11 @@
    }
    case 'edit3' :{
      printRow.value.project=row.project_no
      dialogTableVisible.value = true
      if(company.companyName=='常州市吉利玻璃有限公司'){
        dialogTableVisibleStraight.value = true
      }else{
        dialogTableVisible.value = true
      }
    }
  }
}
@@ -455,6 +461,24 @@
          :printProject="printRow.project"
          style="width: 100%;height: 100%"/>
    </el-dialog>

    <el-dialog
        id="sizePrintCalrd"
        v-model="dialogTableVisibleStraight"
        :title="$t('processCard.print')"
        destroy-on-close
        style="width: 75%;height:75% ">
      <template #header="{ close, titleId, titleClass }">
        <el-button v-print="printContent" :icon="Printer" circle @click="printNumber"/>
      </template>
      <print-process-straight
          id="child"
          :printLike="printRow.like"
          :printList="printRow.list"
          :printMerge="printRow.printMergeVal"
          :printProject="printRow.project"
          style="width: 100%;height: 100%"/>
    </el-dialog>
  </div>
</template>

@@ -481,4 +505,5 @@
  overflow-y: auto;
}


</style>

 north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue

@@ -705,7 +705,8 @@
          </el-row>

        </div>

        <div style="position: absolute;left: 405px;top: 115px;color: red">{{$t('order.width')}}</div>
        <div style="position: absolute;left: 200px;top: 250px;color: red">{{$t('order.height')}}</div>


      </div>

 north-glass-erp/northglass-erp/src/views/sd/product/CreateProduct.vue

@@ -766,7 +766,7 @@
          </el-col>
          <el-col :span="20">
            <div class="grid-content ep-bg-purple" >
              <el-input :value="productName" size="large" disabled  />
              <el-input :value="productName" size="large" readonly  />
            </div>
          </el-col>
        </el-row>