guoyuji
2025-02-08 cfe06a58222e31e83667500fcda085fdb76470a3
Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
3个文件已修改
12 ■■■■■ 已修改文件
north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/components/pp/PrintReworkProcess.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
@@ -266,7 +266,7 @@
              </span>
            </div>
            <div>
              <span v-if="name!='金华福喜天成玻璃有限公司'" style="font-size: 10px">{{itemFlow.otherRemarks}}</span>&nbsp;&nbsp;
              <span v-if="name=='天津北玻玻璃工业技术有限公司(TJBB-QR7.1-01)'" style="font-size: 10px">{{itemFlow.otherRemarks}}</span>&nbsp;&nbsp;
              流程卡号: {{
                itemFlow.process_id
              }}/{{ itemFlow.technologyNumber }} 共 {{ item.count }} 架
north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue
@@ -52,6 +52,7 @@
}
data.value.printList = JSON.parse(props.printList)
let name=company.companyName
//去除重复对象
// let uniqueObjects = {};
// // 遍历原始数据数组
@@ -249,7 +250,7 @@
              时间:{{formattedTime}}
            </div>
            <div>
              <span style="font-size: 10px">{{itemFlow.otherRemarks}}</span>&nbsp;&nbsp;
              <span v-if="name=='天津北玻玻璃工业技术有限公司(TJBB-QR7.1-01)'" style="font-size: 10px">{{itemFlow.otherRemarks}}</span>
              流程卡号: {{
                itemFlow.process_id
              }}/{{ itemFlow.technologyNumber }} 共 {{ item.count }} 架
@@ -281,7 +282,7 @@
        <td rowspan='2'>数量</td>
        <td rowspan='2'>面积</td>
        <td rowspan='2'>周长</td>
        <td rowspan='2'>半径</td>
        <td rowspan='2'>半径/备注</td>
        <td rowspan='2'>类型</td>
        <td rowspan='2'>原因</td>
        <td rowspan='2'>工序</td>
north-glass-erp/northglass-erp/src/components/pp/PrintReworkProcess.vue
@@ -41,6 +41,7 @@
if (like == '') {
  like = null
}
let name=company.companyName
data.value.printList = JSON.parse(props.printList)
let flowCardCount = data.value.printList.length
onMounted(() => {
@@ -204,7 +205,7 @@
              打印人:{{user.user.userName}}
            </div>
            <div>
              <span style="font-size: 10px">{{itemFlow.otherRemarks}}</span>&nbsp;&nbsp;
              <span v-if="name=='天津北玻玻璃工业技术有限公司(TJBB-QR7.1-01)'" style="font-size: 10px">{{itemFlow.otherRemarks}}</span>
              流程卡号: {{
                itemFlow.process_id
              }}/{{ itemFlow.technologyNumber }} 共 {{ item.count }} 架
@@ -236,7 +237,7 @@
        <td rowspan='2'>数量</td>
        <td rowspan='2'>面积</td>
        <td rowspan='2'>周长</td>
        <td rowspan='2'>半径</td>
        <td rowspan='2'>半径/备注</td>
        <td rowspan='2'>类型</td>
        <td rowspan='2'>原因</td>
        <td rowspan='2'>工序</td>