From 5ca512048bcb9fa1e29fa924a468ba1302c6c243 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 13 三月 2024 10:07:06 +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 | 89 ++++++++++++++++++++++----------------------
1 files changed, 44 insertions(+), 45 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..2ad94fa 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
@@ -4,7 +4,8 @@
import request from "@/utils/request"
import {ElMessage} from "element-plus"
import {changeFilterEvent,filterChanged} from "@/hook"
-import SelectProduct from "@/views/sd/product/SelectProduct.vue";
+import {useI18n} from "vue-i18n"
+const { t } = useI18n()
const router = useRouter()
const route = useRoute()
@@ -40,25 +41,25 @@
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},
+ {title: t('basicData.operate'), width: 110, slots: { default: 'button_slot' },fixed:"left",},
+ {field: 'orderNumber',width:120, title: t('order.OrderNum'),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}
+ {field: 'orderDetail.productName',width:120, title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'glassAddress',width:120, 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: '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'),editRender: { name: 'input'},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('order.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 },
@@ -71,9 +72,9 @@
],
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,
@@ -85,7 +86,7 @@
return[
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
- return '鍚堣:'
+ return t('basicData.total')
}
// if (props.tableProp.footList.includes(column.field)) {
// return sumNum(data, column.field)
@@ -198,7 +199,7 @@
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')
}
@@ -223,13 +224,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)
@@ -247,25 +246,25 @@
<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>
@@ -291,7 +290,7 @@
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
<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>
</template>
<template #num1_filter="{ column, $panel }">
@@ -304,7 +303,7 @@
</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 +311,8 @@
/>
</el-dialog>
- <el-dialog v-model="craftVisible" title="宸ヨ壓娴佺▼" style="width: 60%;height:60% ;position: relative;" >
- <h5>宸ヨ壓灞炴��</h5>
+ <el-dialog v-model="craftVisible" :title="$t('craft.technologicalProcess')" style="width: 60%;height:60% ;position: relative;" >
+ <h5>{{$t('craft.processAttribute')}}</h5>
<el-checkbox
v-model="craftObj.newCraft"
v-for="item in process"
@@ -324,16 +323,16 @@
<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>
--
Gitblit v1.8.0