From a944fc9a5bfaac1e2367f6ce398f09eafbcb53a5 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 19 六月 2024 10:01:18 +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 | 407 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 369 insertions(+), 38 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 d1527ea..5319bfb 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
@@ -8,25 +8,44 @@
import {useI18n} from 'vue-i18n'
import {changeFilterEvent, filterChanged} from "@/hook"
import {VXETable} from "vxe-table";
-import {toolbarButtonClickEvent} from "@/hook/mouseMove";
+import {addListener, toolbarButtonClickEvent} from "@/hook/mouseMove";
import PrintProcess from '@/views/pp/processCard/PrintProcess.vue'
import PrintLabel from '@/views/pp/processCard/PrintLabel.vue'
+import PrintCustomLabel from '@/views/pp/processCard/PrintCustomLabel.vue'
+import footSum from "@/hook/footSum"
//璇█鑾峰彇
const {t} = useI18n()
let router = useRouter()
const dialogTableVisible = ref(false)
const dialogTableVisibleLabel = ref(false)
+const dialogTableVisibleCustomLabel = ref(false)
+const printVisible= 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
+const xGrid = ref(null)
+const xGridDetail =ref(null)
+
+
+
+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) {
+
+ produceDetailList.value = (res.data.data)
+ printVisible.value=true
+
+ } else {
+
+ ElMessage.warning(res.msg)
+
+ }
+ })
+ break
+ }
+
+ }
}
//绛涢�夋潯浠讹紝鏈夊閿渶瑕佸厛瀹氫箟鏄庣粏閲岄潰鐨勬暟鎹�
@@ -43,13 +62,51 @@
})
+
//瀹氫箟椤甸潰鎬婚〉鏁�
let pageTotal = ref('')
//瀹氫箟鏁版嵁杩斿洖缁撴灉
let produceList = ref([])
+//瀹氫箟鏁版嵁杩斿洖缁撴灉
+let produceDetailList = ref([])
//瀹氫箟褰撳墠椤垫暟
let pageNum = $ref(1)
let pageState = null
+
+//瀹ゅ唴瀹ゅ闈�
+const stateValue = ref('姝ら潰涓哄鍐呴潰')
+const stateOptions = [
+ {
+ value: '姝ら潰涓哄鍐呴潰',
+ label: '姝ら潰涓哄鍐呴潰',
+ },
+ {
+ value: '姝ら潰涓哄澶栭潰',
+ label: '姝ら潰涓哄澶栭潰',
+ },
+]
+
+//瀹ゅ唴瀹ゅ闈�
+const lableType = ref('1')
+const lableTypeOptions = [
+ {
+ value: '1',
+ label: '鎴愬搧鏍囩',
+ },
+ {
+ value: '2',
+ label: '鍗婂搧鏍囩',
+ },
+]
+
+
+//鎵撳嵃绫诲瀷
+const printType = ref()
+
+//瀹氫箟鎺ユ敹鍔犺浇琛ㄥご涓嬫媺鏁版嵁
+const titleSelectJson = ref({
+ dataType: [],
+})
const {currentRoute} = useRouter()
const route = currentRoute.value
@@ -61,12 +118,14 @@
if (res.code == 200) {
produceList = produceList.value.concat(deepClone(res.data.data))
+ titleSelectJson.value.dataType = res.data.type
xGrid.value.reloadData(produceList)
gridOptions.loading = false
} else {
ElMessage.warning(res.msg)
}
})
+
//琛ㄥ熬姹傚拰
const sumNum = (list, field) => {
@@ -83,8 +142,7 @@
return regex.test(value); // 杩斿洖true/false
}
-//瀛愮粍浠舵帴鏀跺弬鏁�
-const xGrid = ref()
+
const gridOptions = reactive({
loading: true,
border: "full",//琛ㄦ牸鍔犺竟妗�
@@ -105,7 +163,7 @@
useKey: true
},
filterConfig: { //绛涢�夐厤缃」
- // remote: true
+ // remote: true
},
customConfig: {
storage: true
@@ -117,6 +175,7 @@
},//琛ㄥご鍙傛暟
columns: [
{type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
+ {title: '鎿嶄綔', 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},
{
@@ -128,7 +187,7 @@
},
{
field: 'process_id',
- title: '娴佺▼鍗″彿',
+ title: t('processCard.processId'),
showOverflow: "ellipsis",
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
@@ -136,50 +195,52 @@
},
{
field: 'customer_name',
- title: '瀹㈡埛鍚嶇О',
+ title: t('customer.customerName'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
{
field: 'project',
- title: '椤圭洰鍚嶇О',
+ title: t('order.project'),
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: '鍒嗘灦鏃堕棿',},
+ {field: 'technology_number', title: t('processCard.technologyNumber'), showOverflow: "ellipsis"},
+ {field: 'glass_address', title: t('processCard.glassAddress'),},
+ {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: 'founder', title: t('processCard.founder'),},
+ {field: 'splitFrame_time', title: t('processCard.splitFrameTime'),},
],//琛ㄥご鎸夐挳
toolbarConfig: {
buttons: [
- {code: 'print', name: '鎵撳嵃娴佺▼鍗�', status: 'primary'},
- {code: 'printLabel', name: '鎵撳嵃鏍囩', status: 'primary'},
+ {code: 'print', name: t('processCard.print'), status: 'primary'},
+ {code: 'printLabel', name: t('processCard.printLabel'), status: 'primary'},
+ {code: 'customLabel', name: '鑷畾涔夋爣绛炬墦鍗�', status: 'primary'},
+
],
// import: false,
// export: true,
- //print: true,
+ //print: true,
zoom: true,
custom: true
},
data: null,//琛ㄦ牸鏁版嵁
//鑴氶儴姹傚拰
- footerMethod({columns, data}) {//椤佃剼鍑芥暟
- let footList = ['data.orderDetail.quantity', 'data.orderDetail.computeGrossArea']
- return [
+ footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
+ return[
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
return t('basicData.total')
}
- if (footList.includes(column.field)) {
- return sumNum(data, column.field)
+ const List = ["quantity",'total_area',]
+ if (List.includes(column.field)) {
+ return footSum(data, column.field)
}
return ''
})
@@ -190,7 +251,10 @@
const gridEvents = {
toolbarButtonClick ({ code}) {
const $grid = xGrid.value
- selectRecords = $grid.getCheckboxRecords()
+ selectRecords = $grid.getCheckboxRecords()
+ let type=printType.value
+ let faceOrientation=stateValue.value
+ let lableTypes=lableType.value
if ($grid) {
switch (code) {
case 'print': {
@@ -230,16 +294,227 @@
break
}
+ case 'sort': {
+ const $table = xGridDetail.value
+ let data = $table.getTableData().fullData
+ let flowCardData = ref({
+ flowCard: data,
+ })
+ request.post("/processCard/printSort", flowCardData.value).then((res) => {
+ if (res.code == 200) {
+ ElMessage.success("鎺掑簭鎴愬姛")
+ //router.push('/main/processCard/SplittingDetails?orderId=${orderId}')
+ router.push({
+ path: '/main/processCard/PrintFlowCard',
+ query: {orderId: orderId,random: Math.random()}
+ })
+ //location.reload();
+ } else {
+ ElMessage.warning(res.msg)
+ }
+ })
+ break
+ }
+ case 'customLabel': {
+ if(selectRecords===null ||selectRecords===''||selectRecords.length===0){
+ ElMessage.warning(t('searchOrder.msgList.checkOrder'))
+ return
+ }
+ if (type===null||type===''||type===undefined){
+ 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 + "|"
+ }
+ }
+
+ if (lableTypes==1){
+ router.push({path: '/main/processCard/PrintCustomLabel', query: {type:type,faceOrientation:faceOrientation,lableType:lableTypes, printList: JSON.stringify(selectRecords)}})
+
+ }
+ else {
+ router.push({path: '/main/processCard/PrintCustomLabelSemi', query: {type:type,faceOrientation:faceOrientation,lableType:lableTypes, printList: JSON.stringify(selectRecords)}})
+
+ }
+
+
+ break
+ }
}
}
},
}
+
+
+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)
+}
+
+
</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="lableType" class="m-2" placeholder="鎴愬搧鏍囩" style="width: 140px">
+ <el-option
+ v-for="item in lableTypeOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </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>
<vxe-grid
ref="xGrid"
class="mytable-scrollbar"
@@ -264,8 +539,13 @@
</template>
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
+<!-- v-if="userStore.user.permissions.indexOf('SelectProductionBasicData.edit') > -1"-->
<template #button_slot="{ row }">
- <el-button link size="small" type="primary" @click="getTableRow(row,'edit')">{{ $t('basicData.edit') }}
+ <el-button @click="getTableRow(row,'edit')"
+ link
+ type="primary"
+ size="small">
+ {{ $t('basicData.edit') }}
</el-button>
</template>
@@ -285,20 +565,71 @@
<el-dialog
v-model="dialogTableVisible"
destroy-on-close
- title="娴佺▼鍗℃墦鍗�"
+ :title="$t('processCard.print')"
style="width: 80%;height:75% ">
<PrintProcess :printList="selectRecords"
- style="width: 100%;height: 100%" />
+ style="width: 100%;height: 100%" />
</el-dialog>
<el-dialog
v-model="dialogTableVisibleLabel"
destroy-on-close
- title="鏍囩鎵撳嵃"
+ :title="$t('processCard.printLabel')"
style="width: 80%;height:75% ">
<PrintLabel :printList="selectRecords"
- style="width: 100%;height: 100%" />
+ style="width: 100%;height: 100%" />
</el-dialog>
+
+ <el-dialog
+ v-model="dialogTableVisibleCustomLabel"
+ destroy-on-close
+ title="鑷畾涔夋爣绛�"
+ style="width: 80%;height:75% ">
+ <PrintLabel :printList="selectRecords"
+ style="width: 100%;height: 100%" />
+ </el-dialog>
+
+ <el-dialog
+ @opened="openedTable"
+ v-model="printVisible"
+ title="娴佺▼鍗℃槑缁�"
+ :close-on-click-modal="false"
+ :close-on-press-escape="false"
+ 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>
+ </el-dialog>
+
+
</div>
</template>
--
Gitblit v1.8.0