From 43e115a7de2c763c36d79e610a3abb1d833ea892 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 05 八月 2024 10:21:52 +0800
Subject: [PATCH] 修改发货报表

---
 north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue |  102 +++++++++++++++++++-------------------------------
 1 files changed, 39 insertions(+), 63 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue
index 70e3b1f..f1e90a5 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue
@@ -4,15 +4,19 @@
 import deepClone from "@/utils/deepClone"
 import {ElDatePicker, ElMessage} from "element-plus"
 import useProductGlassTypeStore from "@/stores/sd/product/productGlassType"
+import footSum from "@/hook/footSum"
 import {nextTick, onMounted, onUnmounted, reactive, ref, watch} from "vue"
 import {Search} from "@element-plus/icons-vue"
 import GlassType from "@/components/sd/product/GlassType.vue"
 import {useRouter} from 'vue-router'
 import Sortable from 'sortablejs'
-import BasicTable from '@/components/basic/BasicTable.vue'
+import BasicTable from '@/components/sd/product/BasicTable.vue'
 import {VXETable} from "vxe-table";
-
+import  useUserInfoStore from '@/stores/userInfo'
+import {useI18n} from "vue-i18n";
 let productGlassTypeStore = useProductGlassTypeStore()
+const { t } = useI18n()
+const userStore = useUserInfoStore()
 let router = useRouter()
 let props = defineProps({
   rowIndex:{}
@@ -79,21 +83,6 @@
   }
 })
 
-//椤佃剼缈婚〉鏌ヨ
-const selectPageList = ()=>{
-  let startTime = form.date1[0]
-  let endTime = form.date1[1]
-  request.post(`/processCard/flowCard/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}`,filterData.value).then((res) => {
-    if(res.code==200){
-
-      produceList = deepClone(res.data.data)
-      xGrid.value.reloadData(produceList)
-    }else{
-      ElMessage.warning(res.msg)
-    }
-  })
-}
-
 
 //椤佃剼璺宠浆
 const handlePageChange = ({ currentPage, pageSize }) => {
@@ -108,38 +97,6 @@
   $panel.changeOption(event, !!option.data, option)
 }
 
-function filterChanged(column) {
-  gridOptions.loading = true
-  //绛涢�夋潯浠跺彂鐢熷彉鍖栨潯浠跺彂鐢熷彉鍖�
-  let value = column.datas[0] != undefined ? column.datas[0] : ''
-  value = value.trim()
-  //鍒ゆ柇鏄惁瀛樺湪澶栭敭
-  if (column.property.indexOf('.') > -1) {
-    const columnArr = column.property.split('.')
-    filterData.value[columnArr[0]] = {
-      [columnArr[1]]: value
-    }
-  } else {
-    filterData.value[column.property] = value
-  }
-
-//鑾峰彇閫変腑鏃堕棿
-  let startTime = form.date1[0]
-  let endTime = form.date1[1]
-
-  request.post(`/processCard/detailFlowCard/1/${total.pageSize}/${startTime}/${endTime}`, filterData.value).then((res) => {
-    if(res.code==200){
-      pageTotal.value=res.data.total
-      total.pageTotal=parseInt(res.data.total)
-      pageNum.value=1
-      produceList = deepClone(res.data.data)
-      xGrid.value.loadData(produceList)
-      gridOptions.loading=false
-    }else{
-      ElMessage.warning(res.msg)
-    }
-  })
-}
 
 /*鍚庣杩斿洖缁撴灉澶氬眰宓屽灞曠ず*/
 const hasDecimal = (value) => {
@@ -155,7 +112,7 @@
   align: 'center',//鏂囧瓧灞呬腑
   stripe:true,//鏂戦┈绾�
   rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
-  id: 'CustomerList',
+  id: 'SelectDetailProcessCard',
   showFooter: true,//鏄剧ず鑴�
   printConfig: {},
   importConfig: {},
@@ -179,15 +136,19 @@
   },//琛ㄥご鍙傛暟
   columns:[
     {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
-    { type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
-    {field: 'order_id', title: '閿�鍞崟鍙�',filters:[{ data: '' }],slots: { filter: 'num1_filter' },width: 80 },
-    {field: 'process_id', width: 130, title: '娴佺▼鍗″彿' ,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
-    {field: 'order_number', title: '璁㈠崟搴忓彿' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },},
-    {field: 'quantity', title: '鏁伴噺',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, width: 180},
-    {field: 'area', title: '闈㈢Н' ,showOverflow:"ellipsis"},
-    {field: 'product_name', title: '浜у搧鍚嶇О', },
-    {field: 'founder', title: '鍒嗘灦鍛�', },
-    {field: 'splitFrame_time', title: '鍒嗘灦鏃堕棿', },
+    { type: 'seq',fixed:"left", title: t('basicData.Number'), width: 50 },
+    {field: 'order_id', title: t('order.orderId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },width: 80 },
+    {field: 'process_id', width: 140, title: t('processCard.processId') ,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: 'order_number', title: t('order.OrderNum') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },},
+    {field: 'technology_number', title: t('processCard.technologyNumber') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },},
+    {field: 'quantity', title: t('order.quantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, width: 80},
+    {field: 'child_width', title: t('order.width'), },
+    {field: 'child_height', title: t('order.height'), },
+    {field: 'area', title: t('order.area') ,showOverflow:"ellipsis"},
+    {field: 'product_name', title: t('order.product'), },
+    {field: 'glass_child', title: t('reportingWorks.glassChild'), },
+    {field: 'founder', title: t('processCard.founder'), },
+    {field: 'splitFrame_time', title: t('processCard.splitFrameTime'), },
   ],//琛ㄥご鎸夐挳
 
   toolbarConfig: {
@@ -204,15 +165,30 @@
 
   ],//table body瀹為檯鏁版嵁
   //鑴氶儴姹傚拰
+  // footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
+  //   return[
+  //     columns.map((column, columnIndex) => {
+  //       if (columnIndex === 0) {
+  //         return '鍚堣:'
+  //       }
+  //       // if (props.tableProp.footList.includes(column.field)) {
+  //       //   return sumNum(data, column.field)
+  //       // }
+  //       return ''
+  //     })
+  //   ]
+  // }
+
   footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
     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)
-        // }
+        const List = ["quantity",'area']
+        if (List.includes(column.field)) {
+          return footSum(data, column.field)
+        }
         return ''
       })
     ]

--
Gitblit v1.8.0