From c581a6c396f1b367fe132bc302d6337b1ff0ad6f Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 22 四月 2024 08:36:36 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override
---
north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue | 1
north-glass-erp/src/main/java/com/example/erp/tools/netty/MyWebSocketHandler.java | 1
north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue | 1
north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue | 2
north-glass-erp/target/classes/mapper/pp/FolwCard.xml | 83 ++
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue | 1256 ++++++++------------------------
north-glass-erp/src/main/java/com/example/erp/service/sd/ProductService.java | 1
north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java | 13
north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java | 1
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 83 ++
north-glass-erp/northglass-erp/src/views/sd/product/Test.vue | 1
north-glass-erp/northglass-erp/src/components/basic/BasicTable.vue | 1
north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDeliveryDetail.vue | 1
north-glass-erp/northglass-erp/src/views/RegisterView.vue | 1
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/TakeOutRecord.vue | 1
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue | 331 ++++++-
north-glass-erp/northglass-erp/src/views/mm/mainIngredient/CreateIngredients.vue | 1
north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue | 1
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue | 1
north-glass-erp/northglass-erp/src/views/pp/processCard/ProcessCard.vue | 1
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue | 342 ++++----
north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorage.vue | 1
north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue | 1
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java | 28
north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue | 2
north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorageCreate.vue | 7
north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java | 8
north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java | 1
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java | 2
north-glass-erp/northglass-erp/src/views/sd/basicData/CreateBasicData.vue | 1
north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryPrinting.vue | 1
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/StorageRecord.vue | 2
north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomerOrder.vue | 1
north-glass-erp/src/main/java/com/example/erp/service/sd/CustomerService.java | 4
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue | 2
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue | 1
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 46 +
37 files changed, 1,021 insertions(+), 1,211 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/basic/BasicTable.vue b/north-glass-erp/northglass-erp/src/components/basic/BasicTable.vue
index 6cb5437..9a15137 100644
--- a/north-glass-erp/northglass-erp/src/components/basic/BasicTable.vue
+++ b/north-glass-erp/northglass-erp/src/components/basic/BasicTable.vue
@@ -184,7 +184,6 @@
}
case 'myInsert': {
$grid.insert({})
- console.log($grid.getRecordset().insertRecords)
break
}
case 'mySave': {
diff --git a/north-glass-erp/northglass-erp/src/views/RegisterView.vue b/north-glass-erp/northglass-erp/src/views/RegisterView.vue
index db9cd2d..1b49c44 100644
--- a/north-glass-erp/northglass-erp/src/views/RegisterView.vue
+++ b/north-glass-erp/northglass-erp/src/views/RegisterView.vue
@@ -69,7 +69,6 @@
request.post('/user/register',
register).then((res) => {
if(res['code']==200){
- console.log(res.data)
ElMessageBox.alert(
`<strong>鐢ㄦ埛:<i style="color: #1890FF;">'${res.data.userName}</i>'
<br>璐﹀彿ID:<i style="color: #1890FF;">${res.data.loginName}</i> </strong>`,
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainIngredient/CreateIngredients.vue b/north-glass-erp/northglass-erp/src/views/mm/mainIngredient/CreateIngredients.vue
index 3fedbf0..371354b 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainIngredient/CreateIngredients.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainIngredient/CreateIngredients.vue
@@ -103,7 +103,6 @@
}
- console.log(materialStore)
if(isBool){
request.post("/MaterialStore/saveMaterialStore", materialStore).then((res) => {
if(res.code==200){
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorage.vue b/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorage.vue
index db3a33a..7900458 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorage.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorage.vue
@@ -61,7 +61,6 @@
request.post(`/MaterialInventory/getSelectReturningWarehouseDate/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
if(res.code==200){
- console.log(res.data)
total.dataTotal = res.data.total.total*1
total.pageTotal= res.data.total.pageTotal
pageNum.value=1
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorageCreate.vue b/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorageCreate.vue
index 0248d2f..4a6d057 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorageCreate.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorageCreate.vue
@@ -126,7 +126,6 @@
const str = route.query.returningId
if (typeof str != 'undefined' && str != null && str !== '' && str !== '\n' && str !== '\r'){
filterData.value.returningId=str
- console.log(filterData.value)
//绗竴娆¤皟鐢�
request.post("/MaterialInventory/getSelectReturningWarehouse/1/100",filterData.value).then((res) => {
@@ -171,7 +170,6 @@
if(res.code==200){
- console.log(res.data.data)
titleUploadData.value.warehouseManager=userStore.user.userName
titleUploadData.value.returningType = titleSelectJson.value.returningType[0].operateTypeName
@@ -253,7 +251,6 @@
//鏁版嵁缁戝畾
const getStoreWorks = () => {
- console.log(filterData.value)
request.post(`/MaterialStore/getSelectMaterialStore/1/100`,filterData.value).then((res) => {
if(res.code==200){
@@ -294,7 +291,6 @@
switch (code) {
case 'add': {
const selectRecords = $grid.getCheckboxRecords()
- console.log(selectRecords)
if (selectRecords.length === 0) {
ElMessage.warning(t('productStock.unselectedData'))
return
@@ -345,7 +341,6 @@
returningId: route.query.returningId
})
- console.log(flowData)
request.post("/MaterialInventory/saveReturningWarehouse", flowData.value).then((res) => {
if(res.code==200){
ElMessage.success('淇濆瓨鎴愬姛')
@@ -364,7 +359,6 @@
type: 1
})
- console.log(flowData.value)
request.post("/MaterialInventory/updateReturningWarehouseToExamine", flowData.value).then((res) => {
if (res.code == 200) {
ElMessage.success(t('basicData.msg.ReviewSuccess'))
@@ -382,7 +376,6 @@
type: 0
})
- console.log(flowData.value)
request.post("/MaterialInventory/updateReturningWarehouseToExamine", flowData.value).then((res) => {
if (res.code == 200) {
ElMessage.success(t('basicData.msg.cancelReviewSuccess'))
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue
index 0ff0530..54e4cbd 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue
@@ -282,7 +282,6 @@
userName: username,
orderDetail: selectRecords
})
- console.log(orderDetailData)
request.post("/FinishedGoodsInventory/addDeliveryDetail", orderDetailData.value).then((res) => {
if (res.code == 200) {
ElMessage.success(t('productStock.deliverySuccessful'))
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/StorageRecord.vue b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/StorageRecord.vue
index e1b9864..2354aa5 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/StorageRecord.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/StorageRecord.vue
@@ -77,7 +77,6 @@
request.post(`/FinishedGoodsInventory/getSelectStorageRecord/1/${total.pageSize}/${selectDate.value}/${type.value}`,filterData.value).then((res) => {
if(res.code==200){
- console.log(res.data)
total.dataTotal = res.data.total.total*1
total.pageTotal= res.data.total.pageTotal
selectDate.value = res.data.selectDate
@@ -277,7 +276,6 @@
orderDetail:selectRecords
})
- console.log(flowData)
request.post("/FinishedGoodsInventory/cancelFinishedGoodsInventoryStorage",flowData.value).then((res) => {
if(res.code==200){
ElMessage.success(t('productStock.invalidSuccessfully'))
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/TakeOutRecord.vue b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/TakeOutRecord.vue
index 18e5cb6..c52f8c1 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/TakeOutRecord.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/TakeOutRecord.vue
@@ -304,7 +304,6 @@
orderDetail:selectRecords
})
- console.log(flowData)
request.post("/FinishedGoodsInventory/cancelFinishedGoodsInventoryToExamine",flowData.value).then((res) => {
if(res.code==200){
ElMessage.success(t('productStock.invalidSuccessfully'))
diff --git a/north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue b/north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue
index 0bf7d6a..31a42fb 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue
@@ -114,7 +114,6 @@
let endTime = form.date1[1]
request.post(`/maintenance/selectMaintenance/${startTime}/${endTime}`).then((res) => {
if (res.code == 200) {
- console.log(res.data.data)
xGrid.value.loadData(res.data.data)
gridOptions.loading = false
} else {
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
index 993c41f..5b09c92 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
@@ -1,25 +1,70 @@
<script setup>
-import {reactive} from "vue";
-import {useRouter} from 'vue-router'
-let router=useRouter()
-const getTableRow = (row,type) =>{
- switch (type) {
- case 'edit' :{
- //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
- router.push({path: '/main/processCard/PrintFlowCard', query: { id: row.id }})
- break
- }
- case 'delete':{
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
- break
- }
- case 'setType':{
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鎺掔増鐘舵��')
- break
- }
- }
+import request from "@/utils/request"
+import deepClone from "@/utils/deepClone"
+import {ElDatePicker, ElMessage} from "element-plus"
+import {nextTick, onMounted, onUnmounted, reactive, ref, watch} from "vue"
+import {useRouter} from 'vue-router'
+import {useI18n} from 'vue-i18n'
+import {changeFilterEvent, filterChanged} from "@/hook"
+import {VXETable} from "vxe-table";
+import {toolbarButtonClickEvent} from "@/hook/mouseMove";
+import PrintProcess from '@/views/pp/processCard/PrintProcess.vue'
+//璇█鑾峰彇
+const {t} = useI18n()
+let router = useRouter()
+const dialogTableVisible = ref(false)
+let selectRecords = ref(null)
+
+//瀹氫箟婊氬姩鏉￠珮搴�
+let scrollTop = ref(null)
+let scrollHeight = ref(null)
+let clientHeight = ref(null)
+const scrollEvnt = (row) => {
+ // 鍐呭楂樺害
+ scrollTop.value = row.$event.target.scrollTop
+ scrollHeight.value = row.$event.target.scrollHeight
+ clientHeight.value = row.$event.target.clientHeight
}
+
+//绛涢�夋潯浠讹紝鏈夊閿渶瑕佸厛瀹氫箟鏄庣粏閲岄潰鐨勬暟鎹�
+let filterData = ref({
+
+ orderGlassDetail: {
+ productionId: '',
+ },
+ orderDetail: {
+ orderId: '',
+ productId: '',
+ productName: '',
+ }
+
+
+})
+//瀹氫箟椤甸潰鎬婚〉鏁�
+let pageTotal = ref('')
+//瀹氫箟鏁版嵁杩斿洖缁撴灉
+let produceList = ref([])
+//瀹氫箟褰撳墠椤垫暟
+let pageNum = $ref(1)
+let pageState = null
+
+const {currentRoute} = useRouter()
+const route = currentRoute.value
+
+let orderId = route.query.orderId
+
+// 绗竴娆″姞杞芥煡璇�
+request.post(`/processCard/selectPrint/${orderId}`, filterData.value).then((res) => {
+
+ if (res.code == 200) {
+ produceList = produceList.value.concat(deepClone(res.data.data))
+ xGrid.value.reloadData(produceList)
+ gridOptions.loading = false
+ } else {
+ ElMessage.warning(res.msg)
+ }
+})
//琛ㄥ熬姹傚拰
const sumNum = (list, field) => {
@@ -30,27 +75,35 @@
return count.toFixed(2)
}
-//瀛愮粍浠舵帴鏀跺弬鏁�
+const hasDecimal = (value) => {
+ const regex = /\./; // 瀹氫箟姝ｅ垯琛ㄨ揪寮忥紝鏌ユ壘灏忔暟鐐�
+ return regex.test(value); // 杩斿洖true/false
+}
+
+//瀛愮粍浠舵帴鏀跺弬鏁�
+const xGrid = ref()
const gridOptions = reactive({
- border: "full",//琛ㄦ牸鍔犺竟妗�
+ loading: true,
+ border: "full",//琛ㄦ牸鍔犺竟妗�
keepSource: true,//淇濇寔婧愭暟鎹�
align: 'center',//鏂囧瓧灞呬腑
- stripe:true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ stripe: true,//鏂戦┈绾�
+ rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+ id: 'demo_1',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
exportConfig: {},
- scrollY:{ enabled: true },//寮�鍚櫄鎷熸粴鍔�
- showOverflow:true,
+ scrollX: {enabled: true},
+ scrollY: {enabled: true, gt: 0},//寮�鍚櫄鎷熸粴鍔�
+ showOverflow: true,
columnConfig: {
resizable: true,
useKey: true
},
filterConfig: { //绛涢�夐厤缃」
- remote: true
+ // remote: true
},
customConfig: {
storage: true
@@ -60,128 +113,67 @@
mode: 'row',
showStatus: true
},//琛ㄥご鍙傛暟
- columns:[
- {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
- { type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
- {field: '閿�鍞崟鍙�',width: 120, title: '閿�鍞崟鍙�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
- {field: '鐢熶骇璁㈠崟鍙�',width: 140, title: '鐢熶骇璁㈠崟鍙�', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: '娴佺▼鍗″彿',width: 120, title: '娴佺▼鍗″彿', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: '瀹㈡埛鍚嶇О',width: 120, title: '瀹㈡埛鍚嶇О', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: '椤圭洰鍚嶇О',width: 120, title: '椤圭洰鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '鐗囨爣璁�',width: 90, title: '鐗囨爣璁�', sortable: true,showOverflow:"ellipsis"},
- {field: '鏍囪',width: 80, title: '鏍囪', sortable: true},
- {field: '鐗囨暟',width: 80, title: '鐗囨暟', sortable: true},
- {field: '闈㈢Н',width: 80, title: '闈㈢Н', sortable: true,showOverflow:"ellipsis"},
- {field: '浜у搧鍚嶇О',width: 120, title: '浜у搧鍚嶇О', sortable: true},
- {field: '鍗曠墖鍚嶇О',width: 120, title: '鍗曠墖鍚嶇О', sortable: true},
- {field: '妤煎眰缂栧彿',width: 120, title: '妤煎眰缂栧彿', sortable: true},
- {field: '鍒嗘灦鍛�', width: 120,title: '鍒嗘灦鍛�', sortable: true},
- {field: '鍒嗘灦鏃堕棿',width: 120, title: '鍒嗘灦鏃堕棿', sortable: true},
- {field: '澶囨敞',width: 120, title: '澶囨敞', sortable: true}
+ columns: [
+ {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
+ {type: 'checkbox', fixed: "left", title: t('basicData.check'), width: 80},
+ {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
+ {
+ field: 'order_id',
+ title: t('order.orderId'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {
+ field: 'process_id',
+ title: '娴佺▼鍗″彿',
+ showOverflow: "ellipsis",
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {
+ field: 'customer_name',
+ title: '瀹㈡埛鍚嶇О',
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {
+ field: 'project',
+ title: '椤圭洰鍚嶇О',
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {field: 'technology_number', title: '灏忕墖椤哄簭', showOverflow: "ellipsis"},
+ {field: 'glass_address', title: '灏忕墖鏍囪',},
+ {field: 'quantity', title: '鏁伴噺',},
+ {field: 'total_area', title: '闈㈢Н',},
+ {field: 'product_name', title: '浜у搧鍚嶇О',},
+ {field: 'glass_child', title: '鍗曠墖鍚嶇О',},
+ {field: 'founder', title: '鍒嗘灦鍛�',},
+ {field: 'splitFrame_time', title: '鍒嗘灦鏃堕棿',},
],//琛ㄥご鎸夐挳
toolbarConfig: {
buttons: [
- {
- name:'瀹ゅ唴闈�',
- dropdowns: [
- { code: 'other1', name: '瀹ゅ唴闈�', type: 'text', },
- { code: 'other2', name: '瀹ゅ闈�', type: 'text', },
- ]
- },
- {
- name:'鎴愬搧鏍囩',
- dropdowns: [
- { code: 'other1', name: '鎴愬搧鏍囩', type: 'text', },
- { code: 'other2', name: '鍗曠墖鏍囩', type: 'text',},
- ]
- },
- {code: 'print_lck', name: '鎵撳嵃娴佺▼鍗�',status:'primary' },
- {code: 'print_bq', name: '鎵撳嵃鏍囩',status:'primary' }
+ {code: 'print', name: '鎵撳嵃', status: 'primary'},
],
// import: false,
// export: true,
- // print: true,
+ //print: true,
zoom: true,
custom: true
},
- data: [
- {
- 閿�鍞崟鍙�: 'NG231201',
- 鐢熶骇璁㈠崟鍙�:'NG231201A',
- 娴佺▼鍗″彿: 'NG231201A01',
- 瀹㈡埛鍚嶇О:'瑗垮畨楂樼骞曞闂ㄧ獥鏈夐檺鍏徃',
- 椤圭洰鍚嶇О:'閾堕殕骞垮満',
- 鐗囨爣璁�:'(澶�)',
- 鏍囪:'1',
- 鐗囨暟:'16',
- 闈㈢Н:'24.14',
- 浜у搧鍚嶇О: '10mm瓒呯櫧UD60骞抽挗(澶�)+12Ar(缁�)+10mm瓒呯櫧骞抽挗(鍐�)',
- 鍗曠墖鍚嶇О: '10mm瓒呯櫧UD60骞抽挗(澶�)',
- 妤煎眰缂栧彿: '16-BSGB05',
- 鍒嗘灦鍛�: '寮犱笁',
- 鍒嗘灦鏃堕棿: '2023-01-11',
- 澶囨敞: '',
- },
- {
- 閿�鍞崟鍙�: 'NG231201',
- 鐢熶骇璁㈠崟鍙�:'NG231201A',
- 娴佺▼鍗″彿: 'NG231201A01',
- 瀹㈡埛鍚嶇О:'瑗垮畨楂樼骞曞闂ㄧ獥鏈夐檺鍏徃',
- 椤圭洰鍚嶇О:'閾堕殕骞垮満',
- 鐗囨爣璁�:'(澶�)',
- 鏍囪:'1',
- 鐗囨暟:'16',
- 闈㈢Н:'24.14',
- 浜у搧鍚嶇О: '10mm瓒呯櫧UD60骞抽挗(澶�)+12Ar(缁�)+10mm瓒呯櫧骞抽挗(鍐�)',
- 鍗曠墖鍚嶇О: '10mm瓒呯櫧UD60骞抽挗(澶�)',
- 妤煎眰缂栧彿: '16-BSGB05',
- 鍒嗘灦鍛�: '寮犱笁',
- 鍒嗘灦鏃堕棿: '2023-01-11',
- 澶囨敞: '',
- },
- {
- 閿�鍞崟鍙�: 'NG231201',
- 鐢熶骇璁㈠崟鍙�:'NG231201A',
- 娴佺▼鍗″彿: 'NG231201A01',
- 瀹㈡埛鍚嶇О:'瑗垮畨楂樼骞曞闂ㄧ獥鏈夐檺鍏徃',
- 椤圭洰鍚嶇О:'閾堕殕骞垮満',
- 鐗囨爣璁�:'(澶�)',
- 鏍囪:'1',
- 鐗囨暟:'16',
- 闈㈢Н:'24.14',
- 浜у搧鍚嶇О: '10mm瓒呯櫧UD60骞抽挗(澶�)+12Ar(缁�)+10mm瓒呯櫧骞抽挗(鍐�)',
- 鍗曠墖鍚嶇О: '10mm瓒呯櫧UD60骞抽挗(澶�)',
- 妤煎眰缂栧彿: '16-BSGB05',
- 鍒嗘灦鍛�: '寮犱笁',
- 鍒嗘灦鏃堕棿: '2023-01-11',
- 澶囨敞: '',
- },
- {
- 閿�鍞崟鍙�: 'NG231201',
- 鐢熶骇璁㈠崟鍙�:'NG231201A',
- 娴佺▼鍗″彿: 'NG231201A01',
- 瀹㈡埛鍚嶇О:'瑗垮畨楂樼骞曞闂ㄧ獥鏈夐檺鍏徃',
- 椤圭洰鍚嶇О:'閾堕殕骞垮満',
- 鐗囨爣璁�:'(澶�)',
- 鏍囪:'1',
- 鐗囨暟:'16',
- 闈㈢Н:'24.14',
- 浜у搧鍚嶇О: '10mm瓒呯櫧UD60骞抽挗(澶�)+12Ar(缁�)+10mm瓒呯櫧骞抽挗(鍐�)',
- 鍗曠墖鍚嶇О: '10mm瓒呯櫧UD60骞抽挗(澶�)',
- 妤煎眰缂栧彿: '16-BSGB05',
- 鍒嗘灦鍛�: '寮犱笁',
- 鍒嗘灦鏃堕棿: '2023-01-11',
- 澶囨敞: '',
- },
- ],//table body瀹為檯鏁版嵁
+ data: null,//琛ㄦ牸鏁版嵁
//鑴氶儴姹傚拰
- footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
- let footList=['鐗囨暟','闈㈢Н']
- return[
+ footerMethod({columns, data}) {//椤佃剼鍑芥暟
+ let footList = ['data.orderDetail.quantity', 'data.orderDetail.computeGrossArea']
+ return [
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
- return '鍚堣:'
+ return t('basicData.total')
}
if (footList.includes(column.field)) {
return sumNum(data, column.field)
@@ -190,67 +182,99 @@
})
]
}
-
})
+const gridEvents = {
+ toolbarButtonClick ({ code}) {
+ const $grid = xGrid.value
+ selectRecords = $grid.getCheckboxRecords()
+ if ($grid) {
+ switch (code) {
+ case 'print': {
+ if(selectRecords.value===null){
+ ElMessage.warning(t('searchOrder.msgList.checkOrder'))
+ return
+ }
+
+ let id = ""
+ for (let i = 0; i < selectRecords.length; i++) {
+ if (i + 1 === selectRecords.length) {
+ id += selectRecords[i].id
+ } else {
+ id += selectRecords[i].id + "|"
+ }
+ }
+ router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords)}})
+ //dialogTableVisible.value = true
+ break
+ }
+
+ }
+ }
+ },
+}
</script>
<template>
<div class="main-div-customer">
-
<vxe-grid
- max-height="100%"
- @filter-change="filterChanged"
- class="mytable-scrollbar"
ref="xGrid"
+ class="mytable-scrollbar"
+ height="600px"
+ max-height="100%"
v-bind="gridOptions"
+ v-on="gridEvents"
+
>
<!-- @toolbar-button-click="toolbarButtonClickEvent"-->
<!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
- <template #content="{ row}">
+ <template #content="{ row }">
<ul class="expand-wrapper">
- <li v-for="(item,key,index) in row">
- <span style="font-weight: bold">{{key+': '}}</span>
- <span>{{ item }}</span>
+ <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
+ <span style="font-weight: bold">{{ item.title + ': ' }}</span>
+ <span v-if="hasDecimal(item.field)">{{ row[item.field.split('.')[0]][item.field.split('.')[1]] }}</span>
+ <span v-else>{{ row[item.field] }}</span>
+
</li>
</ul>
</template>
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
<template #button_slot="{ row }">
- <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">鎵撳嵃</el-button>
- <el-button @click="getTableRow(row,'setType')" link type="primary" size="small">鎺掔増</el-button>
- <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">鍒犻櫎</el-button>
+ <el-button link size="small" type="primary" @click="getTableRow(row,'edit')">{{ $t('basicData.edit') }}
+ </el-button>
+
</template>
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
+ <input type="text"
+ v-model="option.data"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
</vxe-grid>
+ <el-dialog
+ v-model="dialogTableVisible"
+ destroy-on-close
+ title="娴佺▼鍗℃墦鍗�"
+ style="width: 80%;height:75% ">
+ <PrintProcess :printList="selectRecords"
+ style="width: 100%;height: 100%" />
+ </el-dialog>
</div>
</template>
<style scoped>
-.main-div-customer{
+.main-div-customer {
width: 99%;
height: 100%;
-}
-
-.stnw{
- height: 33px;
- width: 80px;
- background-color: #409eff;
- color: white;
- border: none;
- border-radius: 5px;
}
</style>
\ No newline at end of file
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue
index a52f279..a2083d3 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue
@@ -1,954 +1,358 @@
<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";
+//璇█鑾峰彇
+const {t} = useI18n()
+let router = useRouter()
+let produceList = ref([])
+let details = ref([])
+
+const data = ref({
+ printList:[]
+})
+
+const {currentRoute} = useRouter()
+const route = currentRoute.value
+data.value.printList = JSON.parse(route.query.printList)
+let flowCardCount=data.value.printList.length
+onMounted(() => {
+ // if (id === null || id === undefined || id === '') {
+ // return
+ // }
+
+ request.post(`/processCard/getSelectPrinting`, data.value).then((res) => {
+ if (res.code == 200) {
+
+ produceList.value = deepClone(res.data.data)
+
+ } else {
+ ElMessage.warning(res.msg)
+ router.push("/login")
+ }
+ })
+ }
+ )
+
+// 鎵撳嵃鏂规硶
+const printFlowCard = () => {
+ // 闇�瑕佹墦鍗扮殑灞�閮ㄥ尯鍩熻祴浜�"print-wrap"鐨刬d
+ let el = document.getElementById("printFlowCard");
+ let doc = document;
+ let body = doc.body || doc.getElementsByTagName("body")[0];
+ let printId = "print-" + Date.now();
+
+ // 鍒涘缓鏃犲壇浣滅敤鐨勬墦鍗板鍣�(鍥犱笉纭畾椤甸潰鐨勬墦鍗板厓绱犳湁鏃犲叾瀹冩牱寮�)
+ let content = doc.createElement("div");
+ content.id = printId;
+
+ // 鏍峰紡鎺у埗涓庢墦鍗版棤鍏崇殑鍏冪礌闅愯棌
+ let style = doc.createElement("style");
+ style.innerHTML =
+ "body>#" +
+ printId +
+ "{display:none}@media print{body>:not(#" +
+ printId +
+ "){display:none !important}body>#" +
+ printId +
+ "{display:block;padding-top:1px}}";
+ //
+ content.innerHTML = el.outerHTML;
+ // // console.log("el.outerHTML", el.outerHTML);
+ body.appendChild(style);
+
+ // 涓巗tyle鍏冪礌璁剧疆鐨勬牱寮忕浉閰嶅悎
+ // 鎶婃墦鍗板唴瀹圭殑鍏冪礌娣诲姞鍒癰ody(浣滀负body鐨勫瓙鍏冪礌锛屽彲鐢╞ody鐨勫瓙閫夋嫨鍣� '>' 鎺у埗鎵撳嵃鏍峰紡)
+ body.appendChild(content);
+ setTimeout(() => {
+ window.print();
+ body.removeChild(content);
+ body.removeChild(style);
+ }, 20);
+}
</script>
<template>
- <div class="shu" style="height:0px;"></div>
- <div id="big" class="big">
- <div id="content">
- <table id="tab" border="1">
- <thead>
- <tr>
- <td colspan="22">
- <div class="bj">1</div>
- <h1>娲涢槼鍖楁柟鐜荤拑鎶�鏈偂浠芥湁闄愬叕鍙�</h1>
- <h1>鐢熶骇娴佺▼鍗�</h1>
- <div id="top">
- <span>鍖呰鏂瑰紡锛氶搧鏋�</span><span
- style="float: right;position: relative;right: 5px;">娴佺▼鍗″彿锛�<label class="liuchengka"
- for="">NG23120401A01</label>/1鍏�2鏋�</span></div>
- </td>
- </tr>
- <tr style="height:25px;">
- <td style="min-width:70px;">瀹㈡埛鍚嶇О锛�</td>
- <td style="min-width:200px;">閽㈠寲璁惧浜嬩笟閮�</td>
- <td style="min-width:200px;" colspan="2">椤圭洰鍚嶇О锛氶挗鍖栬澶囦簨涓氶儴(23-12-1-01)</td>
- <td style="min-width:75px;">宸ヨ壓娴佺▼锛�</td>
- <td style="min-width:550px;" colspan="17">鍒囧壊->纾ㄨ竟->鎵撳瓟->閽㈠寲->鍖呰</td>
- </tr>
- <tr style="height:25px;">
- <td>纾� 杈癸細</td>
- <td>绮炬姏</td>
- <td colspan="2" style="word-wrap: break-word;">鍗曠墖鍚嶇О:<span class="dpmc">5mm娆ф床鐏板钩閽�</span></td>
- <td>鎴愬搧鍚嶇О锛�</td>
- <td class="chengpinmingcheng" colspan="17" style="word-wrap: break-word;">5mm娆ф床鐏板钩閽�</td>
- </tr>
- <tr>
- <td colspan="22">
- <table border="1" style="border-collapse: collapse;" frame="below">
- <tbody>
- <tr>
- <td rowspan="2" style="min-width:70px;">搴忓彿</td>
- <td rowspan="2" style="min-width:200px;">缂栧彿</td>
- <td rowspan="2" style="min-width:100px;">瀹斤紙寮ч暱锛�*楂�</td>
- <td rowspan="2" style="min-width:49px;">鏁伴噺</td>
- <td rowspan="2" style="min-width:49px;">闈㈢Н</td>
- <td rowspan="2" style="min-width:49px;">鍛ㄩ暱</td>
- <td rowspan="2" style="min-width:73px;">鍗婂緞</td>
- <td rowspan="2" style="min-width:73px;">澶囨敞</td>
- <td style="min-width:59px;" colspan="2">鍒囧壊</td>
- <td style="min-width:59px;" colspan="2">纾ㄨ竟</td>
- <td style="min-width:59px;" colspan="2">鎵撳瓟</td>
- <td style="min-width:59px;" colspan="2">閽㈠寲</td>
- <td style="min-width:59px;" colspan="2">鍖呰</td>
- <td style="min-width:59px;" colspan="2"></td>
- <td style="min-width:59px;" colspan="2"></td>
- <td style="min-width:59px;" colspan="2"></td>
- </tr>
- <tr>
- <td>姝ｅ搧</td>
- <td>娆″搧</td>
- <td>姝ｅ搧</td>
- <td>娆″搧</td>
- <td>姝ｅ搧</td>
- <td>娆″搧</td>
- <td>姝ｅ搧</td>
- <td>娆″搧</td>
- <td>姝ｅ搧</td>
- <td>娆″搧</td>
- <td>姝ｅ搧</td>
- <td>娆″搧</td>
- <td>姝ｅ搧</td>
- <td>娆″搧</td>
- <td>姝ｅ搧</td>
- <td>娆″搧</td>
- </tr>
- </tbody>
- </table>
- </td>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td colspan="22">
- <table class="tab" border="1" frame="below">
- <tbody>
- <tr class="tr">
- <td style="min-width:70px;height:35.5px;" class="tab_td1">2</td>
- <td style="min-width:200px;height:35.5px;" class="tab_td2">01-1瑙嗙獥鐜荤拑ACB50.10.02-003</td>
- <td style="min-width:100px;height:35.5px;" class="kg"><span class="kuan">1698</span>*339</td>
- <td style="min-width:49px;height:35.5px;" class="sl">2</td>
- <td style="min-width:49px;height:35.5px;" class="mj">1.15</td>
- <td style="min-width:49px;height:35.5px;">8.15</td>
- <td style="min-width:73px;height:35.5px;" class="tab_td3 banjin"></td>
- <td style="min-width:73px;height:35.5px;" class="tab_td3">瑙佸浘A,</td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td class="xh" style="display:none;">1</td>
- </tr>
- <tr class="tr">
- <td style="min-width:70px;height:35.5px;" class="tab_td1">1</td>
- <td style="min-width:200px;height:35.5px;" class="tab_td2">01-1瑙嗙獥鐜荤拑ACB50.10.01-003</td>
- <td style="min-width:100px;height:35.5px;" class="kg"><span class="kuan">1428</span>*339</td>
- <td style="min-width:49px;height:35.5px;" class="sl">3</td>
- <td style="min-width:49px;height:35.5px;" class="mj">1.45</td>
- <td style="min-width:49px;height:35.5px;">10.6</td>
- <td style="min-width:73px;height:35.5px;" class="tab_td3 banjin"></td>
- <td style="min-width:73px;height:35.5px;" class="tab_td3">瑙佸浘A,</td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td class="xh" style="display:none;">1</td>
- </tr>
- <tr class="tr">
- <td style="min-width:70px;height:35.5px;" class="tab_td1">3</td>
- <td style="min-width:200px;height:35.5px;" class="tab_td2">01-2瑙嗙獥鐜荤拑ACB50.10.01-003</td>
- <td style="min-width:100px;height:35.5px;" class="kg"><span class="kuan">1428</span>*339</td>
- <td style="min-width:49px;height:35.5px;" class="sl">3</td>
- <td style="min-width:49px;height:35.5px;" class="mj">1.45</td>
- <td style="min-width:49px;height:35.5px;">10.6</td>
- <td style="min-width:73px;height:35.5px;" class="tab_td3 banjin"></td>
- <td style="min-width:73px;height:35.5px;" class="tab_td3">瑙佸浘A,</td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td class="xh" style="display:none;">1</td>
- </tr>
- <tr class="tr">
- <td style="min-width:70px;height:35.5px;" class="tab_td1">5</td>
- <td style="min-width:200px;height:35.5px;" class="tab_td2">01-3瑙嗙獥鐜荤拑ACB50.10.01-003</td>
- <td style="min-width:100px;height:35.5px;" class="kg"><span class="kuan">1428</span>*339</td>
- <td style="min-width:49px;height:35.5px;" class="sl">3</td>
- <td style="min-width:49px;height:35.5px;" class="mj">1.45</td>
- <td style="min-width:49px;height:35.5px;">10.6</td>
- <td style="min-width:73px;height:35.5px;" class="tab_td3 banjin"></td>
- <td style="min-width:73px;height:35.5px;" class="tab_td3">瑙佸浘A,</td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td class="xh" style="display:none;">1</td>
- </tr>
- <tr class="tr">
- <td style="min-width:70px;height:35.5px;" class="tab_td1">4</td>
- <td style="min-width:200px;height:35.5px;" class="tab_td2">01-2瑙嗙獥鐜荤拑ACB50.10.03-003</td>
- <td style="min-width:100px;height:35.5px;" class="kg"><span class="kuan">1338</span>*339</td>
- <td style="min-width:49px;height:35.5px;" class="sl">2</td>
- <td style="min-width:49px;height:35.5px;" class="mj">0.91</td>
- <td style="min-width:49px;height:35.5px;">6.71</td>
- <td style="min-width:73px;height:35.5px;" class="tab_td3 banjin"></td>
- <td style="min-width:73px;height:35.5px;" class="tab_td3">瑙佸浘A,</td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td class="xh" style="display:none;">1</td>
- </tr>
- <tr class="tr">
- <td style="min-width:70px;height:35.5px;" class="tab_td1">6</td>
- <td style="min-width:200px;height:35.5px;" class="tab_td2">01-3瑙嗙獥鐜荤拑ACB50.10.03-003</td>
- <td style="min-width:100px;height:35.5px;" class="kg"><span class="kuan">1338</span>*339</td>
- <td style="min-width:49px;height:35.5px;" class="sl">2</td>
- <td style="min-width:49px;height:35.5px;" class="mj">0.91</td>
- <td style="min-width:49px;height:35.5px;">6.71</td>
- <td style="min-width:73px;height:35.5px;" class="tab_td3 banjin"></td>
- <td style="min-width:73px;height:35.5px;" class="tab_td3">瑙佸浘A,</td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td class="xh" style="display:none;">1</td>
- </tr>
- </tbody>
- </table>
- </td>
- </tr>
- </tbody>
- <tfoot>
- <tr style="height: 20px;line-height: 20px;">
- <td colspan="22">鏁伴噺锛�<label class="zsl" for="">15鐗�</label> 閲嶉噺锛�<label class="zzl"
- for="">91.50kg</label> 闈㈢Н锛�<label class="zmj" for="">7.32m虏</label></td>
- </tr>
- <tr>
- <td width="50%" style="word-wrap: break-word;;" colspan="5" rowspan="7"><textarea
- style="width: 100%; height: 90%; overflow: hidden; border: 0px;font-size:12px;">1)鎸変紒鏍囥��
-2)鍚勫伐搴忥細鎴愬搧鐜荤拑璐寸紪鍙峰強灏哄鏍囩銆�
-3)纾ㄨ竟锛氭鍗曞锛岄珮灏哄鍏樊鍧囦负锛�0~-1锛夈��
-4)閽㈠寲锛氬寳鐜诲晢鏍囷紝浣嶇疆濡傚浘銆�
+ <el-button id="printButton" @click="printFlowCard">鎵撳嵃</el-button>
+ <div id="printFlowCard">
+ <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 id="bj" style="float: right;font-size: 28px">{{ id+1 }}</div>
+ <div>甯稿窞甯傚悏鍒╃幓鐠冩湁闄愬叕鍙�</div>
+ <div>鐢熶骇娴佺▼鍗�</div>
+ <div style="text-align: right;font-weight: bolder">娴佺▼鍗″彿锛� {{ itemFlow.process_id }}/{{ itemFlow.technologyNumber }} 鍏� {{flowCardCount}} 鏋�</div>
+ </td>
+ </tr>
+ <tr v-for="(items,index) in item.detail" :key="index">
+ <td>瀹㈡埛鍚嶇О锛�</td>
+ <td colspan="2">{{ items.customer_name }}</td>
+ <td>椤圭洰鍚嶇О锛�</td>
+ <td colspan="2">{{ items.project }}</td>
+ <td style="width:100px">宸ヨ壓娴佺▼锛�</td>
+ <td colspan="16">{{ items.process }}</td>
+ </tr>
+ <tr v-for="(itemTr,index) in item.detail" :key="index">
+ <td>纾ㄨ竟绫诲瀷锛�</td>
+ <td colspan="2">{{ itemTr.edging_type }}</td>
+ <td>鍗曠墖鍚嶇О锛�</td>
+ <td colspan="2">{{ itemTr.glass_child }}</td>
+ <td>浜у搧鍚嶇О锛�</td>
+ <td colspan="16">{{ itemTr.product_name }}</td>
+ </tr>
-</textarea></td>
- </tr>
- <tr>
- <td width="70px" height="23px;">瀹屽伐绛惧悕</td>
- <td width="56px;" height="23px;" colspan="2"></td>
- <td width="56px;" height="23px;" colspan="2"></td>
- <td width="56px;" height="23px;" colspan="2"></td>
- <td width="56px;" height="23px;" colspan="2"></td>
- <td width="56px;" height="23px;" colspan="2"></td>
- <td width="56px;" height="23px;" colspan="2"></td>
- <td width="56px;" height="23px;" colspan="2"></td>
- <td width="56px;" height="23px;" colspan="2"></td>
- </tr>
- <tr>
- <td>鎺ユ敹绛惧悕</td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- </tr>
- <tr>
- <td>鐢熶骇鏃ユ湡</td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- </tr>
- <tr>
- <td>璐ㄦ绛惧悕</td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- </tr>
- <tr>
- <td>鏋跺瓙缂栧彿</td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- </tr>
- <tr height="65px">
- <td colspan="22"><span id="qrcode1" class="qr" title="NG23120401A01/1"><canvas width="60" height="60"
- style="display: none;"></canvas><img alt="Scan me!"
- src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAAXNSR0IArs4c6QAAAulJREFUaEPtmuFywyAMg5P3f+jsmjU7cG1/AtLrErqfLSwIW5bsdF2WZVs6/rbtd9u6rtXu6PNj0fF9ttce53gG/W8FxuO0cwIubz67KXvbx9roc/X7MuJq9rSeeX/GEeHWzXb9ZQFbTlrutQKj9V5kVQ4Tp73vXyL8Bfy8bntbrbfrrScaqfVCDZLLYXXztICJby0VX+G7Us2junNKhC8PmNwKRSGiROa0IomzZ4nqiHrmU3XYGozoEJ61/AhguiX1tiPfm1VpdQ8VSgXDaV6aZOvfAN5IDJVrc7omcVu1rNWu9jxjnR6w2ntSR6PIFVX8qBBGSUnObK/SNsK3B2zbwxYdLV2Pp7NllJVotl62zQAl6+RuKQIUjXiUlKY15Ou7AB8prWph5lO9qpm5o955GHE10+s/Dk8HmNKD5JpSu4fDZFeJsx4l5Cp9G8DREI/4pVrJKHPKCk8emZqLlrOEU8vbAlaNB/nc1qL3iPAZ/W35fyKZq/zAdIB7ORzpMfGpvO1RbipDBusGuzn8Bfx8i3iZCFMzTemn7i+rP8lRa0MimRv1dentAKsS0WrcM4dGdjTKmpEWNmwPe6cK6sW19NKKvqrVH2daquMiDlMj4B2YOKmanWoWTkO82wEm43FWsfIiTO1dL4ezbEPjcTvAdsRDsysyFtQ3e7ev0qaHsy/WcjrANKZVU5pckxd5VYdJd2mwWFXp6QCTLJG+Eq+yEQ9VYdXEUKaU36PxuB1gtXmwwMl6Eq+UEU9v9c6s6PALcfK5WTGjlH0rYFU/Rznr9cMRz4mbkT/PLnL4x6Vqu5hZy48CjjSPHFbrjMtrD6M6oeowucT9maTDKhB1XWUCzK/pLwGYtDS69cxTUzapLwW8Zw9HeDrAxPmokpY6TNJGHkCdjLyFw0rhoDSnIkUpLRmPXh0eSWnKDlXyIm8gcTgCEGnlZQET0F4eZfyi1KXUVw1LefbTvLSaftXDQYe/gIM0JA6X234ACjSUFgdqRbsAAAAASUVORK5CYII="
- style="display: block;"><span class="ma">NG23120401A01/1</span></span></td>
- </tr>
- </tfoot>
- </table>
- </div>
+ </thead>
+ <tbody>
+ <tr>
+ <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 colspan='2'>鍒囧壊</td>
+ <td colspan='2'>纾ㄨ竟</td>
+ <td colspan='2'>閽㈠寲</td>
+ <td colspan='2'>涓┖</td>
+ <td colspan='2'>鍖呰</td>
+ <td colspan='2'></td>
+ <td colspan='2'></td>
+ <td colspan='2'></td>
+ </tr>
+ <tr>
+ <td>姝ｅ搧</td>
+ <td>娆″搧</td>
+ <td>姝ｅ搧</td>
+ <td>娆″搧</td>
+ <td>姝ｅ搧</td>
+ <td>娆″搧</td>
+ <td>姝ｅ搧</td>
+ <td>娆″搧</td>
+ <td>姝ｅ搧</td>
+ <td>娆″搧</td>
+ <td>姝ｅ搧</td>
+ <td>娆″搧</td>
+ <td>姝ｅ搧</td>
+ <td>娆″搧</td>
+ <td>姝ｅ搧</td>
+ <td>娆″搧</td>
+ </tr>
+ <tr v-for="(itemDatile,index) in item.detailList" :key="index">
+ <td>{{ itemDatile.order_number }}</td>
+ <td>{{ itemDatile.child_width }}</td>
+ <td>{{ itemDatile.quantity }}</td>
+ <td>{{ itemDatile.total_area }}</td>
+ <td>{{ itemDatile.perimeter }}</td>
+ <td>{{ itemDatile.bend_radius }}</td>
+ <td>{{ itemDatile.order_number }}</td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ </tr>
+ </tbody>
+ <tfoot>
+ <tr>
+ <td colspan="24" v-for="(itemsum,index) in item.detail" :key="index">
+ 鏁伴噺锛�
+ <label>{{ itemsum.quantity }}</label>
+ 闈㈢Н锛�
+ <label>{{ itemsum.gross_area }}</label>
+ 閲嶉噺锛�
+ <label>{{ itemsum.gross_area }}</label>
+ </td>
+ </tr>
+ <tr v-for="(itemtextarea,index) in item.detail" :key="index">
+ <td colspan="6" rowspan="6" style="width: 450px;height: 150px ">
+ <div style="width: 100%;height: 100%"><textarea style="height: 98%;width: 98%">{{ itemtextarea.processing_note }}</textarea></div>
+ </td>
+ <td>瀹屽伐绛惧悕</td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>鎺ュ彈绛惧悕</td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>鐢熶骇鏃ユ湡</td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>璐ㄦ绛惧悕</td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>鏋跺瓙缂栧彿</td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td colspan="17" rowspan="2">
+ <div style="width: 60px;height: 60px;background-color: red"></div>
+ </td>
+ </tr>
+ </tfoot>
+ </table>
</div>
- <div class="shu" style="height:0px;"></div>
- <div id="big" class="big">
- <div id="content">
- <table id="tab" border="1">
- <thead>
- <tr>
- <td colspan="22">
- <div class="bj">1</div>
- <h1>娲涢槼鍖楁柟鐜荤拑鎶�鏈偂浠芥湁闄愬叕鍙�</h1>
- <h1>鐢熶骇娴佺▼鍗�</h1>
- <div id="top">
- <span>鍖呰鏂瑰紡锛氶搧鏋�</span><span
- style="float: right;position: relative;right: 5px;">娴佺▼鍗″彿锛�<label class="liuchengka"
- for="">NG23120401B02</label>/1鍏�2鏋�</span></div>
- </td>
- </tr>
- <tr style="height:25px;">
- <td style="min-width:70px;">瀹㈡埛鍚嶇О锛�</td>
- <td style="min-width:200px;">閽㈠寲璁惧浜嬩笟閮�</td>
- <td style="min-width:200px;" colspan="2">椤圭洰鍚嶇О锛氶挗鍖栬澶囦簨涓氶儴(23-12-1-01)</td>
- <td style="min-width:75px;">宸ヨ壓娴佺▼锛�</td>
- <td style="min-width:550px;" colspan="17">鍒囧壊->纾ㄨ竟->閽㈠寲->鍖呰</td>
- </tr>
- <tr style="height:25px;">
- <td>纾� 杈癸細</td>
- <td>绮炬姏</td>
- <td colspan="2" style="word-wrap: break-word;">鍗曠墖鍚嶇О:<span class="dpmc">5mm娆ф床鐏板钩閽�</span></td>
- <td>鎴愬搧鍚嶇О锛�</td>
- <td class="chengpinmingcheng" colspan="17" style="word-wrap: break-word;">5mm娆ф床鐏板钩閽�</td>
- </tr>
- <tr>
- <td colspan="22">
- <table border="1" style="border-collapse: collapse;" frame="below">
- <tbody>
- <tr>
- <td rowspan="2" style="min-width:70px;">搴忓彿</td>
- <td rowspan="2" style="min-width:200px;">缂栧彿</td>
- <td rowspan="2" style="min-width:100px;">瀹斤紙寮ч暱锛�*楂�</td>
- <td rowspan="2" style="min-width:49px;">鏁伴噺</td>
- <td rowspan="2" style="min-width:49px;">闈㈢Н</td>
- <td rowspan="2" style="min-width:49px;">鍛ㄩ暱</td>
- <td rowspan="2" style="min-width:73px;">鍗婂緞</td>
- <td rowspan="2" style="min-width:73px;">澶囨敞</td>
- <td style="min-width:59px;" colspan="2">鍒囧壊</td>
- <td style="min-width:59px;" colspan="2">纾ㄨ竟</td>
- <td style="min-width:59px;" colspan="2">閽㈠寲</td>
- <td style="min-width:59px;" colspan="2">鍖呰</td>
- <td style="min-width:59px;" colspan="2"></td>
- <td style="min-width:59px;" colspan="2"></td>
- <td style="min-width:59px;" colspan="2"></td>
- <td style="min-width:59px;" colspan="2"></td>
- </tr>
- <tr>
- <td>姝ｅ搧</td>
- <td>娆″搧</td>
- <td>姝ｅ搧</td>
- <td>娆″搧</td>
- <td>姝ｅ搧</td>
- <td>娆″搧</td>
- <td>姝ｅ搧</td>
- <td>娆″搧</td>
- <td>姝ｅ搧</td>
- <td>娆″搧</td>
- <td>姝ｅ搧</td>
- <td>娆″搧</td>
- <td>姝ｅ搧</td>
- <td>娆″搧</td>
- <td>姝ｅ搧</td>
- <td>娆″搧</td>
- </tr>
- </tbody>
- </table>
- </td>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td colspan="22">
- <table class="tab" border="1" frame="below">
- <tbody>
- <tr class="tr">
- <td style="min-width:70px;height:35.5px;" class="tab_td1">11</td>
- <td style="min-width:200px;height:35.5px;" class="tab_td2">01-1閽㈠寲5</td>
- <td style="min-width:100px;height:35.5px;" class="kg"><span class="kuan">1852</span>*143</td>
- <td style="min-width:49px;height:35.5px;" class="sl">2</td>
- <td style="min-width:49px;height:35.5px;" class="mj">0.53</td>
- <td style="min-width:49px;height:35.5px;">7.98</td>
- <td style="min-width:73px;height:35.5px;" class="tab_td3 banjin"></td>
- <td style="min-width:73px;height:35.5px;" class="tab_td3">涓嶆墦鍟嗘爣,</td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td class="xh" style="display:none;">1</td>
- </tr>
- <tr class="tr">
- <td style="min-width:70px;height:35.5px;" class="tab_td1">9</td>
- <td style="min-width:200px;height:35.5px;" class="tab_td2">01-1閽㈠寲3</td>
- <td style="min-width:100px;height:35.5px;" class="kg"><span class="kuan">1835</span>*143</td>
- <td style="min-width:49px;height:35.5px;" class="sl">6</td>
- <td style="min-width:49px;height:35.5px;" class="mj">1.57</td>
- <td style="min-width:49px;height:35.5px;">23.74</td>
- <td style="min-width:73px;height:35.5px;" class="tab_td3 banjin"></td>
- <td style="min-width:73px;height:35.5px;" class="tab_td3">涓嶆墦鍟嗘爣,</td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td class="xh" style="display:none;">1</td>
- </tr>
- <tr class="tr">
- <td style="min-width:70px;height:35.5px;" class="tab_td1">14</td>
- <td style="min-width:200px;height:35.5px;" class="tab_td2">01-2閽㈠寲3</td>
- <td style="min-width:100px;height:35.5px;" class="kg"><span class="kuan">1835</span>*143</td>
- <td style="min-width:49px;height:35.5px;" class="sl">4</td>
- <td style="min-width:49px;height:35.5px;" class="mj">1.05</td>
- <td style="min-width:49px;height:35.5px;">15.82</td>
- <td style="min-width:73px;height:35.5px;" class="tab_td3 banjin"></td>
- <td style="min-width:73px;height:35.5px;" class="tab_td3">涓嶆墦鍟嗘爣,</td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td class="xh" style="display:none;">1</td>
- </tr>
- <tr class="tr">
- <td style="min-width:70px;height:35.5px;" class="tab_td1">19</td>
- <td style="min-width:200px;height:35.5px;" class="tab_td2">01-3閽㈠寲3</td>
- <td style="min-width:100px;height:35.5px;" class="kg"><span class="kuan">1835</span>*143</td>
- <td style="min-width:49px;height:35.5px;" class="sl">6</td>
- <td style="min-width:49px;height:35.5px;" class="mj">1.57</td>
- <td style="min-width:49px;height:35.5px;">23.74</td>
- <td style="min-width:73px;height:35.5px;" class="tab_td3 banjin"></td>
- <td style="min-width:73px;height:35.5px;" class="tab_td3">涓嶆墦鍟嗘爣,</td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td class="xh" style="display:none;">1</td>
- </tr>
- <tr class="tr">
- <td style="min-width:70px;height:35.5px;" class="tab_td1">13</td>
- <td style="min-width:200px;height:35.5px;" class="tab_td2">01-2閽㈠寲2</td>
- <td style="min-width:100px;height:35.5px;" class="kg"><span class="kuan">1732</span>*143</td>
- <td style="min-width:49px;height:35.5px;" class="sl">2</td>
- <td style="min-width:49px;height:35.5px;" class="mj">0.5</td>
- <td style="min-width:49px;height:35.5px;">7.5</td>
- <td style="min-width:73px;height:35.5px;" class="tab_td3 banjin"></td>
- <td style="min-width:73px;height:35.5px;" class="tab_td3">涓嶆墦鍟嗘爣,</td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td class="xh" style="display:none;">1</td>
- </tr>
- <tr class="tr">
- <td style="min-width:70px;height:35.5px;" class="tab_td1">12</td>
- <td style="min-width:200px;height:35.5px;" class="tab_td2">01-2閽㈠寲1</td>
- <td style="min-width:100px;height:35.5px;" class="kg"><span class="kuan">1692</span>*143</td>
- <td style="min-width:49px;height:35.5px;" class="sl">2</td>
- <td style="min-width:49px;height:35.5px;" class="mj">0.48</td>
- <td style="min-width:49px;height:35.5px;">7.34</td>
- <td style="min-width:73px;height:35.5px;" class="tab_td3 banjin"></td>
- <td style="min-width:73px;height:35.5px;" class="tab_td3">涓嶆墦鍟嗘爣,</td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td class="xh" style="display:none;">1</td>
- </tr>
- <tr class="tr">
- <td style="min-width:70px;height:35.5px;" class="tab_td1">16</td>
- <td style="min-width:200px;height:35.5px;" class="tab_td2">01-2閽㈠寲5</td>
- <td style="min-width:100px;height:35.5px;" class="kg"><span class="kuan">1492</span>*143</td>
- <td style="min-width:49px;height:35.5px;" class="sl">2</td>
- <td style="min-width:49px;height:35.5px;" class="mj">0.43</td>
- <td style="min-width:49px;height:35.5px;">6.54</td>
- <td style="min-width:73px;height:35.5px;" class="tab_td3 banjin"></td>
- <td style="min-width:73px;height:35.5px;" class="tab_td3">涓嶆墦鍟嗘爣,</td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td class="xh" style="display:none;">1</td>
- </tr>
- <tr class="tr">
- <td style="min-width:70px;height:35.5px;" class="tab_td1">21</td>
- <td style="min-width:200px;height:35.5px;" class="tab_td2">01-3閽㈠寲5</td>
- <td style="min-width:100px;height:35.5px;" class="kg"><span class="kuan">1492</span>*143</td>
- <td style="min-width:49px;height:35.5px;" class="sl">2</td>
- <td style="min-width:49px;height:35.5px;" class="mj">0.43</td>
- <td style="min-width:49px;height:35.5px;">6.54</td>
- <td style="min-width:73px;height:35.5px;" class="tab_td3 banjin"></td>
- <td style="min-width:73px;height:35.5px;" class="tab_td3">涓嶆墦鍟嗘爣,</td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td class="xh" style="display:none;">1</td>
- </tr>
- <tr class="tr">
- <td style="min-width:70px;height:35.5px;" class="tab_td1">10</td>
- <td style="min-width:200px;height:35.5px;" class="tab_td2">01-1閽㈠寲4</td>
- <td style="min-width:100px;height:35.5px;" class="kg"><span class="kuan">1435</span>*143</td>
- <td style="min-width:49px;height:35.5px;" class="sl">3</td>
- <td style="min-width:49px;height:35.5px;" class="mj">0.62</td>
- <td style="min-width:49px;height:35.5px;">9.47</td>
- <td style="min-width:73px;height:35.5px;" class="tab_td3 banjin"></td>
- <td style="min-width:73px;height:35.5px;" class="tab_td3">涓嶆墦鍟嗘爣,</td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td class="xh" style="display:none;">1</td>
- </tr>
- <tr class="tr">
- <td style="min-width:70px;height:35.5px;" class="tab_td1">15</td>
- <td style="min-width:200px;height:35.5px;" class="tab_td2">01-2閽㈠寲4</td>
- <td style="min-width:100px;height:35.5px;" class="kg"><span class="kuan">1435</span>*143</td>
- <td style="min-width:49px;height:35.5px;" class="sl">3</td>
- <td style="min-width:49px;height:35.5px;" class="mj">0.62</td>
- <td style="min-width:49px;height:35.5px;">9.47</td>
- <td style="min-width:73px;height:35.5px;" class="tab_td3 banjin"></td>
- <td style="min-width:73px;height:35.5px;" class="tab_td3">涓嶆墦鍟嗘爣,</td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td class="xh" style="display:none;">1</td>
- </tr>
- <tr class="tr">
- <td style="min-width:70px;height:35.5px;" class="tab_td1">20</td>
- <td style="min-width:200px;height:35.5px;" class="tab_td2">01-3閽㈠寲4</td>
- <td style="min-width:100px;height:35.5px;" class="kg"><span class="kuan">1435</span>*143</td>
- <td style="min-width:49px;height:35.5px;" class="sl">3</td>
- <td style="min-width:49px;height:35.5px;" class="mj">0.62</td>
- <td style="min-width:49px;height:35.5px;">9.47</td>
- <td style="min-width:73px;height:35.5px;" class="tab_td3 banjin"></td>
- <td style="min-width:73px;height:35.5px;" class="tab_td3">涓嶆墦鍟嗘爣,</td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td class="xh" style="display:none;">1</td>
- </tr>
- <tr class="tr">
- <td style="min-width:70px;height:35.5px;" class="tab_td1">8</td>
- <td style="min-width:200px;height:35.5px;" class="tab_td2">01-1閽㈠寲2</td>
- <td style="min-width:100px;height:35.5px;" class="kg"><span class="kuan">1387</span>*143</td>
- <td style="min-width:49px;height:35.5px;" class="sl">2</td>
- <td style="min-width:49px;height:35.5px;" class="mj">0.4</td>
- <td style="min-width:49px;height:35.5px;">6.12</td>
- <td style="min-width:73px;height:35.5px;" class="tab_td3 banjin"></td>
- <td style="min-width:73px;height:35.5px;" class="tab_td3">涓嶆墦鍟嗘爣,</td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td class="xh" style="display:none;">1</td>
- </tr>
- <tr class="tr">
- <td style="min-width:70px;height:35.5px;" class="tab_td1">18</td>
- <td style="min-width:200px;height:35.5px;" class="tab_td2">01-3閽㈠寲2</td>
- <td style="min-width:100px;height:35.5px;" class="kg"><span class="kuan">1387</span>*143</td>
- <td style="min-width:49px;height:35.5px;" class="sl">2</td>
- <td style="min-width:49px;height:35.5px;" class="mj">0.4</td>
- <td style="min-width:49px;height:35.5px;">6.12</td>
- <td style="min-width:73px;height:35.5px;" class="tab_td3 banjin"></td>
- <td style="min-width:73px;height:35.5px;" class="tab_td3">涓嶆墦鍟嗘爣,</td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td class="xh" style="display:none;">1</td>
- </tr>
- <tr class="tr">
- <td style="min-width:70px;height:35.5px;" class="tab_td1">7</td>
- <td style="min-width:200px;height:35.5px;" class="tab_td2">01-1閽㈠寲1</td>
- <td style="min-width:100px;height:35.5px;" class="kg"><span class="kuan">1347</span>*143</td>
- <td style="min-width:49px;height:35.5px;" class="sl">2</td>
- <td style="min-width:49px;height:35.5px;" class="mj">0.39</td>
- <td style="min-width:49px;height:35.5px;">5.96</td>
- <td style="min-width:73px;height:35.5px;" class="tab_td3 banjin"></td>
- <td style="min-width:73px;height:35.5px;" class="tab_td3">涓嶆墦鍟嗘爣,</td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td class="xh" style="display:none;">1</td>
- </tr>
- <tr class="tr">
- <td style="min-width:70px;height:35.5px;" class="tab_td1">17</td>
- <td style="min-width:200px;height:35.5px;" class="tab_td2">01-3閽㈠寲1</td>
- <td style="min-width:100px;height:35.5px;" class="kg"><span class="kuan">1347</span>*143</td>
- <td style="min-width:49px;height:35.5px;" class="sl">2</td>
- <td style="min-width:49px;height:35.5px;" class="mj">0.39</td>
- <td style="min-width:49px;height:35.5px;">5.96</td>
- <td style="min-width:73px;height:35.5px;" class="tab_td3 banjin"></td>
- <td style="min-width:73px;height:35.5px;" class="tab_td3">涓嶆墦鍟嗘爣,</td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td style="min-width:29px;height:35.5px;"></td>
- <td class="xh" style="display:none;">1</td>
- </tr>
- </tbody>
- </table>
- </td>
- </tr>
- </tbody>
- <tfoot>
- <tr style="height: 20px;line-height: 20px;">
- <td colspan="22">鏁伴噺锛�<label class="zsl" for="">43鐗�</label> 閲嶉噺锛�<label class="zzl"
- for="">125.00kg</label> 闈㈢Н锛�<label class="zmj" for="">10.00m虏</label></td>
- </tr>
- <tr>
- <td width="50%" style="word-wrap: break-word;;" colspan="5" rowspan="7">
- <textarea style="width: 100%; height: 90%; overflow: hidden; border: 0px;font-size:12px;">1)鎸変紒鏍囥��
-2)鍚勫伐搴忥細鎴愬搧鐜荤拑璐寸紪鍙峰強灏哄鏍囩銆�
-3)纾ㄨ竟锛氭鍗曞锛岄珮灏哄鍏樊鍧囦负锛�0~-1锛夈��
-4)閽㈠寲锛氬寳鐜诲晢鏍囷紝浣嶇疆濡傚浘銆�
-</textarea>
- </td>
- </tr>
- <tr>
- <td width="70px" height="23px;">瀹屽伐绛惧悕</td>
- <td width="56px;" height="23px;" colspan="2"></td>
- <td width="56px;" height="23px;" colspan="2"></td>
- <td width="56px;" height="23px;" colspan="2"></td>
- <td width="56px;" height="23px;" colspan="2"></td>
- <td width="56px;" height="23px;" colspan="2"></td>
- <td width="56px;" height="23px;" colspan="2"></td>
- <td width="56px;" height="23px;" colspan="2"></td>
- <td width="56px;" height="23px;" colspan="2"></td>
- </tr>
- <tr>
- <td>鎺ユ敹绛惧悕</td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- </tr>
- <tr>
- <td>鐢熶骇鏃ユ湡</td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- </tr>
- <tr>
- <td>璐ㄦ绛惧悕</td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- </tr>
- <tr>
- <td>鏋跺瓙缂栧彿</td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- <td colspan="2"></td>
- </tr>
- <tr height="65px">
- <td colspan="22"><span id="qrcode2" class="qr" title="NG23120401B02/1"><canvas width="60" height="60"
- style="display: none;"></canvas><img alt="Scan me!"
- src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAAXNSR0IArs4c6QAAAxBJREFUaEPtmuFyhDAIhPX9H9rO2dpJOOBboh2rXn9W47GBXZboPE3TMg38Lcv3snmeB1b7S7Zn2qvbbxzxm69onwk42l3a7Wp6vYqgzG6/YTNcjXmtyC3D1cXq/dGGtf8/FXDESdpdy7MNkMI/CzhaE8WgxuxmWF1MQd4WsLpBloetwlNJ0+ZWYnjjsLqYWkR0vQ0+okFUHZWqed3rxbAbsA3CilSUHU+0aAM+gMH8SBmmvkpZIIVtn2/pU6WJ2hrb3zm8D18GMGU24iYBzPow9VW6Xo2568PVxRQMXfdUlNZQySsY5kUlgvK05h7FYamKfmSIH8BqZqi8qDy9giHH5bk1T/Wz3v+W4dsDjg4AyBqq0xE5MUW8qlyP+nuq0o8FbHe3mtlM3OlZau+veOzwTIsEhEY2pYudAtj2YRItAlpZTyee1U5gVdx7flmlLw/YHuKNTjBUwjRleevVkqee3x06PB5wpMrkclQ1p0pQrmd9Npu3uz5MqnwbwJtKE8focC/qhVQxntOK1JZUO0pKd+LxAfxzMKZkps3O5TJMokMlP7JBZFJIN9TjpU7IohMPehipqcL5UwFXpZ4O2BXVjwzD6GYOiVa1jCx31fWeOqtnV6oH92ILvbTaGkbn5tUEiJ9LULWUrGU0Ld0WsPoFQJXjtGFthqtcVivD0wL5VcttAJPTOmpE88RMHUVVjiqx/ooW3ay2Ieqt3WxqRKsqgKpX6Lw0zcMRFyvtJxsQWp5RJqk/04atuvE4wHtfphEPFQWm0iQfT4LqjodULtH1ywHe+62lOmVVVJrsKlVENrnt/rj0soCrxl3hZuamVOX2VDzLIA0lstOyZXYbwDS4E39UEfOyT5uqCmv6Qny0D6smIasE1d1Vh4U/BVwVrYyT1epSK6L0qkUZ81oQ5KUvD1jNCnlvUnRlo+hkZJeXprcAipEfpQO9spWMx2gfHnVFlT5MAIlGKYdJ+klZifMtBahKIhqMtsaupAmovU4VQUFlnFVNjarSnagePTxQEN6JB/X00c31knj48PDfAX8Bd8KdHJuN7HEAAAAASUVORK5CYII="
- style="display: block;"><span class="ma">NG23120401B02/1</span></span></td>
- </tr>
- </tfoot>
- </table>
- </div>
- </div>
+
</template>
<style scoped>
-.JColResizer {
- table-layout: fixed;
+* {
+ margin: 0;
+ padding: 0;
}
-.JColResizer>tbody>tr>td,
-.JColResizer>tbody>tr>th {
- overflow: hidden;
- padding-left: 0 !important;
- padding-right: 0 !important;
+#printButton{
+ margin-top: -40px;
+ width: 100px;
}
-.JCLRgrips {
- height: 0px;
- position: relative;
+#printFlowCard {
+ margin-top: -40px;
+ text-align: center;
+ //font-weight: bolder;
+ height: 600px;
}
-.JCLRgrip {
- margin-left: -5px;
- position: absolute;
- z-index: 5;
+#contentTable {
+ border-collapse: collapse;
+ border: 1px solid black;
+ width: 100%;
+
}
-.JCLRgrip .JColResizer {
- position: absolute;
- background-color: red;
- filter: alpha(opacity=1);
- opacity: 0;
- width: 10px;
- height: 100%;
- cursor: e-resize;
- top: 0px
+#contentTable thead {
+ font-size: 13px;
+ font-weight: bolder;
}
-.JCLRLastGrip {
- position: absolute;
- width: 1px;
+#contentTable thead div {
+ font-size: 15px;
+ font-weight: bolder;
}
-.JCLRgripDrag {
- border-left: 1px dotted black;
+#contentTable tr td {
+ border: 1px solid black;
+ height: 22px;
+ font-weight: bolder;
+}
+#contentTable tbody{
+ height: 22px;
}
-.JCLRFlex {
- width: auto !important;
+#contentTable tbody td {
+ width: 50px;
}
-.JCLRgrip.JCLRdisabledGrip .JColResizer {
- cursor: default;
- display: none;
+#contentTable tfoot{
+ font-size: 12px;
+ font-weight: bolder;
}
+
+
+/* 鍦� .footer 鍏冪礌鍚庡缁堟彃鍏ュ垎椤电 */
+@media print {
+ #contentTable {page-break-after: always;}
+}
+
+
+thead { display:table-header-group;page-break-inside:avoid; }
+tbody { display:table-row-group;}
+tfoot { display:table-footer-group;page-break-inside:avoid; }
+
+
</style>
\ No newline at end of file
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/ProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/ProcessCard.vue
index 7a62522..2672d8a 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/ProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/ProcessCard.vue
@@ -27,6 +27,7 @@
</el-breadcrumb-item>
<el-breadcrumb-item @click="changeRouter(3)" :class="indexFlag===3?'indexTag':''" :to="{ path: '/main/processCard/ProductionScheduling' }">{{$t('processCard.scheduling')}}
</el-breadcrumb-item>
+ <el-breadcrumb-item @click="changeRouter(4)" :class="indexFlag===4?'indexTag':''" :to="{ path: '/main/processCard/SelectPrintFlowCard' }" >鎵撳嵃</el-breadcrumb-item>
<el-breadcrumb-item @click="changeRouter(4)" :class="indexFlag===4?'indexTag':''" :to="{ path: '/main/processCard/SelectPrintFlowCard' }" style="display: none">鎵撳嵃</el-breadcrumb-item>
</el-breadcrumb>
</div>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue
index 4f0ef09..8a8971e 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue
@@ -1,105 +1,288 @@
<script lang="ts" setup>
-import {reactive, ref} from 'vue'
+import {reactive, ref} from "vue";
+import {useRouter} from 'vue-router'
+import request from "@/utils/request";
+import deepClone from "@/utils/deepClone";
+import {ElDatePicker, ElMessage} from "element-plus";
+import {Search} from "@element-plus/icons-vue";
+import {useI18n} from 'vue-i18n'
+import {changeFilterEvent, filterChanged} from "@/hook"
+//璇█鑾峰彇
+const {t} = useI18n()
-// do not use same name with ref
+let router = useRouter()
+
+
+//瀹氫箟椤甸潰鎬婚〉鏁�
+let pageTotal = ref('')
+//瀹氫箟鏁版嵁杩斿洖缁撴灉
+let produceList = ref([])
+//瀹氫箟褰撳墠椤垫暟
+let pageNum = $ref(1)
+let pageState = null
+
const form = reactive({
- name: '',
- region: '',
date1: '',
- date2: '',
- delivery: false,
- type: [],
- resource: '',
- desc: '',
+ orderId: '',
+ project: ''
})
-const defaultTime = ref<[Date, Date]>([
- new Date(2000, 1, 1, 0, 0, 0),
- new Date(2000, 2, 1, 23, 59, 59),
-])
-const tableData = [
- {
- salesOrderNo: 'NG231201',
- entryName: '淇″悎鏄ュぉ閲�',
- total: '169',
- TotalArea: '175.31',
+const getTableRow = (row, type) => {
+ switch (type) {
+ case 'edit' :{
+ router.push({path: '/main/processCard/PrintFlowCard', query: { orderId: row.order_id }})
+ break
+ }
+ }
+}
+
+/*鍚庣杩斿洖缁撴灉澶氬眰宓屽灞曠ず*/
+const hasDecimal = (value) => {
+ const regex = /\./; // 瀹氫箟姝ｅ垯琛ㄨ揪寮忥紝鏌ユ壘灏忔暟鐐�
+ return regex.test(value); // 杩斿洖true/false
+}
+
+//绛涢�夋潯浠讹紝鏈夊閿渶瑕佸厛瀹氫箟鏄庣粏閲岄潰鐨勬暟鎹�
+let filterData = ref({
+
+ orderGlassDetail: {
+ productionId: '',
},
- {
- salesOrderNo: 'NG231202',
- entryName: '淇″悎鏄ュぉ閲�',
- total: '169',
- TotalArea: '175.31',
+ orderDetail: {
+ orderId: '',
+ productId: '',
+ productName: '',
+ }
+})
+
+//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
+function getNowTime() {
+ const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 7)
+ .toISOString()
+ .replace('T', ' ')
+ .slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
+ const end = new Date(new Date().getTime() + 3600 * 1000 * 24)
+ .toISOString()
+ .replace('T', ' ')
+ .slice(0, 10)//榛樿缁撴潫鏃堕棿褰撳墠鏃堕棿
+ return [start, end]
+}
+
+//绗竴娆″姞杞借幏鍙栬繎涓冨ぉ鏃堕棿鍜岄粯璁ょ姸鎬�
+form.date1 = getNowTime()
+let startTime = form.date1[0]
+let endTime = form.date1[1]
+let orderId=form.orderId
+let project=form.project
+
+if (orderId==''){
+ orderId=null
+}
+if (project==''){
+ project=null
+}
+//绗竴娆″姞杞芥暟鎹�
+
+request.post(`/processCard/selectPrintFlowCard/${startTime}/${endTime}/${orderId}/${project}`, filterData.value).then((res) => {
+
+ if (res.code == 200) {
+ produceList = produceList.value.concat(deepClone(res.data.data))
+ xGrid.value.reloadData(produceList)
+ gridOptions.loading = false
+ } else {
+ ElMessage.warning(res.msg)
+ }
+})
+
+//鐐瑰嚮鏌ヨ
+const getWorkOrder = () => {
+
+ let startTime = form.date1[0]
+ let endTime = form.date1[1]
+ let orderId=form.orderId
+ let project=form.project
+
+ if (orderId==''){
+ orderId=null
+ }
+ if (project==''){
+ project=null
+ }
+ request.post(`/processCard/selectPrintFlowCard/${startTime}/${endTime}/${orderId}/${project}`, filterData.value).then((res) => {
+ if (res.code == 200) {
+
+ xGrid.value.loadData(res.data.data)
+ gridOptions.loading = false
+ } else {
+ ElMessage.warning(res.msg)
+ }
+ })
+}
+
+//瀛愮粍浠舵帴鏀跺弬鏁�
+const xGrid = ref()
+const gridOptions = reactive({
+ loading: true,
+ border: "full",//琛ㄦ牸鍔犺竟妗�
+ keepSource: true,//淇濇寔婧愭暟鎹�
+ align: 'center',//鏂囧瓧灞呬腑
+ stripe: true,//鏂戦┈绾�
+ rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+ id: 'CustomerList',
+ showFooter: true,//鏄剧ず鑴�
+ printConfig: {},
+ importConfig: {},
+ exportConfig: {},
+ scrollY: {enabled: true},//寮�鍚櫄鎷熸粴鍔�
+ showOverflow: true,
+ columnConfig: {
+ resizable: true,
+ useKey: true
},
- {
- salesOrderNo: 'NG231203',
- entryName: '淇″悎鏄ュぉ閲�',
- total: '169',
- TotalArea: '175.31',
+ filterConfig: { //绛涢�夐厤缃」
+ // remote: true
},
- {
- salesOrderNo: 'NG231204',
- entryName: '淇″悎鏄ュぉ閲�',
- total: '169',
- TotalArea: '175.31',
+ customConfig: {
+ storage: true
},
- {
- salesOrderNo: 'NG231205',
- entryName: '淇″悎鏄ュぉ閲�',
- total: '169',
- TotalArea: '175.31',
+
+ editConfig: {
+ trigger: 'click',
+ mode: 'row',
+ showStatus: true
},
- {
- salesOrderNo: 'NG231206',
- entryName: '淇″悎鏄ュぉ閲�',
- total: '169',
- TotalArea: '175.31',
+ //琛ㄥご鍙傛暟
+ columns: [
+ {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
+ {title: t('basicData.operate'), width: 80, slots: { default: 'button_slot' },fixed:"left"},
+ {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
+ {
+ field: 'order_id',
+ title: '閿�鍞崟鍙�',
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {
+ field: 'project',
+ title: '椤圭洰鍚嶇О',
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {
+ field: 'quantity',
+ title: '鏁伴噺',
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {
+ field: 'area',
+ title: '闈㈢Н',
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ ],//琛ㄥご鎸夐挳
+
+ toolbarConfig: {
+ buttons: [],
+ import: false,
+ // export: true,
+ // print: true,
+ zoom: true,
+ custom: true
},
- {
- salesOrderNo: 'NG231207',
- entryName: '淇″悎鏄ュぉ閲�',
- total: '169',
- TotalArea: '175.31',
- },
-]
+ data: [],//table body瀹為檯鏁版嵁
+ //鑴氶儴姹傚拰
+ footerMethod({columns, data}) {//椤佃剼鍑芥暟
+ let footList = []
+ return [
+ columns.map((column, columnIndex) => {
+ if (columnIndex === 0) {
+ return '鍚堣:'
+ }
+ if (footList.includes(column.field)) {
+ return sumNum(data, column.field)
+ }
+ return ''
+ })
+ ]
+ }
+
+})
+
</script>
<template>
- <div>
+ <div class="main-div-customer">
<div id="selectForm">
<el-row :gutter="0">
-<!-- <el-input placeholder="閿�鍞崟鍙�" v-model="form.name" style="width: 200px"/>-->
-<!-- -->
-<!-- <el-input placeholder="椤圭洰鍚嶇О" v-model="form.region" style="width: 200px"/>-->
-<!-- -->
<el-date-picker
v-model="form.date1"
- type="daterange"
- start-placeholder="寮�濮嬫椂闂�"
end-placeholder="缁撴潫鏃堕棿"
- :default-time="defaultTime"
+ format="YYYY/MM/DD"
+ start-placeholder="寮�濮嬫椂闂�"
+ type="daterange"
+ value-format="YYYY-MM-DD"
+
/>
- <el-button type="primary">鏌ヨ</el-button>
+ <el-input v-model="form.orderId" :placeholder="$t('order.orderId')" clearable style="width: 110px"></el-input>
+
+ <el-input v-model="form.project" clearable placeholder="椤圭洰鍚嶇О" style="width: 110px"></el-input>
+
+ <el-button
+ id="select"
+ :icon="Search"
+ type="primary" @click="getWorkOrder">{{ $t('basicData.search') }}
+ </el-button>
</el-row>
-
</div>
- <el-table :data="tableData" border style="width: 100%" height="100%">
- <el-table-column sortable prop="salesOrderNo" label="閿�鍞崟鍙�" width="110" >
- <template v-slot="scope">
- <router-link :to="{path:'PrintFlowCard'}" >{{scope.row.salesOrderNo}}</router-link>
- </template>
- </el-table-column>
- <el-table-column prop="entryName" label="椤圭洰鍚嶇О" width="155" />
- <el-table-column prop="total" label="鎬荤墖鏁�" width="75" />
- <el-table-column prop="TotalArea" label="鎬婚潰绉�" width="100" />
- </el-table><!-- <h1>{{msg}}</h1> -->
+ <vxe-grid
+ ref="xGrid"
+ class="mytable-scrollbar"
+ height="100%"
+ max-height="100%"
+ v-bind="gridOptions"
+ >
+ <!-- @toolbar-button-click="toolbarButtonClickEvent"-->
+ <!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
+ <template #content="{ row }">
+ <ul class="expand-wrapper">
+ <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
+ <span style="font-weight: bold">{{ item.title + ': ' }}</span>
+ <span v-if="hasDecimal(item.field)">{{ row[item.field.split('.')[0]][item.field.split('.')[1]] }}</span>
+ <span v-else>{{ row[item.field] }}</span>
+
+ </li>
+ </ul>
+ </template>
+ <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
+ <template #button_slot="{ row }">
+ <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">{{$t('basicData.edit')}}</el-button>
+ </template>
+
+ <template #num1_filter="{ column, $panel }">
+ <div>
+ <div v-for="(option, index) in column.filters" :key="index">
+ <input v-model="option.data" type="text" @input="changeFilterEvent($event, option, $panel)"/>
+ </div>
+ </div>
+ </template>
+
+
+ </vxe-grid>
</div>
</template>
<style scoped>
-#selectForm {
- width: 40%;
+.main-div-customer {
+ width: 99%;
height: 100%;
- text-align: center;
+}
+#selectForm {
+ width: 60%;
}
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
index 8cfac0f..78b5f41 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
@@ -24,7 +24,6 @@
let endTime = form.date1[1]
switch (type) {
case 'select' : {
- console.log(row.processId)
router.push({path: '/main/processCard/SelectDetailProcessCard', query: { processId: row.processId }})
break
}
@@ -159,7 +158,6 @@
pageTotal.value = res.data.total
produceList = produceList.value.concat(deepClone(res.data.data))
xGrid.value.reloadData(produceList)
- console.log(produceList)
gridOptions.loading = false
} else {
ElMessage.warning(res.msg)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
index 888d6d8..68b8c89 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
@@ -86,7 +86,6 @@
item.reportWorkQuantityCount=JSON.parse(item.reportWorkQuantityCount)
})
mergeCells.value = res.data.mergeCell
- console.log(res.data.title)
xGrid.value.loadData(res.data.data)
} else {
ElMessage.warning(res.msg)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
index 1b282cb..2e31b63 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
@@ -516,7 +516,6 @@
const checkClose = async (done) => {
if(brokenGrid.value.getTableData().fullData.length===0){
- console.log(brokenRow.value)
brokenRow.value.breakageQuantity=null
brokenRow.value.completedQuantity = brokenRow.value.quantity
brokenRow.value.damageDetails=[]
diff --git a/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue b/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
index cf4b5a8..fd22964 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
@@ -29,7 +29,6 @@
let startTime = form.date1[0]
let endTime = form.date1[1]
let state = optionVal.value
- console.log(startTime, endTime, state)
request.post(`/workOrder/deleteOrderWork/${row.orderId}/${row.productionId}`).then((res) => {
if (res.code == 200) {
ElMessage.success(t('workOrder.deleteOk'))
@@ -128,7 +127,6 @@
let state = optionVal.value
//绗竴娆″姞杞芥暟鎹�
-console.log('绗竴娆″姞杞芥暟鎹�:',state,startTime,endTime)
request.post(`/workOrder/orderGlassDetail/${startTime}/${endTime}/${state}`, filterData.value).then((res) => {
if (res.code == 200) {
diff --git a/north-glass-erp/northglass-erp/src/views/sd/basicData/CreateBasicData.vue b/north-glass-erp/northglass-erp/src/views/sd/basicData/CreateBasicData.vue
index 3e131b6..0e47b24 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/basicData/CreateBasicData.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/basicData/CreateBasicData.vue
@@ -157,7 +157,6 @@
const handleChange = (value) => {
const filterArr = options.value.filter((item) =>item.value === value[0]
).map((item) =>item.children.filter((item) =>item.value === value[1]))
- console.log(filterArr)
}
diff --git a/north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomerOrder.vue b/north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomerOrder.vue
index e69429c..3d1a745 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomerOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomerOrder.vue
@@ -68,7 +68,6 @@
request.post(`/customer/getSelectCustomerOderDate/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
if(res.code==200){
- console.log(res.data.data)
total.dataTotal = res.data.total.total*1
total.pageTotal= res.data.total.pageTotal
selectDate.value = res.data.selectDate
diff --git a/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
index 978cf7d..24d7774 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
@@ -107,7 +107,6 @@
if(res.code==200){
titleSelectJson.value=deepClone(res.data)
- console.log(titleSelectJson.value)
const today = new Date
today.setTime(today.getTime() + (15 * 24 * 60 * 60 * 1000))
titleUploadData.value.deliveryDate = today.getFullYear() +
@@ -431,7 +430,6 @@
deliveryId: route.query.deliveryID
})
- console.log(flowData)
request.post("/Delivery/insertDelivery", flowData.value).then((res) => {
if(res.code==200){
ElMessage.success(t('delivery.deliveryNoteSubmittedSuccessfully'))
diff --git a/north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryPrinting.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryPrinting.vue
index 24a3ce0..494fbc4 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryPrinting.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryPrinting.vue
@@ -69,7 +69,6 @@
onMounted(()=>{
- console.log(props.deliveryId)
/*if(props.deliveryId===null || props.deliveryId===undefined || props.deliveryId===''){
return
}
diff --git a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
index fe180ed..80a0781 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
@@ -86,7 +86,6 @@
request.post(`/Delivery/getSelectShippingOrder/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
if(res.code==200){
- console.log(res.data.data)
total.dataTotal = res.data.total.total*1
total.pageTotal= res.data.total.pageTotal
diff --git a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDeliveryDetail.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDeliveryDetail.vue
index bce7e56..78afce2 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDeliveryDetail.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDeliveryDetail.vue
@@ -296,7 +296,6 @@
}
request.post(`/order/getOrderById/${str}`).then((res) => {
if(res.code==200){
- console.log(res.data.order)
titleUploadData.value = res.data.order
//鍙栨秷宸ヨ壓鎸夐挳绂佺敤
gridOptions.toolbarConfig.buttons[1].disabled = false
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue b/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue
index 702efcb..464631f 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue
@@ -248,7 +248,6 @@
selectDate.value=res.data.selectDate
orderList.value = deepClone(res.data.data)
xGrid.value.loadData(orderList.value)
- console.log(xGrid.value.getTableData().fullData)
}else{
ElMessage.warning(res.msg)
}
diff --git a/north-glass-erp/northglass-erp/src/views/sd/product/Test.vue b/north-glass-erp/northglass-erp/src/views/sd/product/Test.vue
index 83a0971..3c13c5f 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/product/Test.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/product/Test.vue
@@ -69,7 +69,6 @@
//鎺ユ敹瀛愮粍浠朵紶杩囨潵鐨勯�変腑澶嶉�夋鏁版嵁
const getCheckList = (row) =>{
alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑纭澶嶉�夋淇℃伅鍙湪鎺у埗鍙版煡鐪�')
- console.log(row)
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
index cbc1ec4..09ae89a 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
@@ -2,6 +2,7 @@
import com.example.erp.common.Constants;
import com.example.erp.entity.pp.FlowCard;
+import com.example.erp.entity.sd.DeliveryDetail;
import com.example.erp.entity.sd.Order;
import com.example.erp.common.Result;
import com.example.erp.entity.sd.OrderDetail;
@@ -44,7 +45,6 @@
@PathVariable Date selectTime2,
@RequestBody FlowCard flowCard){
return Result.seccess(flowCardService.selectAddProcess(selectTime1,selectTime2,flowCard));
-
}
//鍒嗘灦鏄庣粏鏌ヨ
@@ -144,4 +144,30 @@
return Result.seccess(flowCardService.flowCardDetailSv(processId,flowCard));
}
+
+ @ApiOperation("娴佺▼鍗℃墦鍗版煡璇㈡帴鍙�")
+ @PostMapping ("/selectPrintFlowCard/{selectTime1}/{selectTime2}/{orderId}/{project}")
+ public Result selectPrintFlowCard(
+ @PathVariable Date selectTime1,
+ @PathVariable Date selectTime2,
+ @PathVariable String orderId,
+ @PathVariable String project,
+ @RequestBody FlowCard flowCard){
+ return Result.seccess(flowCardService.selectPrintFlowCardSv(selectTime1,selectTime2,orderId,project,flowCard));
+ }
+
+ @ApiOperation("娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
+ @PostMapping ("/selectPrint/{orderId}")
+ public Result selectPrint(
+ @PathVariable String orderId,
+ @RequestBody FlowCard flowCard){
+ return Result.seccess(flowCardService.selectPrintSv(orderId,flowCard));
+
+ }
+
+ @ApiOperation("鎵撳嵃娴佺▼鍗℃暟鎹煡璇㈡帴鍙�")
+ @PostMapping("/getSelectPrinting")
+ public Result getSelectPrinting( @RequestBody Map<String,Object> object){
+ return Result.seccess(flowCardService.getSelectPrintingSv(object));
+ }
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
index 0adef47..4a2eb8f 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
@@ -2,9 +2,6 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.example.erp.entity.pp.FlowCard;
-import com.example.erp.entity.sd.Order;
-import com.example.erp.entity.sd.OrderDetail;
-import com.example.erp.entity.sd.OrderGlassDetail;
import org.apache.ibatis.annotations.Mapper;
import java.sql.Date;
@@ -68,4 +65,14 @@
List<Map<String, String>> flowCardDetailMp(String processId, FlowCard flowCard);
Boolean deleteReportingWork(String processId);
+
+ List<Map<String, String>> selectPrintFlowCardMp(Date selectTime1, Date selectTime2, String orderId, String project, FlowCard flowCard);
+
+ List<Map<String, String>> selectPrintMp(String orderId, FlowCard flowCard);
+
+ List<Map<String, String>> getPrimaryList(String processId, Integer technologyNumber);
+
+ List<Map<String, Object>> getDetailList(String processId, Integer technologyNumber);
+
+ List<Map<String, Object>> getProcessList(String processId, Integer technologyNumber);
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java b/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
index 38df1b3..30b5cad 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
@@ -88,7 +88,7 @@
Integer ordersum = finishedGoodsInventoryMapper.findOrderQuantity(flowCard.getOrder().getOrderId());
Integer ordernumbersum = finishedGoodsInventoryMapper.findOrderNumberdsum(flowCard.getOrder().getOrderId());
- System.out.println("璁㈠崟鎬绘暟:" + ordersum + "宸插叆搴撴暟閲忥細" + ordernumbersum + "鍑嗗鍏ュ簱鏁伴噺" + flowCard.getInventoryQuantity());
+ /*System.out.println("璁㈠崟鎬绘暟:" + ordersum + "宸插叆搴撴暟閲忥細" + ordernumbersum + "鍑嗗鍏ュ簱鏁伴噺" + flowCard.getInventoryQuantity());*/
if (finishedGoodsInventorycount > 0) {
//淇敼搴撳瓨琛ㄥ叆搴撴暟閲�
finishedGoodsInventoryMapper.updateInventory(flowCard,storageRegion, remark);
@@ -183,9 +183,9 @@
deliverydetailsum=0;
}
- System.out.println("璁㈠崟鎬绘暟:" + ordersum + "璁㈠崟宸插彂鏁伴噺锛�" + orderDeliveryQuantitySum + "鍑嗗鍑哄簱鏁伴噺" +
+ /*System.out.println("璁㈠崟鎬绘暟:" + ordersum + "璁㈠崟宸插彂鏁伴噺锛�" + orderDeliveryQuantitySum + "鍑嗗鍑哄簱鏁伴噺" +
orderDetail.getWarehouseNum()+ "鍙戣揣鏁伴噺" + orderDetail.getDeliveryDetail().getQuantity()+ "鍙戣揣鎬绘暟" +
- deliverysum+ "宸插彂鏁伴噺" + deliverydetailsum);
+ deliverysum+ "宸插彂鏁伴噺" + deliverydetailsum);*/
if (finishedGoodsInventorycount > 0) {
if(orderDetail.getWarehouseNum()>=orderDetail.getDeliveryDetail().getQuantity()){
//淇敼搴撳瓨琛ㄥ簱瀛樻暟閲�
@@ -607,7 +607,7 @@
for (FinishedOperateLog finishedOperateLog : finishedOperateLogslist) {
Integer ordersum = finishedGoodsInventoryMapper.findOrderQuantity(finishedOperateLog.getOrderId());
Integer ordernumbersum = finishedGoodsInventoryMapper.findOrderNumberdsum(finishedOperateLog.getOrderId());
- System.out.println(finishedOperateLog.getOperateType());
+
if(Objects.equals(finishedOperateLog.getOperateType(), "鍏ュ簱")){
//淇敼璁板綍琛�
finishedOperateLogMapper.updateFinishedOperateLogState(finishedOperateLog,"宸蹭綔搴�");
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java b/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java
index 401705d..c5a4f39 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java
@@ -198,7 +198,6 @@
public Map<String, Object> getSelectMaterialInventoryEngineering(Integer pageNum, Integer pageSize, OptimizeUse optimizeUse) {
Integer offset = (pageNum - 1) * pageSize;
- System.out.println(optimizeUse);
Map<String, Object> map = new HashMap<>();
map.put("data", materialInventoryMapper.getSelectMaterialInventoryEngineering(offset, pageSize, optimizeUse));
map.put("total", materialInventoryMapper.getSelectMaterialInventoryEngineeringPageTotal(offset, pageSize, optimizeUse));
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
index f2df3fe..981e4d7 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
@@ -6,17 +6,15 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.example.erp.entity.pp.FlowCard;
-import com.example.erp.entity.sd.Order;
-import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.entity.sd.OrderGlassDetail;
import com.example.erp.entity.sd.OrderProcessDetail;
import com.example.erp.mapper.pp.FlowCardMapper;
import com.example.erp.mapper.sd.OrderGlassDetailMapper;
import com.example.erp.mapper.sd.OrderProcessDetailMapper;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.sql.Date;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -195,4 +193,46 @@
map.put("data", flowCardMapper.flowCardDetailMp(processId, flowCard));
return map;
}
+
+ public Object selectPrintFlowCardSv(Date selectTime1, Date selectTime2, String orderId, String project, FlowCard flowCard) {
+ if ("null".equals(orderId)) {
+ orderId = "";
+ }
+ if ("null".equals(project)) {
+ project = "";
+ }
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", flowCardMapper.selectPrintFlowCardMp(selectTime1, selectTime2, orderId, project, flowCard));
+ return map;
+ }
+
+ public Object selectPrintSv(String orderId, FlowCard flowCard) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", flowCardMapper.selectPrintMp(orderId, flowCard));
+ return map;
+ }
+
+ public Map<String, Object> getSelectPrintingSv(Map<String, Object> object) {
+ Map<String, Object> map = new HashMap<>();
+ List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();//鏈�缁堢粨鏋�
+ List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("printList")), FlowCard.class);
+ if (!flowCardList.isEmpty()) {
+ for (FlowCard flowCard : flowCardList) {
+ Map<String, Object> itemmap = new HashMap<>();
+ //娴佺▼鍗¤〃澶磋〃灏炬暟鎹�
+ itemmap.put("detail", flowCardMapper.getPrimaryList(flowCard.getProcessId(), flowCard.getTechnologyNumber()));
+ //娴佺▼鍗℃槑缁嗘暟鎹�
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailList(flowCard.getProcessId(), flowCard.getTechnologyNumber());
+ //宸ヨ壓娴佺▼
+ List<Map<String, Object>> processList = flowCardMapper.getProcessList(flowCard.getProcessId(), flowCard.getTechnologyNumber());
+ itemmap.put("detailList", detailList);
+ itemmap.put("processList", processList);
+ list.add(itemmap);
+
+
+ }
+ }
+ map.put("data", list);
+ return map;
+ }
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
index 611202c..b78390d 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
@@ -126,7 +126,6 @@
patchMapper.updateReplenish(patchLog,userName);
ReportingWork reportingWork = reportingWorkMapper
.selectOne(new QueryWrapper<ReportingWork>().eq("reporting_work_id",patchLog.getReportingWorkId()));
- System.out.println(reportingWork.getReportingWorkId());
//淇敼灏忕墖娴佺▼鍗℃暟閲�
patchMapper.updateOrderProcessDetail(patchLog,reportingWork);
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/CustomerService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/CustomerService.java
index d14e3dc..5a24079 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/CustomerService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/CustomerService.java
@@ -45,10 +45,8 @@
Customer customer = JSONObject.parseObject(JSONObject.toJSONString(object.get("customer")), Customer.class);
if(customer!=null){
if (customer.getId()!=null && customer.getId()!=0){
- System.out.println(111);
customerMapper.updateCustomer(customer);
}else{
- System.out.println(222);
customerMapper.insertCustomer(customer);
}
@@ -109,8 +107,6 @@
endDate = selectDate.get(1);
}
}
- System.out.println(orderDetail);
- System.out.println(orderDetail.getOrder());
Map<String, Object> map = new HashMap<>();
map.put("data", customerMapper.getSelectCustomerOderDate(offset, pageSize,startDate,endDate, orderDetail));
map.put("total", customerMapper.getSelectCustomerOderDatePageTotal(offset, pageSize,startDate,endDate, orderDetail));
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
index c14a556..1473de8 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
@@ -77,7 +77,6 @@
endDate = selectDate.get(1);
}
}
- System.out.println(pageSize);
Map<String, Object> map = new HashMap<>();
map.put("data", deliveryDetailMapper.getSelectDeliveryDetailReport(offset, pageSize,startDate,endDate, deliveryDetail));
map.put("total", deliveryDetailMapper.getSelectDeliveryDetailReportPageTotal(offset, pageSize,startDate,endDate, deliveryDetail));
@@ -179,7 +178,6 @@
//鏂板鍙戣揣琛ㄦ暟鎹�
deliveryMapper.insertDelivery(delivery, oddNumber, orderDetaillist.get(0).getOrderId());
}
- System.out.println(4);
Double area = 0.0;
Integer quantity = 0;
Double money = 0.0;
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/ProductService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/ProductService.java
index d6b3f07..0d88662 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/ProductService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/ProductService.java
@@ -50,7 +50,6 @@
JSONObject productJson = new JSONObject(productObject);
Product product = JSONObject.parseObject(JSONObject.toJSONString(productJson.get("title")), Product.class);
List<ProductDetail> productDetails = JSONArray.parseArray(JSONObject.toJSONString(productJson.get("detail")), ProductDetail.class);
- System.out.println(product);
//瀹屽杽涓婚檮琛ㄤ俊鎭苟杩斿洖
Map<String,Object> getProductJson = updateProduct(productDetails,product);
Product getProduct = JSONObject.parseObject(JSONObject.toJSONString(getProductJson.get("title")), Product.class);
diff --git a/north-glass-erp/src/main/java/com/example/erp/tools/netty/MyWebSocketHandler.java b/north-glass-erp/src/main/java/com/example/erp/tools/netty/MyWebSocketHandler.java
index 9e02bbb..e6907f2 100644
--- a/north-glass-erp/src/main/java/com/example/erp/tools/netty/MyWebSocketHandler.java
+++ b/north-glass-erp/src/main/java/com/example/erp/tools/netty/MyWebSocketHandler.java
@@ -37,7 +37,6 @@
//濡傛灉url鍖呭惈鍙傛暟锛岄渶瑕佸鐞�
if(uri.contains("?")){
String newUri=uri.substring(0,uri.indexOf("?"));
- System.out.println(newUri);
request.setUri(newUri);
}
diff --git a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
index 0c9b1fd..4e6b812 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -402,4 +402,87 @@
delete from sd.order_process_detail
where left(process_id,11) = left(#{processId},11)
</delete>
+
+ <select id="selectPrintFlowCardMp">
+ select * from sd.order where create_time between #{selectTime1} and #{selectTime2} and
+ position(#{orderId} in order_id ) and position(#{project} in project)
+ and processing_card=2
+ </select>
+
+ <select id="selectPrintMp">
+ select fc.id,
+ fc.order_id,
+ fc.process_id,
+ o.customer_name,
+ o.project,
+ ogd.technology_number,
+ ogd.glass_address,
+ od.quantity,
+ ogd.total_area,
+ od.product_name,
+ ogd.glass_child,
+ fc.founder,
+ date(fc.splitFrame_time) as splitFrame_time
+ from flow_card as fc
+ left join sd.order_glass_detail as ogd
+ on ogd.order_id = fc.order_id and ogd.order_number = fc.order_number and
+ ogd.technology_number = fc.technology_number
+ left join sd.order_detail as od on od.order_id = fc.order_id and od.order_number = fc.order_number
+ left join sd.`order` as o on o.order_id = fc.order_id
+ where fc.order_id = #{orderId}
+ GROUP BY fc.process_id, ogd.technology_number
+ order by fc.process_id, ogd.technology_number
+
+ </select>
+
+ <select id="getPrimaryList">
+ select o.customer_name,
+ o.project,
+ ogd.process,
+ od.edging_type,
+ ogd.glass_child,
+ od.product_name,
+ o.processing_note,
+ fc.process_id,
+ SUM( od.quantity) as quantity,
+ SUM(od.gross_area) as gross_area,
+ #{technologyNumber} as technologyNumber
+ from flow_card as fc
+ left join sd.order_glass_detail as ogd
+ on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and
+ fc.technology_number = ogd.technology_number
+ left join sd.order_detail as od on od.order_id = fc.order_id and od.order_number = fc.order_number
+ left join sd.`order` as o on o.order_id = fc.order_id
+ where fc.process_id = #{processId}
+ and fc.technology_number = #{technologyNumber}
+ group by fc.process_id, fc.technology_number
+ </select>
+
+ <select id="getDetailList">
+ select fc.order_number,
+ concat(ogd.child_width, "*", ogd.child_height) as child_width,
+ od.quantity,
+ ogd.total_area,
+ od.perimeter,
+ od.bend_radius,
+ od.remarks
+ from flow_card as fc
+ left join sd.order_glass_detail as ogd
+ on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and
+ fc.technology_number = ogd.technology_number
+ left join sd.order_detail as od on od.order_id = fc.order_id and od.order_number = fc.order_number
+ where fc.process_id = #{processId}
+ and fc.technology_number = #{technologyNumber}
+ group by fc.process_id, fc.order_number
+ order by fc.order_number
+ limit 15
+ </select>
+
+ <select id="getProcessList">
+ select *
+ from sd.order_process_detail
+ where process_id = #{processId}
+ and technology_number = #{technologyNumber}
+ group by process
+ </select>
</mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/pp/FolwCard.xml b/north-glass-erp/target/classes/mapper/pp/FolwCard.xml
index 0c9b1fd..4e6b812 100644
--- a/north-glass-erp/target/classes/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/target/classes/mapper/pp/FolwCard.xml
@@ -402,4 +402,87 @@
delete from sd.order_process_detail
where left(process_id,11) = left(#{processId},11)
</delete>
+
+ <select id="selectPrintFlowCardMp">
+ select * from sd.order where create_time between #{selectTime1} and #{selectTime2} and
+ position(#{orderId} in order_id ) and position(#{project} in project)
+ and processing_card=2
+ </select>
+
+ <select id="selectPrintMp">
+ select fc.id,
+ fc.order_id,
+ fc.process_id,
+ o.customer_name,
+ o.project,
+ ogd.technology_number,
+ ogd.glass_address,
+ od.quantity,
+ ogd.total_area,
+ od.product_name,
+ ogd.glass_child,
+ fc.founder,
+ date(fc.splitFrame_time) as splitFrame_time
+ from flow_card as fc
+ left join sd.order_glass_detail as ogd
+ on ogd.order_id = fc.order_id and ogd.order_number = fc.order_number and
+ ogd.technology_number = fc.technology_number
+ left join sd.order_detail as od on od.order_id = fc.order_id and od.order_number = fc.order_number
+ left join sd.`order` as o on o.order_id = fc.order_id
+ where fc.order_id = #{orderId}
+ GROUP BY fc.process_id, ogd.technology_number
+ order by fc.process_id, ogd.technology_number
+
+ </select>
+
+ <select id="getPrimaryList">
+ select o.customer_name,
+ o.project,
+ ogd.process,
+ od.edging_type,
+ ogd.glass_child,
+ od.product_name,
+ o.processing_note,
+ fc.process_id,
+ SUM( od.quantity) as quantity,
+ SUM(od.gross_area) as gross_area,
+ #{technologyNumber} as technologyNumber
+ from flow_card as fc
+ left join sd.order_glass_detail as ogd
+ on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and
+ fc.technology_number = ogd.technology_number
+ left join sd.order_detail as od on od.order_id = fc.order_id and od.order_number = fc.order_number
+ left join sd.`order` as o on o.order_id = fc.order_id
+ where fc.process_id = #{processId}
+ and fc.technology_number = #{technologyNumber}
+ group by fc.process_id, fc.technology_number
+ </select>
+
+ <select id="getDetailList">
+ select fc.order_number,
+ concat(ogd.child_width, "*", ogd.child_height) as child_width,
+ od.quantity,
+ ogd.total_area,
+ od.perimeter,
+ od.bend_radius,
+ od.remarks
+ from flow_card as fc
+ left join sd.order_glass_detail as ogd
+ on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and
+ fc.technology_number = ogd.technology_number
+ left join sd.order_detail as od on od.order_id = fc.order_id and od.order_number = fc.order_number
+ where fc.process_id = #{processId}
+ and fc.technology_number = #{technologyNumber}
+ group by fc.process_id, fc.order_number
+ order by fc.order_number
+ limit 15
+ </select>
+
+ <select id="getProcessList">
+ select *
+ from sd.order_process_detail
+ where process_id = #{processId}
+ and technology_number = #{technologyNumber}
+ group by process
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0