From 12f2fd73462da331478fabc7eaa79fc35b1a59b3 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 19 七月 2024 16:41:17 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue | 487 +++++++++++++++++++++++++++++-------------------------
1 files changed, 261 insertions(+), 226 deletions(-)
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 7c02c89..711b7d1 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
@@ -9,10 +9,17 @@
import {changeFilterEvent, filterChanged} from "@/hook"
import {VXETable} from "vxe-table";
import {addListener, toolbarButtonClickEvent} from "@/hook/mouseMove";
-import PrintProcess from '@/views/pp/processCard/PrintProcess.vue'
+import PrintProcess from '@/components/pp/PrintProcess.vue'
import PrintLabel from '@/views/pp/processCard/PrintLabel.vue'
import PrintCustomLabel from '@/views/pp/processCard/PrintCustomLabel.vue'
+import SortDetail from '@/components/pp/SelectSortDetailProcessCard.vue'
import footSum from "@/hook/footSum"
+import companyInfo from "@/stores/sd/companyInfo"
+import {CircleCheck, Download, Printer} from "@element-plus/icons-vue/global";
+
+const company = companyInfo()
+
+
//璇█鑾峰彇
const {t} = useI18n()
let router = useRouter()
@@ -22,32 +29,40 @@
const printVisible= ref(false)
let selectRecords = ref(null)
+const selectRecordsData = ref({
+ printList: []
+})
+
const xGrid = ref(null)
const xGridDetail =ref(null)
+//鎺掑簭
+let editRow = ref({
+ processId:null,
+ technologyNumber:null
+})
+
+//鎵撳嵃
+let printRow = ref({
+ list:null,
+ printMergeVal:null,
+ like:null
+})
-const getTableRow = (row,type) =>{
+
+const getTableRow = (row,type) => {
switch (type) {
- case 'edit' :{
- request.post(`/processCard/printFlowCardDetails/${row.process_id}/${row.technology_number}`,filterData.value).then((res) => {
- if (res.code == 200) {
+ case 'edit' : {
+ editRow.value.processId = row.process_id
+ editRow.value.technologyNumber = row.technology_number
+ printVisible.value = true
- produceDetailList.value = (res.data.data)
- printVisible.value=true
-
- } else {
-
- ElMessage.warning(res.msg)
-
- }
- })
+ // router.push({path: '/sort-detail', query: {processId: row.process_id,technologyNumber:row.technology_number}})
break
}
-
}
}
-
//绛涢�夋潯浠讹紝鏈夊閿渶瑕佸厛瀹氫箟鏄庣粏閲岄潰鐨勬暟鎹�
let filterData = ref({
@@ -74,18 +89,55 @@
let pageState = null
//瀹ゅ唴瀹ゅ闈�
-const stateValue = ref('姝ら潰涓哄鍐呴潰')
+const stateValue = ref('')
const stateOptions = [
{
- value: '姝ら潰涓哄鍐呴潰',
- label: '姝ら潰涓哄鍐呴潰',
+ value: t('processCard.thisIsTheIndoorSurface'),
+ label: t('processCard.thisIsTheIndoorSurface'),
},
{
- value: '姝ら潰涓哄澶栭潰',
- label: '姝ら潰涓哄澶栭潰',
+ value: t('processCard.thisSideIsOutsideTheRoom'),
+ label: t('processCard.thisSideIsOutsideTheRoom'),
},
]
+//鏍囩绫诲瀷
+let filteredOptions=[]
+const lableType = ref('1')
+const lableTypeOptions = [
+ {
+ value: '1',
+ label: t('processCard.finishedProductLabel'),
+ },
+/* {
+ value: '2',
+ label: t('processCard.halfProductLabel'),
+ },*/
+ {
+ value: `${company.printLabel.labelValue}`,
+ label: `${company.printLabel.labelType}`,
+ },
+ {
+ value: `${company.printLabel.labelValue3}`,
+ label: `${company.printLabel.labelType3}`,
+ },
+]
+let hidePrintLabels = company.printLabel.hideButton;
+
+if (hidePrintLabels=='true'){
+ filteredOptions = lableTypeOptions.filter((option, index) => index !== 2);
+}else {
+ filteredOptions = lableTypeOptions;
+}
+
+//鍚堢墖娴佺▼鍗℃墦鍗颁笅鎷夐�夐」
+const printMerge = ref('')
+const printMergeOptions=[{}]
+
+const printContent = ref({
+ id: 'child',
+
+})
//鎵撳嵃绫诲瀷
const printType = ref()
@@ -95,19 +147,32 @@
dataType: [],
})
+const data = ref({
+ printList: []
+})
+
const {currentRoute} = useRouter()
const route = currentRoute.value
let orderId = route.query.orderId
+data.value.printList=JSON.parse(route.query.printList)
+
// 绗竴娆″姞杞芥煡璇�
-request.post(`/processCard/selectPrint/${orderId}`, filterData.value).then((res) => {
+request.post(`/processCard/selectPrint`, data.value).then((res) => {
if (res.code == 200) {
- produceList = produceList.value.concat(deepClone(res.data.data))
+ let newDataCollection = [];
+ for (let i = 0; i <res.data.data.length ; i++) {
+ res.data.data[i].detail.forEach((item) =>{
+ newDataCollection.push(item);
+ })
+ }
+
titleSelectJson.value.dataType = res.data.type
- xGrid.value.reloadData(produceList)
+ xGrid.value.reloadData(newDataCollection)
gridOptions.loading = false
+ hideButton()
} else {
ElMessage.warning(res.msg)
}
@@ -137,7 +202,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe: true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'demo_1',
+ id: 'printFlowCard_1',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -162,7 +227,7 @@
},//琛ㄥご鍙傛暟
columns: [
{type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
- {title: '鎿嶄綔', width: 55, slots: { default: 'button_slot' },fixed:"left"},
+ {title: t('basicData.operate'), width: 55, slots: { default: 'button_slot' },fixed:"left"},
{type: 'checkbox', fixed: "left", title: t('basicData.check'), width: 80},
{type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
{
@@ -175,14 +240,6 @@
{
field: 'process_id',
title: t('processCard.processId'),
- showOverflow: "ellipsis",
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
- },
- {
- field: 'order_number',
- title: '搴忓彿',
showOverflow: "ellipsis",
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
@@ -207,17 +264,25 @@
{field: 'quantity', title: t('order.quantity'),},
{field: 'total_area', title: t('order.area'),},
{field: 'product_name', title: t('order.product'),},
- {field: 'glass_child', title: t('reportingWorks.glassChild'),},
+ {field: 'glass_child', title: t('reportingWorks.glassChild'),filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod: filterChanged},
{field: 'founder', title: t('processCard.founder'),},
{field: 'splitFrame_time', title: t('processCard.splitFrameTime'),},
+ {
+ field: 'print_status',
+ title: t('processCard.printStatus'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
],//琛ㄥご鎸夐挳
toolbarConfig: {
buttons: [
{code: 'print', name: t('processCard.print'), status: 'primary'},
- {code: 'printLabel', name: t('processCard.printLabel'), status: 'primary'},
- // {code: 'customLabel', name: '鑷畾涔夋爣绛炬墦鍗�', status: 'primary'},
-
+ {code: 'customLabel', name: t('processCard.customLabelPrinting'), status: 'primary'},
+ {code: 'printLabel', name: t('processCard.labelPrinting'), status: 'primary'},
+ {code: 'printLabel2', name: t('processCard.labelPrinting2'), status: 'primary'},
+ {code: 'printLike', name: "鍚岄厤缃墦鍗�", status: 'primary'},
],
// import: false,
// export: true,
@@ -240,15 +305,22 @@
return ''
})
]
- }
+ },
+
+
})
const gridEvents = {
toolbarButtonClick ({ code}) {
const $grid = xGrid.value
selectRecords = $grid.getCheckboxRecords()
+ // selectRecords.forEach(obj => {
+ // delete obj.print_status;
+ // });
let type=printType.value
let faceOrientation=stateValue.value
+ let lableTypes=lableType.value
+ let lableTitle=lableType.text
if ($grid) {
switch (code) {
case 'print': {
@@ -265,8 +337,11 @@
id += selectRecords[i].id + "|"
}
}
- router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords)}})
-
+ printRow.value.list = JSON.stringify(selectRecords)
+ printRow.value.printMergeVal=printMerge.value
+ printRow.value.like=null
+ // router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords),printMerge:printMergeVal}})
+ dialogTableVisible.value=true
break
}
@@ -288,16 +363,40 @@
break
}
+ case 'printLabel2': {
+ if(selectRecords===null ||selectRecords===''||selectRecords.length===0){
+ 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/PrintCustomLabelSemi2', query: {printList: JSON.stringify(selectRecords)}})
+
+ break
+ }
case 'sort': {
const $table = xGridDetail.value
let data = $table.getTableData().fullData
let flowCardData = ref({
flowCard: data,
})
+ for (let i = 0; i < flowCardData.value.flowCard.length; i++) {
+ const regex = /^[1-9]\d*$/
+ if (!regex.test(flowCardData.value.flowCard[i].sort)) {
+ ElMessage.warning(t('basicData.msg.greater0'))
+ return; // 濡傛灉鏈変竴涓笉鏄暣鏁�
+ }
+ }
request.post("/processCard/printSort", flowCardData.value).then((res) => {
if (res.code == 200) {
- ElMessage.success("鎺掑簭鎴愬姛")
- //router.push('/main/processCard/SplittingDetails?orderId=${orderId}')
+ ElMessage.success(t('processCard.sortingSuccessful'))
router.push({
path: '/main/processCard/PrintFlowCard',
query: {orderId: orderId,random: Math.random()}
@@ -316,7 +415,7 @@
return
}
if (type===null||type===''||type===undefined){
- ElMessage.warning('璇烽�夋嫨鑷畾涔夋墦鍗版爣绛炬牱寮�')
+ ElMessage.warning(t('processCard.pleaseSelectCustomPrintLabelStyle'))
return
}
@@ -329,8 +428,44 @@
}
}
- router.push({path: '/main/processCard/PrintCustomLabel', query: {type:type,faceOrientation:faceOrientation, printList: JSON.stringify(selectRecords)}})
+ if (lableTypes==1){
+ router.push({path: '/main/processCard/PrintCustomLabel', query: {type:type,faceOrientation:faceOrientation,lableType:lableTypes, printList: JSON.stringify(selectRecords)}})
+ }
+ else if (lableTypes==2) {
+ router.push({path: '/main/processCard/PrintCustomLabelSemi', query: {type:type,faceOrientation:faceOrientation,lableType:lableTypes, printList: JSON.stringify(selectRecords)}})
+
+ }else if (lableTypes==3) {
+ router.push({path: '/main/processCard/PrintLabel1', query: {type:type,faceOrientation:faceOrientation,lableType:lableTypes, printList: JSON.stringify(selectRecords)}})
+
+ }
+
+
+ break
+ }
+ case 'printLike': {
+ if(selectRecords===null ||selectRecords===''||selectRecords.length===0){
+ ElMessage.warning(t('searchOrder.msgList.checkOrder'))
+ return
+ }
+ if(printMerge.value===null ||printMerge.value===''){
+ ElMessage.warning('璇峰～鍏ラ渶瑕佸悎骞剁殑灞�')
+ 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 + "|"
+ }
+ }
+ printRow.value.list = JSON.stringify(selectRecords)
+ printRow.value.printMergeVal=printMerge.value
+ printRow.value.like="1"
+ // router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords),printMerge:printMergeVal}})
+ dialogTableVisible.value=true
break
}
}
@@ -339,158 +474,73 @@
}
-
-const detailGridOptions = reactive({
- border: "full",//琛ㄦ牸鍔犺竟妗�
- keepSource: true,//淇濇寔婧愭暟鎹�
- align: 'center',//鏂囧瓧灞呬腑
- stripe: true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'demo_1',
- showFooter: true,//鏄剧ず鑴�
- printConfig: {},
- importConfig: {},
- exportConfig: {},
- scrollX: {enabled: true},
- scrollY: {enabled: true, gt: 0},//寮�鍚櫄鎷熸粴鍔�
- showOverflow: true,
- columnConfig: {
- resizable: true,
- useKey: true
- },
- filterConfig: { //绛涢�夐厤缃」
- // remote: true
- },
- customConfig: {
- storage: true
- },
- editConfig: {
- trigger: 'click',
- mode: 'row',
- showStatus: true
- },//琛ㄥご鍙傛暟
- columns: [
- {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
- {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
- {
- field: 'sort',
- width: 80,
- editRender: {name: 'input', attrs: {placeholder: ''}},
- title: '鎺掑簭',
- },
- {
- field: 'process_id',
- title: '娴佺▼鍗″彿',
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
- },
- {
- field: 'order_number',
- title: '搴忓彿',
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
- },
- {
- field: 'technology_number',
- title: '灏忕墖椤哄簭',
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
- },
- {
- field: 'glass_address',
- title: '灏忕墖鏍囪',
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
- },
- {
- field: 'quantity',
- title: '鏁伴噺',
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
- },
- {
- field: 'child_width',
- title: '瀹�',
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
- },
- {
- field: 'child_height',
- title: '楂�',
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
- },
- {
- field: 'area',
- title: '闈㈢Н',
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
- },
- ],//琛ㄥご鎸夐挳
-
- toolbarConfig: {
- buttons: [
- {code: 'sort', name: '鎺掑簭', status: 'primary'},
- ],
- // import: false,
- // export: true,
- //print: true,
- zoom: true,
- custom: true
- },
- data: null,//琛ㄦ牸鏁版嵁
- //鑴氶儴姹傚拰
- footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
- return[
- columns.map((column, columnIndex) => {
- if (columnIndex === 0) {
- return t('basicData.total')
- }
- const List = ["quantity",'area',]
- if (List.includes(column.field)) {
- return footSum(data, column.field)
- }
- return ''
- })
- ]
- }
-})
-
const openedTable = () => {
let detail =ref(produceDetailList.value)
xGridDetail.value.reloadData(detail.value)
+ addListener(xGridDetail.value, detailGridOptions)
}
+const hideButton = () =>{
+ // 鏍规嵁鏉′欢鍊� hidePrintLabels 杩囨护鎸夐挳鏁扮粍
+ gridOptions.toolbarConfig.buttons = gridOptions.toolbarConfig.buttons.filter(button => {
+ // 杩欓噷鏍规嵁 hidePrintLabels 鐨勫�煎喅瀹氭槸鍚﹂殣钘� printLabel 鍜� printLabel2
+ if (hidePrintLabels=='true') {
+ return button.code !== 'printLabel' && button.code !== 'printLabel2' ;
+ } else {
+ return true && button.code !=='printLike'; // 鏄剧ず璇ユ寜閽�
+ }
+ })
+}
+
+
+// 鐩戝惉鎵撳嵃瀹屾垚浜嬩欢
+const printNumber = () =>{
+
+ selectRecordsData.value.printList=selectRecords
+ let printState=0
+ request.post(`/processCard/updatePrintState/${printState}`, selectRecordsData.value).then((res) => {
+ if (res.code == 200 && res.data === true) {
+ } else {
+
+ ElMessage.warning(t('basicData.msg.saveFail'))
+
+ }
+ })
+}
</script>
<template>
<div class="main-div-customer">
-<!-- <label>鏍囩鏍峰紡锛�</label>-->
-<!-- <el-select v-model="printType" clearable default-value="default_city" style="width: 120px">-->
-<!-- <el-option-->
-<!-- v-for="item in titleSelectJson['dataType']"-->
-<!-- :key="item.id"-->
-<!-- :label="item.name"-->
-<!-- :value="item.name"-->
-<!-- />-->
-<!-- </el-select>-->
-<!-- <el-select v-model="stateValue" class="m-2" placeholder="瀹ゅ唴澶栭潰" style="width: 140px">-->
-<!-- <el-option-->
-<!-- v-for="item in stateOptions"-->
-<!-- :key="item.value"-->
-<!-- :label="item.label"-->
-<!-- :value="item.value"-->
-<!-- />-->
-<!-- </el-select>-->
+ <el-input clearable :placeholder="$t('processCard.mergePrinting')" v-model="printMerge" style="width: 90px"></el-input>
+
+ <label>{{$t('processCard.labelStyle')}}锛�</label>
+ <el-select v-model="printType" clearable default-value="default_city" :placeholder="$t('processCard.pleaseSelect')" style="width: 120px">
+ <el-option
+ v-for="item in titleSelectJson['dataType']"
+ :key="item.id"
+ :label="item.name"
+ :value="item.name"
+ />
+ </el-select>
+
+ <el-select v-model="lableType" class="m-2" :placeholder="lableTypeOptions[0].label" style="width: 140px">
+ <el-option
+ v-for="item in filteredOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+
+ <el-select v-model="stateValue" class="m-2" :placeholder="$t('processCard.pleaseSelect')" clearable allow-create filterable style="width: 140px">
+ <el-option
+ v-for="item in stateOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
<vxe-grid
ref="xGrid"
class="mytable-scrollbar"
@@ -539,11 +589,15 @@
</vxe-grid>
<el-dialog
+ id="sizePrintCalrd"
v-model="dialogTableVisible"
- destroy-on-close
:title="$t('processCard.print')"
- style="width: 80%;height:75% ">
- <PrintProcess :printList="selectRecords"
+ destroy-on-close
+ style="width: 75%;height:75% ">
+ <template #header="{ close, titleId, titleClass }">
+ <el-button v-print="printContent" @click="printNumber" :icon="Printer" circle />
+ </template>
+ <print-process id="child" :printList="printRow.list" :printMerge="printRow.printMergeVal" :printLike="printRow.like"
style="width: 100%;height: 100%" />
</el-dialog>
@@ -559,50 +613,19 @@
<el-dialog
v-model="dialogTableVisibleCustomLabel"
destroy-on-close
- title="鑷畾涔夋爣绛�"
+ :title="$t('processCard.labelStyle')"
style="width: 80%;height:75% ">
<PrintLabel :printList="selectRecords"
style="width: 100%;height: 100%" />
</el-dialog>
<el-dialog
- @opened="openedTable"
+ id="sizeCheck"
v-model="printVisible"
- title="娴佺▼鍗℃槑缁�"
- :close-on-click-modal="false"
- :close-on-press-escape="false"
+ :title="$t('processCard.processCardDetails')"
+ destroy-on-close
style="width: 80%;height:75% ">
- <vxe-grid
- ref="xGridDetail"
- class="mytable-scrollbar"
- max-height="100%"
- height="600px"
- size="small"
- v-bind="detailGridOptions"
- v-on="gridEvents">
-
- <template #content="{ row }">
- <ul class="expand-wrapper">
- <li v-for="(item,index) in detailGridOptions.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 #num1_filter="{ column, $panel }">
- <div>
- <div v-for="(option, index) in column.filters" :key="index">
- <input type="text"
- v-model="option.data"
- @input="changeFilterEvent($event, option, $panel)"/>
- </div>
- </div>
- </template>
-
- </vxe-grid>
+ <sort-detail id="child" :processId="editRow.processId" :technologyNumber="editRow.technologyNumber" />
</el-dialog>
@@ -615,4 +638,16 @@
height: 100%;
}
+
+:deep(#sizeCheck .el-dialog__body){
+ height: 90%;
+ width: 100%;
+}
+
+:deep(#sizePrintCalrd .el-dialog__body){
+ height: 85%;
+ width: 100%;
+ overflow-y: auto;
+}
+
</style>
\ No newline at end of file
--
Gitblit v1.8.0