From b27e80bcfaacc225fcf8d2f1617b98bdedb7edf7 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 02 四月 2024 16:45:04 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 12 ++++++------
north-glass-erp/northglass-erp/public/trademark.png | 0
north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue | 46 ++++++++++++++++++++++++++++++++++------------
3 files changed, 40 insertions(+), 18 deletions(-)
diff --git a/north-glass-erp/northglass-erp/public/trademark.png b/north-glass-erp/northglass-erp/public/trademark.png
new file mode 100644
index 0000000..b993093
--- /dev/null
+++ b/north-glass-erp/northglass-erp/public/trademark.png
Binary files differ
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 4f0dc91..b2dc09d 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
@@ -1,5 +1,5 @@
<script setup>
-import {computed, onMounted, reactive, ref} from "vue"
+import {computed, onMounted, reactive, ref, watch} from "vue"
import {useRouter,useRoute} from "vue-router"
import request from "@/utils/request"
import {ElMessage} from "element-plus"
@@ -222,6 +222,8 @@
})
+
+
let process = ref([])
request.get(`/basicData/BasicDataByType/product/process`).then((res) =>{
if (res.code==200){
@@ -349,6 +351,18 @@
return filterArr.length > 0
}
+const resetTrademark = () => {
+ for(const key in trademarkAttr.value){
+
+ trademarkAttr.value[key] = ''
+ if(key==='location'){
+ trademarkAttr.value[key] = []
+ }
+ }
+}
+
+
+
</script>
<template>
@@ -549,7 +563,7 @@
<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-button @click="resetTrademark" style="float:right;margin-right: 0.5rem" type="primary" >{{$t('craft.reset')}}</el-button>
</el-col>
</el-row>
</div>
@@ -558,9 +572,9 @@
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-col :span="20"><el-image :class="{'xStyle':trademarkAttr.xImage,'yStyle':trademarkAttr.yImage}" src="/trademark.png"/></el-col>
</el-row>
- <el-row >
+ <el-row style="margin-top: -25px" >
<el-col :span="5" >X:</el-col>
<el-col :span="2" >{{trademarkAttr.xMargin}}</el-col>
</el-row>
@@ -574,9 +588,9 @@
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-col :span="20"><el-image :class="{'xStyle':trademarkAttr.xImage,'yStyle':trademarkAttr.yImage}" src="/trademark.png"/></el-col>
</el-row>
- <el-row >
+ <el-row style="margin-top: -25px" >
<el-col :span="5" >X:</el-col>
<el-col :span="2" >{{trademarkAttr.xMargin}}</el-col>
</el-row>
@@ -588,11 +602,11 @@
<div
v-if="tagCheck('宸︿笅')"
- style="width: 60px;height: 60px;margin-left: 1rem;float: left;position: absolute;bottom: 8px">
+ style="width: 60px;height: 60px;margin-left: 1rem;float: left;position: absolute;bottom: 15px">
<el-row>
- <el-col :span="20"><el-icon :size="20"><Location /></el-icon></el-col>
+ <el-col :span="20"><el-image :class="{'xStyle':trademarkAttr.xImage,'yStyle':trademarkAttr.yImage}" src="/trademark.png"/></el-col>
</el-row>
- <el-row >
+ <el-row style="margin-top: -25px" >
<el-col :span="5" >X:</el-col>
<el-col :span="2" >{{trademarkAttr.xMargin}}</el-col>
</el-row>
@@ -604,11 +618,13 @@
<div
v-if="tagCheck('鍙充笅')"
- style="width: 60px;height: 60px;position: absolute;bottom: 8px;right: 1rem">
+ style="width: 60px;height: 60px;position: absolute;bottom: 15px;right: 1rem">
<el-row>
- <el-col :span="20"><el-icon :size="20"><Location /></el-icon></el-col>
+ <el-col :span="20">
+ <el-image :class="{'xStyle':trademarkAttr.xImage,'yStyle':trademarkAttr.yImage}" src="/trademark.png"/>
+ </el-col>
</el-row>
- <el-row >
+ <el-row style="margin-top: -25px">
<el-col :span="5" >X:</el-col>
<el-col :span="2" >{{trademarkAttr.xMargin}}</el-col>
</el-row>
@@ -658,4 +674,10 @@
-ms-user-select: none;
user-select: none;
}
+.xStyle{
+ transform : rotateY(180deg)
+}
+.yStyle{
+ transform : rotateX(180deg)
+}
</style>
\ No newline at end of file
diff --git a/north-glass-erp/src/main/resources/mapper/pp/Report.xml b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
index 43b3c62..70dfae6 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -44,12 +44,12 @@
<result column="total_thickness" property="totalThickness"/>
<result column="thickness" property="thickness"/>
</association>
-
+
<!--<result column="g_typeId" property="glassTypes.typeId"/>
<result column="g_type" property="glassTypes.type"/>-->
-
+
</resultMap>
-
+
<!-- 娴佺▼鍗¤繘搴�-->
<select id="processCardProgressMp">
select
@@ -63,7 +63,7 @@
e.reportWorkQuantityCount,
e.broken_num,
round(ifnull(f.inventory,0)*a.area,2) as inventoryArea
-
+
from
flow_card as c
left join
@@ -96,8 +96,8 @@
) as e
on e.process_id = c.process_id
and e.technology_number = c.technology_number
-
+
where a.order_id = #{orderId}
-
+
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0