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/workOrder/SelectWorkOrder.vue |   50 ++++++++++++++++++++++++++------------------------
 1 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue b/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
index c80a393..dab7819 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
@@ -10,7 +10,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()
@@ -26,7 +28,7 @@
     case 'delete': {
         request.post(`/workOrder/deleteOrderWork/${row.orderId}/${row.orderDetail.productName}`).then((res) => {
         if (res.code == 200) {
-          ElMessage.success("鍒犻櫎鎴愬姛")
+          ElMessage.success(t('workOrder.deleteOk'))
           location.reload();
         } else {
           ElMessage.warning(res.msg)
@@ -54,11 +56,11 @@
 const options = [
   {
     value: '0',
-    label: '宸茶浆',
+    label: t('workOrder.convert'),
   },
   {
     value: '1',
-    label: '鏈浆',
+    label: t('workOrder.unConverted'),
   },
 ]
 
@@ -238,25 +240,25 @@
   },//琛ㄥご鍙傛暟
   columns: [
     {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
-    {title: '鎿嶄綔', width: 110, slots: {default: 'button_slot'}, fixed: "left"},
-    {type: 'seq', fixed: "left", title: '鑷簭', width: 50},
-    {field: 'orderId', title: '閿�鍞崟鍙�', filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},
+    {title: t('basicData.operate'), width: 110, 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: 110},
     {
       field: 'productionId',
-      title: '鐢熶骇璁㈠崟鍙�',
+      title: t('workOrder.productionId'),
       showOverflow: "ellipsis",
       filters: [{data: ''}],
       slots: {filter: 'num1_filter'}
       , width: 130
     },
-    {field: 'order.batch', title: '鎵规', filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},
-    {field: 'orderDetail.productName', title: '浜у搧鍚嶇О', filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 210},
-    {field: 'orderDetail.computeArea', title: '鍗曠墖鎬婚潰绉�', showOverflow: "ellipsis", width: 110},
-    {field: 'orderDetail.quantity', title: '鎬绘暟閲�', width: 70},
-    {field: 'orderDetail.computeGrossArea', title: '鎴愬搧鎬婚潰绉�',},
-    {field: 'orderDetail.perimeter', title: '鍛ㄩ暱', showOverflow: "ellipsis"},
-    {field: 'orderDetail.bendRadius', title: '鍗婂緞',},
-    {field: 'orderDetail.processingNote', title: '鍔犲伐瑕佹眰',}
+    {field: 'order.batch', title: t('order.batch'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},
+    {field: 'orderDetail.productName', title: t('order.product'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 210},
+    {field: 'orderDetail.computeArea', title: t('order.area'), showOverflow: "ellipsis", width: 110},
+    {field: 'orderDetail.quantity', title: t('order.quantity'), width: 70},
+    {field: 'orderDetail.computeGrossArea', title: t('order.trueGrossArea'),},
+    {field: 'orderDetail.perimeter', title: t('workOrder.perimeter'), showOverflow: "ellipsis"},
+    {field: 'orderDetail.bendRadius', title: t('order.trueGrossArea'),},
+    {field: 'orderDetail.processingNote', title: t('order.processingNote'),}
   ],//琛ㄥご鎸夐挳
   data: null,//琛ㄦ牸鏁版嵁
   toolbarConfig: {
@@ -275,7 +277,7 @@
     return [
       columns.map((column, columnIndex) => {
         if (columnIndex === 0) {
-          return '鍚堣:'
+          return t('basicData.total')
         }
         if (footList.includes(column.field)) {
           return sumNum(data, column.field)
@@ -299,14 +301,14 @@
             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"
 
         />
         &nbsp;&nbsp;
-        <el-select :default-first-option="true" ref="getSelect" style="width: 120px" v-model="optionVal" class="m-2"
-                   placeholder="鏄惁杞伐鍗�">
+        <el-select :default-first-option="true" ref="getSelect" style="width: 130px" v-model="optionVal" class="m-2"
+                   >
           <el-option
               v-for="item in options"
               :key="item.value"
@@ -319,7 +321,7 @@
             @click="getWorkOrder(isButtonDisabled)"
             :disabled="isButtonDisabled"
             id="select"
-            type="primary" :icon="Search">鏌ヨ
+            type="primary" :icon="Search">{{$t('basicData.search')}}
         </el-button>
       </el-row>
 
@@ -347,8 +349,8 @@
 
       <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
       <template #button_slot="{ row }">
-        <el-button :class="{disable: optionVal== 0}" :disabled="optionVal == 0" @click="getTableRow(row,'edit')" link type="primary" size="small">杞伐鍗�</el-button>
-        <el-button :class="{disable: optionVal== 1}" :disabled="optionVal == 1" @click="getTableRow(row,'delete')" link type="primary" size="small">鍒犻櫎</el-button>
+        <el-button :class="{disable: optionVal== 0}" :disabled="optionVal == 0" @click="getTableRow(row,'edit')" link type="primary" size="small">{{$t('workOrder.transferOrder')}}</el-button>
+        <el-button :class="{disable: optionVal== 1}" :disabled="optionVal == 1" @click="getTableRow(row,'delete')" link type="primary" size="small">{{$t('basicData.delete')}}</el-button>
       </template>
 
       <template #num1_filter="{ column, $panel }">

--
Gitblit v1.8.0