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/SelectOrder.vue | 94 ++++++++++++++++++++++++-----------------------
1 files changed, 48 insertions(+), 46 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue b/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue
index 4a3072f..4fc0bc4 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue
@@ -1,13 +1,15 @@
<script setup>
import {Search} from "@element-plus/icons-vue"
import {useRouter} from "vue-router"
- import {reactive, ref} from "vue";
- const router = useRouter()
+ import {reactive, ref} from "vue"
import ProcessCardProgress from '@/views/pp/report/ProcessCardProgress.vue'
import request from "@/utils/request";
- import deepClone from "@/utils/deepClone";
- import {ElMessage} from "element-plus";
- import {VXETable} from "vxe-table";
+ import deepClone from "@/utils/deepClone"
+ import {ElMessage} from "element-plus"
+ import {VXETable} from "vxe-table"
+ import {useI18n} from "vue-i18n"
+ const { t } = useI18n()
+ const router = useRouter()
const xGrid = ref()
@@ -41,35 +43,35 @@
},//琛ㄥご鍙傛暟
columns:[
{type:'expand',slots: { content:'content' },width: 50,fixed:"left",},
- {title: '鎿嶄綔', width: 110, slots: { default: 'button_slot' },fixed:"left",},
- {type: 'seq', title: '鑷簭', width: 80 ,fixed:"left",},
+ {title: t('basicData.operate'), width: 110, slots: { default: 'button_slot' },fixed:"left",},
+ {type: 'seq', title: t('basicData.Number'), width: 80 ,fixed:"left",},
- {field:'createOrder',title: '涓嬪崟', width: 40, slots: { default: 'state' }},
- {field:'processReview',title: '宸ヨ壓', width: 40, slots: { default: 'state' }},
- {field:'orderReview',title: '瀹℃牳', width: 40, slots: { default: 'state' }},
- {field:'productionOrder',title: '宸ュ崟', width: 40, slots: { default: 'state' }},
- {field:'processingCard',title: '娴佺▼', width: 40, slots: { default: 'state' }},
- {field:'warehousing',title: '鍏ュ簱', width: 40, slots: { default: 'state' }},
- {field:'delivery',title: '鍙戣揣', width: 40, slots: { default: 'state' }},
+ {field:'createOrder',title: t('searchOrder.createOrder'), width: 40, slots: { default: 'state' }},
+ {field:'processReview',title: t('order.technology'), width: 40, slots: { default: 'state' }},
+ {field:'orderReview',title: t('basicData.review'), width: 40, slots: { default: 'state' }},
+ {field:'productionOrder',title: t('searchOrder.production'), width: 40, slots: { default: 'state' }},
+ {field:'processingCard',title: t('searchOrder.process'), width: 40, slots: { default: 'state' }},
+ {field:'warehousing',title: t('searchOrder.storage'), width: 40, slots: { default: 'state' }},
+ {field:'delivery',title: t('searchOrder.delivery'), width: 40, slots: { default: 'state' }},
- {field: 'orderId',width:120, title: '閿�鍞崟鍙�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'customerId',width:120, title: '瀹㈡埛缂栧彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'customerName',width:120, title: '瀹㈡埛鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'project',width:120, title: '椤圭洰鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'batch',width:120, title: '鎵规',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'quantity',width:120, title: '鏁伴噺',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '14',width:120, title: '搴撳瓨鏁�', sortable: true},
- {field: 'area',width:120, title: '鎬荤粨绠楅潰绉�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'createTime',width:120, title: '鎶ヨ〃鏃ユ湡',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'packType',width:120, title: '鍖呰鏂瑰紡',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'orderType',width:120, title: '璁㈠崟绫诲瀷',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'salesman',width:120, title: '涓氬姟鍛�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'perimeter',width:120, title: '鍛ㄩ暱',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'deliveryDate',width:120, title: '浜よ揣鏃ユ湡',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'customerBatch',width:120, title: '瀹㈡埛鎵规',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'orderId',width:120, title: t('order.orderId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'customerId',width:120, title: t('customer.customerNumber'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'customerName',width:120, title: t('customer.customerName'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'project',width:120, title: t('order.project'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'batch',width:120, title: t('order.batch'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'quantity',width:120, title: t('order.quantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: '14',width:120, title: t('searchOrder.inventoryNum'), sortable: true},
+ {field: 'area',width:120, title: t('order.computeGrossArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'createTime',width:120, title: t('basicData.reportData'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'packType',width:120, title: t('order.packType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'orderType',width:120, title: t('order.orderType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'salesman',width:120, title: t('order.salesman'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'perimeter',width:120, title: t('searchOrder.perimeter'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'deliveryDate',width:120, title: t('order.deliveryDate'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'customerBatch',width:120, title: t('order.customerBatch'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
//{field: '14',width:120, title: '澶囨敞',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'deliveryAddress',width:120, title: '鍦板潃',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true}
+ {field: 'deliveryAddress',width:120, title: t('order.deliveryAddress'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true}
],//琛ㄥご鎸夐挳
toolbarConfig: {
@@ -91,7 +93,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)
@@ -109,7 +111,7 @@
switch (code) {
case 'checkList': {
if($grid.getCheckboxRecords().length==0){
- VXETable.modal.message( '璇烽�夋嫨涓�鏉℃暟鎹紒')
+ VXETable.modal.message( t('searchOrder.msg'))
return
}
break
@@ -219,15 +221,15 @@
}
case 'delete': {
if (row.processReview === 2) {
- ElMessage.warning('宸插鏍哥殑璁㈠崟涓嶈兘鍒犻櫎')
+ ElMessage.warning(t('searchOrder.msgDelete'))
return
}
request.post(`/order/deleteOrder/${row.orderId}`).then((res) => {
if(res.code==200){
- ElMessage.success('鍒犻櫎鎴愬姛')
- location.reload()
+ ElMessage.success(t('searchOrder.msgDeleteSuccess'))
+ router.push({path:'/main/order/selectOrder',query:{random:Math.random()}})
}else{
- ElMessage.warning('鍒犻櫎澶辫触')
+ ElMessage.warning(t('searchOrder.msgDeleteFail'))
}
})
break
@@ -244,13 +246,13 @@
<el-date-picker
v-model="selectDate"
type="daterange"
- start-placeholder="寮�濮嬫椂闂�"
- end-placeholder="缁撴潫鏃堕棿"
+ :start-placeholder="$t('basicData.startDate')"
+ :end-placeholder="$t('basicData.startDate')"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
/>
- <el-button @click="changeDate" style="margin-top: -5px" id="searchButton" type="primary" :icon="Search">鏌ヨ</el-button>
+ <el-button @click="changeDate" style="margin-top: -5px" id="searchButton" type="primary" :icon="Search">{{ $t('basicData.search') }}</el-button>
<vxe-grid
@filter-change="filterChanged"
@cell-dblclick="cellClickEvent"
@@ -276,10 +278,10 @@
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
<template #button_slot="{ row }">
- <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">缂栬緫</el-button>
- <el-popconfirm @confirm="getTableRow(row,'delete')" title="纭鍒犻櫎璁㈠崟?">
+ <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">{{ $t('basicData.edit') }}</el-button>
+ <el-popconfirm @confirm="getTableRow(row,'delete')" :title="$t('basicData.deleteConfirm')">
<template #reference>
- <el-button link type="primary" size="small">鍒犻櫎</el-button>
+ <el-button link type="primary" size="small">{{ $t('basicData.delete') }}</el-button>
</template>
</el-popconfirm>
</template>
@@ -293,10 +295,10 @@
</template>
<template #toolbar_buttons>
- <vxe-select @change="changeOrderType" v-model="orderType" placeholder="璁㈠崟绫诲瀷">
- <vxe-option value="2" label="姝ｅ父璁㈠崟"></vxe-option>
- <vxe-option value="-2" label="浣滃簾璁㈠崟"></vxe-option>
- <vxe-option value="0" label="鍏ㄩ儴璁㈠崟"></vxe-option>
+ <vxe-select @change="changeOrderType" v-model="orderType" :placeholder="$t('searchOrder.orderType')">
+ <vxe-option value="2" :label="$t('searchOrder.regularOrders')"></vxe-option>
+ <vxe-option value="-2" :label="$t('searchOrder.cancelledOrders')"></vxe-option>
+ <vxe-option value="0" :label="$t('searchOrder.allOrders')"></vxe-option>
</vxe-select>
</template>
--
Gitblit v1.8.0