From a660db06773007b1be690e0674829c00a57aeb7b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 24 十二月 2025 16:21:23 +0800
Subject: [PATCH] 订单首页流程卡新增楼层编号显示

---
 north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue |  281 +++++++++++++++++++++++++++++++++----------------------
 1 files changed, 169 insertions(+), 112 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
index 70553f3..65ccd72 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
@@ -4,23 +4,36 @@
 import {ElDatePicker, ElMessage} from "element-plus"
 import {nextTick, onMounted, onUnmounted, reactive, ref, watch} from "vue"
 import {Search} from "@element-plus/icons-vue"
-import {useRouter} from 'vue-router'
+import {useRoute, useRouter} from 'vue-router'
 import {changeFilterEvent, filterChanged} from "@/hook"
-
+import {addListener} from "@/hook/mouseMove";
 import { useI18n } from 'vue-i18n'
+import footSum from "@/hook/footSum";
+import {VxeUI} from "vxe-pc-ui";
 //璇█鑾峰彇
 const { t } = useI18n()
 let router=useRouter()
+const route = useRoute()
 
 let props = defineProps({
   orderId:null
 })
 onMounted(()=>{
+  //鍚敤琛ㄦ牸鎷栧姩閫変腑
+  addListener(xGrid.value, gridOptions)
   if(props.orderId===null  || props.orderId===undefined || props.orderId===''){
-    return
+
+  }else{
+    form.orderId = props.orderId
+    getWorkOrder()
   }
-  form.orderId = props.orderId
-  getWorkOrder()
+  if(route.query.orderId===null  || route.query.orderId===undefined || route.query.orderId===''){
+
+  }else {
+    form.orderId = route.query.orderId
+    getWorkOrder()
+  }
+
 })
 
 
@@ -33,16 +46,7 @@
   return count.toFixed(2)
 }
 
-//瀹氫箟婊氬姩鏉￠珮搴�
-let scrollTop = ref(null)
-let scrollHeight = ref(null)
-let clientHeight = ref(null)
-const scrollEvnt = (row) => {
-  // 鍐呭楂樺害
-  scrollTop.value = row.$event.target.scrollTop
-  scrollHeight.value = row.$event.target.scrollHeight
-  clientHeight.value = row.$event.target.clientHeight
-}
+
 //绛涢�夋潯浠讹紝鏈夊閿渶瑕佸厛瀹氫箟鏄庣粏閲岄潰鐨勬暟鎹�
 let filterData = ref({
   order: {
@@ -55,38 +59,34 @@
     processingNote: '',
   }
 })
