From 1c5bdd46d4d8b71fd3dc7bbfb2331d9281305ec4 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 22 十一月 2024 16:50:59 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue | 131 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 116 insertions(+), 15 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue
index edbd291..bac1943 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue
@@ -1,5 +1,5 @@
<script lang="ts" setup>
-import {reactive, ref} from "vue";
+import {onMounted, reactive, ref} from "vue";
import {useRouter} from 'vue-router'
import request from "@/utils/request";
import deepClone from "@/utils/deepClone";
@@ -13,19 +13,26 @@
import {Printer} from "@element-plus/icons-vue/global";
import companyInfo from "@/stores/sd/companyInfo"
import {remove} from "xe-utils";
+import PrintCustomLabelProject from "@/components/pp/PrintCustomLabelProject.vue";
//璇█鑾峰彇
const {t} = useI18n()
let router = useRouter()
const dialogTableVisibleLabelXJTwo = ref(false)
+const dialogTableVisibleLabelProject = ref(false)
let rowClickIndex = ref(null)
+let lastList = ref([])
+const tags = ref([])
+const tagType=ref()
//瀹氫箟鏁版嵁杩斿洖缁撴灉
let produceList = ref([])
let titleStyleVisible = ref(false)
let print = ref("1")
+
+
//鏍囩
let labelRow = ref({
@@ -34,9 +41,11 @@
type: "",//鏍囩妯℃澘
lableType: null,//鏍囩绫诲瀷
dataType: 0,//鏍囩绫诲瀷
- projectNo:null
+ projectNo:null,
+ detailType:0//鏄惁鏄伐绋嬫槑缁嗘墦鍗�
})
const company = companyInfo()
+let name=company.companyName
let hidePrintLabels = company.printLabel.hideButton;
const form = reactive({
@@ -44,11 +53,60 @@
orderId: '',
project: ''
})
+
+const tag = ref({
+ id:null,
+ name:null,
+ type:1,
+ tagWidth:null,
+ tagHeight:null,
+ value:null,
+ size:null
+
+})
+
+onMounted(async () => {
+ await getTags();
+ await hiprint.init();
+})
+let hiprintTemplate = ref()
+const changeTag = () => {
+ hiprintTemplate.value = new hiprint.PrintTemplate({});
+ const json = JSON.parse(tag.value.value)
+ hiprintTemplate.value.update(json)
+}
const getTableRow = (row, type) => {
switch (type) {
case 'edit' :{
if(parseInt(print.value)==1){
- router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:1 }})
+ if (name.indexOf('鍚夊埄鐜荤拑')!=-1){
+ router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:1 }})
+ }
+ else {
+ if (tag.value.name==null || tag.value.name==''){
+ ElMessage.warning(t('璇烽�夋嫨鏍囩妯℃澘'))
+ return
+ }
+ let name=company.companyName
+ labelRow.value.list = JSON.stringify([row])
+ if (name == '閲戝崕绂忓枩澶╂垚鐜荤拑鏈夐檺鍏徃'){
+ labelRow.value.type = tag.value.name
+ labelRow.value.dataType=3
+ labelRow.value.lableType = 1
+ labelRow.value.switch=true
+ labelRow.value.detailType=1
+ lastList.value = []
+ dialogTableVisibleLabelProject.value = true
+ }
+ else {
+ labelRow.value.type = '鎭掗懌甯︽暟閲�'
+ labelRow.value.dataType=3
+ dialogTableVisibleLabelXJTwo.value = true
+ }
+ }
+
+
+ return
}else{
router.push({path: '/main/processCard/PrintCustomLabelSemi2', query: { projectNo: row.project_no,type:1 }})
}
@@ -100,6 +158,12 @@
let endTime = form.date1[1]
let orderId=form.orderId
let project=form.project
+
+const getTags = () => {
+ request.get('tagStyle/getTagList').then(res => {
+ tags.value = res.data
+ })
+}
//绗竴娆″姞杞芥暟鎹�
@@ -281,15 +345,8 @@
id: 'childLabel',
})
-const hideButton = () => {
- let name=company.companyName
- // 鏍规嵁鏉′欢鍊� hidePrintLabels 杩囨护鎸夐挳鏁扮粍
- gridOptions.toolbarConfig.buttons = gridOptions.toolbarConfig.buttons.filter(button => {
- // 杩欓噷鏍规嵁 hidePrintLabels 鐨勫�煎喅瀹氭槸鍚﹂殣钘� printLabel 鍜� printLabel2
- if (name == '閲戝崕绂忓枩澶╂垚鐜荤拑鏈夐檺鍏徃') {
- return button.code !== 'printLabel';
- }
- })
+const printObjectProcess = () => {
+ hiprintTemplate.value.print(lastList.value)
}
</script>
@@ -313,7 +370,26 @@
:icon="Search"
type="primary" @click="getWorkOrder">{{ $t('basicData.search') }}
</el-button>
+
+
+ <el-row v-if="name.indexOf('鍚夊埄鐜荤拑')==-1">
+ 鏍囩妯℃澘锛�
+ <el-select v-model="tag" @change="changeTag" placeholder="鏍囩妯℃澘鍒楄〃" style="width: 140px" >
+ <el-option
+ v-for="(tag,index) in tags"
+ :key="index"
+ :label="tag.name"
+ :value="tag"
+ />
+ </el-select>
+ </el-row>
</el-row>
+ <el-row>
+
+ </el-row>
+ <div>
+
+ </div>
</div>
<vxe-grid
ref="xGrid"
@@ -336,8 +412,9 @@
</template>
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
<template #button_slot="{ row }">
- <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">{{$t('machine.cutting')}}</el-button>
- <el-button @click="getTableRow(row,'edit1')" link type="primary" size="small">{{$t('machine.tempering')}}</el-button>
+ <el-button v-if="name.indexOf('鍚夊埄鐜荤拑')!=-1" @click="getTableRow(row,'edit')" link type="primary" size="small">{{$t('machine.cutting')}}</el-button>
+ <el-button v-else @click="getTableRow(row,'edit')" link type="primary" size="small">{{$t('machine.tempering')}}</el-button>
+ <el-button v-if="name.indexOf('鍚夊埄鐜荤拑')!=-1" @click="getTableRow(row,'edit1')" link type="primary" size="small">{{$t('machine.tempering')}}</el-button>
</template>
<template #num1_filter="{ column, $panel }">
@@ -387,6 +464,30 @@
:projectNo="labelRow.projectNo"
style="width: 100%;height: 100%"/>
</el-dialog>
+
+ <!-- 鎴愬搧鏍囩宸ョ▼鎵撳嵃-->
+ <el-dialog
+ id="sizeCustom"
+ v-model="dialogTableVisibleLabelProject"
+ :title="$t('processCard.printLabel')"
+ destroy-on-close
+ style="width: 80%;height:75% ">
+ <template #header="{ close, titleId, titleClass }">
+ <el-button @click="printObjectProcess" :icon="Printer" circle/>
+ </template>
+ <print-custom-label-project id="childLabel"
+
+ :lastList = 'lastList'
+ :faceOrientation="labelRow.faceOrientation"
+ :lableType="labelRow.lableType"
+ :list="labelRow.list"
+ :type="labelRow.type"
+ :titleList="labelRow.titleList"
+ :switch="labelRow.switch"
+ :detailType="labelRow.detailType"
+
+ style="width: 100%;height: 100%"/>
+ </el-dialog>
</div>
</template>
@@ -398,7 +499,7 @@
height: 93%;
}
#selectForm {
- width: 60%;
+ width: 50%;
}
:deep(#titleStyle .el-dialog__body){
height: 90%;
--
Gitblit v1.8.0