From 15f335a0553bbc56c23a1eea9548e53b8fdbcb87 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 11 三月 2024 11:29:04 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue |   50 +++++++++++++++++++++++---------------------------
 1 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue
index bdc6117..eb198e6 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue
@@ -12,6 +12,7 @@
 import BasicTable from '@/components/basic/BasicTable.vue'
 import {VXETable} from "vxe-table";
 import useUserInfoStore from "@/stores/userInfo";
+import {changeFilterEvent,filterChanged} from "@/hook"
 
 let router = useRouter()
 const userStore = useUserInfoStore()
@@ -33,20 +34,7 @@
 
 //宸ュ簭
 const value = ref('')
-const options = [
-  {
-    value: '鍒囧壊',
-    label: '鍒囧壊',
-  },
-  {
-    value: '纾ㄨ竟',
-    label: '纾ㄨ竟',
-  },
-  {
-    value: '閽㈠寲',
-    label: '閽㈠寲',
-  },
-]
+
 
 //鎺掍骇鐘舵��
 const stateValue = ref('1')
@@ -69,6 +57,11 @@
 const form = reactive({
   date1: '',
   orderId: ''
+})
+
+//瀹氫箟鎺ユ敹鍔犺浇琛ㄥご涓嬫媺鏁版嵁
+const titleSelectJson = ref({
+  processType: [],
 })
 
 
@@ -137,8 +130,10 @@
   if (res.code == 200) {
     pageTotal.value = res.data.total
     produceList = produceList.value.concat(deepClone(res.data.data))
+    titleSelectJson.value.processType=res.data.process
     xGrid.value.reloadData(produceList)
     gridOptions.loading = false
+    console.log(res.data)
     //绂佺敤鍒犻櫎銆佷繚瀛樻寜閽�
     gridOptions.toolbarConfig.buttons[0].disabled = true
     gridOptions.toolbarConfig.buttons[1].disabled = true
@@ -177,7 +172,8 @@
         ElMessage.warning(res.msg)
       }
     })
-  } else if (inputVal != null && selectState == 1) {
+  } else
+    if (inputVal != null && selectState == 1) {
 
     //鏍规嵁宸ュ簭鏌ヨ鏈帓浜ф暟鎹�
     request.post(`/productionScheduling/selectScheduling/${startTime}/${endTime}/${inputVal}/${selectProcesses}/${selectState}`, filterData.value).then((res) => {
@@ -253,7 +249,7 @@
     useKey: true
   },
   filterConfig: {   //绛涢�夐厤缃」
-    remote: true
+    // remote: true
   },
   customConfig: {
     storage: true
@@ -280,13 +276,13 @@
       title: '璁″垝缁撴潫鏃堕棿'
     },
     // {field: '鎺掍骇缂栧彿', title: '鎺掍骇缂栧彿',  width: 120 },
-    {field: 'order_id', title: '閿�鍞崟鍙�', filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 100},
-    {field: 'customer_name', title: '瀹㈡埛鍚嶇О', width: 110, filters: [{data: ''}], slots: {filter: 'num1_filter'}},
-    {field: 'project', title: '椤圭洰鍚嶇О', width: 100, filters: [{data: ''}], slots: {filter: 'num1_filter'}},
-    {field: 'order_number', title: '搴忓彿', filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 70},
+    {field: 'order_id', title: '閿�鍞崟鍙�', filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 100,filterMethod:filterChanged},
+    {field: 'customer_name', title: '瀹㈡埛鍚嶇О', width: 110, filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+    {field: 'project', title: '椤圭洰鍚嶇О', width: 100, filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+    {field: 'order_number', title: '搴忓彿', filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 70,filterMethod:filterChanged},
 
-    {field: 'width', title: '瀹�', width: 60},
-    {field: 'height', title: '楂�', width: 60},
+    {field: 'width', title: '瀹�', width: 60,filters: [{data: ''}],slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+    {field: 'height', title: '楂�', width: 60,filters: [{data: ''}],slots: {filter: 'num1_filter'},filterMethod:filterChanged},
     {field: 'quantity', title: '璁㈠崟鏁伴噺', width: 70},
     {field: 'area', title: '璁㈠崟闈㈢Н', width: 90},
     {
@@ -487,12 +483,12 @@
         &nbsp;&nbsp;
         <el-input v-model="form.orderId" placeholder="閿�鍞崟鍙�" clearable style="width: 110px"></el-input>
         &nbsp;
-        <el-select v-model="value" class="m-2" placeholder="宸ュ簭" clearable style="width: 90px;">
+        <el-select v-model="value" clearable placeholder="璇烽�夋嫨宸ュ簭" style="width: 120px">
           <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+              v-for="item in titleSelectJson['processType']"
+              :key="item.id"
+              :label="item.basic_name"
+              :value="item.basic_name"
           />
         </el-select>
         &nbsp;

--
Gitblit v1.8.0