From 162c5c7e65af0e0a247acb202ab2490e108353ea Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期日, 29 九月 2024 12:31:32 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue |   48 ++++++++++++++++++++++++++++++++++--------------
 1 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue b/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue
index 86d8ed7..e6d9056 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue
@@ -19,7 +19,7 @@
 })
 
 //宸ュ簭
-const value = ref(t('machine.edgeGrinding'))
+const procseeValue = ref()
 
 //琛ㄥ熬姹傚拰
 const sumNum = (list, field) => {
@@ -50,6 +50,13 @@
 let pageNum = ref(1)
 let pageState = null
 
+let newItem= ref({
+  basic_name: '鍏ㄩ儴',
+  basic_type: 'product',
+  basic_category: 'process',
+  id: "001"
+    })
+
 //鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
 function getNowTime() {
   const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 3)
@@ -68,7 +75,7 @@
 form.date1 = getNowTime()
 let startTime = form.date1[0]
 let endTime = form.date1[1]
-let selectProcesses = value.value
+let selectProcesses = procseeValue.value
 
 let total = reactive({
   pageTotal: 0,
@@ -88,6 +95,7 @@
     pageTotal.value = res.data.total
     produceList = produceList.value.concat(deepClone(res.data.data))
     titleSelectJson.value.processType = res.data.process
+    titleSelectJson.value.processType.unshift(newItem.value)
     xGrid.value.reloadData(produceList)
     gridOptions.loading = false
   } else {
@@ -99,7 +107,7 @@
 const selectPageList = () => {
   let startTime = form.date1[0]
   let endTime = form.date1[1]
-
+  let selectProcesses = procseeValue.value
 
   request.post(`/report/teamOutput/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}/${selectProcesses}`, filterData.value).then((res) => {
     if (res.code == 200) {
@@ -118,7 +126,7 @@
 
   let startTime = form.date1[0]
   let endTime = form.date1[1]
-  let selectProcesses = value.value
+  let selectProcesses = procseeValue.value
 
   request.post(`/report/teamOutput/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}/${selectProcesses}`, filterData.value).then((res) => {
 
@@ -148,6 +156,7 @@
 }
 
 function filterChanged(column){
+  let selectProcesses = procseeValue.value
   //gridOptions.loading=true
   //绛涢�夋潯浠跺彂鐢熷彉鍖栨潯浠跺彂鐢熷彉鍖�
   let value = column.datas[0]!=undefined?column.datas[0]:''
@@ -219,7 +228,7 @@
   },//琛ㄥご鍙傛暟
   columns: [
     {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
-    {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 40},
+    {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
     {
       field: 'reportingWorkTime', width: 160, title: t('reportingWorks.reportingWorkTime'),
     },
@@ -239,16 +248,14 @@
     {
       field: 'processId', width: 140, title: t('processCard.processId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }
     },
-    {field: 'orderNumber', width: 60, title: t('order.OrderNum')},
+    {field: 'orderNumber', width: 90, title: t('order.OrderNum')},
     {field: 'code', width: 60, title: t('reportingWorks.glassNumber')},
     {field: 'width', width: 100, title: t('order.width')},
     {field: 'height', width: 100, title: t('order.height')},
-    {field: 'shape', width: 90, title: t('order.shape')},
-    {field: 'thickness', width: 90, title: t('order.totalThickness'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
     {field: 'edgingType', width: 110, title: t('order.edgingType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
     {field: 'completedQuantity', width: 90, title: t('reportingWorks.completedQuantity')},
     {field: 'area', width: 100, title: t('reportingWorks.completedArea')},
-    {field: 'productName', width: 150, title: t('order.product')},
+    {field: 'productName', title: t('order.product')},
   ],//琛ㄥご鎸夐挳
 
   toolbarConfig: {
@@ -284,7 +291,7 @@
 })
 
 function exportExcel(url, fileName,date) {
-  let processes = value.value
+  let processes = procseeValue.value
   if(date===null){
     ElMessage.warning(t('report.pleaseSelectADateFirst'))
     return
@@ -343,7 +350,7 @@
             value-format="YYYY-MM-DD"
         />
         &nbsp;&nbsp;
-        <el-select v-model="value" clearable default-value="default_city" style="width: 120px">
+        <el-select v-model="procseeValue" clearable default-value="default_city" style="width: 120px">
           <el-option
               v-for="item in titleSelectJson['processType']"
               :key="item.id"
@@ -358,8 +365,9 @@
     <vxe-grid
         ref="xGrid"
         class="mytable-scrollbar"
-        max-height="100%"
+        height="100%"
         v-bind="gridOptions"
+        @filter-change="filterChanged"
 
     >
       <!--      @toolbar-button-click="toolbarButtonClickEvent"-->
@@ -373,7 +381,19 @@
         </ul>
       </template>
 
-
+      <template #pager>
+        <!--浣跨敤 pager 鎻掓Ы-->
+        <!--        'PrevJump','NextJump', -->
+        <vxe-pager
+            v-model:current-page="pageNum"
+            v-model:page-size="total.pageSize"
+            v-model:pager-count="total.pageTotal"
+            :layouts="[  'PrevPage', 'Jump','PageCount', 'NextPage',  'Total']"
+            :total="total.dataTotal"
+            @page-change="handlePageChange"
+        >
+        </vxe-pager>
+      </template>
       <template #num1_filter="{ column, $panel }">
         <div>
           <div v-for="(option, index) in column.filters" :key="index">
@@ -396,7 +416,7 @@
 <style scoped>
 .main-div-customer {
   width: 99%;
-  height: 100%;
+  height: 90%;
 }
 
 #selectForm {

--
Gitblit v1.8.0