From 93b80ffb7f7ffc02bc414271b8ebeac82be6bcb9 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 11 十一月 2024 16:29:00 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue |   60 ++++++++++++++++++++++++++++++------------------------------
 1 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue b/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue
index 163f213..67dcab1 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue
@@ -20,7 +20,7 @@
 })
 
 //宸ュ簭
-const value = ref(t('machine.edgeGrinding'))
+const value = ref()
 
 //鏍规嵁浠ヤ笅瀛楁姹囨�绘煡璇�
 const stateValue = ref('')
@@ -157,7 +157,7 @@
       total.dataTotal = res.data.total.total * 1
       total.pageTotal = res.data.total.pageTotal
       pageTotal.value = res.data.total
-      xGrid.value.loadData(res.data.data)
+      xGrid.value.reloadData(res.data.data)
       gridOptions.loading = false
     } else {
       ElMessage.warning(res.msg)
@@ -181,41 +181,41 @@
 }
 
 function filterChanged(column){
-  //gridOptions.loading=true
+  gridOptions.loading = true
   //绛涢�夋潯浠跺彂鐢熷彉鍖栨潯浠跺彂鐢熷彉鍖�
-  let value = column.datas[0]!=undefined?column.datas[0]:''
+  let value = column.datas[0] != undefined ? column.datas[0] : ''
   value = value.trim()
   //鍒ゆ柇鏄惁瀛樺湪澶栭敭
-  if (column.property.indexOf('.')>-1){
-    const  columnArr = column.property.split('.')
+  if (column.property.indexOf('.') > -1) {
+    const columnArr = column.property.split('.')
     filterData.value[columnArr[0]] = {
-      [columnArr[1]]:value
+      [columnArr[1]]: value
     }
-  }else{
+  } else {
     filterData.value[column.property] = value
   }
-  gridOptions.loading = true
 
-  let startTime = form.date1[0]
-  let endTime = form.date1[1]
-  let optionVal=stateValue.value
-  if (optionVal == '') {
-    optionVal = null
-  }
-  request.post(`/report/workInProgress/1/${total.pageSize}/${inputVal}/${inputProject}/${selectProcesses}/${optionVal}`, filterData.value).then((res) => {
-
-    if (res.code == 200) {
-      total.dataTotal = res.data.total.total*1
-      total.pageTotal=parseInt(res.data.total)
-      pageNum.value=1
-      produceList = deepClone(res.data.data)
-      xGrid.value.reloadData(produceList)
-      gridOptions.loading=false
-    } else {
-      ElMessage.warning(res.msg)
-    }
-    //handleUpdateData(produceList)
-  })
+  getWorkOrder()
+  // let selectProcesses = value.value
+  // let optionVal=stateValue.value
+  // if (optionVal == '') {
+  //   optionVal = null
+  // }
+  // request.post(`/report/workInProgress/1/${total.pageSize}/${inputVal}/${inputProject}/${selectProcesses}/${optionVal}`, filterData.value).then((res) => {
+  //
+  //   if (res.code == 200) {
+  //     total.dataTotal = res.data.total.total*1
+  //     total.pageTotal=parseInt(res.data.total)
+  //     pageNum.value=1
+  //     produceList = deepClone(res.data.data)
+  //     console.log(res.data.data)
+  //     xGrid.value.reloadData(produceList)
+  //     gridOptions.loading=false
+  //   } else {
+  //     ElMessage.warning(res.msg)
+  //   }
+  //   //handleUpdateData(produceList)
+  // })
 
 }
 
@@ -436,7 +436,7 @@
           />
         </el-select>
         &nbsp;
-        <el-select v-model="value" clearable default-value="default_city" style="width: 120px">
+        <el-select v-model="value" clearable :placeholder="$t('reportingWorks.selectProcess')" default-value="default_city" style="width: 120px">
           <el-option
               v-for="item in titleSelectJson['processType']"
               :key="item.id"

--
Gitblit v1.8.0