From 5df5dba2a321098fd0fc7e18b71549f5c2312049 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 27 八月 2024 17:19:13 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue | 578 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 496 insertions(+), 82 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 9613ec1..294fc0a 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,33 +1,41 @@
<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"
+import {ElMessage, ElMessageBox} from "element-plus"
import {changeFilterEvent,filterChanged} from "@/hook"
-import SelectProduct from "@/views/sd/product/SelectProduct.vue";
+import {addListener,toolbarButtonClickEvent} from "@/hook/mouseMove"
+import {useI18n} from "vue-i18n"
+import companyInfo from "@/stores/sd/companyInfo";
+const { t } = useI18n()
const router = useRouter()
const route = useRoute()
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({
+ loading:true,
border: "full",//琛ㄦ牸鍔犺竟妗�
keepSource: true,//淇濇寔婧愭暟鎹�
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾规ゼ鍙�
rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'OrderList',
- showFooter: true,//鏄剧ず鑴�
+ id: 'updateOrderCraft',
printConfig: {},
importConfig: {},
exportConfig: {},
- scrollY:{ enabled: true },//寮�鍚櫄鎷熸粴鍔�
+ scrollY:{ enabled: true,gt:13 },//寮�鍚櫄鎷熸粴鍔�
+ scrollX:{ enabled: true,gt:7 },//寮�鍚櫄鎷熸粴鍔�
showOverflow:true,
columnConfig: {
resizable: true,
useKey: true
},
+ mouseConfig:{selected: true},
filterConfig: { //绛涢�夐厤缃」
// remote: true
},
@@ -35,65 +43,67 @@
storage: true
},
editConfig: {
- trigger: 'click',
- mode: 'row',
+ trigger: 'dblclick',
+ mode: 'cell',
showStatus: true
},//琛ㄥご鍙傛暟
columns:[
- {title: '鎿嶄綔', width: 110, slots: { default: 'button_slot' },fixed:"left",},
- {field: 'orderNumber',width:120, title: '搴忓彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- //{field: 'orderDetail.buildingNumber',width:120, title: '妤煎彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'orderDetail.productName',width:120, title: '鎴愬搧鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'glassAddress',width:120, title: '鏍囪',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'glassChild',width:120, title: '瀛愪骇鍝�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'orderDetail.width',width:120, title: '鎴愬搧瀹�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'orderDetail.height',width:120, title: '鎴愬搧楂�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'orderDetail.shape',width:120, title: '褰㈢姸',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'totalArea',width:120, title: '鎬诲昂瀵�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'childWidth',width:120, title: '鍗曠墖瀹�',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'childHeight',width:120, title: '鍗曠墖楂�',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'area',width:120, title: '鍗曠墖灏哄',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'orderDetail.quantity',width:120, title: '鏁伴噺',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'process',width:120, title: '宸ヨ壓娴佺▼',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'icon',width:120, title: '鍟嗘爣',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'orderDetail.processingNote',width:120, title: '鍔犲伐瑕佹眰',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'orderDetail.remarks',width:120, title: '澶囨敞',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'orderDetail.edgingType',width:120, title: '纾ㄨ竟绫诲瀷',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged}
+ {title: t('basicData.operate'), width: 220, slots: { default: 'button_slot' },fixed:"left",},
+ {field: 'orderNumber',fixed:"left",width:120, title: t('order.OrderNum'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'orderDetail.productId',fixed:"left",width:120, title: t('order.productId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'orderDetail.productName',fixed:"left",width:120, title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'technologyNumber',width:120, fixed:"left", title: t('craft.glassAddress'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'glassChild',width:120, title: t('craft.glassChild'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'orderDetail.width',width:120, title: t('craft.width'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'orderDetail.height',width:120, title: t('craft.height'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'orderDetail.shape',width:120, title: t('order.shape'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'totalArea',width:120, title: t('craft.totalArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'childWidth',width:120, title: t('craft.childWidth'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'childHeight',width:120, title: t('craft.childHeight'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'arc',width:120, title: t('craft.arc'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'area',width:120, title: t('craft.area'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'orderDetail.quantity',width:120, title: t('order.quantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'process',width:120, title: t('craft.process'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'icon',width:120, title: t('order.icon'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'orderDetail.processingNote',width:120, title: t('order.processingNote'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'orderDetail.remarks',width:120, title: t('basicData.remarks'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'orderDetail.edgingType',width:120, title: t('order.edgingType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged}
],//琛ㄥご鎸夐挳
mergeCells: [
- /*{ row: 0, col: 1, rowspan: 4, colspan: 1 },
- { row: 0, col: 2, rowspan: 4, colspan: 1 },
- { row: 0, col: 4, rowspan: 4, colspan: 1 },
- { row: 0, col: 5, rowspan: 4, colspan: 1 },
- { row: 0, col: 6, rowspan: 4, colspan: 1 },
- { row: 0, col: 7, rowspan: 4, colspan: 1 },
- { row: 0, col: 8, rowspan: 4, colspan: 1 },*/
+ // { row: 0, col: 1, rowspan: 4, colspan: 1 },
+ // { row: 0, col: 2, rowspan: 4, colspan: 1 },
+ // { row: 0, col: 4, rowspan: 4, colspan: 1 },
+ // { row: 0, col: 5, rowspan: 4, colspan: 1 },
+ // { row: 0, col: 6, rowspan: 4, colspan: 1 },
+ // { row: 0, col: 7, rowspan: 4, colspan: 1 },
+ // { row: 0, col: 8, rowspan: 4, colspan: 1 },
],
+ menuConfig:{
+ body:{
+ options:[
+ [
+ { code: 'copyChecked', name: t('basicData.selectSame'), prefixIcon: 'vxe-icon-copy', visible: true, disabled: false },
+ { code: 'copyAll', name: t('basicData.sameAfterwards'), prefixIcon: 'vxe-icon-feedback', visible: true, disabled: false },
+ { code: 'clearChecked', name: t('basicData.clearSelection'), prefixIcon: 'vxe-icon-indicator', visible: true, disabled: false },
+ { code: 'computedSize', name: t('basicData.computedSize'), prefixIcon: 'vxe-icon-chart-line', visible: true, disabled: false },
+ { code: 'paste', name: t('basicData.paste'), prefixIcon: 'vxe-icon-paste', visible: true, disabled: false },
+ ]
+ ]
+ }
+ },
toolbarConfig: {
buttons: [
- {'code': 'remarks', 'name': '鍔犲伐瑕佹眰'},
- {'code': 'Craft', 'name': '璁㈠崟璇︽儏',status: 'primary'},
- {'code': 'review', 'name': '瀹℃牳',status: 'primary'},
+ {'code': 'remarks', 'name': t('order.processingNote')},
+ {'code': 'Craft', 'name': t('craft.orderDetail'),status: 'primary'},
+ {'code': 'review', 'name': t('basicData.review'),status: 'primary'},
],
// import: false,
- // export: true,
+ export: true,
// print: true,
zoom: true,
custom: true
},
- footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
- return[
- columns.map((column, columnIndex) => {
- if (columnIndex === 0) {
- return '鍚堣:'
- }
- // if (props.tableProp.footList.includes(column.field)) {
- // return sumNum(data, column.field)
- // }
- return ''
- })
- ]
- }
+
})
@@ -116,6 +126,106 @@
}
case 'remarks': {
dialogTableVisible.value=true
+ break
+ }
+ }
+ }
+ },
+ async menuClick ({ menu, row, column }) {
+ const $grid = xGrid.value
+ if ($grid) {
+ switch (menu.code) {
+ case 'copyChecked' :{
+ let result = toolbarButtonClickEvent()
+ if(result){
+ const dataList = xGrid.value.getTableData().visibleData
+ const val = dataList[result.start][result.cell]
+ dataList.forEach((item,index) =>{
+ if(index>=result.start && index<=result.end){
+ item[result.cell] = val
+ }
+ })
+ }
+ break
+ }
+ case 'computedSize' :{
+ let result = toolbarButtonClickEvent()
+ if(!result || result.cell!=='childWidth'){
+ break
+ }
+ ElMessageBox.prompt('', '', {
+ confirmButtonText: t('basicData.confirmButtonText'),
+ cancelButtonText: t('basicData.cancelButtonText'),
+ inputPattern:/^(-?\d{1,4}(\.\d{1,2})?|-?0(\.\d{1,2})?)$/,
+ inputErrorMessage: '-9999.99~9999.99',
+ })
+ .then(({ value }) => {
+ const value1 = value*1
+ $grid.getTableData().visibleData.forEach((item,index) =>{
+ if(index>=result.start && index<=result.end){
+
+ item[result.cell] = item[result.cell]*1+value1
+ }
+
+ })
+ })
+
+ break
+ }
+ case 'copyAll' :{
+ let result = toolbarButtonClickEvent()
+ if(result){
+ const dataList = xGrid.value.getTableData().visibleData
+ const val = dataList[result.start][result.cell]
+ dataList.forEach((item,index) =>{
+ if(index>=result.start ){
+ item[result.cell] = val
+ }
+ })
+ }
+ break
+ }
+ case 'clearChecked' :{
+ let result = toolbarButtonClickEvent()
+ if(result){
+ const dataList = xGrid.value.getTableData().visibleData
+ dataList.forEach((item,index) =>{
+ if(index>=result.start && index<=result.end){
+ item[result.cell] = ''
+ }
+ })
+ }
+ break
+ }
+ case 'paste' :{
+ if(xGrid.value.getSelectedCell()===null){
+ return
+ }
+ if(xGrid.value.getSelectedCell().column.editRender===undefined){
+ return
+ }
+ const flag = xGrid.value.getSelectedCell()['_rowIndex']
+ const column =xGrid.value.getSelectedCell().column.field
+ ElMessageBox.prompt()
+ .then(({ value }) => {
+ let text = value
+ text = text.split(' ')
+ if(text===null){
+ return
+ }
+
+ const data = xGrid.value.getTableData().visibleData
+ //let i = 0
+ for (let i=0; i<text.length; i++) {
+ if(i+flag>=data.length){
+ return
+ }
+ data[i+flag][column] = text[i]
+ }
+ })
+
+
+
break
}
}
@@ -149,10 +259,35 @@
processingNote:''
})
+const trademarkAttr = ref({
+ trademark:null,
+ xImage:null,
+ yImage:null,
+ tag:null,
+ tag2:null ,
+ tag3:null,
+ xMargin:30,
+ yMargin:30,
+ location:[]
+
+})
+
+
+
let process = ref([])
request.get(`/basicData/BasicDataByType/product/process`).then((res) =>{
if (res.code==200){
process.value=res.data
+ }
+})
+const trademarkList =ref([])
+request.get(`/basicData/BasicDataByType/order/icon`).then((res) =>{
+ if (res.code==200){
+ trademarkList.value = res.data
+ trademarkList.value.forEach(item =>{
+ item.basicName
+ })
+
}
})
@@ -164,6 +299,51 @@
})
rowIndex.value = row
}
+
+//淇敼鍟嗘爣閫夐」
+let trademarkVisible = ref(false)
+const updateTrademark = (row) => {
+ trademarkVisible.value= true
+ /*Object.keys(trademarkAttr.value).forEach((key) => {
+ if(key==='location'){
+ trademarkAttr.value[key] = []
+ }else if(key==='xMargin' || key==='yMargin'){
+ trademarkAttr.value[key] = 30
+ }else{
+ trademarkAttr.value[key] = ''
+ }
+ })*/
+ trademarkAttr.value = {
+ trademark:"3C",
+ xImage:false,
+ yImage:false,
+ tag:true,
+ tag2:true ,
+ tag3:true,
+ xMargin:30,
+ yMargin:30,
+ location:t('craft.lowLeft')
+ }
+ if(row.icon!=null){
+ trademarkAttr.value = JSON.parse(row.icon)
+ }
+ trademarkList.value.forEach(item =>{
+ if(item.basicName===trademarkAttr.value.trademark){
+ iconNickname.value=item.nickname
+ }
+ })
+
+ rowIndex.value = row
+}
+
+const changeTrademark = ()=>{
+ rowIndex.value.icon = JSON.stringify(trademarkAttr.value)
+ trademarkVisible.value=false
+ Object.keys(trademarkAttr.value).forEach((key) => (trademarkAttr.value[key] = ''))
+}
+
+
+
const craftObj = reactive({
newCraft: [],
oldCraft: []
@@ -186,6 +366,7 @@
//鍒濆鍖栧垽鏂槸鍚︽湁id浼犲叆
onMounted(()=>{
+ addListener(xGrid.value,gridOptions)
const str = route.query.orderId
if (typeof str === 'undefined' || str === null || str === '' || str === '\n' || str === '\r'){
return
@@ -193,24 +374,23 @@
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 ){
//gridOptions.toolbarConfig.buttons[2].disabled = false
gridOptions.toolbarConfig.buttons[2].code='reviews'
- gridOptions.toolbarConfig.buttons[2].name='鍙嶅'
+ gridOptions.toolbarConfig.buttons[2].name=t('basicData.cancelReview')
}
//鎸夐挳瀹℃牳杩囧悗鍙樹负鍙嶅
- if(res.data.order.orderReview === 2){
+ if(Math.abs(res.data.order.orderReview) === 2){
gridOptions.toolbarConfig.buttons[2].disabled = true
}
-
xGrid.value.reloadData(res.data.orderGlassDetails)
-
- //xGrid.value.reloadData(res.data.orderDetails)
+ gridOptions.loading = false
}else{
ElMessage.error(res.msg)
}
@@ -223,13 +403,11 @@
if(res.code==200){
gridOptions.toolbarConfig.buttons[2].disabled = true
if(state==2){
- ElMessage.success('瀹℃牳鎴愬姛锛�')
+ ElMessage.success(t('basicData.msg.ReviewSuccess'))
}else if (state==0){
- ElMessage.success('鍙嶅鎴愬姛锛�')
+ ElMessage.success(t('basicData.msg.cancelReviewSuccess'))
}
- setTimeout(() =>{
- location.reload()
- },1500)
+ router.push({path:'/main/order/updateOrderCraft',query:{orderId:titleUploadData.value.orderId,random:Math.random()}})
}else{
ElMessage.error(res.msg)
@@ -237,9 +415,37 @@
})
}
+const tagCheck = (state) => {
+ return trademarkAttr.value.location === state
+}
+const resetTrademark = () => {
+ for(const key in trademarkAttr.value){
+
+ trademarkAttr.value[key] = ''
+ if(key==='location'){
+ trademarkAttr.value[key] = []
+ }
+ }
+}
+
+const iconChange = () => {
+ trademarkList.value.forEach(item =>{
+ if(item.basicName===trademarkAttr.value.trademark){
+ iconNickname.value=item.nickname
+ }
+ })
+ if(trademarkAttr.value.trademark===company.icon){
+ trademarkAttr.value.yMargin=66
+ }
+
+}
+
+let enlargementFlag = ref(false)
+const trademarkenlargement = () => {
+ enlargementFlag.value = !enlargementFlag.value
+}
-//
</script>
<template>
@@ -247,32 +453,32 @@
<div class="order-primary" style="background-color: white">
<el-row>
- <el-col :span="4"><el-text>閿�鍞崟鍙凤細</el-text></el-col>
+ <el-col :span="4"><el-text>{{t('order.orderId')}}</el-text></el-col>
<el-col :span="4"><el-text>{{titleUploadData.orderId}}</el-text></el-col>
- <el-col :span="4"><el-text>瀹㈡埛鍚嶇О锛�</el-text></el-col>
+ <el-col :span="4"><el-text>{{t('customer.customerName')}}</el-text></el-col>
<el-col :span="4"><el-text>{{titleUploadData.customerName}}</el-text></el-col>
- <el-col :span="4"><el-text>椤圭洰鍚嶇О锛�</el-text></el-col>
+ <el-col :span="4"><el-text>{{t('order.project')}}</el-text></el-col>
<el-col :span="4"><el-text>{{titleUploadData.project}}</el-text></el-col>
</el-row>
<el-row>
- <el-col :span="4"><el-text>璁㈠崟鎵规锛�</el-text></el-col>
+ <el-col :span="4"><el-text>{{t('order.batch')}}</el-text></el-col>
<el-col :span="4"><el-text>{{titleUploadData.batch}}</el-text></el-col>
- <el-col :span="4"><el-text>璁㈠崟绫诲瀷锛�</el-text></el-col>
+ <el-col :span="4"><el-text>{{t('order.orderType')}}</el-text></el-col>
<el-col :span="4"><el-text>{{ titleUploadData.orderType }}</el-text></el-col>
- <el-col :span="4"><el-text>涓氬姟鍛�</el-text></el-col>
+ <el-col :span="4"><el-text>{{t('order.salesman')}}</el-text></el-col>
<el-col :span="4"><el-text>{{titleUploadData.salesman}}</el-text></el-col>
</el-row>
<el-row>
- <el-col :span="4"><el-text>鍖呰鏂瑰紡锛�</el-text></el-col>
+ <el-col :span="4"><el-text>{{t('order.packType')}}</el-text></el-col>
<el-col :span="4"><el-text>{{titleUploadData.packType}}</el-text></el-col>
- <el-col :span="4"><el-text>浜よ揣鏃ユ湡锛�</el-text></el-col>
+ <el-col :span="4"><el-text>{{t('order.deliveryDate')}}</el-text></el-col>
<el-col :span="4"><el-text>{{titleUploadData.deliveryDate}}</el-text></el-col>
</el-row>
</div>
<div class="order-detail">
<vxe-grid
- max-height="97%"
+ height="100%"
class="mytable-scrollbar"
ref="xGrid"
v-bind="gridOptions"
@@ -291,7 +497,8 @@
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
<template #button_slot="{ row }">
- <el-button @click="updateCraft(row)" link type="primary" size="small">淇敼宸ヨ壓</el-button>
+ <el-button @click="updateCraft(row)" link type="primary" size="small">{{$t('craft.updateCraft')}}</el-button>
+ <el-button @click="updateTrademark(row)" link type="primary" size="small">{{$t('craft.modifyTrademark')}}</el-button>
</template>
<template #num1_filter="{ column, $panel }">
@@ -304,7 +511,11 @@
</vxe-grid>
</div>
- <el-dialog v-model="dialogTableVisible" title="鍔犲伐瑕佹眰" style="width: 60%;height:75% ">
+ <el-dialog
+
+ v-model="dialogTableVisible"
+ :title="$t('order.processingNote')"
+ style="width: 60%;height:75% ">
<el-input
v-model="titleUploadData.processingNote"
type="textarea"
@@ -312,8 +523,13 @@
/>
</el-dialog>
- <el-dialog v-model="craftVisible" title="宸ヨ壓娴佺▼" style="width: 60%;height:60% ;position: relative;" >
- <h5>宸ヨ壓灞炴��</h5>
+ <el-dialog id="processChange"
+ v-model="craftVisible"
+ :title="$t('craft.technologicalProcess')"
+ :close-on-click-modal="false"
+ :close-on-press-escape="false"
+ style="width: 60%;height:60% ;position: relative;" >
+ <h5>{{$t('craft.processAttribute')}}</h5>
<el-checkbox
v-model="craftObj.newCraft"
v-for="item in process"
@@ -324,21 +540,199 @@
<el-row style="width: 90%;border: 0;position: absolute;bottom: 1rem; left: 50%;transform: translateX(-50%);">
<span class="ml-3 w-35 text-gray-600 inline-flex items-center"
- >鍘熸祦绋�:
+ >{{$t('craft.oldProcess')}}:
</span>
<el-input :value="oldCraftComputed" disabled class="w-50 m-2" />
<span class="ml-3 w-35 text-gray-600 inline-flex items-center"
- >娴佺▼:
+ >{{$t('craft.newProcess')}}:
</span>
<el-input :value="newCraftComputed" disabled class="w-50 m-2" />
<el-col style="margin-top: 0.5rem">
- <el-button type="primary" @click="resetCraft">閲嶇疆</el-button>
- <el-button type="primary" @click="saveCraft">淇濆瓨</el-button>
+ <el-button type="primary" @click="resetCraft">{{$t('craft.reset')}}</el-button>
+ <el-button type="primary" @click="saveCraft">{{$t('basicData.save')}}</el-button>
</el-col>
</el-row>
+ </el-dialog>
+ <el-dialog
+ id="trademark"
+ v-model="trademarkVisible"
+ :title="$t('craft.TrademarkAttribute')"
+ :close-on-click-modal="false"
+ :close-on-press-escape="false"
+ style="width: 922px;height:443px ;
+ position: relative;" >
+ <div style="width: 50%;height: 100%;float: left">
+ <el-row style="">
+ <el-col :span="4">{{$t('craft.TrademarkOptions')}}:</el-col>
+ <el-col :span="6">
+ <el-select v-model="trademarkAttr.trademark" @change ="iconChange" filterable>
+ <el-option :value="item.basicName" v-for="item in trademarkList" />
+ </el-select>
+ </el-col>
+ </el-row>
+
+ <el-row>
+ <el-col :span="4">{{$t('craft.xImage')}}:</el-col>
+ <el-col :span="6">
+ <el-select v-model="trademarkAttr.xImage">
+ <el-option :value="true" :label="$t('basicData.true')"/>
+ <el-option :value="false" :label="$t('basicData.false')"/>
+ </el-select>
+ </el-col>
+ </el-row>
+
+ <el-row>
+ <el-col :span="4">{{$t('craft.yImage')}}:</el-col>
+ <el-col :span="6">
+ <el-select v-model="trademarkAttr.yImage">
+ <el-option :value="true" :label="$t('basicData.true')"/>
+ <el-option :value="false" :label="$t('basicData.false')"/>
+ </el-select>
+ </el-col>
+ </el-row>
+
+ <el-row>
+ <el-col :span="4">{{$t('craft.tag')}}:</el-col>
+ <el-col :span="6">
+ <el-select v-model="trademarkAttr.tag">
+ <el-option :value="true" :label="$t('basicData.true')"/>
+ <el-option :value="false" :label="$t('basicData.false')"/>
+ </el-select>
+ </el-col>
+ </el-row>
+
+ <el-row>
+ <el-col :span="4">{{$t('craft.tag2')}}:</el-col>
+ <el-col :span="6">
+ <el-select v-model="trademarkAttr.tag2">
+ <el-option :value="true" :label="$t('basicData.true')"/>
+ <el-option :value="false" :label="$t('basicData.false')"/>
+ </el-select>
+ </el-col>
+ </el-row>
+
+ <el-row>
+ <el-col :span="4">{{$t('craft.tag3')}}:</el-col>
+ <el-col :span="6">
+ <el-select v-model="trademarkAttr.tag3">
+ <el-option :value="true" :label="$t('basicData.true')"/>
+ <el-option :value="false" :label="$t('basicData.false')"/>
+ </el-select>
+ </el-col>
+ </el-row>
+
+ <el-row>
+ <el-col :span="4">{{$t('craft.xMargin')}}:</el-col>
+ <el-col :span="6">
+ <el-input-number v-model="trademarkAttr.xMargin"/>
+ </el-col>
+ </el-row>
+
+ <el-row>
+ <el-col :span="4">{{$t('craft.yMargin')}}:</el-col>
+ <el-col :span="6">
+ <el-input-number v-model="trademarkAttr.yMargin"/>
+ </el-col>
+ </el-row>
+
+ <el-row>
+ <el-col :span="4">{{$t('craft.location')}}:</el-col>
+ <el-col :span="25">
+ <el-radio 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 @click="resetTrademark" style="float:right;margin-right: 0.5rem" type="primary" >{{$t('craft.reset')}}</el-button>
+ </el-col>
+ </el-row>
+ </div>
+ <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 @dblclick="trademarkenlargement" style="width: 100%;height: 100%" :class="{'xStyle':trademarkAttr.xImage,'yStyle':trademarkAttr.yImage}" :src="iconNickname"/>
+ </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(t('craft.upperRight'))"
+ style="float: right;width: 50px;height: 90px;margin-right: 1rem;margin-top: 15px">
+ <el-row class="icon">
+ <el-col class="icon" >
+ <el-image @dblclick="trademarkenlargement" style="width: 100%;height: 100%" :class="{'xStyle':trademarkAttr.xImage,'yStyle':trademarkAttr.yImage}" :src="iconNickname"/>
+ </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(t('craft.lowLeft'))"
+ style="width: 50px;height: 90px;margin-left: 1rem;float: left;position: absolute;bottom: 15px" >
+ <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>
+ <el-row class="icon">
+ <el-col class="icon" >
+ <el-image @dblclick="trademarkenlargement" style="width: 100%;height: 100%" :class="{'xStyle':trademarkAttr.xImage,'yStyle':trademarkAttr.yImage}" :src="iconNickname"/>
+ </el-col>
+ </el-row>
+
+ </div>
+
+
+ <div
+ v-if="tagCheck(t('craft.lowRight'))"
+ style="width: 50px;height: 90px;position: absolute;bottom: 15px;right: 1rem">
+ <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>
+ <el-row class="icon">
+ <el-col class="icon">
+ <el-image style="width: 100%;height: 100%" @dblclick="trademarkenlargement" :class="{'xStyle':trademarkAttr.xImage,'yStyle':trademarkAttr.yImage}" :src="iconNickname"/>
+ </el-col>
+ </el-row>
+
+ </div>
+ </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>
@@ -358,12 +752,32 @@
}
.order-detail{
width: 100%;
- height: 90%;
+ height: 85%;
}
-.el-dialog .el-col{
+#trademark .el-row,#trademark .el-col{
+ border: 0
+}
+#processChange .el-col{
border: 0;text-align: right
}
-.el-dialog .el-text{
+#processChange .el-text{
font-weight: bolder
}
+.vxe-grid {
+ /* 绂佺敤娴忚鍣ㄩ粯璁ら�変腑 */
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+}
+.xStyle{
+ transform : rotateY(180deg)
+}
+.yStyle{
+ transform : rotateX(180deg)
+}
+.icon{
+ width: 50px;
+ height: 50px;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0