From 583b80a582f9280a262ee72506d31d1bfa46f734 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 10 十二月 2025 11:29:57 +0800
Subject: [PATCH] 补交

---
 north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue |  365 ++++++---------------------------------------------
 1 files changed, 44 insertions(+), 321 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue b/north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue
index 51c9642..c67cd3a 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue
@@ -1,348 +1,71 @@
 <script setup>
-
-import {reactive, ref} from "vue";
-import {useRouter} from 'vue-router'
-import request from "@/utils/request";
-import deepClone from "@/utils/deepClone";
-import {ElDatePicker, ElMessage} from "element-plus";
-import {useI18n} from 'vue-i18n'
-import {changeFilterEvent, filterChanged} from "@/hook"
-//璇█鑾峰彇
+import BasicTable from "@/components/BrokenReportTemplate.vue"
+import request from "@/utils/request"
+import { ref} from "vue"
+import {useI18n} from "vue-i18n";
 const {t} = useI18n()
-let router = useRouter()
-let filterData = ref({})
-//鎻愪氦鐨勮〃鍗�
-const form = reactive({
-  date1: '',
-  orderId: '',
-  project: ''
-})
-
-//宸ュ簭
-const value = ref('纾ㄨ竟')
-
-//琛ㄥ熬姹傚拰
-const sumNum = (list, field) => {
-  let count = 0
-  list.forEach(item => {
-    count += Number(item[field])
-  })
-  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 pageTotal = ref('')
-//瀹氫箟鏁版嵁杩斿洖缁撴灉
-let produceList = ref([])
-//瀹氫箟褰撳墠椤垫暟
-let pageNum = ref(1)
-let pageState = null
-
-//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
-function getNowTime() {
-  const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 3)
-      .toISOString()
-      .replace('T', ' ')
-      .slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
-  const end = new Date(new Date().getTime() + 3600 * 1000 * 24)
-      .toISOString()
-      .replace('T', ' ')
-      .slice(0, 10)//榛樿缁撴潫鏃堕棿褰撳墠鏃堕棿
-  return [start, end]
-}
-
-
-//绗竴娆″姞杞借幏鍙栬繎涓冨ぉ鏃堕棿鍜岄粯璁ょ姸鎬�
-form.date1 = getNowTime()
-let startTime = form.date1[0]
-let endTime = form.date1[1]
-let total = reactive({
-  pageTotal: 0,
-  dataTotal: 0,
-  pageSize: 100
-})
-//瀹氫箟鎺ユ敹鍔犺浇琛ㄥご涓嬫媺鏁版嵁
-const titleSelectJson = ref({
-  processType: [],
-})
-//绗竴娆″姞杞芥暟鎹�
-request.post(`/report/damageReport/${startTime}/${endTime}`, filterData.value).then((res) => {
-
-  if (res.code == 200) {
-    // total.dataTotal = res.data.total.total*1
-    // total.pageTotal= res.data.total.pageTotal
-    // pageTotal.value = res.data.total
-    produceList = produceList.value.concat(deepClone(res.data.data))
-    xGrid.value.reloadData(produceList)
-    gridOptions.loading = false
-  } else {
-    ElMessage.warning(res.msg)
-  }
-})
-
-//椤佃剼缈婚〉鏌ヨ
-const selectPageList = () => {
-  let startTime = form.date1[0]
-  let endTime = form.date1[1]
-
-  request.post(`/report/selectReportingWork/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}/${inputVal}`, filterData.value).then((res) => {
-    if (res.code == 200) {
-
-
-      produceList = deepClone(res.data.data)
-      xGrid.value.reloadData(produceList)
-    } else {
-      ElMessage.warning(res.msg)
-    }
-  })
-}
-
-//鐐瑰嚮鏌ヨ
-const getWorkOrder = () => {
-
-  let startTime = form.date1[0]
-  let endTime = form.date1[1]
-  request.post(`/report/damageReport/${startTime}/${endTime}`, filterData.value).then((res) => {
-
-    if (res.code == 200) {
-      // total.dataTotal = res.data.total.total*1
-      // total.pageTotal= res.data.total.pageTotal
-      // pageTotal.value = res.data.total
-      produceList = deepClone(res.data.data)
-      xGrid.value.reloadData(produceList)
-    } else {
-      ElMessage.warning(res.msg)
-    }
-  })
-}
-
-//椤佃剼璺宠浆
-const handlePageChange = ({currentPage, pageSize}) => {
-  pageNum.value = currentPage
-  total.pageTotal = pageSize
-  selectPageList()
-}
-
-
-/*浣跨敤绛涢�夛紝鍚庣鑾峰彇鏁版嵁*/
-// const changeFilterEvent = (event, option, $panel,) => {
-//   // 鎵嬪姩瑙﹀彂绛涢��
-//   $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
-//   }
-//
-//   gridOptions.loading = true
-//
-// }
-
-/*鍚庣杩斿洖缁撴灉澶氬眰宓屽灞曠ず*/
-const hasDecimal = (value) => {
-  const regex = /\./; // 瀹氫箟姝ｅ垯琛ㄨ揪寮忥紝鏌ユ壘灏忔暟鐐�
-  return regex.test(value); // 杩斿洖true/false
-}
-
-//瀛愮粍浠舵帴鏀跺弬鏁�
-const xGrid = ref()
-const gridOptions = reactive({
-  border: "full",//琛ㄦ牸鍔犺竟妗�
-  keepSource: true,//淇濇寔婧愭暟鎹�
-  align: 'center',//鏂囧瓧灞呬腑
-  stripe: true,//鏂戦┈绾�
-  rowConfig: {isCurrent: true, isHover: true, height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
-  id: 'CustomerList',
-  showFooter: true,//鏄剧ず鑴�
-  printConfig: {},
-  importConfig: {},
-  exportConfig: {},
-  scrollY: {enabled: true},//寮�鍚櫄鎷熸粴鍔�
-  showOverflow: true,
-  columnConfig: {
-    resizable: true,
-    useKey: true
-  },
-  filterConfig: {   //绛涢�夐厤缃」
-    // remote: true
-  },
-  customConfig: {
-    storage: true
-  },
-  editConfig: {
-    trigger: 'click',
-    mode: 'row',
-    showStatus: true
-  },//琛ㄥご鍙傛暟
+const childrenData = ref({
   columns: [
     {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
-    {type: 'seq', fixed: "left", title: '鑷簭', width: 50},
+    {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
     {
-      field: 'order_id', width: 120, title: '閿�鍞崟鍙�', filters: [{data: ''}],
-      slots: {filter: 'num1_filter'},
-      filterMethod: filterChanged
+      field: 'orderId', width: 120, title: t('order.orderId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }
     },
     {
       field: 'project',
       width: 120,
-      title: '椤圭洰鍚嶇О',
+      title: t('order.project'),
       showOverflow: "ellipsis",
-      filters: [{data: ''}],
-      slots: {filter: 'num1_filter'},
-      filterMethod: filterChanged
+      filters:[{ data: '' }],slots: { filter: 'num1_filter' }
+    },
+    {field: 'batch', width: 90, title: t('order.batch')},
+    {
+      field: 'processId', width: 130, title: t('processCard.processId'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }
     },
     {
-      field: 'process_id', width: 130, title: '娴佺▼鍗″彿', filters: [{data: ''}],
-      slots: {filter: 'num1_filter'},
-      filterMethod: filterChanged
+      field: 'orderNumber', width: 120, title: t('order.OrderNum'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }
+    },
+    {field: 'glassNumber', width: 160,title: t('reportingWorks.glassNumber') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+
+    {
+      field: 'technologyNumber', width: 100, title: t('processCard.technologyNumber'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }
     },
     {
-      field: 'order_number', width: 120, title: '璁㈠崟搴忓彿', filters: [{data: ''}],
-      slots: {filter: 'num1_filter'},
-      filterMethod: filterChanged
-    },
-    {
-      field: 'technology_number', width: 100, title: '灏忕墖椤哄簭', filters: [{data: ''}],
-      slots: {filter: 'num1_filter'},
-      filterMethod: filterChanged
-    },
-    {
-      field: 'reporting_work_time',
+      field: 'reportingWorkTime',
       width: 100,
-      title: '鎶ュ伐鏃堕棿',
+      title: t('reportingWorks.reportingWorkTime'),
       type: 'date',
       attrs: {placeholder: '', type: 'date'},
     },
-    {field: 'responsible_process', width: 120, title: '璐ｄ换宸ュ簭', showOverflow: "ellipsis"},
-    {field: 'responsible_team', width: 100, title: '璐ｄ换鐝粍'},
-    {field: 'responsible_equipment', width: 120, title: '璐ｄ换璁惧'},
-    {field: 'breakage_type', width: 120, title: '娆＄牬绫诲瀷'},
-    {field: 'breakage_reason', width: 120, title: '娆＄牬鍘熷洜'},
-    {field: 'breakage_quantity', width: 120, title: '娆＄牬鏁伴噺'},
-    {field: 'area', width: 120, title: '娆＄牬闈㈢Н'},
-    {field: 'personnel', width: 120, title: '璐ｄ换浜哄憳'},
-    {field: 'glass_child', width: 120, title: '鍗曠墖鍚嶇О'},
-  ],//琛ㄥご鎸夐挳
-
-  toolbarConfig: {
-    // buttons: [{
-    //
-    // }],
-    import: false,
-    export: true,
-    print: true,
-    zoom: true,
-    custom: true
-  },
-  data: [],//table body瀹為檯鏁版嵁
-  //鑴氶儴姹傚拰
-  footerMethod({columns, data}) {//椤佃剼鍑芥暟
-    let footList = ['']
-    return [
-      columns.map((column, columnIndex) => {
-        if (columnIndex === 0) {
-          return '鍚堣:'
-        }
-        if (footList.includes(column.field)) {
-          return sumNum(data, column.field)
-        }
-        return ''
-      })
-    ]
-  }
-
+    {field: 'responsibleProcess', width: 120, title: t('reportingWorks.responsibleProcess'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, showOverflow: "ellipsis"},
+    {field: 'responsibleTeam', width: 100, title: t('reportingWorks.responsibleTeam'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: 'responsibleEquipment', width: 120, title: t('reportingWorks.responsibleEquipment'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: 'breakageType', width: 120, title: t('reportingWorks.breakageType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: 'breakageReason', width: 120, title: t('reportingWorks.breakageReason'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: 'thisProcess',width: 120, title: t('reportingWorks.reportingProcess'), sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: 'creator',width: 120, title: t('product.creator'), sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: 'childWidth', width: 100, title: t('order.width'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: 'childHeight', width: 100, title: t('order.height'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: 'thickness',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, width: 90, title: t('order.totalThickness')},
+    {field: 'breakageQuantity', width: 120, title: t('reportingWorks.quantityBroken')},
+    {field: 'area', width: 120, title: t('reportingWorks.wornArea')},
+    {field: 'personnel', width: 120, title: t('reportingWorks.responsiblePersonnel')},
+    {field: 'glassChild', width: 120, title: t('reportingWorks.glassChild'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: 'reportingWorkId', width: 100,title: t('reportingWorks.reportingWorkId'),filters: [{data: ''}], slots: {filter: 'num1_filter'}},
+  ],//琛ㄦ牸琛ㄥご瀛楁
+  data:[],//琛ㄦ牸鏁版嵁
+  url :'/report/damageReport',
+  exportUrl :'/report/exportDamageReport',
+  exportName:t('report.secondaryBrokenTotal'),
+  footList:['breakageQuantity','area']
 })
-
 
 </script>
 
 <template>
-  <div class="main-div-customer">
-    <div id="selectForm">
-      <el-row :gutter="0">
-        <el-date-picker
-            v-model="form.date1"
-            end-placeholder="缁撴潫鏃堕棿"
-            format="YYYY/MM/DD"
-            start-placeholder="寮�濮嬫椂闂�"
-            style="width: 100px"
-            type="daterange"
-            value-format="YYYY-MM-DD"
-        />
-        &nbsp;&nbsp;
-        <el-button type="primary" @click="getWorkOrder">鏌ヨ</el-button>
-      </el-row>
-
-    </div>
-    <vxe-grid
-        ref="xGrid"
-        class="mytable-scrollbar"
-        max-height="100%"
-        v-bind="gridOptions"
-
-    >
-      <!--      @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 #button_slot="{ row }">
-        <el-button link size="small" type="primary" @click="getTableRow(row,'edit')">缂栬緫</el-button>
-        <el-button link size="small" type="primary" @click="getTableRow(row,'setType')">鍙嶅</el-button>
-        <el-button link size="small" type="primary" @click="getTableRow(row,'delete')">鍒犻櫎</el-button>
-      </template>
-
-      <template #num1_filter="{ column, $panel }">
-        <div>
-          <div v-for="(option, index) in column.filters" :key="index">
-            <input v-model="option.data" type="type" @input="changeFilterEvent($event, option, $panel)"/>
-          </div>
-        </div>
-      </template>
-
-
-    </vxe-grid>
-  </div>
+  <basic-table
+      :childrenData="childrenData"/>
 </template>
 
 <style scoped>
-.main-div-customer {
-  width: 99%;
-  height: 100%;
-}
-
-#selectForm {
-  width: 60%;
-  text-align: center;
-}
 </style>
\ No newline at end of file

--
Gitblit v1.8.0