From 3abdf1e1c92438d8e2986b0a2cf89a1d83477d43 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期二, 17 六月 2025 16:21:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/dnc/base/modules/ProductStructure/GuideCardBatch/KnifeListPrintModal.vue | 158 ++++++++++++----------------------------------------
1 files changed, 38 insertions(+), 120 deletions(-)
diff --git a/src/views/dnc/base/modules/ProductStructure/GuideCardBatch/KnifeListPrintModal.vue b/src/views/dnc/base/modules/ProductStructure/GuideCardBatch/KnifeListPrintModal.vue
index 173cc7f..5890c50 100644
--- a/src/views/dnc/base/modules/ProductStructure/GuideCardBatch/KnifeListPrintModal.vue
+++ b/src/views/dnc/base/modules/ProductStructure/GuideCardBatch/KnifeListPrintModal.vue
@@ -5,60 +5,60 @@
<div class="table-header">
<h3>鍒�鍏锋竻鍗�</h3>
<div>
- <div>鍗曚綅锛�<span>鏈哄姞涓績</span></div>
- <div>缂栧彿锛�<span>25-C140-PST-293</span></div>
+ <div>鍗曚綅锛�<span>{{detail.unit}}</span></div>
+ <div>缂栧彿锛�<span>{{detail.serialNumber}}</span></div>
</div>
</div>
<table border="1">
<tr>
<th colspan="2">绋嬪簭澶栭儴鏂囦欢鍚�</th>
- <td colspan="9">TY9F-11-2507-002-TY9F1W0130-30-3</td>
+ <td colspan="9">{{detail.docName}}</td>
</tr>
<tr>
<th colspan="2">闆朵欢鍥惧彿</th>
- <td colspan="5">TY9F-11-2507-002-TY9F1W0130</td>
+ <td colspan="5">{{detail.partsCode}}</td>
<th>闆朵欢鍚嶇О</th>
- <td colspan="3">杞帴澶�</td>
+ <td colspan="3">{{detail.partsName}}</td>
</tr>
<tr>
<th colspan="2">闆朵欢鏉愭枡</th>
- <td colspan="3">閽㈡</td>
+ <td colspan="3">{{detail.materielDesp}}</td>
<th colspan="2">澶瑰叿</th>
<td colspan="4">{{detail.fixtureInformation}}</td>
</tr>
<tr>
<th colspan="2">宸ュ簭锛堝伐姝ュ彿锛�</th>
- <td>30-3</td>
+ <td>{{detail.processWorkCode}}</td>
<th colspan="2">鍔犲伐鎵规</th>
- <td colspan="2">S2501</td>
+ <td colspan="2">{{detail.processingBatch}}</td>
<th>鍔犲伐鏁伴噺</th>
- <td>20</td>
+ <td>{{detail.processingQuantity}}</td>
<th>鍔犲伐璁惧</th>
- <td>3140123</td>
+ <td>{{detail.processingEquipment}}</td>
</tr>
<tr>
- <th colspan="2">鍒�浣嶅彿</th>
- <th>鍒�鍏锋弿杩�</th>
- <th colspan="2">鏈�鐭伐浣滈暱搴�</th>
<th colspan="2">鍒�鍏风紪鍙�</th>
- <th>瑙勬牸</th>
- <th>搴撲綅</th>
- <th colspan="2">澶囨敞</th>
+ <th>鍒�鍏峰悕绉�</th>
+ <th colspan="2">鍒�鍏风畝绉�</th>
+ <th colspan="2">鍒�鍏疯鏍�</th>
+ <th>鍒�浣�</th>
+ <th>鍒�鍏锋暟閲�</th>
+ <th colspan="2">鎻忚堪</th>
</tr>
<tr v-for="item in knifeList" :key="item.knifeId">
- <td colspan="2">{{item.knifeNo}}</td>
- <td>{{item.knifeDescription}}</td>
- <td colspan="2">{{item.minWorkLength}}</td>
- <td colspan="2">{{item.knifeId}}</td>
- <td>{{item.spec}}</td>
- <td>{{item.position}}</td>
- <td colspan="2">{{item.remark}}</td>
+ <td colspan="2">{{item.cutterCode}}</td>
+ <td>{{item.cutterName}}</td>
+ <td colspan="2">{{item.cutterType}}</td>
+ <td colspan="2">{{item.cutterSpec}}</td>
+ <td>{{item.cutterSpacing}}</td>
+ <td>{{item.quantity}}</td>
+ <td colspan="2">{{item.description}}</td>
</tr>
</table>
</div>
@@ -70,114 +70,32 @@
</template>
<script>
+ import { getAction } from '@api/manage'
+
export default {
name: 'KnifeListPrintModal',
data() {
return {
visible: false,
detail: {},
- knifeList: [
- {
- knifeNo: '1',
- knifeDescription: '8E',
- minWorkLength: '35',
- knifeId: 'Q20110211',
- spec: '',
- position: '05070201',
- remark: ''
- },
- {
- knifeNo: '2',
- knifeDescription: '6E',
- minWorkLength: '35',
- knifeId: 'Q20110212',
- spec: '',
- position: '05070202',
- remark: ''
- },
- {
- knifeNo: '5',
- knifeDescription: '6R',
- minWorkLength: '20',
- knifeId: 'Q20110213',
- spec: '',
- position: '05070203',
- remark: ''
- },
- {
- knifeNo: '1',
- knifeDescription: '8E',
- minWorkLength: '35',
- knifeId: 'Q20110214',
- spec: '',
- position: '05070201',
- remark: ''
- },
- {
- knifeNo: '2',
- knifeDescription: '6E',
- minWorkLength: '35',
- knifeId: 'Q20110215',
- spec: '',
- position: '05070202',
- remark: ''
- },
- {
- knifeNo: '5',
- knifeDescription: '6R',
- minWorkLength: '20',
- knifeId: 'Q20110216',
- spec: '',
- position: '05070203',
- remark: ''
- },
- {
- knifeNo: '1',
- knifeDescription: '8E',
- minWorkLength: '35',
- knifeId: 'Q20110217',
- spec: '',
- position: '05070201',
- remark: ''
- },
- {
- knifeNo: '2',
- knifeDescription: '6E',
- minWorkLength: '35',
- knifeId: 'Q20110218',
- spec: '',
- position: '05070202',
- remark: ''
- },
- {
- knifeNo: '5',
- knifeDescription: '6R',
- minWorkLength: '20',
- knifeId: 'Q20110219',
- spec: '',
- position: '05070203',
- remark: ''
- },
- {
- knifeNo: '1',
- knifeDescription: '8E',
- minWorkLength: '35',
- knifeId: 'Q20110220',
- spec: '',
- position: '05070201',
- remark: ''
- }
- ]
+ knifeList: [],
+ url:{
+ getByBusinessId: '/nc/cutter/getList'
+ }
}
},
methods: {
- getImageUrl(imgSrcSuffix) {
- return `${window._CONFIG['domianURL']}/${imgSrcSuffix}`
- },
-
handleCancel() {
this.visible = false
- }
+ },
+ handleCutter(docId){
+ getAction(this.url.getByBusinessId,{docId:docId}).then((res)=>{
+ if(res.success){
+ this.knifeList = res.result
+ this.visible = true
+ }
+ })
+ },
}
}
</script>
--
Gitblit v1.9.3