From 59ef6e9b5b8aff7614711c2afdba23a460ac1c56 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 27 三月 2024 08:41:47 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue |   91 +++++++++++++++++++++++++++++++--------------
 1 files changed, 63 insertions(+), 28 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue b/north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue
index 051e8c4..d280dea 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue
@@ -2,25 +2,14 @@
 
 import {reactive, ref} from "vue";
 import {useRouter} from  'vue-router'
-
+import {Search} from "@element-plus/icons-vue";
+import {changeFilterEvent, filterChanged} from "@/hook"
+import { useI18n } from 'vue-i18n'
+import request from "@/utils/request";
+import {ElMessage} from "element-plus";
+//璇█鑾峰彇
+const { t } = useI18n()
 let router=useRouter()
-const getTableRow = (row,type) =>{
-  switch (type) {
-    case 'edit' :{
-      //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
-      router.push({path: '/main/reportingWorks/ReportingWorkDetail', query: { id: row.id }})
-      break
-    }
-    case 'delete':{
-      alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
-      break
-    }
-    case  'setType':{
-      alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍙嶅鐘舵��')
-      break
-    }
-  }
-}
 
 //琛ㄥ熬姹傚拰
 const sumNum = (list, field) => {
@@ -31,8 +20,56 @@
   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: {
+    project: ''
+  },
+  orderDetail: {
+    productId: '',
+    productName: '',
+    computeGrossArea: '',
+    processingNote: '',
+  }
 
+})
+
+
+//鐐瑰嚮鏌ヨ
+const getWorkOrder = () => {
+  let inputVal = form.orderId
+
+  request.post(`/report/ProductionSchedule/${inputVal}`, filterData.value).then((res) => {
+    if (res.code == 200) {
+
+      pageTotal.value = res.data.total
+      xGrid.value.loadData(res.data.data)
+      gridOptions.loading = false
+    } else {
+      ElMessage.warning(res.msg)
+    }
+  })
+}
+
+
+/*鍚庣杩斿洖缁撴灉澶氬眰宓屽灞曠ず*/
+const hasDecimal = (value) => {
+  const regex = /\./; // 瀹氫箟姝ｅ垯琛ㄨ揪寮忥紝鏌ユ壘灏忔暟鐐�
+  return regex.test(value); // 杩斿洖true/false
+}
+
+//瀛愮粍浠舵帴鏀跺弬鏁�
+const xGrid = ref()
 const gridOptions = reactive({
   border:  "full",//琛ㄦ牸鍔犺竟妗�
   keepSource: true,//淇濇寔婧愭暟鎹�
@@ -283,9 +320,14 @@
   <div class="main-div-customer">
     <div id="selectForm">
       <el-row :gutter="0">
-        <el-input placeholder="閿�鍞崟鍙�" v-model="form.name" style="width: 150px"/>
+        <el-input v-model="form.orderId" clearable :placeholder="$t('order.orderId')" style="width: 130px"></el-input>
         &nbsp;&nbsp;
-        <el-button type="primary">鏌ヨ</el-button>
+        <el-button
+            @click="getWorkOrder"
+            id="select"
+            type="primary" :icon="Search">{{$t('basicData.search')}}
+
+        </el-button>
       </el-row>
 
     </div>
@@ -307,13 +349,6 @@
             <span>{{ row[item.field] }}</span>
           </li>
         </ul>
-      </template>
-
-      <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
-      <template #button_slot="{ row }">
-        <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">缂栬緫</el-button>
-        <el-button @click="getTableRow(row,'setType')" link type="primary" size="small">鍙嶅</el-button>
-        <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">鍒犻櫎</el-button>
       </template>
 
       <template #num1_filter="{ column, $panel }">

--
Gitblit v1.8.0