-const columns = [
-  {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
-  {field: 'product_name', width: 150, title: '浜у搧鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
-  {field: 'glass_child',width: 130, title: '鍗曠墖鍚嶇О' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
-  {field: 'order_type', width: 120,title: '璁㈠崟绫诲瀷',filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
-  {field: 'process_id',width: 110, title: '娴佺▼鍗″彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
-  {field: 'order_number', width: 90,title: '璁㈠崟搴忓彿',showOverflow:"ellipsis"},
-  {field: 'technology_number', width: 90,title: '灏忕墖椤哄簭',showOverflow:"ellipsis"},
-  {field: 'quantity', width: 90,title: '鏁伴噺'},
-  {field: 'broken_num',width: 90, title: '娆＄牬鏁伴噺'},
-  {field: 'shippedQuantity',width: 120, title: '鍙戣揣鏁伴噺'},
-  {field: 'inventory',width: 120, title: '鍏ュ簱鏁伴噺'},
-  {field: 'inventoryArea',width: 120, title: '鍏ュ簱闈㈢Н'},
-]
+
+
 //闇�瑕佸悎骞剁殑鍒�
 let column = [1,3,8]
 //鐐瑰嚮鏌ヨ
 const getWorkOrder = () => {
-  request.post(`/report/processCardProgress/${form.orderId}`,column).then((res) => {
+  gridOptions.columns = gridOptions.columns.slice(0, 11); //娓呴櫎鍔ㄦ�佺敓鎴愮殑鍒楅噸鏂版煡璇�
+  request.post(`/report/processCardProgressReport/${form.orderId}`, column).then((res) => {
     if (res.code == 200) {
-      if(res.data.data.length===0){
-        ElMessage.warning('鏈煡璇㈠埌姝よ鍗曟祦绋嬪崱鏁版嵁')
+      if (res.data.data.length === 0) {
+        ElMessage.warning(t('report.noDataFoundForThisOrder'))
         return
       }
-      gridOptions.columns = JSON.parse(JSON.stringify(columns))
-      res.data.title.forEach(item =>{
-        let column = {slots: { default: 'quantitySum' }, width: 90,title: item.process}
+
+      // 鍔ㄦ�佹坊鍔犲垪
+      res.data.title.forEach((item, index) => {
+        let column = {
+          slots: { default: 'quantitySum' },
+          width: 150,
+          title: item.process,
+          field: `dynamicColumn${index}` // 涓哄姩鎬佸垪娣诲姞鍞竴鐨� field
+        }
         gridOptions.columns.push(column)
       })
       res.data.data.forEach(item => {
         item.reportWorkQuantity=JSON.parse(item.reportWorkQuantity)
         item.reportWorkQuantityCount=JSON.parse(item.reportWorkQuantityCount)
+        item.reportWorkQuantityShow=JSON.parse(item.reportWorkQuantityShow)
       })
       mergeCells.value = res.data.mergeCell
       xGrid.value.loadData(res.data.data)
@@ -95,18 +95,27 @@
     }
   })
 }
+
+const footSumDynamic = (data, columnTitle) => {
+  let sum = 0;
+  data.forEach(item => {
+    const value = Number(item.reportWorkQuantity[columnTitle]) || 0; // 浠� reportWorkQuantity 涓彁鍙栧�煎苟杞崲涓烘暟瀛�
+    sum += value;
+  });
+  return sum.toFixed(2);
+}
+
 const quantitySum = ( row,column )=>{
-  const reportWorkQuantity = row.reportWorkQuantity[column.title] || 0
-  const reportWorkQuantityCount = row.reportWorkQuantityCount[column.title] || 0
-  if(reportWorkQuantity===reportWorkQuantityCount){
-    return reportWorkQuantity
+  const reportWorkQuantityCount = row.reportWorkQuantityCount[column.title] || ''
+  const reportWorkQuantityShow = row.reportWorkQuantityShow[column.title] || ''
+  if(reportWorkQuantityShow === reportWorkQuantityCount ){
+    return reportWorkQuantityShow
   }
 
-  return (reportWorkQuantity
+  return (reportWorkQuantityShow
       +'('
       +reportWorkQuantityCount
       +')' )
-  //return
 }
 
 
@@ -123,7 +132,7 @@
   align: 'center',//鏂囧瓧灞呬腑
   stripe:true,//鏂戦┈绾�
   rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
-  id: 'CustomerList',
+  id: 'ProcessCardProgress',
   showFooter: true,//鏄剧ず鑴�
   printConfig: {},
   importConfig: {},
@@ -135,7 +144,7 @@
     useKey: true
   },
   filterConfig: {   //绛涢�夐厤缃」
-    remote: true
+                    // remote: true
   },
   customConfig: {
     storage: true
@@ -145,7 +154,38 @@
     mode: 'row',
     showStatus: true
   },//琛ㄥご鍙傛暟
-  columns:[],//琛ㄥご鎸夐挳
+  columns : [
+    // {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
+    {field: 'product_name', width: 150,
+      title: t('order.product'),
+      filters: [{data: ''}],
+      slots: {filter: 'num1_filter'},
+      filterMethod: filterChanged},
+    {field: 'glass_child',width: 130, title:  t('reportingWorks.glassChild') ,filters: [{data: ''}],
+      slots: {filter: 'num1_filter'},
+      filterMethod: filterChanged},
+    {field: 'order_type', width: 120,title: t('order.orderType'),filters: [{data: ''}],
+      slots: {filter: 'num1_filter'},
+      filterMethod: filterChanged},
+    {field: 'process_id',width: 150, title: t('processCard.processId'),filters: [{data: ''}],
+      slots: {filter: 'num1_filter'},
+      filterMethod: filterChanged},
+    {field: 'order_number', width: 100,title: t('order.OrderNum'),showOverflow:"ellipsis",filters: [{data: ''}],
+      slots: {filter: 'num1_filter'},
+      filterMethod: filterChanged},
+    {field: 'glassNumber', width: 110,title: t('reportingWorks.glassNumber'),showOverflow:"ellipsis",filters: [{data: ''}],
+      slots: {filter: 'num1_filter'},
+      filterMethod: filterChanged},
+    {field: 'technology_number', width: 110,title: t('processCard.technologyNumber'),showOverflow:"ellipsis",filters: [{data: ''}],
+      slots: {filter: 'num1_filter'},
+      filterMethod: filterChanged},
+    {field: 'quantity', width: 90,title: t('order.quantity')},
+    {field: 'grossArea', width: 90,title: t('order.area')},
+    {field: 'broken_num',width: 90, title: t('reportingWorks.quantityBroken')},
+    // {field: 'shippedQuantity',width: 120, title: t('report.shippedQuantity')},
+    {field: 'Storage',width: 120, title: t('report.inventoryNum')},
+    {field: 'StorageAreaShow',width: 120, title: t('report.inventoryArea')},
+  ],
 
   toolbarConfig: {
     // buttons: [{
@@ -153,28 +193,31 @@
     // }],
     // import: false,
     // export: true,
-     // print: true,
+    // print: true,
     zoom: true,
     custom: true
   },
   data:  [
   ],//table body瀹為檯鏁版嵁
   //鑴氶儴姹傚拰
-  // footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
-  //   let footList=['7','8','9','10']
-  //   return[
-  //     columns.map((column, columnIndex) => {
-  //       if (columnIndex === 0) {
-  //         return '鍚堣:'
-  //       }
-  //       if (footList.includes(column.field)) {
-  //         return sumNum(data, column.field)
-  //       }
-  //       return ''
-  //     })
-  //   ]
-  // }
-
+  footerMethod ({ columns, data }) {
+    return [
+      columns.map((column, columnIndex) => {
+        if (columnIndex === 0) {
+          return t('basicData.total')
+        }
+        const List = ["quantity", "broken_num", "inventory", "inventoryArea","gross_area"]; // 闈欐�佸垪鐨勬眰鍜�
+        if (List.includes(column.field)) {
+          return footSum(data, column.field)
+        }
+        // 鍔ㄦ�佸垪鐨勬眰鍜�
+        if (column.field && column.field.startsWith('dynamicColumn')) {
+          return footSumDynamic(data, column.title)
+        }
+        return ''
+      })
+    ]
+  }
 })
 
 
@@ -189,76 +232,90 @@
 ])
 
 
-
+const handleCellDblClick = ({ row, column, cell, $event }) => {
+  VxeUI.clipboard.copy(row[column.property])
+}
 </script>
 
 <template>
-  <div class="main-div-customer" >
-    <div id="selectForm">
-      <el-row :gutter="0">
-        <el-input
-            v-model="form.orderId"
-            clearable
-            :disabled="props.orderId"
-            :placeholder="$t('order.orderId')"
-            style="width: 130px"></el-input>
-        &nbsp;&nbsp;
-        <el-button
-            :disabled="props.orderId"
-            @click="getWorkOrder"
-            id="select"
-            type="primary" :icon="Search">{{$t('basicData.search')}}
+  <div  style="width: 100%;height: 100%">
+    <div class="head">
+      <el-input
+          v-model="form.orderId"
+          clearable
+          :disabled="props.orderId"
+          :placeholder="$t('order.orderId')"
+          style="width: 140px"></el-input>
+      &nbsp;&nbsp;
+      <el-button
+          :disabled="props.orderId"
+          @click="getWorkOrder"
+          id="select"
+          type="primary" :icon="Search">{{$t('basicData.search')}}
 
-        </el-button>
-      </el-row>
+      </el-button>
 
     </div>
-    <vxe-grid
-       height="520px"
-        @filter-change="filterChanged"
-        class="mytable-scrollbar"
-        ref="xGrid"
-        v-bind="gridOptions"
-        :merge-cells="mergeCells"
+    <div class="main-table">
+      <vxe-grid
+          height="100%"
+          class="mytable-scrollbar"
+          ref="xGrid"
+          v-bind="gridOptions"
+          :merge-cells="mergeCells"
+          @cell-dblclick="handleCellDblClick"
 
-    >
-      <!--      @toolbar-button-click="toolbarButtonClickEvent"-->
-      <!--      涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
-      <template #content="{ row }">
-        <ul class="expand-wrapper">
-          <li  v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
-            <span style="font-weight: bold">{{item.title+':  '}}</span>
-            <span>{{ row[item.field] }}</span>
-          </li>
-        </ul>
-      </template>
+      >
+        <!--      @toolbar-button-click="toolbarButtonClickEvent"-->
+        <!--      涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
+        <template #content="{ row }">
+          <ul class="expand-wrapper">
+            <li  v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
+              <span style="font-weight: bold">{{item.title+':  '}}</span>
+              <span>{{ row[item.field] }}</span>
+            </li>
+          </ul>
+        </template>
 
 
 
-      <template #num1_filter="{ column, $panel }">
-        <div>
-          <div v-for="(option, index) in column.filters" :key="index">
-            <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
+        <template #num1_filter="{ column, $panel }">
+          <div>
+            <div v-for="(option, index) in column.filters" :key="index">
+              <input v-model="option.data"
+                     type="text"
+                     @keyup.enter.native="$panel.confirmFilter()"
+                     @input="changeFilterEvent($event, option, $panel)"/>
+            </div>
           </div>
-        </div>
-      </template>
+        </template>
 
-      <template #quantitySum="{ row,column }">
-        <span>{{ quantitySum(row,column) }} </span>
-      </template>
+        <template #quantitySum="{ row,column }">
+          <span>{{ quantitySum(row,column) }} </span>
+        </template>
 
 
-    </vxe-grid>
+      </vxe-grid>
+    </div>
   </div>
 </template>
 
 <style scoped>
-.main-div-customer{
-  width: 99%;
-  height: 100%;
+.head{
+  width: 100%;
+  height: 35px;
 }
-#selectForm {
-  width: 60%;
-  text-align: center;
+
+.main-table{
+  width: 100%;
+  height: calc(100% - 35px);
+}
+
+.vxe-grid {
+  /* 绂佺敤娴忚鍣ㄩ粯璁ら�変腑 */
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
 }
 </style>
\ No newline at end of file

--
Gitblit v1.8.0