From 9866aa9501cd64269857bcc6c75a77a2fcd4c9d4 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 02 十二月 2024 11:26:45 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue | 140 +++++++---------------------------------------
1 files changed, 22 insertions(+), 118 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 bac1943..3da9010 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 {onMounted, reactive, ref} from "vue";
+import {reactive, ref} from "vue";
import {useRouter} from 'vue-router'
import request from "@/utils/request";
import deepClone from "@/utils/deepClone";
@@ -13,26 +13,19 @@
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({
@@ -41,11 +34,9 @@
type: "",//鏍囩妯℃澘
lableType: null,//鏍囩绫诲瀷
dataType: 0,//鏍囩绫诲瀷
- projectNo:null,
- detailType:0//鏄惁鏄伐绋嬫槑缁嗘墦鍗�
+ projectNo:null
})
const company = companyInfo()
-let name=company.companyName
let hidePrintLabels = company.printLabel.hideButton;
const form = reactive({
@@ -53,60 +44,11 @@
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){
- 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
+ router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:1 }})
}else{
router.push({path: '/main/processCard/PrintCustomLabelSemi2', query: { projectNo: row.project_no,type:1 }})
}
@@ -115,6 +57,10 @@
}
case 'edit1' :{
router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:2 }})
+ break
+ }
+ case 'edit2' :{
+ router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:3 }})
break
}
}
@@ -158,12 +104,6 @@
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
- })
-}
//绗竴娆″姞杞芥暟鎹�
@@ -234,7 +174,7 @@
useKey: true
},
filterConfig: { //绛涢�夐厤缃」
- // remote: true
+ // remote: true
},
customConfig: {
storage: true
@@ -248,7 +188,7 @@
//琛ㄥご鍙傛暟
columns: [
{type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
- {title: t('basicData.operate'), width: 120, slots: { default: 'button_slot' },fixed:"left"},
+ {title: t('basicData.operate'), width: 140, slots: { default: 'button_slot' },fixed:"left"},
{type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
{
field: 'project_no',
@@ -345,8 +285,15 @@
id: 'childLabel',
})
-const printObjectProcess = () => {
- hiprintTemplate.value.print(lastList.value)
+const hideButton = () => {
+ let name=company.companyName
+ // 鏍规嵁鏉′欢鍊� hidePrintLabels 杩囨护鎸夐挳鏁扮粍
+ gridOptions.toolbarConfig.buttons = gridOptions.toolbarConfig.buttons.filter(button => {
+ // 杩欓噷鏍规嵁 hidePrintLabels 鐨勫�煎喅瀹氭槸鍚﹂殣钘� printLabel 鍜� printLabel2
+ if (name == '閲戝崕绂忓枩澶╂垚鐜荤拑鏈夐檺鍏徃') {
+ return button.code !== 'printLabel';
+ }
+ })
}
</script>
@@ -370,26 +317,7 @@
: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"
@@ -412,9 +340,9 @@
</template>
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
<template #button_slot="{ row }">
- <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>
+ <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 @click="getTableRow(row,'edit2')" link type="primary" size="small">{{$t('components.finishedProduct')}}</el-button>
</template>
<template #num1_filter="{ column, $panel }">
@@ -464,30 +392,6 @@
: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>
@@ -499,7 +403,7 @@
height: 93%;
}
#selectForm {
- width: 50%;
+ width: 60%;
}
:deep(#titleStyle .el-dialog__body){
height: 90%;
--
Gitblit v1.8.0