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/WorkInProgressCombination.vue |   61 ++++++++++++++++++++++--------
 1 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgressCombination.vue b/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgressCombination.vue
index e1b1782..4235538 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgressCombination.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgressCombination.vue
@@ -23,6 +23,8 @@
 
 //椤圭洰鍚嶇О姹囨��
 let projectSummary= ref(1)
+//缁堟鐘舵��
+let terminationVal = ref(1)
 //宸ュ簭
 const value = ref()
 
@@ -96,12 +98,7 @@
   dataTotal: 0,
   pageSize: 100
 })
-let newItem= ref({
-  basic_name: '鍏ㄩ儴',
-  basic_type: 'product',
-  basic_category: 'process',
-  id: "001"
-})
+
 //瀹氫箟鎺ユ敹鍔犺浇琛ㄥご涓嬫媺鏁版嵁
 const titleSelectJson = ref({
   processType: [],
@@ -110,11 +107,14 @@
 if (optionVal == '') {
   optionVal = null
 }
+let terminationVals = terminationVal.value
+if (terminationVals == '') {
+  terminationVals = null
+}
 //绗竴娆″姞杞芥暟鎹�
-request.post(`/report/workInProgressCombination/1/${total.pageSize}/${selectProcesses}/${inputVal}/${inputProject}/${optionVal}`, filterData.value).then((res) => {
+request.post(`/report/workInProgressCombinationProcess/1/${total.pageSize}/${selectProcesses}/${inputVal}/${inputProject}/${optionVal}`, filterData.value).then((res) => {
 
   if (res.code == 200) {
-    console.log(res.data)
     // total.dataTotal = res.data.total.total*1
     // total.pageTotal= res.data.total.pageTotal
     // pageTotal.value = res.data.total
@@ -122,8 +122,7 @@
     // produceList = produceList.value.concat(deepClone(res.data.data))
     titleSelectJson.value.processType = res.data.process
     titleSelectJson.value.processType.splice(0,1)
-    titleSelectJson.value.processType.unshift(newItem.value)
-    xGrid.value.reloadData(produceList)
+    //xGrid.value.reloadData(produceList)
     gridOptions.loading = false
   } else {
     ElMessage.warning(res.msg)
@@ -145,7 +144,11 @@
   if (optionVal == '') {
     optionVal = null
   }
-  request.post(`/report/workInProgressCombination/${pageNum.value}/${total.pageSize}/${inputVal}/${inputProject}/${selectProcesses}/${optionVal}`, filterData.value).then((res) => {
+  let terminationVals = terminationVal.value
+  if (terminationVals == '') {
+    terminationVals = null
+  }
+  request.post(`/report/workInProgressCombination/${pageNum.value}/${total.pageSize}/${inputVal}/${inputProject}/${selectProcesses}/${optionVal}/${terminationVals}`, filterData.value).then((res) => {
     if (res.code == 200) {
       total.value = res.data.total
       produceList = deepClone(res.data.data)
@@ -177,10 +180,13 @@
   if (optionVal == '') {
     optionVal = null
   }
-  request.post(`/report/workInProgressCombination/${pageNum.value}/${total.pageSize}/${inputVal}/${inputProject}/${selectProcesses}/${optionVal}`, filterData.value).then((res) => {
+  let terminationVals = terminationVal.value
+  if (terminationVals == '') {
+    terminationVals = null
+  }
+  request.post(`/report/workInProgressCombination/${pageNum.value}/${total.pageSize}/${inputVal}/${inputProject}/${selectProcesses}/${optionVal}/${terminationVals}`, filterData.value).then((res) => {
 
     if (res.code == 200) {
-      console.log(res.data.data)
       // total.dataTotal = res.data.total.total * 1
       // total.pageTotal = res.data.total.pageTotal
       // pageTotal.value = res.data.total
@@ -255,7 +261,7 @@
       filterMethod: filterChanged,
     },
     {
-      field: 'project', width: 120, title: t('order.project'), filters: [{data: ''}],
+      field: 'project', width: 220, title: t('order.project'), filters: [{data: ''}],
       slots: {filter: 'num1_filter'},
       filterMethod: filterChanged,
       visible: true
@@ -291,7 +297,7 @@
         const List = ["quantity",'stockNum','stockArea',]
         if (List.includes(column.field)) {
           //return footSum(data, column.field)
-          return footSum(data, column.field)
+          return total.value?.[column.field] ?? 0
         }
         return ''
       })
@@ -304,7 +310,12 @@
   projectSummary.value = checked ? 0 : 1
 }
 
+function onlandingTerminationChange(checked) {
+  terminationVal.value = checked ? 0 : 1
+}
+
 function exportExcel(url, fileName,date) {
+
   let processes = value.value
   let inputVal = form.orderId
   if (inputVal == '') {
@@ -314,11 +325,15 @@
   if (inputProject == '') {
     inputProject = null
   }
+  let terminationVals = terminationVal.value
+  if (terminationVals == '') {
+    terminationVals = null
+  }
   if(date===null){
     ElMessage.warning(t('report.pleaseSelectADateFirst'))
     return
   }
-
+  gridOptions.loading = true
   if(processes===null){
     ElMessage.warning(t('report.pleaseSelectAProcessFirst'))
     return
@@ -336,7 +351,8 @@
     date: date,
     processes: processes,
     orderId: inputVal,
-    project: inputProject
+    project: inputProject,
+    terminationVals:terminationVals
   })
   request.post(url,dataMp.value,{responseType :'blob'}).then(res => {
     const blob = new Blob([res])
@@ -349,6 +365,7 @@
       elink.click()
       URL.revokeObjectURL(elink.href) // 閲婃斁URL 瀵硅薄
       document.body.removeChild(elink)
+      gridOptions.loading = false
     } else { // IE10+涓嬭浇
       navigator.msSaveBlob(blob, fileName)
     }
@@ -370,6 +387,10 @@
       {{$t('report.workingProcedure')}}锛�
         <el-select v-model="value" clearable :placeholder="$t('reportingWorks.selectProcess')" default-value="default_city" style="width: 120px">
           <el-option
+              :label="t('report.allProcess')"
+              :value="'all'"
+          />
+          <el-option
               v-for="item in titleSelectJson['processType']"
               :key="item.id"
               :label="item.basic_name"
@@ -383,6 +404,12 @@
       >
         {{ t('order.project') }}
       </el-checkbox>
+      <el-checkbox
+          :model-value="terminationVal === 0"
+          @change="onlandingTerminationChange"
+      >
+        {{ t('processCard.notTermination') }}
+      </el-checkbox>
       &nbsp;
         <el-button type="primary" @click="getWorkOrder">{{$t('basicData.search')}}</el-button>
     </div>

--
Gitblit v1.8.0