From 2c98be64470f8298d3083ce337b0ffb948bee5f7 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 09 六月 2025 16:45:34 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue | 83 +++++++++++++++++++++++++++++++++++++----
1 files changed, 75 insertions(+), 8 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 8ec533e..752adf4 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
@@ -44,6 +44,19 @@
let produceList = ref([])
let titleStyleVisible = ref(false)
+//瀹氫箟鍒嗘灦鐘舵��
+const optionVal = ref('1')
+const options = [
+ {
+ value: '0',
+ label: '鏈垎鏋�',
+ },
+ {
+ value: '1',
+ label: '宸插垎鏋�',
+ },
+]
+
const form = reactive({
date1: '',
@@ -104,7 +117,7 @@
let endTime = orderInfo.workOrderDate[1]
let orderId=form.orderId
let project=form.project
-
+let state = optionVal.value
if (orderId==''){
orderId=null
}
@@ -114,7 +127,7 @@
//绗竴娆″姞杞芥暟鎹�
-request.post(`/processCard/selectPrintFlowCard/${startTime}/${endTime}/${orderId}/${project}/${userId}`, filterData.value).then((res) => {
+request.post(`/processCard/selectPrintFlowCard/${startTime}/${endTime}/${orderId}/${project}/${userId}/${state}`, filterData.value).then((res) => {
if (res.code == 200) {
produceList = produceList.value.concat(deepClone(res.data.data))
@@ -145,7 +158,9 @@
if (project==''){
project=null
}
- request.post(`/processCard/selectPrintFlowCard/${startTime}/${endTime}/${orderId}/${project}/${userId}`, filterData.value).then((res) => {
+ let state = optionVal.value
+
+ request.post(`/processCard/selectPrintFlowCard/${startTime}/${endTime}/${orderId}/${project}/${userId}/${state}`, filterData.value).then((res) => {
if (res.code == 200) {
xGrid.value.loadData(res.data.data)
@@ -229,10 +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: '璁㈠崟鎵撳嵃', status: 'primary'},
],
zoom: true,
@@ -266,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('璇烽�夋嫨宸插垎鏋惰鍗曟墦鍗�')
+ return
+ }
let orderIdList = ""
for (let i = 0; i < selectRecords.length; i++) {
if (i + 1 === selectRecords.length) {
@@ -286,13 +305,17 @@
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('璇烽�夋嫨宸插垎鏋惰鍗曟墦鍗�')
+ return
+ }
let orderIdList = ""
for (let i = 0; i < selectRecords.length; i++) {
if (i + 1 === selectRecords.length) {
@@ -306,13 +329,17 @@
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('璇烽�夋嫨宸插垎鏋惰鍗曟墦鍗�')
+ return
+ }
let orderIdList = ""
for (let i = 0; i < selectRecords.length; i++) {
if (i + 1 === selectRecords.length) {
@@ -323,6 +350,30 @@
}
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('璇烽�夋嫨鏈垎鏋惰鍗曟墦鍗�')
+ 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;
}
@@ -351,6 +402,22 @@
<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"
--
Gitblit v1.8.0