From 43e115a7de2c763c36d79e610a3abb1d833ea892 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 05 八月 2024 10:21:52 +0800
Subject: [PATCH] 修改发货报表
---
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue | 51 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 45 insertions(+), 6 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 70c1dfa..ad25712 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,13 +9,28 @@
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";
//璇█鑾峰彇
const {t} = useI18n()
-
+const company = companyInfo()
let router = useRouter()
const printVisible= ref(false)
+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,
@@ -162,6 +177,7 @@
//琛ㄥご鍙傛暟
columns: [
{type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
+ {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},
{
@@ -199,7 +215,9 @@
toolbarConfig: {
buttons: [
- {'code': 'titleStyle', 'name': t('processCard.labelStyle'),status: 'primary'}
+ {code: 'editCheckbox', name: t('basicData.edit'), status: 'primary'},
+ {'code': 'titleStyle', 'name': t('processCard.labelStyle'),status: 'primary'},
+
],
zoom: true,
@@ -233,6 +251,26 @@
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;
+
+ }
}
}
}
@@ -263,13 +301,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="鍚堝苟" :checked-value="1" :unchecked-value="2" ></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"
>
@@ -287,7 +325,7 @@
</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>
@@ -304,11 +342,12 @@
<el-dialog
id="titleStyle"
:title="$t('processCard.labelStyle')"
- style="width: 70%;height:70% "
+ 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
--
Gitblit v1.8.0