From b97e00dae4fa017c8273e41fb0f24cf7c7c69a33 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 25 十一月 2024 13:28:35 +0800
Subject: [PATCH] 工程打印标签调整
---
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue | 167 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 146 insertions(+), 21 deletions(-)
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 3e1aa74..5edee96 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
@@ -9,12 +9,36 @@
import {changeFilterEvent, filterChanged} from "@/hook"
import footSum from "@/hook/footSum"
import TagStyle from "@/components/pp/TagStyle.vue"
+import TagStyleDesigner from "@/components/pp/TagStyleDesigner.vue"
+import OrderSortDetail from '@/components/pp/OrderSortDetail.vue'
+import companyInfo from "@/stores/sd/companyInfo"
+import useUserInfoStore from "@/stores/userInfo";
+import useOrderInfoStore from "@/stores/sd/order/orderInfo"
+
//璇█鑾峰彇
const {t} = useI18n()
-
+const company = companyInfo()
let router = useRouter()
+const printVisible= ref(false)
+const orderInfo = useOrderInfoStore()
+const userStore = useUserInfoStore()
+const userId = userStore.user.userId
+
+let inquiryMode = company.printLabel.getSelectFlowCard;
+
+const checkedValue = ref("")
+if (userId==="A071" || userId==="A107"){
+ checkedValue.value = ref(2)
+}
+else {
+ checkedValue.value = ref(inquiryMode)
+}
+//鎺掑簭
+let editRow = ref({
+ orderId:null,
+})
//瀹氫箟鏁版嵁杩斿洖缁撴灉
let produceList = ref([])
@@ -30,6 +54,11 @@
switch (type) {
case 'edit' :{
router.push({path: '/main/processCard/PrintFlowCard', query: { orderId: row.order_id }})
+ break
+ }
+ case 'sort' :{
+ editRow.value.orderId = row.order_id
+ printVisible.value = true
break
}
}
@@ -56,11 +85,11 @@
//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
function getNowTime() {
- const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 10)
+ const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 15)
.toISOString()
.replace('T', ' ')
.slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
- const end = new Date(new Date().getTime() + 3600 * 1000 * 24)
+ const end = new Date(new Date().getTime())
.toISOString()
.replace('T', ' ')
.slice(0, 10)//榛樿缁撴潫鏃堕棿褰撳墠鏃堕棿
@@ -68,9 +97,11 @@
}
//绗竴娆″姞杞借幏鍙栬繎涓冨ぉ鏃堕棿鍜岄粯璁ょ姸鎬�
-form.date1 = getNowTime()
-let startTime = form.date1[0]
-let endTime = form.date1[1]
+if (orderInfo.workOrderDate[0]=="" && orderInfo.workOrderDate[1]==""){
+ orderInfo.workOrderDate=getNowTime()
+}
+let startTime = orderInfo.workOrderDate[0]
+let endTime = orderInfo.workOrderDate[1]
let orderId=form.orderId
let project=form.project
@@ -80,12 +111,19 @@
if (project==''){
project=null
}
+
//绗竴娆″姞杞芥暟鎹�
-request.post(`/processCard/selectPrintFlowCard/${startTime}/${endTime}/${orderId}/${project}`, filterData.value).then((res) => {
+request.post(`/processCard/selectPrintFlowCard/${startTime}/${endTime}/${orderId}/${project}/${userId}`, filterData.value).then((res) => {
if (res.code == 200) {
produceList = produceList.value.concat(deepClone(res.data.data))
+ gridOptions.toolbarConfig.buttons[2].visible=false
+ let roleId=res.data.user
+ if (roleId=='1' || roleId=='17'){
+ gridOptions.toolbarConfig.buttons[2].visible=true
+ }
+
xGrid.value.reloadData(produceList)
gridOptions.loading = false
} else {
@@ -96,8 +134,8 @@
//鐐瑰嚮鏌ヨ
const getWorkOrder = () => {
- let startTime = form.date1[0]
- let endTime = form.date1[1]
+ let startTime = orderInfo.workOrderDate[0]
+ let endTime = orderInfo.workOrderDate[1]
let orderId=form.orderId
let project=form.project
@@ -107,7 +145,7 @@
if (project==''){
project=null
}
- request.post(`/processCard/selectPrintFlowCard/${startTime}/${endTime}/${orderId}/${project}`, filterData.value).then((res) => {
+ request.post(`/processCard/selectPrintFlowCard/${startTime}/${endTime}/${orderId}/${project}/${userId}`, filterData.value).then((res) => {
if (res.code == 200) {
xGrid.value.loadData(res.data.data)
@@ -126,7 +164,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe: true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'SelectPrintFlowCard',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -145,14 +183,15 @@
},
editConfig: {
- trigger: 'click',
+ trigger: 'dblclick',
mode: 'row',
showStatus: true
},
//琛ㄥご鍙傛暟
columns: [
{type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
- {title: t('basicData.operate'), width: 80, slots: { default: 'button_slot' },fixed:"left"},
+ {type: 'checkbox', fixed: "left", title: t('basicData.check'),width: 78},
+ {title: t('basicData.operate'), width: 100, slots: { default: 'button_slot' },fixed:"left"},
{type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
{
field: 'order_id',
@@ -161,6 +200,9 @@
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
+ {field: 'customer_name', title: t('processCard.customerName'), filters: [{data: ''}], slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged, width: 110},
+
{
field: 'project',
title: t('order.project'),
@@ -186,7 +228,11 @@
toolbarConfig: {
buttons: [
- {'code': 'titleStyle', 'name': '鏍囩鏍峰紡',status: 'primary'}
+ {code: 'editCheckbox', name: t('basicData.edit'), status: 'primary'},
+ {'code': 'titleStyle', 'name': t('processCard.labelStyle'),status: 'primary'},
+ {code: 'detailsPrint', name: t('processCard.detailPrinting'), status: 'primary'},
+ {code: 'detailsProcessPrint', name: t('processCard.detailsPrintedSeparately'), status: 'primary'},
+
],
zoom: true,
@@ -220,6 +266,67 @@
titleStyleVisible.value = true
break
}
+ case 'editCheckbox': {
+ const selectRecords = $grid.getCheckboxRecords()
+ if(selectRecords===null ||selectRecords===''||selectRecords.length===0){
+ ElMessage.warning(t('searchOrder.msgList.checkOrder'))
+ return
+ }
+
+ let orderIdList = ""
+ for (let i = 0; i < selectRecords.length; i++) {
+ if (i + 1 === selectRecords.length) {
+ orderIdList += selectRecords[i].order_id
+ } else {
+ orderIdList += selectRecords[i].order_id + "|"
+ }
+ }
+ let array = orderIdList.split('|');
+ router.push({path: '/main/processCard/PrintFlowCard', query: {printList: JSON.stringify(selectRecords),checkedValue:checkedValue.value.value}})
+ return;
+
+ }
+ case 'detailsPrint': {
+ const selectRecords = $grid.getCheckboxRecords()
+ if(selectRecords===null ||selectRecords===''||selectRecords.length===0){
+ ElMessage.warning(t('searchOrder.msgList.checkOrder'))
+ return
+ }
+
+ let orderIdList = ""
+ for (let i = 0; i < selectRecords.length; i++) {
+ if (i + 1 === selectRecords.length) {
+ orderIdList += selectRecords[i].order_id
+ } else {
+ orderIdList += selectRecords[i].order_id + "|"
+ }
+ }
+ let array = orderIdList.split('|');
+ router.push({path: '/main/processCard/PrintFlowCardDetails', query: {printList: JSON.stringify(selectRecords),checkedValue:checkedValue.value.value,type:1}})
+ return;
+
+ }
+ case 'detailsProcessPrint': {
+ const selectRecords = $grid.getCheckboxRecords()
+ if(selectRecords===null ||selectRecords===''||selectRecords.length===0){
+ ElMessage.warning(t('searchOrder.msgList.checkOrder'))
+ return
+ }
+
+ let orderIdList = ""
+ for (let i = 0; i < selectRecords.length; i++) {
+ if (i + 1 === selectRecords.length) {
+ orderIdList += selectRecords[i].order_id
+ } else {
+ orderIdList += selectRecords[i].order_id + "|"
+ }
+ }
+ let array = orderIdList.split('|');
+ router.push({path: '/main/processCard/PrintFlowCardDetails', query: {printList: JSON.stringify(selectRecords),checkedValue:checkedValue.value.value,type:2}})
+ return;
+
+ }
+
}
}
}
@@ -232,7 +339,7 @@
<div id="selectForm">
<el-row :gutter="0">
<el-date-picker
- v-model="form.date1"
+ v-model="orderInfo.workOrderDate"
:start-placeholder="$t('basicData.startDate')"
:end-placeholder="$t('basicData.endDate')"
format="YYYY/MM/DD"
@@ -250,13 +357,13 @@
:icon="Search"
type="primary" @click="getWorkOrder">{{ $t('basicData.search') }}
</el-button>
+ <vxe-checkbox style="margin-top:6px;margin-left:10px " v-if="!(checkedValue.value === 2 && inquiryMode === 2)" v-model="checkedValue.value" :content="$t('processCard.merge')" :checked-value="1" :unchecked-value="3" ></vxe-checkbox>
</el-row>
</div>
<vxe-grid
ref="xGrid"
class="mytable-scrollbar"
- height="100%"
- max-height="100%"
+ height="95%"
v-bind="gridOptions"
v-on="gridEvents"
>
@@ -274,13 +381,16 @@
</template>
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
<template #button_slot="{ row }">
- <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">{{$t('basicData.edit')}}</el-button>
+<!-- <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">{{$t('basicData.edit')}}</el-button>-->
+ <el-button @click="getTableRow(row,'sort')" link type="primary" size="small">{{$t('processCard.sorting')}}</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)"/>
+ <input v-model="option.data" type="text"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
@@ -289,12 +399,22 @@
</vxe-grid>
<el-dialog
id="titleStyle"
- :title="'鏍囩鏍峰紡'"
- style="width: 70%;height:70% "
+ :title="$t('processCard.labelStyle')"
+ style="width: 90%;height:90%;margin-top: 3vh "
:close-on-click-modal="false"
:close-on-press-escape="false"
v-model="titleStyleVisible">
<tag-style style="width: 100%;height: 100%"/>
+<!-- <tag-style-designer style="width: 100%;height: 100%"/>-->
+ </el-dialog>
+
+ <el-dialog
+ id="sizeCheck"
+ v-model="printVisible"
+ :title="$t('processCard.processCardDetails')"
+ destroy-on-close
+ style="width: 80%;height:75% ">
+ <order-sort-detail id="child" :orderId="editRow.orderId" />
</el-dialog>
</div>
</template>
@@ -312,4 +432,9 @@
width: 100%;
}
+:deep(#sizeCheck .el-dialog__body){
+ height: 90%;
+ width: 100%;
+}
+
</style>
\ No newline at end of file
--
Gitblit v1.8.0