From 1c13bd7a2cd2c8ba69a185da69344c8b59f4e561 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 04 七月 2024 09:29:15 +0800
Subject: [PATCH] 选中求和功能以及还原双击回车才能点击单元格
---
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue | 234 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 199 insertions(+), 35 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 5e615b1..1f502b8 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
@@ -11,12 +11,19 @@
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"
+import companyInfo from "@/stores/sd/companyInfo"
+
+const company = companyInfo()
+
+
//璇█鑾峰彇
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)
@@ -60,6 +67,7 @@
})
+
//瀹氫箟椤甸潰鎬婚〉鏁�
let pageTotal = ref('')
//瀹氫箟鏁版嵁杩斿洖缁撴灉
@@ -69,6 +77,49 @@
//瀹氫箟褰撳墠椤垫暟
let pageNum = $ref(1)
let pageState = null
+
+//瀹ゅ唴瀹ゅ闈�
+const stateValue = ref('')
+const stateOptions = [
+ {
+ value: t('processCard.thisIsTheIndoorSurface'),
+ label: t('processCard.thisIsTheIndoorSurface'),
+ },
+ {
+ value: t('processCard.thisSideIsOutsideTheRoom'),
+ label: t('processCard.thisSideIsOutsideTheRoom'),
+ },
+]
+
+//鏍囩绫诲瀷
+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}`,
+ },
+]
+
+//鍚堢墖娴佺▼鍗℃墦鍗颁笅鎷夐�夐」
+const printMerge = ref('')
+const printMergeOptions=[{}]
+
+
+//鎵撳嵃绫诲瀷
+const printType = ref()
+
+//瀹氫箟鎺ユ敹鍔犺浇琛ㄥご涓嬫媺鏁版嵁
+const titleSelectJson = ref({
+ dataType: [],
+})
const {currentRoute} = useRouter()
const route = currentRoute.value
@@ -80,12 +131,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) => {
@@ -135,7 +188,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},
{
@@ -147,7 +200,7 @@
},
{
field: 'process_id',
- title: '娴佺▼鍗″彿',
+ title: t('processCard.processId'),
showOverflow: "ellipsis",
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
@@ -155,32 +208,33 @@
},
{
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'),filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod: filterChanged},
+ {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: 'customLabel', name: t('processCard.customLabelPrinting'), status: 'primary'},
+ {code: 'printLabel', name: t('processCard.labelPrinting'), status: 'primary'},
],
// import: false,
// export: true,
@@ -210,6 +264,10 @@
toolbarButtonClick ({ code}) {
const $grid = xGrid.value
selectRecords = $grid.getCheckboxRecords()
+ let type=printType.value
+ let faceOrientation=stateValue.value
+ let lableTypes=lableType.value
+ let lableTitle=lableType.text
if ($grid) {
switch (code) {
case 'print': {
@@ -226,7 +284,9 @@
id += selectRecords[i].id + "|"
}
}
- router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords)}})
+
+ let printMergeVal=printMerge.value
+ router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords),printMerge:printMergeVal}})
break
}
@@ -255,10 +315,16 @@
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()}
@@ -271,10 +337,42 @@
})
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(t('processCard.pleaseSelectCustomPrintLabelStyle'))
+ 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({
@@ -283,7 +381,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe: true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'demo_1',
+ id: 'demo_2',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -301,6 +399,15 @@
customConfig: {
storage: true
},
+ mouseConfig:{selected: true},//榧犳爣閫変腑
+ keyboardConfig:{
+ isArrow: true,
+ isDel: true,
+ isEnter: true,
+ isTab: true,
+ isEdit: true,
+ isChecked: true
+ },
editConfig: {
trigger: 'click',
mode: 'row',
@@ -313,69 +420,85 @@
field: 'sort',
width: 80,
editRender: {name: 'input', attrs: {placeholder: ''}},
- title: '鎺掑簭',
+ title: t('processCard.sorting'),
},
{
field: 'process_id',
- title: '娴佺▼鍗″彿',
+ title: t('processCard.processId'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
{
field: 'order_number',
- title: '搴忓彿',
+ title: t('order.OrderNum'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
{
field: 'technology_number',
- title: '灏忕墖椤哄簭',
+ title: t('processCard.technologyNumber'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
{
field: 'glass_address',
- title: '灏忕墖鏍囪',
+ title: t('processCard.glassAddress'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
{
field: 'quantity',
- title: '鏁伴噺',
+ title: t('order.quantity'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
{
field: 'child_width',
- title: '瀹�',
+ title: t('order.width'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
+ filterMethod: filterChanged,
+ sortable: true,
},
{
field: 'child_height',
- title: '楂�',
+ title: t('order.height'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
+ filterMethod: filterChanged,
+ sortable: true,
},
{
field: 'area',
- title: '闈㈢Н',
+ title: t('order.area'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
- ],//琛ㄥご鎸夐挳
+ ],
+ //琛ㄥ崟楠岃瘉
+ editRules: {
+ sort: [
+ //type: 'number', min: 0, message: '璇疯緭鍏ュぇ浜庣瓑浜�0鐨勬暟鍊�' ,
+ {
+ validator ({ cellValue }) {
+ const regex = /^[1-9]\d*$/
+ if (!regex.test(cellValue)) {
+ return new Error(t('basicData.msg.greater0'))
+ }
+ }}
+ ],
+ },
+ //琛ㄥご鎸夐挳
toolbarConfig: {
buttons: [
- {code: 'sort', name: '鎺掑簭', status: 'primary'},
+ {code: 'sort', name: t('processCard.sorting'), status: 'primary'},
],
// import: false,
// export: true,
@@ -406,10 +529,40 @@
xGridDetail.value.reloadData(detail.value)
}
+
</script>
<template>
<div class="main-div-customer">
+ <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 lableTypeOptions"
+ :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"
@@ -460,7 +613,7 @@
<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%" />
@@ -469,7 +622,16 @@
<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%" />
+ </el-dialog>
+
+ <el-dialog
+ v-model="dialogTableVisibleCustomLabel"
+ destroy-on-close
+ :title="$t('processCard.labelStyle')"
style="width: 80%;height:75% ">
<PrintLabel :printList="selectRecords"
style="width: 100%;height: 100%" />
@@ -478,7 +640,7 @@
<el-dialog
@opened="openedTable"
v-model="printVisible"
- title="娴佺▼鍗℃槑缁�"
+ :title="$t('processCard.processCardDetails')"
:close-on-click-modal="false"
:close-on-press-escape="false"
style="width: 80%;height:75% ">
@@ -486,7 +648,7 @@
ref="xGridDetail"
class="mytable-scrollbar"
max-height="100%"
- height="600px"
+ height="550px"
size="small"
v-bind="detailGridOptions"
v-on="gridEvents">
@@ -514,6 +676,8 @@
</vxe-grid>
</el-dialog>
+
+
</div>
</template>
--
Gitblit v1.8.0