From 5a149d626ae8bc3fa4bddbb53f8caf40f51f6da6 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 04 6月 2025 17:42:13 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Views/Pages/WorkTask/WorkTask.tsx | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Views/Pages/WorkTask/WorkTask.tsx b/PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Views/Pages/WorkTask/WorkTask.tsx
index c67f201..61dc33e 100644
--- a/PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Views/Pages/WorkTask/WorkTask.tsx
+++ b/PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Views/Pages/WorkTask/WorkTask.tsx
@@ -25,7 +25,7 @@
import { injectModel } from '@/libs/Provider/Provider'
// 寮曞叆鍏叡閫夐」閰嶇疆
import {
- FILTER_MODE_OPTIONS_STRING
+ FILTER_MODE_OPTIONS_STRING_KEY
} from '@/components/DyFormForHighQuery/DyFormForHighQueryOptions';
// 寮曞叆鍏叡楂樼骇鏌ヨ宸ュ叿鏂囦欢
import { commonSaveCurHighQueryData,setValueForCurHighQueryData,commonGetHighQueryForm,initQueryForm,GetFilteredData } from '@/utils/myHighQueryUtils';
@@ -74,9 +74,9 @@
//瀹氫箟鏁翠綋妯＄硦鏌ヨ鐨勫垪鏁扮粍(娉ㄦ剰锛氬繀椤诲ぇ灏忓啓璺熷悗绔殑瀹炰綋绫诲睘鎬у悕涓�鑷达紝鍚﹀垯浼氬鑷村尮閰嶄笉瀵圭殑闂)
const _searchFormInputAttrs = ref([
- 'Son_TaskCode','TaskCode','DataIdentifier','MaterialMode','MarkingContent','WeldingHeatInput','PipeAllowableStress','FactoryCode','ProductCode','WorkstationCode','EquipmentCode','ProdLineCode','ShipNumber','ProjectNumber','ProcessName','PipeFittingCode','PreSerialNumber','PipeSpecCode','PipeSectionName','Material','ProcessRouteNumber','TeamInfo','Timestamp','CreatorName','LastModifierName','Remark'
+ 'Son_TaskCode','TaskCode','PipeSpecCode','PipeSectionName','PipeSpecMode','ProcessName','ShipNumber','ProjectNumber','ProcessRouteNumber','DataIdentifier','MaterialMode','MarkingContent','WeldingHeatInput','PipeAllowableStress','FactoryCode','ProductCode','WorkstationCode','EquipmentCode','ProdLineCode','PipeFittingCode','PreSerialNumber','Material','TeamInfo','Timestamp','CreatorName','LastModifierName','Remark'
]);
- const searchFormInputAttrs_Placeholder = ref('璇疯緭鍏ュ瓙浠诲姟缂栫爜/浠诲姟缂栫爜/鍘熸枡鏍囪瘑/鍘熸枡鍨嬪彿/鎵撶爜鍐呭/娉曞叞鍏О鍘嬪姏/娉曞叞鍐茬爜鍐呭/宸ュ巶浠ｇ爜/浜у搧浠ｇ爜/宸ヤ綅浠ｇ爜/璁惧浠ｇ爜/浜х嚎缂栫爜/鑸瑰彿/椤圭洰鍙�/宸ュ簭鍚嶇О/绠′欢缂栫爜/椤哄簭鍙�/绠℃缂栫爜/绠℃鍚嶇О/鏉愯川/宸ヨ壓娴佸悜缂栧彿/鐝粍淇℃伅/鏃堕棿鎴�/鍒涘缓浜�/淇敼浜�/澶囨敞');
+ const searchFormInputAttrs_Placeholder = ref('璇疯緭鍏ュ瓙浠诲姟缂栫爜/浠诲姟缂栫爜/绠℃缂栫爜/绠℃鍚嶇О/绠℃鍨嬪彿/宸ュ簭鍚嶇О/鑸瑰彿/椤圭洰鍙�/宸ヨ壓娴佸悜缂栧彿/鍘熸枡鏍囪瘑/鍘熸枡鍨嬪彿/鎵撶爜鍐呭/娉曞叞鍏О鍘嬪姏/娉曞叞鍐茬爜鍐呭/宸ュ巶浠ｇ爜/浜у搧浠ｇ爜/宸ヤ綅浠ｇ爜/璁惧浠ｇ爜/浜х嚎缂栫爜/绠′欢缂栫爜/椤哄簭鍙�/鏉愯川/鐝粍淇℃伅/鏃堕棿鎴�/鍒涘缓浜�/淇敼浜�/澶囨敞');
// 鍔ㄦ�佹灇涓鹃�夐」
@@ -130,7 +130,7 @@
}
// 鏂扮増鐨勬煡璇㈤噸缃�
const resetQuery = () => {
- initQueryForm(queryForm,_searchFormInputAttrs,FILTER_MODE_OPTIONS_STRING);
+ initQueryForm(queryForm,_searchFormInputAttrs,FILTER_MODE_OPTIONS_STRING_KEY);
setValueForCurHighQueryData(_curHighQueryData,queryForm,_searchFormInputAttrs);
}
//鏂扮増鐨勫鍑烘柟娉�
@@ -338,7 +338,7 @@
placeholder="璇烽�夋嫨"
class={styles.formItem}
>
- {FILTER_MODE_OPTIONS_STRING.map((option) => (
+ {FILTER_MODE_OPTIONS_STRING_KEY.map((option) => (
<ElOption
key={option.value}
label={option.label}
--
Gitblit v1.9.3