From 6c17e1f3da486ffd16b7237d9bc35a9bcbef5348 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 29 三月 2024 16:35:41 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue | 242 ++++++++++++++++++++++++++++++++----------------
1 files changed, 162 insertions(+), 80 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 f3878a7..4f0dc91 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 {Flag, Location} from "@element-plus/icons-vue";
const { t } = useI18n()
const router = useRouter()
@@ -337,6 +338,17 @@
}
})
}
+
+const tagCheck = (state) => {
+ if(typeof trademarkAttr.value.location === 'string'){
+ return false
+ }
+ const filterArr = trademarkAttr.value.location.filter((item) =>{
+ return item === state
+ })
+ return filterArr.length > 0
+
+}
</script>
<template>
@@ -450,95 +462,165 @@
:title="'鍟嗘爣鍙傛暟'"
:close-on-click-modal="false"
:close-on-press-escape="false"
- style="width: 60%;height:60% ;
+ style="width: 922px;height:443px ;
position: relative;" >
- <el-row>
- <el-col :span="2">鍟嗘爣閫夐」:</el-col>
- <el-col :span="3">
- <el-select v-model="trademarkAttr.trademark"
- >
- <el-option :value="item.basicName" v-for="item in trademarkList" />
- </el-select>
- </el-col>
- </el-row>
+ <div style="width: 50%;height: 100%;float: left">
+ <el-row style="">
+ <el-col :span="4">鍟嗘爣閫夐」:</el-col>
+ <el-col :span="6">
+ <el-select v-model="trademarkAttr.trademark"
+ >
+ <el-option :value="item.basicName" v-for="item in trademarkList" />
+ </el-select>
+ </el-col>
+ </el-row>
- <el-row>
- <el-col :span="2">X杞撮暅鍍�:</el-col>
- <el-col :span="3">
- <el-select v-model="trademarkAttr.xImage">
- <el-option :value="true"/>
- <el-option :value="false"/>
- </el-select>
- </el-col>
- </el-row>
+ <el-row>
+ <el-col :span="4">X杞撮暅鍍�:</el-col>
+ <el-col :span="6">
+ <el-select v-model="trademarkAttr.xImage">
+ <el-option :value="true" :label="'鏄�'"/>
+ <el-option :value="false" :label="'鍚�'"/>
+ </el-select>
+ </el-col>
+ </el-row>
- <el-row>
- <el-col :span="2">Y杞撮暅鍍�:</el-col>
- <el-col :span="3">
- <el-select v-model="trademarkAttr.yImage">
- <el-option :value="true"/>
- <el-option :value="false"/>
- </el-select>
- </el-col>
- </el-row>
+ <el-row>
+ <el-col :span="4">Y杞撮暅鍍�:</el-col>
+ <el-col :span="6">
+ <el-select v-model="trademarkAttr.yImage">
+ <el-option :value="true" :label="'鏄�'"/>
+ <el-option :value="false" :label="'鍚�'"/>
+ </el-select>
+ </el-col>
+ </el-row>
- <el-row>
- <el-col :span="2">鎵撴爣浣胯兘:</el-col>
- <el-col :span="3">
- <el-select v-model="trademarkAttr.tag">
- <el-option :value="true"/>
- <el-option :value="false"/>
- </el-select>
- </el-col>
- </el-row>
+ <el-row>
+ <el-col :span="4">鎵撴爣浣胯兘:</el-col>
+ <el-col :span="6">
+ <el-select v-model="trademarkAttr.tag">
+ <el-option :value="true" :label="'鏄�'"/>
+ <el-option :value="false" :label="'鍚�'"/>
+ </el-select>
+ </el-col>
+ </el-row>
- <el-row>
- <el-col :span="2">鏍囩2浣胯兘:</el-col>
- <el-col :span="3">
- <el-select v-model="trademarkAttr.tag2">
- <el-option :value="true"/>
- <el-option :value="false"/>
- </el-select>
- </el-col>
- </el-row>
+ <el-row>
+ <el-col :span="4">浜岀淮鐮佹墦鍗�:</el-col>
+ <el-col :span="6">
+ <el-select v-model="trademarkAttr.tag2">
+ <el-option :value="true" :label="'鏄�'"/>
+ <el-option :value="false" :label="'鍚�'"/>
+ </el-select>
+ </el-col>
+ </el-row>
- <el-row>
- <el-col :span="2">鏍囩3浣胯兘:</el-col>
- <el-col :span="3">
- <el-select v-model="trademarkAttr.tag3">
- <el-option :value="true"/>
- <el-option :value="false"/>
- </el-select>
- </el-col>
- </el-row>
+ <el-row>
+ <el-col :span="4">鏍囩3浣胯兘:</el-col>
+ <el-col :span="6">
+ <el-select v-model="trademarkAttr.tag3">
+ <el-option :value="true" :label="'鏄�'"/>
+ <el-option :value="false" :label="'鍚�'"/>
+ </el-select>
+ </el-col>
+ </el-row>
- <el-row>
- <el-col :span="2">X杞磋竟璺�:</el-col>
- <el-col :span="3">
- <el-input-number v-model="trademarkAttr.xMargin"/>
- </el-col>
- </el-row>
+ <el-row>
+ <el-col :span="4">X杞磋竟璺�:</el-col>
+ <el-col :span="6">
+ <el-input-number v-model="trademarkAttr.xMargin"/>
+ </el-col>
+ </el-row>
- <el-row>
- <el-col :span="2">Y杞磋竟璺�:</el-col>
- <el-col :span="3">
- <el-input-number v-model="trademarkAttr.yMargin"/>
- </el-col>
- </el-row>
+ <el-row>
+ <el-col :span="4">Y杞磋竟璺�:</el-col>
+ <el-col :span="6">
+ <el-input-number v-model="trademarkAttr.yMargin"/>
+ </el-col>
+ </el-row>
- <el-row>
- <el-col :span="2">鍟嗘爣浣嶇疆:</el-col>
- <el-col :span="8">
- <el-checkbox v-model="trademarkAttr.location" v-for="item in trademarkLocation" :label="item" />
- </el-col>
- </el-row>
+ <el-row>
+ <el-col :span="4">鍟嗘爣浣嶇疆:</el-col>
+ <el-col :span="16">
+ <el-checkbox v-model="trademarkAttr.location" v-for="item in trademarkLocation" :label="item" />
+ </el-col>
+ </el-row>
- <el-row>
- <el-col >
- <el-button @click="changeTrademark" style="float:right;" type="primary" >{{$t('craft.sure')}}</el-button>
- <el-button style="float:right;margin-right: 0.5rem" type="primary" >{{$t('craft.reset')}}</el-button>
- </el-col>
- </el-row>
+ <el-row>
+ <el-col >
+ <el-button @click="changeTrademark" style="float:right;" type="primary" >{{$t('craft.sure')}}</el-button>
+ <el-button style="float:right;margin-right: 0.5rem" type="primary" >{{$t('craft.reset')}}</el-button>
+ </el-col>
+ </el-row>
+ </div>
+ <div style="width: 400px;height: 250px;border: 2px solid #000;float: left;position: relative;">
+ <div
+ v-if="tagCheck('宸︿笂')"
+ style="float: left;width: 60px;height: 60px;margin-left: 1rem">
+ <el-row>
+ <el-col :span="20"><el-icon :size="20"><Location /></el-icon></el-col>
+ </el-row>
+ <el-row >
+ <el-col :span="5" >X:</el-col>
+ <el-col :span="2" >{{trademarkAttr.xMargin}}</el-col>
+ </el-row>
+ <el-row >
+ <el-col :span="5" >Y:</el-col>
+ <el-col :span="2" >{{trademarkAttr.yMargin}}</el-col>
+ </el-row>
+ </div>
+
+ <div
+ v-if="tagCheck('鍙充笂')"
+ style="float: right;width: 60px;height: 60px;margin-right: 1rem">
+ <el-row>
+ <el-col :span="20"><el-icon :size="20"><Location /></el-icon></el-col>
+ </el-row>
+ <el-row >
+ <el-col :span="5" >X:</el-col>
+ <el-col :span="2" >{{trademarkAttr.xMargin}}</el-col>
+ </el-row>
+ <el-row >
+ <el-col :span="5" >Y:</el-col>
+ <el-col :span="2" >{{trademarkAttr.yMargin}}</el-col>
+ </el-row>
+ </div>
+
+ <div
+ v-if="tagCheck('宸︿笅')"
+ style="width: 60px;height: 60px;margin-left: 1rem;float: left;position: absolute;bottom: 8px">
+ <el-row>
+ <el-col :span="20"><el-icon :size="20"><Location /></el-icon></el-col>
+ </el-row>
+ <el-row >
+ <el-col :span="5" >X:</el-col>
+ <el-col :span="2" >{{trademarkAttr.xMargin}}</el-col>
+ </el-row>
+ <el-row >
+ <el-col :span="5" >Y:</el-col>
+ <el-col :span="2" >{{trademarkAttr.yMargin}}</el-col>
+ </el-row>
+ </div>
+
+ <div
+ v-if="tagCheck('鍙充笅')"
+ style="width: 60px;height: 60px;position: absolute;bottom: 8px;right: 1rem">
+ <el-row>
+ <el-col :span="20"><el-icon :size="20"><Location /></el-icon></el-col>
+ </el-row>
+ <el-row >
+ <el-col :span="5" >X:</el-col>
+ <el-col :span="2" >{{trademarkAttr.xMargin}}</el-col>
+ </el-row>
+ <el-row >
+ <el-col :span="5" >Y:</el-col>
+ <el-col :span="2" >{{trademarkAttr.yMargin}}</el-col>
+ </el-row>
+ </div>
+
+
+
+ </div>
</el-dialog>
</div>
@@ -558,7 +640,7 @@
}
.order-detail{
width: 100%;
- height: 90%;
+ height: 85%;
}
#trademark .el-row,#trademark .el-col{
border: 0
--
Gitblit v1.8.0