From a3f1b364738a8b8250aaddfba1a8b21a5acb5a26 Mon Sep 17 00:00:00 2001
From: lihang <lihang@vci-tech.com>
Date: 星期一, 10 七月 2023 12:17:01 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue | 79 ++++++++++++++++++++++++---------------
1 files changed, 48 insertions(+), 31 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
index 137ee2c..75413c2 100644
--- a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
@@ -23,59 +23,70 @@
<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> -->
- <el-button plain size="small" type="primary" v-for="(item, index) in masterVrBtnList" :key="index"
- @click="handelBtnClick(item)">{{
- item.name }}</el-button>
- <el-input placeholder="璇疯緭鍏ュ叧閿瓧鎸夊洖杞︽煡璇�" size="small"
- style="width: 180px; margin-left: 5px; margin-top: 10px"></el-input>
+
</div>
<el-row style="height: 700px; width: 100%">
- <el-table v-loading="isLoading" :data="tableData" max-height="700" style="" @cell-click="handleCellClick"
- @selection-change="handleSelectionChange" @sort-change="sortChange" v-if="tableData.length != 0">
- <el-table-column fixed type="selection" width="55"> </el-table-column>
+ <div>
+ <el-button v-for="(item, index) in masterVrBtnList" :key="index" plain size="small" type="primary"
+ @click="handelBtnClick(item)">{{
+ item.name
+ }}
+ </el-button>
+ <el-input v-model="WupinFindValue" placeholder="璇疯緭鍏ュ叧閿瓧鎸夊洖杞︽煡璇�"
+ size="small" style="width: 180px; margin-left: 5px; margin-top: 10px"></el-input>
+ </div>
+ <el-table v-if="tableData.length != 0" v-loading="isLoading" :data="tableData" max-height="700" style=""
+ @cell-click="handleCellClick" @selection-change="handleSelectionChange" @sort-change="sortChange">
+ <el-table-column fixed type="selection" width="55"></el-table-column>
<el-table-column fixed label="搴忓彿" type="index" width="55">
</el-table-column>
- <el-table-column v-for="item in this.tableHeadFindData" :key="item.id" :label="item.label" :prop="item.prop"
- :sortable="item.sortable" :formatter="item.formatter"
- :width="item.label.length >= 4 ? '150' : item.label.length == 3 ? '120' : '90'" :show-overflow-tooltip="true"
- align="center">
+ <el-table-column v-for="item in this.tableHeadFindData" :key="item.id" :formatter="item.formatter" :label="item.label"
+ :prop="item.prop" :show-overflow-tooltip="true"
+ :sortable="item.sortable"
+ :width="item.label.length >= 4 ? '150' : item.label.length == 3 ? '120' : '90'"
+ align="center">
</el-table-column>
</el-table>
</el-row>
<FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
- :disabledProp="disabledProp" :templateOid="templateOid" type="add" :visible.sync="addvisible" @submit="AddSumbit">
+ :disabledProp="disabledProp" :templateOid="templateOid" :visible.sync="addvisible" type="add"
+ @submit="AddSumbit">
</FormTemplateDialog>
<FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
- :disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid" type="edit" :title="'淇敼缂栫爜淇℃伅'"
- :visible.sync="editvisible" @submit="EditSumbit"></FormTemplateDialog>
+ :disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid" :title="'淇敼缂栫爜淇℃伅'"
+ :visible.sync="editvisible"
+ type="edit" @submit="EditSumbit"></FormTemplateDialog>
<FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
- :disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid" :type="edit" :title="'宸插彂甯冩暟鎹洿鏀�'"
- :visible.sync="DataVisible"></FormTemplateDialog>
- <set-personnel :visible.sync="visibleFlow" :parameter="this.parameter"></set-personnel>
+ :disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid" :title="'宸插彂甯冩暟鎹洿鏀�'"
+ :type="edit"
+ :visible.sync="DataVisible"></FormTemplateDialog>
+ <set-personnel :parameter="this.parameter" :visible.sync="visibleFlow"></set-personnel>
<advanced-query :options="this.options" :visible.sync="findvisible" @echoContion="echoContion"></advanced-query>
<integration-transfer :data="transferData" :props="transferProps" :visible.sync="dialogPush"
- @save="handelTransferSave"></integration-transfer>
- <ResembleQueryDialog :visible.sync="similarVisible" :templateOid="templateOid" :codeClassifyOid="codeClassifyOid"
- :rowOid="rowOid" :codeRuleOid="this.codeRuleOid"></ResembleQueryDialog>
+ @save="handelTransferSave"></integration-transfer>
+ <ResembleQueryDialog :codeClassifyOid="codeClassifyOid" :codeRuleOid="this.codeRuleOid" :rowOid="rowOid"
+ :templateOid="templateOid" :visible.sync="similarVisible"></ResembleQueryDialog>
</div>
<div class="block" style="display: flex; justify-content: flex-end">
<el-pagination :current-page="page.currentPage" :page-size="page.pageSizes" :page-sizes="page.pageSizes"
- :total="page.total" layout="total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange"
- @current-change="handleCurrentChange">
+ :total="page.total" layout="total, sizes, prev, pager, next, jumper"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange">
</el-pagination>
</div>
- <BatchImport v-if="batchImportData.visible" :visible.sync="batchImportData.visible" v-bind="batchImportData">
+ <BatchImport v-if="batchImportData.visible" v-bind="batchImportData" :visible.sync="batchImportData.visible">
</BatchImport>
</basic-container>
</template>
<script>
-import { MasterTable, TableData, FindData } from "@/api/GetItem";
-import { listCodeAttributeByClassId } from "@/api/integration/integration.js";
+import {MasterTable, TableData, FindData} from "@/api/GetItem";
+import {listCodeAttributeByClassId} from "@/api/integration/integration.js";
import integrationTransfer from "@/views/integration/integrationTransfer";
import SetPersonnel from "@/components/template/SetPersonnel";
import ResembleQueryDialog from "@/components/FormTemplate/ResembleQueryDialog.vue";
import BatchImport from '@/components/BatchImport'
-import { validatenull } from "@/util/validate";
+import {validatenull} from "@/util/validate";
+
export default {
components: {
integrationTransfer,
@@ -126,6 +137,8 @@
},
data() {
return {
+ //棣栭〉鍙充晶鎼滅储
+ WupinFindValue: "",
//鐩镐技椤规煡璇�
similarVisible: false,
//鍙戝竷
@@ -184,8 +197,10 @@
};
},
computed: {},
- created() { },
- mounted() { },
+ created() {
+ },
+ mounted() {
+ },
activated() {
// this.doLayout();
},
@@ -218,7 +233,9 @@
record.formatter = eval("(" + record.templet + ")");
//function(row,column){return row[column.property]=='true' || row[column.property]=='1'?'鏄�':'鍚�'}
} else if (record.fieldType == "truefalse") {
- record.formatter = function (row, column) { return row[column.property] == 'true' || row[column.property] == '1' ? '鏄�' : '鍚�' }
+ record.formatter = function (row, column) {
+ return row[column.property] == 'true' || row[column.property] == '1' ? '鏄�' : '鍚�'
+ }
}
}
})
@@ -261,7 +278,7 @@
this[visible] = true
},
handelBtnClick(event) {
- const { uniqueFlag } = event
+ const {uniqueFlag} = event
this.$nextTick(() => {
if (uniqueFlag === 'CODEADD') return this.addvisible = true
if (uniqueFlag === 'CODEEDIT') return this.editHandler()
--
Gitblit v1.9.3