From 260ad701e251aaa71a1bf5531bd98d93cb91c2bf Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 19 十一月 2025 11:18:57 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue | 186 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 159 insertions(+), 27 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 1885c7f..2381dce 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
@@ -13,12 +13,16 @@
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()
+let printNumberFc = company.printNumber;
const userStore = useUserInfoStore()
const userId = userStore.user.userId
@@ -39,6 +43,19 @@
//瀹氫箟鏁版嵁杩斿洖缁撴灉
let produceList = ref([])
let titleStyleVisible = ref(false)
+
+//瀹氫箟鍒嗘灦鐘舵��
+const optionVal = ref('1')
+const options = [
+ {
+ value: '0',
+ label: t('processCard.noFlowCard'),
+ },
+ {
+ value: '1',
+ label: t('processCard.okFlowCard'),
+ },
+]
const form = reactive({
@@ -85,7 +102,7 @@
.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)//榛樿缁撴潫鏃堕棿褰撳墠鏃堕棿
@@ -93,24 +110,33 @@
}
//绗竴娆″姞杞借幏鍙栬繎涓冨ぉ鏃堕棿鍜岄粯璁ょ姸鎬�
-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
-
+let state = optionVal.value
if (orderId==''){
orderId=null
}
if (project==''){
project=null
}
+
//绗竴娆″姞杞芥暟鎹�
-request.post(`/processCard/selectPrintFlowCard/${startTime}/${endTime}/${orderId}/${project}`, filterData.value).then((res) => {
+request.post(`/processCard/selectPrintFlowCard/${orderInfo.workOrderDate}/${orderId}/${project}/${userId}/${state}`, 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
+ }*/
+ orderInfo.workOrderDate = res.data.selectDate
xGrid.value.reloadData(produceList)
gridOptions.loading = false
} else {
@@ -121,8 +147,7 @@
//鐐瑰嚮鏌ヨ
const getWorkOrder = () => {
- let startTime = form.date1[0]
- let endTime = form.date1[1]
+
let orderId=form.orderId
let project=form.project
@@ -132,9 +157,11 @@
if (project==''){
project=null
}
- request.post(`/processCard/selectPrintFlowCard/${startTime}/${endTime}/${orderId}/${project}`, filterData.value).then((res) => {
- if (res.code == 200) {
+ let state = optionVal.value
+ request.post(`/processCard/selectPrintFlowCard/${orderInfo.workOrderDate}/${orderId}/${project}/${userId}/${state}`, filterData.value).then((res) => {
+ if (res.code == 200) {
+ orderInfo.workOrderDate = res.data.selectDate
xGrid.value.loadData(res.data.data)
gridOptions.loading = false
} else {
@@ -197,6 +224,7 @@
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
+ {field: 'batch', title: t('order.batch'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110,filterMethod: filterChanged},
{
field: 'quantity',
title: t('order.quantity'),
@@ -216,8 +244,10 @@
toolbarConfig: {
buttons: [
{code: 'editCheckbox', name: t('basicData.edit'), status: 'primary'},
- {'code': 'titleStyle', 'name': t('processCard.labelStyle'),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'},
+ {code: 'orderPrint', name: t('processCard.orderPrint'), status: 'primary'},
],
zoom: true,
@@ -251,13 +281,17 @@
titleStyleVisible.value = true
break
}
+ //缂栬緫
case 'editCheckbox': {
const selectRecords = $grid.getCheckboxRecords()
if(selectRecords===null ||selectRecords===''||selectRecords.length===0){
ElMessage.warning(t('searchOrder.msgList.checkOrder'))
return
}
-
+ if (optionVal.value != '1'){
+ ElMessage.warning(t('processCard.addFlowCardMsg1'))
+ return
+ }
let orderIdList = ""
for (let i = 0; i < selectRecords.length; i++) {
if (i + 1 === selectRecords.length) {
@@ -267,10 +301,86 @@
}
}
let array = orderIdList.split('|');
- router.push({path: '/main/processCard/PrintFlowCard', query: {printList: JSON.stringify(selectRecords),checkedValue:checkedValue.value.value}})
+ if (selectRecords.length==1){
+ printNumberFc = true
+ }
+ router.push({path: '/main/processCard/PrintFlowCard', query: {printList: JSON.stringify(selectRecords),checkedValue:checkedValue.value.value,printNumberFc:printNumberFc}})
return;
}
+ //鏄庣粏鎵撳嵃
+ case 'detailsPrint': {
+ const selectRecords = $grid.getCheckboxRecords()
+ if(selectRecords===null ||selectRecords===''||selectRecords.length===0){
+ ElMessage.warning(t('searchOrder.msgList.checkOrder'))
+ return
+ }
+ if (optionVal.value != '1'){
+ ElMessage.warning(t('processCard.addFlowCardMsg1'))
+ 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
+ }
+ if (optionVal.value != '1'){
+ ElMessage.warning(t('processCard.addFlowCardMsg1'))
+ 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;
+
+ }
+ //璁㈠崟鎵撳嵃
+ case 'orderPrint': {
+ const selectRecords = $grid.getCheckboxRecords()
+ if(selectRecords===null ||selectRecords===''||selectRecords.length===0){
+ ElMessage.warning(t('searchOrder.msgList.checkOrder'))
+ return
+ }
+ if (optionVal.value != '0'){
+ ElMessage.warning(t('processCard.addFlowCardMsg2'))
+ 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:3}})
+ return;
+
+ }
+
}
}
}
@@ -279,11 +389,10 @@
</script>
<template>
- <div class="main-div-customer">
- <div id="selectForm">
- <el-row :gutter="0">
+ <div style="width: 100%;height: 100%">
+ <div class="head">
<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"
@@ -296,18 +405,36 @@
<el-input v-model="form.project" clearable :placeholder="$t('order.project')" style="width: 110px"></el-input>
+
+ <el-select
+ :default-first-option="true"
+ ref="getSelect" style="width: 130px"
+ v-model="optionVal"
+ class="m-2"
+ @change="getWorkOrder"
+ >
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+
<el-button
id="select"
: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="鍚堝苟" :checked-value="1" :unchecked-value="3" ></vxe-checkbox>
- </el-row>
+ <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>
+
</div>
+
+ <div class="main-table">
<vxe-grid
ref="xGrid"
class="mytable-scrollbar"
- height="95%"
+ height="100%"
v-bind="gridOptions"
v-on="gridEvents"
>
@@ -332,13 +459,16 @@
<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>
</vxe-grid>
+ </div>
<el-dialog
id="titleStyle"
:title="$t('processCard.labelStyle')"
@@ -362,12 +492,14 @@
</template>
<style scoped>
-.main-div-customer {
- width: 99%;
- height: 100%;
+.head{
+ width: 100%;
+ height: 35px;
}
-#selectForm {
- width: 60%;
+
+.main-table{
+ width: 100%;
+ height: calc(100% - 35px);
}
:deep(#titleStyle .el-dialog__body){
height: 90%;
--
Gitblit v1.8.0