From 51cd18dc2821b2b67802ea36c707fd96b99a6afa Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期三, 05 七月 2023 09:46:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue | 33 ++++++++++-----------------------
1 files changed, 10 insertions(+), 23 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
index cb47ef6..a7232ee 100644
--- a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
@@ -3,10 +3,10 @@
<div class="testbox">
<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>
@@ -15,22 +15,22 @@
<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
>
<el-button plain size="small" type="primary" @click="DataChange"
- >鏁版嵁鏇存敼</el-button
+ >鏁版嵁鏇存敼</el-button
>
<el-button plain size="small" type="primary" @click="huishouHandler"
- >鍥炴敹</el-button
+ >鍥炴敹</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
>
<el-button plain size="small" type="primary">鍒锋柊</el-button>
<el-input
@@ -64,17 +64,6 @@
:show-overflow-tooltip="true"
align="center"
>
- <!-- 缂栬緫鍜屽睍绀洪�昏緫 -->
- <!-- <template slot-scope="{ row }">-->
- <!-- <el-input v-if="editingRow === row && editShow== item.prop" v-model="row[item.prop]" @blur="saveRow"></el-input>-->
- <!-- <span v-else>{{row[item.prop]}}</span>-->
- <!-- <el-switch-->
- <!-- v-if="editShow === 'true'"-->
- <!-- v-model="row[item.prop]"-->
- <!-- active-color="#13ce66"-->
- <!-- inactive-color="#ff4949">-->
- <!-- </el-switch>-->
- <!-- </template>-->
</el-table-column>
</el-table>
</el-row>
@@ -261,7 +250,7 @@
this.doLayout();
},
watch: {
- tableHeadDataFateher:{
+ tableHeadDataFateher:{
handler(newval,oldval){
this.options=newval.tableDefineVO.seniorQueryColumns
}
@@ -315,9 +304,6 @@
},
// 鍙戝竷
setHandler() {
- console.log("1111");
- console.log("鐖�", this.parameter);
-
if (this.selectRow.length <= 0) {
this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
} else {
@@ -461,6 +447,7 @@
row.forEach((item) => {
this.parameter.ids.push(item.oid);
});
+ console.log( ' this.parameter.ids',this.parameter.ids)
},
//缂栬緫
editHandler() {
--
Gitblit v1.9.3