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 | 857 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 733 insertions(+), 124 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 b27d91d..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,88 +1,449 @@
<script setup>
- let titleList = [
- '搴忓彿',
- '妤煎彿',
- '鎴愬搧鍚嶇О',
- '鏍囪',
- '瀛愪骇鍝�',
- '鎴愬搧瀹�',
- '鎴愬搧楂�',
- '褰㈢姸',
- '鎴愬搧灏哄',
- '纾ㄨ竟绫诲瀷',
- '鍗曠墖瀹�',
- '鍗曠墖楂�',
- '鍗曠墖灏哄',
- '鏁伴噺',
- '宸ヨ壓娴佺▼',
- '鍔犲伐瑕佹眰',
- '澶囨敞'
- ]
+import {computed, onMounted, reactive, ref, watch} from "vue"
+import {useRouter,useRoute} from "vue-router"
+import request from "@/utils/request"
+import {ElMessage, ElMessageBox} from "element-plus"
+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()
- let dataList = [
- {
- '0' : '1',
- '1' : 'JHH-T33-G-07A-01',
- '2' : '10mm瓒呯櫧UD60骞抽挗(澶�)+12A鏆�(缁�)+10mm瓒呯櫧骞抽挗(鍐�)',
- '3' : '(澶�)',
- '4' : '10mm瓒呯櫧UD60骞抽挗(澶�)',
- '5' : '1427',
- '6' : '2696',
- '7' : '鏅舰',
- '8' : '42.32',
- '9' : '绮剧（',
- '10' : '1427',
- '11' : '1427',
- '12' : '42.32',
- '13' : '11',
- '14' : '鍒囧壊->纾ㄨ竟->閽㈠寲->鍧囪川->涓┖->鍖呰',
- '15' : '',
- '16' : '',
- '17':2
- },
- {
- '0' : '1',
- '1' : 'JHH-T33-G-07A-01',
- '2' : '10mm瓒呯櫧UD60骞抽挗(澶�)+12A鏆�(缁�)+10mm瓒呯櫧骞抽挗(鍐�)',
- '3' : '(鍐�)',
- '4' : '10mm瓒呯櫧骞抽挗(鍐�)',
- '5' : '1427',
- '6' : '2696',
- '7' : '鏅舰',
- '8' : '42.32',
- '9' : '绮剧（',
- '10' : '1427',
- '11' : '1427',
- '12' : '42.32',
- '13' : '11',
- '14' : '鍒囧壊->纾ㄨ竟->閽㈠寲->鍧囪川->涓┖->鍖呰',
- '15' : '',
- '16' : '',
- '17' : 0,
+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: 'updateOrderCraft',
+ printConfig: {},
+ importConfig: {},
+ exportConfig: {},
+ scrollY:{ enabled: true,gt:13 },//寮�鍚櫄鎷熸粴鍔�
+ scrollX:{ enabled: true,gt:7 },//寮�鍚櫄鎷熸粴鍔�
+ showOverflow:true,
+ columnConfig: {
+ resizable: true,
+ useKey: true
+ },
+ mouseConfig:{selected: true},
+ filterConfig: { //绛涢�夐厤缃」
+ // remote: true
+ },
+ customConfig: {
+ storage: true
+ },
+ editConfig: {
+ trigger: 'dblclick',
+ mode: 'cell',
+ showStatus: true
+ },//琛ㄥご鍙傛暟
+ columns:[
+ {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 },
+ ],
+ 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': t('order.processingNote')},
+ {'code': 'Craft', 'name': t('craft.orderDetail'),status: 'primary'},
+ {'code': 'review', 'name': t('basicData.review'),status: 'primary'},
+ ],
+ // import: false,
+ export: true,
+ // print: true,
+ zoom: true,
+ custom: true
+ },
- const objectSpanMethod = ({ row, column, rowIndex, columnIndex }) => {
- if (columnIndex === 2 || columnIndex === 3 || columnIndex === 4) {
- // 鑾峰彇褰撳墠琛岀殑闇�瑕佸悎骞剁殑鍗曞厓鏍兼暟
- const rowNum = dataList[rowIndex]['17']
- if (rowNum) {
- // 涓�涓崟鍏冩牸绾靛悜妯悜鍚堝苟鐨勫崟鍏冩牸鏁伴噺
- return {
- rowspan: rowNum, // 绾靛悜鍚堝苟鍗曞厓鏍肩殑鏁伴噺
- colspan: rowNum > 0 ? 1 : 0 // 妯悜鍚堝苟鍗曞厓鏍肩殑鏁伴噺锛岀旱鍚戝崟鍏冩牸鏁版槸0鐨勮瘽璇存槑浠栨槸琚悎骞剁殑锛屾í鍚戝崟鍏冩牸鏁颁篃灏变负0涓嶆樉绀轰簡锛岃繖閲屼笉鑰冭檻妯悜鍚堝苟鎵�浠ュ啓姝荤殑鏄�1
- };
- } else {
- // 琚悎骞堕」璁剧疆涓�0锛屽嵆涓嶆樉绀哄崟鍏冩牸
- return {
- rowspan: 0,
- colspan: 0
- };
+})
+
+const gridEvents = {
+ toolbarButtonClick ({ code }) {
+ const $grid = xGrid.value
+ if ($grid) {
+ switch (code) {
+ case 'Craft': {
+ router.push({path: '/main/order/createOrder', query: { orderId: titleUploadData.value.orderId }})
+ break
+ }
+ case 'review': {
+ reviewOrderCraft(2)
+ break
+ }
+ case 'reviews': {//鍙嶅
+ reviewOrderCraft(0)
+ break
+ }
+ 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
+ }
}
}
}
+}
+// 瀹氫箟琛ㄥご涓婁紶鏁版嵁
+const titleUploadData = ref({
+ project:'',
+ orderType:'',
+ customerId:'',
+ customerName:'',
+ icon:'',
+ orderClassify:'',
+ packType:'',
+ orderId:'',
+ deliveryDate:'',
+ batch:'',
+ calculateType:'',
+ salesmanId:'',
+ salesman:'',
+ alType:'',
+ money:'',
+ contractId:'',
+ customerBatch:'',
+ contacts:'',
+ contactNumber:'',
+ deliveryAddress:'',
+ otherMoney:'',
+ otherMoneyRemarks:'',
+ 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
+ })
+
+ }
+})
+
+let rowIndex = ref({})
+const updateCraft = (row) => {
+ craftVisible.value= true
+ Object.keys(craftObj).forEach((key) =>{
+ craftObj[key] = row['process'].split('->')
+ })
+ 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: []
+})
+const resetCraft = () => {
+ craftObj.newCraft = []
+}
+
+const saveCraft = () => {
+ rowIndex.value.process = craftObj.newCraft.join('->')
+ craftVisible.value= false
+}
+
+const newCraftComputed = computed(() =>{
+ return craftObj.newCraft.join('->')
+})
+const oldCraftComputed = computed(() =>{
+ return craftObj.oldCraft.join('->')
+})
+
+//鍒濆鍖栧垽鏂槸鍚︽湁id浼犲叆
+onMounted(()=>{
+ addListener(xGrid.value,gridOptions)
+ const str = route.query.orderId
+ if (typeof str === 'undefined' || str === null || str === '' || str === '\n' || str === '\r'){
+ return
+ }
+ 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=t('basicData.cancelReview')
+
+ }
+
+ //鎸夐挳瀹℃牳杩囧悗鍙樹负鍙嶅
+ if(Math.abs(res.data.order.orderReview) === 2){
+ gridOptions.toolbarConfig.buttons[2].disabled = true
+
+ }
+ xGrid.value.reloadData(res.data.orderGlassDetails)
+ gridOptions.loading = false
+ }else{
+ ElMessage.error(res.msg)
+ }
+ })
+})
+//淇濆瓨淇敼宸ヨ壓
+const reviewOrderCraft = (state) => {
+
+ request.post(`/order/reviewProcessById/${titleUploadData.value.orderId}/${state}`,xGrid.value.getRecordset().updateRecords).then(res =>{
+ if(res.code==200){
+ gridOptions.toolbarConfig.buttons[2].disabled = true
+ if(state==2){
+ ElMessage.success(t('basicData.msg.ReviewSuccess'))
+ }else if (state==0){
+ ElMessage.success(t('basicData.msg.cancelReviewSuccess'))
+ }
+ router.push({path:'/main/order/updateOrderCraft',query:{orderId:titleUploadData.value.orderId,random:Math.random()}})
+
+ }else{
+ ElMessage.error(res.msg)
+ }
+ })
+}
+
+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>
@@ -90,61 +451,290 @@
<template>
<div class="main-div">
- <div class="order-primary">
+ <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>NG23120704</el-text></el-col>
- <el-col :span="4"><el-text>瀹㈡埛鍚嶇О锛�</el-text></el-col>
- <el-col :span="4"><el-text>澶粨楂樼幓鐠冨埗鍝佹湁闄愬叕鍙�</el-text></el-col>
- <el-col :span="4"><el-text>椤圭洰鍚嶇О锛�</el-text></el-col>
- <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>{{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>{{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>1鎵�1</el-text></el-col>
- <el-col :span="4"><el-text>璁㈠崟绫诲瀷锛�</el-text></el-col>
- <el-col :span="4"><el-text>鏅�氳鍗�</el-text></el-col>
- <el-col :span="4"><el-text>涓氬姟鍛�</el-text></el-col>
- <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>{{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>{{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>鏈ㄧ</el-text></el-col>
- <el-col :span="4"><el-text>浜よ揣鏃ユ湡锛�</el-text></el-col>
- <el-col :span="4"><el-text>2023-11-11</el-text></el-col>
- <el-col style="background-color: #337ecc" :span="4"><el-button style="width: 100%;height: 100%" size="small" type="primary">鍔犲伐瑕佹眰璇︾粏</el-button></el-col>
- <el-col style="background-color: #337ecc" :span="4"><el-button style="width: 100%;height: 100%" size="small" type="primary">瀹℃牳</el-button></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>{{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
+ height="100%"
+ class="mytable-scrollbar"
+ ref="xGrid"
+ v-bind="gridOptions"
+ v-on="gridEvents"
- <el-table
- :data="dataList"
- :header-cell-style="{ 'text-align': 'center' }"
- :cell-style="{ 'text-align': 'center' }"
- border
- :span-method="objectSpanMethod"
>
+ <!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
+ <template #content="{ row}">
+ <ul class="expand-wrapper">
+ <li v-for="(item,key,index) in row">
+ <span style="font-weight: bold">{{key+': '}}</span>
+ <span>{{ item }}</span>
+ </li>
+ </ul>
+ </template>
- <el-table-column type="expand" fixed>
- <template #default="props" >
- <div m="4">
- <p m="t-0 b-2">浜у搧鍚嶇О: {{ props.row['2'] }}</p>
- <p m="t-0 b-2">鍗曠墖: {{ props.row['4'] }}</p>
- <p m="t-0 b-2">宸ヨ壓: {{ props.row['14'] }}</p>
+ <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
+ <template #button_slot="{ row }">
+ <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 }">
+ <div>
+ <div v-for="(option, index) in column.filters" :key="index">
+ <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
</div>
- </template>
- </el-table-column>
+ </div>
+ </template>
+ </vxe-grid>
- <el-table-column label="鎿嶄綔" fixed><el-button link type="primary" size="small">淇敼宸ヨ壓</el-button></el-table-column>
- <el-table-column
- :prop="index.toString()"
- :show-overflow-tooltip='true'
- width="100"
- v-for="(item,index) in titleList" :label="item" />
- </el-table>
</div>
+ <el-dialog
+
+ v-model="dialogTableVisible"
+ :title="$t('order.processingNote')"
+ style="width: 60%;height:75% ">
+ <el-input
+ v-model="titleUploadData.processingNote"
+ type="textarea"
+ :autosize="{ minRows: 2, maxRows: 20 }"
+ />
+ </el-dialog>
+
+ <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"
+ :label="item.basicName"
+ class="glass-process-checkbox"
+ size="small" />
+
+ <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">{{$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>
</template>
@@ -157,18 +747,37 @@
.el-col{
border: #181818 1px solid;
}
-:deep(.el-input__wrapper) {
- box-shadow: 0 0 0 0 var(--el-input-border-color, var(--el-border-color)) inset;
- cursor: default;
- border: none !important;
- background-color: transparent;
-}
.order-primary{
width: 100%;
}
.order-detail{
width: 100%;
- height: 80%;
+ height: 85%;
}
-
+#trademark .el-row,#trademark .el-col{
+ border: 0
+}
+#processChange .el-col{
+ border: 0;text-align: right
+}
+#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