From 1157e8e97e24ec7938deea2e3345a502644fc256 Mon Sep 17 00:00:00 2001
From: wang1 <844966816@qq.com>
Date: 星期三, 05 七月 2023 16:44:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue | 67 +++++++++++++++++++--------------
1 files changed, 38 insertions(+), 29 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
index 48731fd..949c618 100644
--- a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
@@ -3,34 +3,34 @@
<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">鎵归噺瀵煎叆鐢宠</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="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
>
<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>
@@ -144,6 +133,7 @@
>
</el-pagination>
</div>
+ <BatchImport v-if="batchImportData.visible" :visible.sync="batchImportData.visible" v-bind="batchImportData"></BatchImport>
</basic-container>
</template>
<script>
@@ -152,11 +142,13 @@
import integrationTransfer from "@/views/integration/integrationTransfer";
import SetPersonnel from "@/components/template/SetPersonnel";
import ResembleQueryDialog from "@/components/FormTemplate/ResembleQueryDialog.vue";
+import BatchImport from '@/components/BatchImport'
export default {
components: {
integrationTransfer,
SetPersonnel,
ResembleQueryDialog,
+ BatchImport
},
name: "Crud.vue",
props: {
@@ -206,6 +198,7 @@
code: "",
type: "PUBLIC",
template: "",
+ codeClassifyOid:""
},
visibleFlow: false,
transferData: [],
@@ -243,6 +236,11 @@
seniorQueryColumns: [],
selectRow: [],
userName: "",
+ batchImportData: {
+ visible: false,
+ type: '',
+ codeClassifyOid: ''
+ }
};
},
computed: {},
@@ -252,7 +250,7 @@
this.doLayout();
},
watch: {
- tableHeadDataFateher:{
+ tableHeadDataFateher:{
handler(newval,oldval){
this.options=newval.tableDefineVO.seniorQueryColumns
}
@@ -260,6 +258,7 @@
codeClassifyOid: {
handler(newval, oldval) {
this.codeClassifyOid = newval;
+ this.parameter.codeClassifyOid=newval
},
deep: true,
},
@@ -289,9 +288,9 @@
// 杞崲鏁版嵁true鍜宖alse
formatBoolean(row, column) {
if (column.property === "xiaoshouwl"
- ||column.property === "shifoupihaoguanli"
- ||column.property === "caigouwl"
- ||column.property === "kucunwl"
+ ||column.property === "shifoupihaoguanli"
+ ||column.property === "caigouwl"
+ ||column.property === "kucunwl"
||column.property === "passing") {
return row[column.property] =='true'? "鏄�" : "鍚�";
}
@@ -299,9 +298,6 @@
},
// 鍙戝竷
setHandler() {
- console.log("1111");
- console.log("鐖�", this.parameter);
-
if (this.selectRow.length <= 0) {
this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
} else {
@@ -441,9 +437,11 @@
this.rowOid = "";
}
this.selectRow = row;
+ this.parameter.ids = [];
row.forEach((item) => {
this.parameter.ids.push(item.oid);
});
+ console.log( ' this.parameter.ids',this.parameter.ids)
},
//缂栬緫
editHandler() {
@@ -502,6 +500,11 @@
EditSumbit(val) {
this.editvisible = false;
},
+ openBatchImport(type) {
+ this.batchImportData.visible = true
+ this.batchImportData.type = type
+ this.batchImportData.codeClassifyOid = this.codeClassifyOid
+ }
},
};
</script>
@@ -516,4 +519,10 @@
background-color: #f5f7fa !important;
}
}
+
+/deep/ .el-button {
+ margin: 0 10px 10px 0;
+}
+
+
</style>
--
Gitblit v1.9.3