From e37f04c97ef893edce5f3f748398424fa17ffc2a Mon Sep 17 00:00:00 2001 From: ludc Date: 星期三, 18 九月 2024 10:04:17 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS-WEB/src/views/docking/loge.vue | 14 -------------- Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue | 3 +++ 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue b/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue index bfb2231..4216767 100644 --- a/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue +++ b/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue @@ -24,6 +24,9 @@ <el-option label="鍒嗙被鏌ヨ" value="queryClassify"></el-option> <el-option label="鍚紪鐮佽鍒欑殑鍒嗙被鏌ヨ" value="queryClassifyRule"></el-option> <el-option label="鏁版嵁鏌ヨ" value="queryData"></el-option> + <el-option label="鏍囧噯鐢宠" value="applyCodeForBZ"></el-option> + <el-option label="閮ㄩ棬鐢宠" value="syncDataForOrg"></el-option> + <el-option label="浜哄憳鐢宠" value="syncDataForPerson"></el-option> </el-select> </el-form-item> <!-- 闆嗘垚浠诲姟 鏄惁鎺ㄩ�佹垚鍔� diff --git a/Source/UBCS-WEB/src/views/docking/loge.vue b/Source/UBCS-WEB/src/views/docking/loge.vue index 4c202e3..73af2ff 100644 --- a/Source/UBCS-WEB/src/views/docking/loge.vue +++ b/Source/UBCS-WEB/src/views/docking/loge.vue @@ -103,20 +103,6 @@ value:7 }, { - label: '鏍囧噯鐢宠', - prop: 'applyCodeForBZ', - value:8 }, - { - label: '閮ㄩ棬鐢宠', - prop: 'syncDataForOrg', - value:9 - }, - { - label: '浜哄憳鐢宠', - prop: 'syncDataForPerson', - value:10 - }, - { label:'鎺ュ彛鍙傛暟', prop:'paramString', value:11 -- Gitblit v1.9.3