From d7c8e07d5e7dca7582f019fd4a8283a28f8fe027 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 10 九月 2024 10:26:38 +0800
Subject: [PATCH] 报工新增流程卡查询语句修改，一行两列打印标签修改
---
north-glass-erp/northglass-erp/src/components/pp/PrintReworkProcess.vue | 153 +++++++++++++++++++++++++++++++-------------------
1 files changed, 95 insertions(+), 58 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintReworkProcess.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintReworkProcess.vue
index 448eee5..7cf5cce 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintReworkProcess.vue
+++ b/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}}
+ 娴佺▼鍗″彿锛� {{
+ itemFlow.process_id
+ }}/{{ itemFlow.technologyNumberMerge }} 鍏� {{ flowCardCount }} 鏋�
+ </div>
+ <div v-else style="text-align: right;font-weight: bolder">
+ {{itemFlow.otherRemarks}}
+ 娴佺▼鍗″彿锛� {{
+ 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,18 @@
</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}}
+ 娆＄牬鍘熷洜锛歿{itemtextarea.breakage_reason}}
+ 璐ｄ换宸ュ簭锛歿{itemtextarea.responsible_process}}
+ 璐ｄ换鐝粍锛歿{itemtextarea.responsible_team}}
+ <span v-if="itemtextarea.responsible_personnel!=null">璐ｄ换淇℃伅锛歿{itemtextarea.responsible_personnel}}</span>
</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 +342,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 +355,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 +367,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;">
--
Gitblit v1.8.0