From bd8f3a15f17facd2f77521da844eaf76dca22bad Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 22 三月 2024 10:02:25 +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/CreateOrder.vue | 209 ++++++++++++++++++++++++++++++----------------------
1 files changed, 120 insertions(+), 89 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
index cdbf84d..26a04c7 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
@@ -8,8 +8,10 @@
import useUserInfoStore from '@/stores/userInfo'
import SelectProduct from "@/views/sd/product/SelectProduct.vue"
import {changeFilterEvent,filterChanged} from "@/hook"
-import {addListener,toolbarButtonClickEvent} from "@/hook/mouseMove";
-import {CaretBottom} from "@element-plus/icons-vue";
+import {addListener,toolbarButtonClickEvent} from "@/hook/mouseMove"
+import downLoadFile from "@/hook/downLoadFile"
+import {useI18n} from "vue-i18n"
+const { t } = useI18n()
let dialogTableVisible = ref(false)
let productVisible = ref(false)
@@ -31,7 +33,7 @@
orderId:'',
deliveryDate:'',
batch:'',
- calculateType:'',
+ calculateType:null,
salesmanId:'',
salesman:'',
alType:'',
@@ -79,12 +81,12 @@
body: {
options: [
[
- { code: 'addRow', name: '娣诲姞', prefixIcon: 'vxe-icon-square-plus', visible: true, disabled: false },
- { code: 'deleteRow', name: '鍒犻櫎', prefixIcon: 'vxe-icon-delete', visible: true, disabled: true },
- { code: 'copyChecked', name: '閫変腑鐩稿悓', prefixIcon: 'vxe-icon-copy', visible: true, disabled: false },
- { code: 'copyAll', name: '涔嬪悗鐩稿悓', prefixIcon: 'vxe-icon-feedback', visible: true, disabled: false },
- { code: 'clearChecked', name: '娓呴櫎閫変腑', prefixIcon: 'vxe-icon-indicator', visible: true, disabled: false },
- { code: 'computedMoney', name: '璁＄畻閲戦', prefixIcon: 'vxe-icon-chart-bar-x', visible: true, disabled: true },
+ { code: 'addRow', name: t('basicData.add'), prefixIcon: 'vxe-icon-square-plus', visible: true, disabled: false },
+ { code: 'deleteRow', name: t('basicData.delete'), prefixIcon: 'vxe-icon-delete', visible: true, disabled: true },
+ { 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: 'computedMoney', name: t('basicData.calculateAmount'), prefixIcon: 'vxe-icon-chart-bar-x', visible: true, disabled: true },
]
]
}
@@ -105,45 +107,44 @@
showStatus: true
},//琛ㄥご鍙傛暟
columns:[
- {type: 'seq',fixed:"left", title: '鑷簭', width: 80 },
+ {type: 'seq',fixed:"left", title: t('basicData.Number'), width: 80 },
// {field: 'buildingNumber',width:120, title: '妤煎彿',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
- {field: 'productId',width:100, title: '浜у搧ID',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'productName',width:120, title: '浜у搧',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'price',width:140, title: '鍗曚环',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'quantity',width:120, title: '鏁伴噺',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'grossAmount',width:120, title: '鎬婚噾棰�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'width',width:120, title: '瀹�',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'height',width:120, title: '楂�',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'area',width:150, title: '瀹為檯鍗曠墖闈㈢Н',filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
- {field: 'grossArea',width:140, title: '瀹為檯鎬婚潰绉�',filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
- {field: 'computeArea',width:180, title: '缁撶畻鍗曠墖闈㈢Н',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'computeGrossArea',width:140, title: '缁撶畻鎬婚潰绉�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'shape',width:120, title: '褰㈢姸',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'bendRadius',width:140, title: '寮挗寮у害',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'edgingType',width:140, title: '纾ㄨ竟绫诲瀷',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'processingNote',width:140, title: '鍔犲伐瑕佹眰',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'remarks',width:120, title: '澶囨敞',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged}
-
+ {field: 'productId',width:140, title: t('order.productId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'productName',width:300, title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'price',width:140, title: t('order.price'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'quantity',width:140, title: t('order.quantity'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'grossAmount',width:160, title: t('order.grossAmount'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'width',width:120, title: t('order.width') ,editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'height',width:140, title: t('order.height'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'area',width:150, title: t('order.trueArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
+ {field: 'grossArea',width:160, title: t('order.trueGrossArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
+ {field: 'computeArea',width:180, title: t('order.computeArea'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'computeGrossArea',width:200, title: t('order.computeGrossArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'shape',width:120, title: t('order.shape'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'bendRadius',width:160, title: t('order.bendRadius'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'edgingType',width:160, title: t('order.edgingType'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'processingNote',width:200, title: t('order.processingNote'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'remarks',width:140, title: t('basicData.remarks'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged}
],
//琛ㄥ崟楠岃瘉
editRules: {
buildingNumber: [
{ required: false},
- { min: 0, max: 255, message: '鍚嶇О闀垮害鍦� 0 鍒� 255 涓瓧绗�' }
+ { min: 0, max: 255, message: t('basicData.msg.max255') }
],
productId: [
- { required: true, message: '璇烽�夋嫨浜у搧' }
+ { required: true, message: t('order.msg.productCheck') }
],
productName: [
- { required: true, message: '璇烽�夋嫨浜у搧' }
+ { required: true, message: t('order.msg.productCheck') }
],
price: [
{
validator ({ cellValue }) {
const regex = /^(0(\.\d{1,2})?|([1-9]\d{0,4})(\.\d{1,2})?|99999(\.9{1,2})?)$/
if ( !regex.test(cellValue) ) {
- return new Error('杈撳叆0.00~99999.99鐨勬暟瀛�')
+ return new Error(t('basicData.msg.range99999Dec2') )
}
}
}
@@ -153,7 +154,7 @@
validator ({ cellValue }) {
const regex = /^(0(\.\d{1,2})?|([1-9]\d{0,4})(\.\d{1,2})?|99999(\.9{1,2})?)$/
if (!regex.test(cellValue)) {
- return new Error('杈撳叆0.00~99999.99鐨勬暟瀛�')
+ return new Error(t('basicData.msg.range99999Dec2'))
}
}
}
@@ -164,7 +165,7 @@
validator ({ cellValue }) {
const regex = /^[1-9]\d*$/
if (!regex.test(cellValue)) {
- return new Error('杈撳叆澶т簬0鐨勬暣鏁�')
+ return new Error(t('basicData.msg.greater0'))
}
}}
],
@@ -173,7 +174,7 @@
validator ({ cellValue }) {
const regex = /^(0(\.\d{1,2})?|([1-9]\d{0,4})(\.\d{1,2})?|99999(\.9{1,2})?)$/
if (!regex.test(cellValue)) {
- return new Error('杈撳叆0.00~99999.99鐨勬暟瀛�')
+ return new Error(t('basicData.msg.range99999Dec2'))
}
}
}
@@ -183,7 +184,7 @@
validator ({ cellValue }) {
const regex = /^(0|[1-9][0-9]{0,4}([.][0-9]{1,2})?)$/
if ( !regex.test(cellValue)) {
- return new Error('杈撳叆0.00~99999.99鐨勬暟瀛�')
+ return new Error(t('basicData.msg.range99999Dec2'))
}
}
}
@@ -191,11 +192,11 @@
},
toolbarConfig: {
buttons: [
- {'code': 'remarks', 'name': '鍔犲伐瑕佹眰'},
- {'code': 'Craft', 'name': '宸ヨ壓',status: 'primary',disabled: true},
- {'code': 'review', 'name': '瀹℃牳',status: 'primary',disabled: true},
- {'code': 'updateMoney', 'name': '閲戦閲嶇疆',status: 'primary',disabled: true},
- {'code': 'saveOrder', 'name': '淇濆瓨',status: 'primary',icon: 'vxe-icon-save',disabled: false}
+ {'code': 'remarks', 'name': t('order.processingNote')},
+ {'code': 'Craft', 'name': t('order.technology'),status: 'primary',disabled: true},
+ {'code': 'review', 'name': t('basicData.review'),status: 'primary',disabled: true},
+ {'code': 'updateMoney', 'name': t('order.amountReset'),status: 'primary',disabled: true},
+ {'code': 'saveOrder', 'name': t('basicData.save'),status: 'primary',icon: 'vxe-icon-save',disabled: false}
],
slots: {
tools: 'toolbar_buttons'
@@ -212,7 +213,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)
@@ -248,41 +249,45 @@
reviewOrder(0)
break
}
+ case 'cancelOrder':{
+ cancelOrder()
+ break
+ }
case 'saveOrder': {
if ($grid.getTableData().tableData.length === 0){
- ElMessage.error('娌℃湁琛ㄦ牸鏁版嵁锛�')
+ ElMessage.error( t('order.msg.tableLengthNot'))
return
}
if(!gridOptions.menuConfig.body.options[0][5].disabled){
- ElMessage.error('璇峰厛鎵撳紑鍙冲嚮鑿滃崟閲嶆柊璁＄畻閲戦鍚庯紝鍐嶄繚瀛橈紒')
+ ElMessage.error(t('order.msg.amountReset'))
return
}
const project = titleUploadData.value.project
if(project === null || project === undefined || project === ''){
- ElMessage.error('杈撳叆椤圭洰鍚嶇О锛�')
+ ElMessage.error(t('order.msg.projectCheck'))
return
}
const customer = titleUploadData.value.customerId
if(customer === null || customer === undefined || customer === ''){
- ElMessage.error('璇烽�夋嫨瀹㈡埛锛�')
+ ElMessage.error(t('order.msg.customerCheck'))
return
}
const salasMan = titleUploadData.value.salesman
if(salasMan === null || salasMan === undefined || salasMan === ''){
- ElMessage.error('璇烽�夋嫨涓氬姟鍛橈紒')
+ ElMessage.error(t('order.msg.salasManCheck'))
return
}
const calculateType = titleUploadData.value.calculateType
if(calculateType === null || calculateType === undefined || calculateType === ''){
- ElMessage.error('璇烽�夋嫨璁＄畻鏂瑰紡锛�')
+ ElMessage.error(t('order.msg.calculateTypeCheck'))
return
}
if ($grid) {
const errMap = await $grid.validate(true)
if (errMap) {
- ElMessage.error(`鏍￠獙涓嶉�氳繃锛乣)
+ ElMessage.error(t('basicData.msg.checkoutLose'))
return
}
let order ={
@@ -295,7 +300,7 @@
}
}
}
- },//澶撮儴鎸夐挳浜嬩欢
+ },//鍙抽敭鎸夐挳浜嬩欢
menuClick ({ menu, row, column }) {
const $grid = xGrid.value
if ($grid) {
@@ -306,7 +311,7 @@
}
case 'addRow': {
if ($grid.getTableData().tableData.length >=240){
- ElMessage.error('琛ㄦ牸鏁版嵁宸茶揪鍒版渶澶у�硷紒')
+ ElMessage.error(t('order.msg.tableLengthMax'))
return
}
$grid.insert({})
@@ -392,7 +397,7 @@
//鑾峰彇瀛愰〉闈骇鍝佹柟娉�
const getProductRow = (row) => {
if(row.state!=1){
- ElMessage.warning('璇ヤ骇鍝佽繕鏈鏍�')
+ ElMessage.warning(t('order.msg.productStateCheck'))
return
}
@@ -413,7 +418,6 @@
}
request.post(`/order/getOrderById/${str}`).then((res) => {
if(res.code==200){
- console.log(res.data.order)
titleUploadData.value = res.data.order
//鍙栨秷宸ヨ壓鎸夐挳绂佺敤
gridOptions.toolbarConfig.buttons[1].disabled = false
@@ -427,14 +431,24 @@
}
//鎸夐挳瀹℃牳杩囧悗鍙樹负鍙嶅
- if(res.data.order.orderReview === 2){
+ if(Math.abs(res.data.order.orderReview) === 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')
gridOptions.toolbarConfig.buttons[3].disabled = false
+ const button = {'code': 'cancelOrder',
+ status: 'primary',
+ 'name': (res.data.order.orderReview>0?t('basicData.cancel'):t('basicData.restore'))}
+ gridOptions.toolbarConfig.buttons.push(button)
+ if(res.data.order.orderReview===-2){
+ gridOptions.toolbarConfig.buttons[2].disabled = true
+ gridOptions.toolbarConfig.buttons[3].disabled = true
+ gridOptions.toolbarConfig.buttons[4].disabled = true
+ }
}
if(res.data.order.productionOrder !==0 ){
gridOptions.toolbarConfig.buttons[2].disabled = true
+
}
//鍔犺浇鍓〃鏁版嵁
@@ -444,6 +458,18 @@
}
})
})
+
+const cancelOrder = () => {
+ request.post(`/order/cancelOrder/${titleUploadData.value.orderId}`).then((res) =>{
+ if (res.code== 200){
+ ElMessage.success(t('order.msg.updateOrderState'))
+ router.push({path:'/main/order/createOrder',query:{orderId:titleUploadData.value.orderId,random:Math.random()}})
+ }else{
+ ElMessage.error(res.msg)
+ }
+ })
+}
+
//椤甸潰绗竴娆″姞杞芥墽琛�
request.get(`/basicData/orderBasicData`).then((res) => {
@@ -455,6 +481,7 @@
titleUploadData.value.icon = titleSelectJson.value.icon[0].basicName
titleUploadData.value.packType = titleSelectJson.value.packType[0].basicName
titleUploadData.value.alType = titleSelectJson.value.alType[0].basicName
+ titleUploadData.value.calculateType=1
const today = new Date
today.setTime(today.getTime() + (15 * 24 * 60 * 60 * 1000))
titleUploadData.value.deliveryDate = today.getFullYear() +
@@ -469,7 +496,7 @@
const saveOrder = (order) => {
request.post(`/order/saveOrder`,order).then((res) => {
if(res.code==200){
- ElMessage.success('淇濆瓨鎴愬姛')
+ ElMessage.success(t('basicData.msg.saveSuccess'))
router.push({path:'/main/order/selectOrder'})
}else {
ElMessage.error(res.msg)
@@ -485,7 +512,7 @@
}
request.post(`/order/updateOrderMoney`,updateData).then(res => {
if (res.code == 200){
- ElMessage.success('鏇存柊閲戦鎴愬姛')
+ ElMessage.success( t('order.msg.updateAmountSuccessfully') )
router.push({path:'/main/order/createOrder',query:{orderId:titleUploadData.value.orderId,random:Math.random()}})
}
@@ -500,13 +527,13 @@
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/createOrder',query:{
+ orderId:titleUploadData.value.orderId,
+ random:Math.random()}})
}else{
ElMessage.error(res.msg)
@@ -540,7 +567,7 @@
list.forEach((item)=>{
countMoney += parseFloat(item.grossAmount)
})
- return countMoney
+ return parseFloat((countMoney).toFixed(2))
}
//瀵煎叆鍔熻兘
const importEvent = async () => {
@@ -554,7 +581,10 @@
const workbook = XLXS.read(data, { type: 'binary' })
let jsonData = XLXS.utils.sheet_to_json(workbook.Sheets.Sheet1).slice(1)
if(jsonData.length>240){
- ElMessage.error(`瀵煎叆${jsonData.length}鏉�,鏁版嵁涓嶈兘瓒呰繃240鏉�,璇峰垎璁㈠崟瀵煎叆`)
+ ElMessage.error(`${t('order.msg.importMaxCheckFailFirst')}
+ ${jsonData.length}
+ ${t('order.msg.importMaxCheckFailMid')}
+ ${t('order.msg.importMaxCheckFailLast')}`)
return
}
jsonData.forEach((item,index) => {
@@ -571,6 +601,11 @@
xGrid.value.loadData(jsonData)
}
fileReader.readAsBinaryString(files[0])
+}
+
+//妯℃澘涓嬭浇
+const importTemplate = () => {
+ downLoadFile('/importTemplate.xlsx','importTemplate.xlsx')
}
//琛屽崟鍏冩牸淇敼淇敼瑙﹀彂姝や簨浠�
@@ -598,15 +633,15 @@
<div class="main-div">
<div class="order-primary" style="background-color: white">
<el-row>
- <el-col :span="2"><el-text>*椤圭洰鍚嶇О锛�</el-text></el-col>
+ <el-col :span="2"><el-text>*{{$t('order.project')}}锛�</el-text></el-col>
<el-col :span="2"><el-input v-model="titleUploadData.project"/></el-col>
- <el-col :span="2"><el-text>*瀹㈡埛閫夋嫨锛�</el-text></el-col>
+ <el-col :span="2"><el-text>*{{$t('order.customers')}}锛�</el-text></el-col>
<el-col :span="2">
<el-select v-model="titleUploadData.customerId"
@change="changeCustomer"
filterable
clearable
- placeholder="" >
+ placeholder=" " >
<el-option v-for="item in titleSelectJson['customer']"
:key="item.id"
:label="item.id+' '+item.customerName"
@@ -614,7 +649,7 @@
/>
</el-select>
</el-col>
- <el-col :span="2"><el-text>*璁㈠崟绫诲瀷锛�</el-text></el-col>
+ <el-col :span="2"><el-text>*{{$t('order.orderType')}}锛�</el-text></el-col>
<el-col :span="2">
<el-select v-model="titleUploadData.orderType" clearable placeholder="" >
<el-option
@@ -625,7 +660,7 @@
/>
</el-select>
</el-col>
- <el-col :span="2"><el-text>璁㈠崟鍒嗙被锛�</el-text></el-col>
+ <el-col :span="2"><el-text>{{$t('order.orderClassify')}}锛�</el-text></el-col>
<el-col :span="2">
<el-select v-model="titleUploadData.orderClassify" clearable placeholder=" " >
<el-option
@@ -636,7 +671,7 @@
/>
</el-select>
</el-col>
- <el-col :span="2"><el-text>鍟嗘爣閫夐」锛�</el-text></el-col>
+ <el-col :span="2"><el-text>{{$t('order.icon')}}锛�</el-text></el-col>
<el-col :span="2">
<el-select v-model="titleUploadData.icon" clearable placeholder=" " >
<el-option v-for="item in titleSelectJson['icon']"
@@ -645,7 +680,7 @@
:value="item.basicName"/>
</el-select>
</el-col>
- <el-col :span="2"><el-text>鍖呰鏂瑰紡锛�</el-text></el-col>
+ <el-col :span="2"><el-text>{{$t('order.packType')}}锛�</el-text></el-col>
<el-col :span="2">
<el-select v-model="titleUploadData.packType" clearable placeholder=" " >
<el-option v-for="item in titleSelectJson['packType']"
@@ -657,9 +692,9 @@
<!-- <el-col :span="2"><el-text /></el-col>-->
</el-row>
<el-row>
- <el-col :span="2"><el-text>閿�鍞崟鍙凤細</el-text></el-col>
+ <el-col :span="2"><el-text>{{$t('order.orderId')}}锛�</el-text></el-col>
<el-col :span="2"><el-text >{{titleUploadData.orderId}}</el-text></el-col>
- <el-col :span="2"><el-text>浜よ揣鏃ユ湡锛�</el-text></el-col>
+ <el-col :span="2"><el-text>{{$t('order.deliveryDate')}}锛�</el-text></el-col>
<el-col :span="2">
<el-date-picker
v-model="titleUploadData.deliveryDate"
@@ -667,15 +702,15 @@
placeholder=""
/>
</el-col>
- <el-col :span="2"><el-text>鎵规锛�</el-text></el-col>
+ <el-col :span="2"><el-text>{{$t('order.batch')}}锛�</el-text></el-col>
<el-col :span="2"><el-input v-model="titleUploadData.batch"/></el-col>
- <el-col :span="2"><el-text>璁＄畻鏂瑰紡锛�</el-text></el-col>
+ <el-col :span="2"><el-text>{{$t('order.calculateType')}}锛�</el-text></el-col>
<el-col :span="2">
<el-select v-model="titleUploadData.calculateType" clearable placeholder=" " >
<el-option :value="1" label="闈㈢Н閲戦锛堝崟鐗囷級"/>
</el-select>
</el-col>
- <el-col :span="2"><el-text>*涓氬姟鍛橈細</el-text></el-col>
+ <el-col :span="2"><el-text>*{{$t('order.salesman')}}锛�</el-text></el-col>
<el-col :span="2">
<el-select
v-model="titleUploadData.salesmanId"
@@ -689,7 +724,7 @@
:value="item.id"/>
</el-select>
</el-col>
- <el-col :span="2"><el-text>閾濇潯鏂瑰紡锛�</el-text></el-col>
+ <el-col :span="2"><el-text>{{$t('order.alType')}}</el-text></el-col>
<el-col :span="2">
<el-select v-model="titleUploadData.alType" clearable placeholder=" " >
<el-option v-for="item in titleSelectJson['alType']"
@@ -700,17 +735,17 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="2"><el-text>鎬婚噾棰濓細</el-text></el-col>
+ <el-col :span="2"><el-text>{{$t('order.money')}}锛�</el-text></el-col>
<el-col :span="2"><el-text >{{titleUploadData.money}}</el-text></el-col>
- <el-col :span="2"><el-text>鍚堝悓缂栧彿锛�</el-text></el-col>
+ <el-col :span="2"><el-text>{{$t('order.customers')}}锛�</el-text></el-col>
<el-col :span="2"><el-input v-model="titleUploadData.contractId"/></el-col>
- <el-col :span="2"><el-text>瀹㈡埛鎵规锛�</el-text></el-col>
+ <el-col :span="2"><el-text>{{$t('order.customerBatch')}}:</el-text></el-col>
<el-col :span="2"><el-input v-model="titleUploadData.customerBatch"/></el-col>
- <el-col :span="2"><el-text>鑱旂郴浜猴細</el-text></el-col>
+ <el-col :span="2"><el-text>{{$t('order.contacts')}}:</el-text></el-col>
<el-col :span="2"><el-input v-model="titleUploadData.contacts" /></el-col>
- <el-col :span="2"><el-text>鑱旂郴鐢佃瘽锛�</el-text></el-col>
+ <el-col :span="2"><el-text>{{$t('order.contactNumber')}}:</el-text></el-col>
<el-col :span="2"><el-input v-model="titleUploadData.contactNumber"/></el-col>
- <el-col :span="2"><el-text >閫佽揣鍦板潃锛�</el-text></el-col>
+ <el-col :span="2"><el-text >{{$t('order.deliveryAddress')}}:</el-text></el-col>
<el-col :span="2"><el-input v-model="titleUploadData.deliveryAddress"/></el-col>
</el-row>
<!-- <el-row>-->
@@ -740,13 +775,14 @@
</div>
</template>
<template #toolbar_buttons>
- <vxe-button @click="importEvent">瀵煎叆</vxe-button>
+ <vxe-button @click="importTemplate">{{$t('order.template')}}</vxe-button>
+ <vxe-button @click="importEvent">{{$t('order.import')}}</vxe-button>
</template>
</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"
@@ -756,12 +792,7 @@
<el-dialog v-model="productVisible" style="width: 80%;height:75% ">
<select-product :rowIndex="rowIndex" @getProductRow="getProductRow" style="width: 100%;height: 100%" />
</el-dialog>
-<!--閫変腑琛ㄦ牸 -->
-<!-- <div class="vxe-table--cell-area" ref="cellArea" >-->
-<!-- <span class="vxe-table--cell-main-area" ></span>-->
-<!-- <span class="vxe-table--cell-active-area" ></span>-->
-<!-- </div>-->
</div>
</template>
--
Gitblit v1.8.0