Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2024-08-19 1d193f2cc23f54634ef8ed73c11436fbe76bb575

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

@@ -24,7 +24,8 @@

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

const {currentRoute} = useRouter()
@@ -34,15 +35,19 @@
if (merge == '') {
  merge = null
}
let like = props.printLike
if (like == '') {
  like = null
}
data.value.printList = JSON.parse(props.printList)
let flowCardCount = data.value.printList.length
onMounted(() => {
      request.post(`/processCard/getSelectPrinting/${merge}`, data.value).then((res) => {
  request.post(`/processCard/getSelectPrinRework/${merge}/${like}`, data.value).then((res) => {
        if (res.code == 200) {
          produceList.value = deepClone(res.data.data)
          //处理单片厚度

          for (let j = 0; j <  produceList.value.length; j++) {
          for (let j = 0; j < produceList.value.length; j++) {
            let sumWeight = 0
            produceList.value[j].detailList.forEach((item, index) => {
              // 解析 separation 字段的 JSON 字符串
@@ -54,12 +59,12 @@
              // 去除 'mm' 单位
              let thicknessWithoutUnit = thicknessValue.replace('mm', '');

              item.separation=thicknessWithoutUnit
              item.separation = thicknessWithoutUnit

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

            });
            produceList.value[j].detail[0].weight=sumWeight
            produceList.value[j].detail[0].weight = sumWeight
          }
          //处理合并打印
          if (printMerge !== null && printMerge !== undefined && printMerge !== "") {
@@ -69,26 +74,29 @@
            });

            //合并打印工艺流程处理
            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
              })
            }
            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 === '夹胶');
              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);
              if (getProceList !== -1) {
                // 使用 filter 方法过滤出 "夹胶" 及其之后的对象
                produceList.value[0].processList = indexOfProceList.filter((item, index) => index >= getProceList);
              }
            }
          }

          produceList.value.forEach(item =>{

          produceList.value.forEach(item => {
            let technologyNumberMerge = printMerge.split('').join(',');
            item.detail[0].technologyNumberMerge = technologyNumberMerge
          })
@@ -98,8 +106,8 @@
          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){
            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;
@@ -115,6 +123,7 @@
          }


          handleSummary()
          handleGetQRCode()
        } else {
          ElMessage.warning(res.msg)
@@ -182,10 +191,27 @@
    <table v-for="(item,id) in produceList" id="contentTable" :key="id">
      <thead>
      <tr v-for="(itemFlow,index) in item.detail" :key="index">
        <td colspan="24">
          <div style="float: left;"><input style="border: none;font-size: 28px;width: 70px  "/></div>
        <td  v-if="like='1'"  colspan="26">
          <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>{{ company.companyName }}</div>
          <div>生产流程卡</div>
          <div v-if="itemFlow.technologyNumberMerge!=''" style="text-align: right;font-weight: bolder">{{itemFlow.otherRemarks}}&nbsp;&nbsp;
            流程卡号： {{
              itemFlow.process_id
            }}/{{ itemFlow.technologyNumberMerge }} 共 {{ flowCardCount }} 架
          </div>
          <div v-else style="text-align: right;font-weight: bolder">
            {{itemFlow.otherRemarks}}&nbsp;&nbsp;
            流程卡号： {{
              itemFlow.process_id
            }}/{{ itemFlow.technologyNumber }} 共 {{ flowCardCount }} 架
          </div>
        </td>
        <td v-else colspan="24">
          <div style="float: left;"><input style="border: none;font-size: 28px;width: 70px  "/></div>
          <div id="bj" style="float: right;font-size: 28px">{{ id + 1 }}</div>
          <div>{{ company.companyName }}</div>
          <div>生产流程卡</div>
          <div v-if="itemFlow.technologyNumberMerge!=''" style="text-align: right;font-weight: bolder">流程卡号： {{
              itemFlow.process_id
@@ -203,7 +229,8 @@
        <td class="tdNowrap">项目名称：</td>
        <td colspan="2">{{ items.project }}</td>
        <td class="tdNowrap">工艺流程：</td>
        <td colspan="17" style="width: 500px">{{ items.process }}</td>
        <td colspan="19" v-if="like='1'" style="width: 500px">{{ items.process }}</td>
        <td colspan="17" v-else style="width: 500px">{{ items.process }}</td>
      </tr>
      <tr v-for="(itemTr,index) in item.detail" :key="index">
        <td class="tdNowrap">磨边类型：</td>
@@ -211,11 +238,14 @@
        <td class="tdNowrap">单片名称：</td>
        <td colspan="2">{{ itemTr.glass_child }}</td>
        <td class="tdNowrap">产品名称：</td>
        <td colspan="17">{{ itemTr.product_name }}</td>
        <td v-if="like=='1'" colspan="19">{{ itemTr.product_name }}</td>
        <td v-else colspan="17">{{ itemTr.product_name }}</td>
      </tr>
      <tr>
        <td rowspan='2'>序号</td>
        <td rowspan='2'>编号</td>
        <td v-if="like!=null" rowspan="2">小片顺序</td>
        <td v-else style="display: none;" rowspan="2">小片顺序</td>
        <td rowspan='2'>宽*高</td>
        <td rowspan='2'>数量</td>
        <td rowspan='2'>面积</td>
@@ -226,31 +256,35 @@
      </tr>
      <tr>

        <td>{{company.printLabel.printFlowCard.patch}}</td>
        <td>{{company.printLabel.printFlowCard.lackOf}}</td>
        <td>{{company.printLabel.printFlowCard.patch}}</td>
        <td>{{company.printLabel.printFlowCard.lackOf}}</td>
        <td>{{company.printLabel.printFlowCard.patch}}</td>
        <td>{{company.printLabel.printFlowCard.lackOf}}</td>
        <td>{{company.printLabel.printFlowCard.patch}}</td>
        <td>{{company.printLabel.printFlowCard.lackOf}}</td>
        <td>{{company.printLabel.printFlowCard.patch}}</td>
        <td>{{company.printLabel.printFlowCard.lackOf}}</td>
        <td>{{company.printLabel.printFlowCard.patch}}</td>
        <td>{{company.printLabel.printFlowCard.lackOf}}</td>
        <td>{{company.printLabel.printFlowCard.patch}}</td>
        <td>{{company.printLabel.printFlowCard.lackOf}}</td>
        <td>{{company.printLabel.printFlowCard.patch}}</td>
        <td>{{company.printLabel.printFlowCard.lackOf}}</td>
        <td>{{ company.printLabel.printFlowCard.patch }}</td>
        <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
        <td>{{ company.printLabel.printFlowCard.patch }}</td>
        <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
        <td>{{ company.printLabel.printFlowCard.patch }}</td>
        <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
        <td>{{ company.printLabel.printFlowCard.patch }}</td>
        <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
        <td>{{ company.printLabel.printFlowCard.patch }}</td>
        <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
        <td>{{ company.printLabel.printFlowCard.patch }}</td>
        <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
        <td>{{ company.printLabel.printFlowCard.patch }}</td>
        <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
        <td>{{ company.printLabel.printFlowCard.patch }}</td>
        <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
      </tr>
      </thead>
      <tbody>

      <tr v-for="(itemDatile,index) in item.detailList" :key="index">
        <td>{{ itemDatile.order_number }}</td>
        <td>{{itemDatile.s01Value}}</td>
        <td>{{ itemDatile.s01Value }}</td>
        <td v-if="like=='1'">{{ itemDatile.technology_number }}</td>
        <td v-else style="display: none"></td>
        <td>{{ itemDatile.child_width }}</td>
        <td class="item" style="width: 5%;height: 100%;"><el-input @keyup="handleSummary()" style="border: none" v-model="itemDatile.quantity"></el-input></td>
        <td class="item" style="width: 5%;height: 100%;">
          <el-input v-model="itemDatile.quantity" style="border: none" @keyup="handleSummary()"></el-input>
        </td>
        <td>{{ itemDatile.total_area }}</td>
        <td>{{ itemDatile.perimeter }}</td>
        <td>{{ itemDatile.bend_radius }}</td>
@@ -275,7 +309,7 @@
      </tbody>
      <tfoot>
      <tr style="height: 14px">
        <td v-for="(itemsum,index) in item.detail" :key="index" colspan="24">
        <td v-for="(itemsum,index) in item.detail" :key="index" colspan="26">
          数量：
          <label>{{ itemsum.quantity }}</label>
          面积：
@@ -285,15 +319,17 @@
        </td>
      </tr>
      <tr v-for="(itemtextarea,index) in item.detail" :key="index">
        <td colspan="6" rowspan="6" style="width: 480px;height: 100px ">
          <!--          <div style="width: 100%;height: 100%"><textarea style="height: 99%;width: 99%;font-size: 11px">{{ itemtextarea.processing_note }}</textarea>-->
          <!--          </div>-->
          <div style="width: 100%;height: 100%;"><textarea style="height: 99%;width: 99%;border: none;;font-size: 11px">{{company.printLabel.printFlowCard.processingNote(itemtextarea)}}</textarea>
        <td colspan="4" rowspan="5" style="width: 480px;height: 100px ">
          <div>
            次破类型：{{itemtextarea.breakage_type}}&nbsp;
            次破原因：{{itemtextarea.breakage_reason}}&nbsp;
            责任工序：{{itemtextarea.responsible_process}}&nbsp;
            责任班组：{{itemtextarea.responsible_team}}
          </div>
        </td>
        <td>完工签名</td>
        <td></td>

        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
@@ -305,8 +341,8 @@
      </tr>
      <tr>
        <td>生产日期</td>
        <td></td>

        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
@@ -318,8 +354,8 @@
      </tr>
      <tr>
        <td>质检签名</td>
        <td></td>

        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
@@ -330,7 +366,7 @@
        <td colspan="2"></td>
      </tr>
      <tr v-for="(qrCodeItem,index) in item.detail" :key="index">
        <td colspan="19">
        <td colspan="23">
          <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;">