From e50fa16b6dbc4e7c50d5fbdbc04d2a556ca01c4e Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 02 十二月 2024 11:26:36 +0800
Subject: [PATCH] 补片流程卡调整
---
north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue b/north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue
index 14ece97..8782447 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue
@@ -6,6 +6,7 @@
import {changeFilterEvent,filterChanged} from "@/hook"
import {addListener,toolbarButtonClickEvent} from "@/hook/mouseMove"
import {useI18n} from "vue-i18n"
+import companyInfo from "@/stores/sd/companyInfo";
const { t } = useI18n()
const router = useRouter()
@@ -13,6 +14,7 @@
let dialogTableVisible = ref(false)
let craftVisible = ref(false)
const iconNickname = ref()
+const company = companyInfo()
const xGrid = ref()
const trademarkLocation=ref([t('craft.upperLeft'),t('craft.upperRight'),t('craft.lowLeft'),t('craft.lowRight')])
const gridOptions = reactive({
@@ -372,7 +374,6 @@
request.post(`/order/getOrderCraftById/${str}`).then((res) => {
if(res.code==200){
titleUploadData.value = res.data.order
- console.log(res.data.orderGlassDetails)
//鍙栨秷瀹℃牳鎸夐挳绂佺敤
if(res.data.order.processReview === 2 ){
@@ -432,8 +433,16 @@
iconNickname.value=item.nickname
}
})
+ if(trademarkAttr.value.trademark===company.icon){
+ trademarkAttr.value.xMargin=66
+ }
+
}
+let enlargementFlag = ref(false)
+const trademarkenlargement = () => {
+ enlargementFlag.value = !enlargementFlag.value
+}
</script>
@@ -494,7 +503,10 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
+ <input type="type"
+ v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
@@ -555,7 +567,7 @@
<el-row style="">
<el-col :span="4">{{$t('craft.TrademarkOptions')}}:</el-col>
<el-col :span="6">
- <el-select v-model="trademarkAttr.trademark" @change ="iconChange">
+ <el-select v-model="trademarkAttr.trademark" @change ="iconChange" filterable>
<el-option :value="item.basicName" v-for="item in trademarkList" />
</el-select>
</el-col>
@@ -639,13 +651,13 @@
</el-col>
</el-row>
</div>
- <div style="width: 400px;height: 250px;border: 2px solid #000;float: left;position: relative;">
+ <div v-if="!enlargementFlag" style="width: 400px;height: 250px;border: 2px solid #000;float: left;position: relative;">
<div
v-if="tagCheck(t('craft.upperLeft'))"
style="float: left;width: 50px;height: 90px;margin-left: 1rem;margin-top: 15px">
<el-row class="icon">
<el-col class="icon" >
- <el-image style="width: 100%;height: 100%" :class="{'xStyle':trademarkAttr.xImage,'yStyle':trademarkAttr.yImage}" :src="iconNickname"/>
+ <el-image @dblclick="trademarkenlargement" style="width: 100%;height: 100%" :class="{'xStyle':trademarkAttr.xImage,'yStyle':trademarkAttr.yImage}" :src="iconNickname"/>
</el-col>
</el-row>
<el-row >
@@ -663,7 +675,7 @@
style="float: right;width: 50px;height: 90px;margin-right: 1rem;margin-top: 15px">
<el-row class="icon">
<el-col class="icon" >
- <el-image style="width: 100%;height: 100%" :class="{'xStyle':trademarkAttr.xImage,'yStyle':trademarkAttr.yImage}" :src="iconNickname"/>
+ <el-image @dblclick="trademarkenlargement" style="width: 100%;height: 100%" :class="{'xStyle':trademarkAttr.xImage,'yStyle':trademarkAttr.yImage}" :src="iconNickname"/>
</el-col>
</el-row>
<el-row >
@@ -678,6 +690,7 @@
<div
+
v-if="tagCheck(t('craft.lowLeft'))"
style="width: 50px;height: 90px;margin-left: 1rem;float: left;position: absolute;bottom: 15px" >
<el-row >
@@ -690,7 +703,7 @@
</el-row>
<el-row class="icon">
<el-col class="icon" >
- <el-image style="width: 100%;height: 100%" :class="{'xStyle':trademarkAttr.xImage,'yStyle':trademarkAttr.yImage}" :src="iconNickname"/>
+ <el-image @dblclick="trademarkenlargement" style="width: 100%;height: 100%" :class="{'xStyle':trademarkAttr.xImage,'yStyle':trademarkAttr.yImage}" :src="iconNickname"/>
</el-col>
</el-row>
@@ -710,7 +723,7 @@
</el-row>
<el-row class="icon">
<el-col class="icon">
- <el-image style="width: 100%;height: 100%" :class="{'xStyle':trademarkAttr.xImage,'yStyle':trademarkAttr.yImage}" :src="iconNickname"/>
+ <el-image style="width: 100%;height: 100%" @dblclick="trademarkenlargement" :class="{'xStyle':trademarkAttr.xImage,'yStyle':trademarkAttr.yImage}" :src="iconNickname"/>
</el-col>
</el-row>
@@ -719,6 +732,9 @@
</div>
+ <div v-if="enlargementFlag" style="width: 400px;height: 250px;float: left;position: relative;">
+ <el-image @dblclick="trademarkenlargement" style="z-index: 9999;max-width: 100%;max-height: 100%" :src="iconNickname"/>
+ </div>
</el-dialog>
</div>
--
Gitblit v1.8.0