From 7a49d45da7e1d8d1b9aca8bbfcd22b622bc3e6ac Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 28 七月 2023 16:02:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 24 +-----------------------
1 files changed, 1 insertions(+), 23 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
similarity index 94%
rename from Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
rename to Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 7b631ec..2fbc819 100644
--- a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -4,28 +4,6 @@
<div class="top">
<div class="testbox" style="">
<div>
- <!-- <el-button plain size="small" type="primary" @click="addvisible = true">澧炲姞
- </el-button>
- <el-button plain size="small" type="primary" @click="editHandler">缂栬緫
- </el-button>
- <el-button plain size="small" type="primary" @click="openBatchImport('batchImportApply')">鎵归噺瀵煎叆鐢宠</el-button>
- <el-button plain size="small" type="primary" @click="openBatchImport('historyImport')">鍘嗗彶鏁版嵁瀵煎叆</el-button>
- <el-button plain size="small" type="primary" @click="openBatchImport('batchApplyCode')">鎵归噺鐢宠缂栫爜</el-button>
- <el-button plain size="small" type="primary">鎵归噺鍙戝竷</el-button>
- <el-button plain size="small" type="primary">鏌ョ湅娴佺▼鍘嗗彶</el-button>
- <el-button plain size="small" type="primary">鍒犻櫎</el-button>
- <el-button plain size="small" type="primary" @click="setHandler">鍙戝竷</el-button>
- <el-button plain size="small" type="primary" @click="DataChange">鏁版嵁鏇存敼</el-button>
- <el-button plain size="small" type="primary" @click="huishouHandler">鍥炴敹</el-button>
- <el-button plain size="small" type="primary" @click="openD">瀵煎嚭
- </el-button>
- <el-button plain size="small" type="primary" @click="findHandler">鏌ヨ
- </el-button>
- <el-button plain size="small" type="primary" @click="similarHandler">鐩镐技椤规煡璇�</el-button>
- <el-button plain size="small" type="primary">鍒锋柊</el-button>
- <el-input placeholder="璇疯緭鍏ュ叧閿瓧鎸夊洖杞︽煡璇�" size="small"
- style="width: 180px; margin-left: 5px; margin-top: 10px"></el-input> -->
-
</div>
<el-row style="width: 100%;margin-bottom: 20px">
<div>
@@ -87,7 +65,7 @@
<advanced-query :options="this.options" :visible.sync="findvisible"
@echoContion="echoContion"></advanced-query>
<!-- 瀵煎嚭-->
- <MasterTransfer :codeClassifyOid="codeClassifyOid" :selectRow="selectRow"
+ <MasterTransfer :codeClassifyOid="codeClassifyOid" :limit="page.pageSize" :templateOid="templateOid" :selectRow="selectRow"
:tableData="tableData" :tableHeadData="tableHeadFindData"
:visible.sync="dialogPush"></MasterTransfer>
<!-- 鐩镐技椤�-->
--
Gitblit v1.9.3