From d8085c81987d5819d7f270bcf0bd68d879f28d2b Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 13 三月 2024 10:30:47 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue | 61 ++++++++++++++++--------------
1 files changed, 33 insertions(+), 28 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
index 91df402..7cd887e 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
@@ -11,7 +11,9 @@
import Sortable from 'sortablejs'
import BasicTable from '@/components/basic/BasicTable.vue'
import {VXETable} from "vxe-table";
-
+import { useI18n } from 'vue-i18n'
+//璇█鑾峰彇
+const { t } = useI18n()
let productGlassTypeStore = useProductGlassTypeStore()
let router = useRouter()
let props = defineProps({
@@ -21,9 +23,9 @@
let startTime = form.date1[0]
let endTime = form.date1[1]
switch (type) {
- case 'edit' : {
- // console.log(row)
- // router.push({path: '/main/processCard/PrintFlowCard', query: {id: row.id}})
+ case 'select' : {
+ console.log(row.processId)
+ router.push({path: '/main/processCard/SelectDetailProcessCard', query: { processId: row.processId }})
break
}
case 'setType': {
@@ -32,7 +34,8 @@
if (state=='鍙帓鐗�'){
request.post(`/processCard/updateLayoutStatus/${row.processId}/2`).then((res) => {
if (res.code == 200) {
- ElMessage.success("鎺掔増鎴愬姛")
+ ElMessage.success(t('processCard.typesettingSuccess')
+ )
router.push({path: '/main/processCard/SelectProcessCard', query: {random:Math.random()}})
} else {
@@ -43,7 +46,7 @@
else if(state=='涓嶅彲鎺掔増'){
request.post(`/processCard/updateLayoutStatus/${row.processId}/1`).then((res) => {
if (res.code == 200) {
- ElMessage.success("淇敼鎴愬姛")
+ ElMessage.success(t('processCard.modifySuccessfully'))
router.push({path: '/main/processCard/SelectProcessCard', query: {random:Math.random()}})
} else {
@@ -57,7 +60,7 @@
case 'delete': {
request.post(`/processCard/deleteFlowCard/${row.orderId}/${row.processId}`).then((res) => {
if (res.code == 200) {
- ElMessage.success("鍒犻櫎鎴愬姛")
+ ElMessage.success(t('workOrder.deleteOk'))
router.push({path: '/main/processCard/SelectProcessCard', query: {random:Math.random()}})
} else {
@@ -279,18 +282,18 @@
},//琛ㄥご鍙傛暟
columns:[
{type:'expand',fixed:"left",slots: { content:'content' },width: 50},
- {title: '鎿嶄綔', width: 160, slots: { default: 'button_slot' },fixed:"left"},
- { type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
- {field: 'orderId', title: '閿�鍞崟鍙�',filters:[{ data: '' }],slots: { filter: 'num1_filter' },width: 80 },
- {field: 'processId', width: 130, title: '娴佺▼鍗″彿' ,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'orderDetail.productId', title: '浜у搧缂栧彿' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },},
- {field: 'orderDetail.productName', title: '浜у搧鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, width: 180},
- {field: 'order.project', title: '椤圭洰鍚嶇О' ,showOverflow:"ellipsis"},
- {field: 'quantity', title: '鏁伴噺', },
- {field: 'orderDetail.computeGrossArea', title: '闈㈢Н', },
- {field: 'founder', title: '鍒嗘灦鍛�', },
- {field: 'orderDetail.processingNote', title: '鍔犲伐瑕佹眰', },
- {field: 'layoutStatus', title: '鎺掔増鐘舵��', }
+ {title: t('basicData.operate'), width: 160, slots: { default: 'button_slot' },fixed:"left"},
+ { type: 'seq',fixed:"left", title: t('basicData.Number'), width: 50 },
+ {field: 'orderId', title: t('order.orderId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },width: 80 },
+ {field: 'processId', width: 130, title: t('processCard.processId') ,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'orderDetail.productId', title: t('order.productId') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },},
+ {field: 'orderDetail.productName', title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, width: 180},
+ {field: 'order.project', title: t('order.project') ,showOverflow:"ellipsis"},
+ {field: 'quantity', title: t('order.quantity'), },
+ {field: 'orderDetail.computeGrossArea', title: t('order.area'), },
+ {field: 'founder', title: t('processCard.founder'), },
+ {field: 'orderDetail.processingNote', title: t('order.processingNote'), },
+ {field: 'layoutStatus', title: t('processCard.layoutStatus'), }
],//琛ㄥご鎸夐挳
toolbarConfig: {
@@ -311,7 +314,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)
@@ -336,8 +339,8 @@
type="daterange"
format="YYYY/MM/DD"
value-format="YYYY-MM-DD"
- start-placeholder="寮�濮嬫椂闂�"
- end-placeholder="缁撴潫鏃堕棿"
+ :start-placeholder="$t('basicData.startDate')"
+ :end-placeholder="$t('basicData.endDate')"
:default-time="defaultTime"
/>
@@ -345,7 +348,8 @@
<el-button
@click="getWorkOrder"
id="select"
- type="primary" :icon="Search">鏌ヨ
+ type="primary" :icon="Search">{{$t('basicData.search')}}
+
</el-button>
</el-row>
@@ -374,11 +378,12 @@
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
<template #button_slot="{ row }" >
- <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">鎵撳嵃</el-button>
- <el-button v-if="row.layoutStatus=='鍙帓鐗�'" @click="getTableRow(row,'setType')" link type="primary" size="small">鎺掔増</el-button>
- <el-button v-else-if="row.layoutStatus=='涓嶅彲鎺掔増'" @click="getTableRow(row,'setType')" link type="primary" size="small">鍙帓鐗�</el-button>
- <el-button v-else-if="row.layoutStatus=='宸叉帓鐗�'" disabled @click="getTableRow(row,'setType')" link type="primary" size="small">鎺掔増</el-button>
- <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">鍒犻櫎</el-button>
+ <el-button @click="getTableRow(row,'select')" link type="primary" size="small">{{$t('basicData.edit')}}
+ </el-button>
+ <el-button v-if="row.layoutStatus=='鍙帓鐗�'" @click="getTableRow(row,'setType')" link type="primary" size="small">{{$t('processCard.composing')}}</el-button>
+ <el-button v-else-if="row.layoutStatus=='涓嶅彲鎺掔増'" @click="getTableRow(row,'setType')" link type="primary" size="small">{{$t('processCard.composingOk')}}</el-button>
+ <el-button v-else-if="row.layoutStatus=='宸叉帓鐗�'" disabled @click="getTableRow(row,'setType')" link type="primary" size="small">{{$t('processCard.typesetter')}}</el-button>
+ <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">{{$t('basicData.delete')}}</el-button>
</template>
<template #num1_filter="{ column, $panel }">
--
Gitblit v1.8.0