From 875be114d48b0591186030819233fdcc20a8cd0a Mon Sep 17 00:00:00 2001
From: wang1 <844966816@qq.com>
Date: 星期四, 20 七月 2023 14:09:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue | 234 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 178 insertions(+), 56 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
index 20d1b8b..6747729 100644
--- a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
@@ -29,21 +29,26 @@
</div>
<el-row style="width: 100%;margin-bottom: 20px">
<div>
- <el-button v-for="(item, index) in masterVrBtnList" :key="index" plain size="small" type="primary"
- v-if="!['PREVIEW', 'DELETEFILE', 'revisefile', 'DOWNLOADFILE', 'UPLOADFILE'].includes(item.uniqueFlag)"
+ <el-button v-for="(item, index) in masterVrBtnList" v-if="!['PREVIEW', 'DELETEFILE', 'revisefile', 'DOWNLOADFILE', 'UPLOADFILE'].includes(item.uniqueFlag)" :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>
+ size="small" style="width: 180px; margin-left: 5px; margin-top: 10px"
+ @keyup.enter.native="tableFindInp"></el-input>
</div>
- <el-table v-if="tableData.length != 0" v-loading="isLoading" :data="tableData" :height="tableHeight" style="min-height: 300px" ref="dataTable"
- @cell-click="handleCellClick" @row-click="handleRowClick" @select="handleSelection" @select-all="handleSelectionAll" @selection-change="handleSelectionChange" @sort-change="sortChange">
+ <el-table v-if="tableData.length != 0" ref="dataTable" v-loading="isLoading" :data="tableData"
+ :height="tableHeight"
+ @select="handleSelection" @cell-click="handleCellClick" @row-click="handleRowClick"
+ @select-all="handleSelectionAll" @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" :formatter="item.formatter" :label="item.label"
+ <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'"
@@ -51,45 +56,55 @@
</el-table-column>
</el-table>
</el-row>
-<!-- 鏂板-->
+ <!-- 鏂板-->
<FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
- :disabledProp="disabledProp" :templateOid="templateOid" :visible.sync="addvisible" type="add"
+ :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" :title="'淇敼缂栫爜淇℃伅'"
:visible.sync="editvisible"
type="edit" @submit="EditSumbit"></FormTemplateDialog>
-<!-- 宸插彂甯冩暟鎹慨鏀�-->
+ <!-- 宸插彂甯冩暟鎹慨鏀�-->
<FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
- :disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid" :title="'宸插彂甯冩暟鎹洿鏀�'"
+ :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>
+ <!-- 鍙戝竷-->
+ <set-personnel :parameter="this.parameter" :title="title" :visible.sync="visibleFlow"></set-personnel>
+ <!-- 鍋滅敤-->
+ <set-personnel :parameter="this.parameter" :title="title" :visible.sync="visibleDeactivate"></set-personnel>
+ <!-- 鍚敤-->
+ <set-personnel :parameter="this.parameter" :title="title" :visible.sync="visibleEnable"></set-personnel>
+ <!-- 鍥炴敹-->
+ <set-personnel :parameter="this.parameter" :title="title" :visible.sync="visibleRecovery"></set-personnel>
+ <!-- 楂樼骇鏌ヨ-->
+ <advanced-query :options="this.options" :visible.sync="findvisible"
+ @echoContion="echoContion"></advanced-query>
+ <!-- 瀵煎嚭-->
+ <MasterTransfer :codeClassifyOid="codeClassifyOid" :selectRow="selectRow"
+ :tableData="tableData" :tableHeadData="tableHeadFindData"
+ :visible.sync="dialogPush"></MasterTransfer>
+ <!-- 鐩镐技椤�-->
<ResembleQueryDialog :codeClassifyOid="codeClassifyOid" :codeRuleOid="this.codeRuleOid" :rowOid="rowOid"
:templateOid="templateOid" :visible.sync="similarVisible"></ResembleQueryDialog>
-
- <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">
- </el-pagination>
+ <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">
+ </el-pagination>
+ </div>
</div>
- </div>
<BatchImport v-if="batchImportData.visible" v-bind="batchImportData" :visible.sync="batchImportData.visible">
</BatchImport>
</div>
<div class="bottom">
<el-collapse v-model="visibleNames" @change="handleCollapse">
- <el-collapse-item title="闄勪欢鍒楄〃" name="1">
+ <el-collapse-item name="1" title="闄勪欢鍒楄〃">
<fileInHtml :options="fileOptions"></fileInHtml>
</el-collapse-item>
</el-collapse>
@@ -98,7 +113,7 @@
</basic-container>
</template>
<script>
-import {MasterTable, TableData, FindData,addSaveCode,editSaveCode} from "@/api/GetItem";
+import {MasterTable, TableData, FindData, addSaveCode, editSaveCode} from "@/api/GetItem";
import {listCodeAttributeByClassId} from "@/api/integration/integration.js";
import integrationTransfer from "@/views/integration/integrationTransfer";
import SetPersonnel from "@/components/template/SetPersonnel";
@@ -158,6 +173,7 @@
},
data() {
return {
+ searchResults:[],
//棣栭〉鍙充晶鎼滅储
WupinFindValue: "",
//鐩镐技椤规煡璇�
@@ -166,15 +182,24 @@
parameter: {
ids: [],
code: "",
- type: "PUBLIC",
+ type: '',
+ // this.visibleDeactivate ?'ENABLE':this.visibleEnable ? 'DISABLE' :this.visibleRecovery ? 'ROLLBACK' :'PUBLIC'
template: "",
vars: {
codeClassifyOid: "",
- templateOid:""
+ templateOid: ""
}
},
- visibleNames:[],
+ visibleNames: [],
+ //鍙戝竷
visibleFlow: false,
+ //鍋滅敤
+ visibleDeactivate: false,
+ //鍚敤
+ visibleEnable: false,
+ //鍥炴敹
+ visibleRecovery: false,
+ title: '',
transferData: [],
transferProps: {
key: "oid",
@@ -204,7 +229,7 @@
datetime: "datetime",
},
tableData: [],
- tableHeight:'calc(100vh - 330px)',
+ tableHeight: 'calc(100vh - 330px)',
DataVisible: false,
tableHeadData: [],
items: {},
@@ -218,14 +243,14 @@
},
// 涓绘暟鎹寜閽�
masterVrBtnList: [],
- fileOptions:{
- ownbizOid:"0",
- ownbizBtm:"0",
- fileDocClassify:'!=processAuditSuggest',
- fileDocClassifyName:'',
- hasDownload:true,
- hasUpload:true,
- height:100
+ fileOptions: {
+ ownbizOid: "0",
+ ownbizBtm: "0",
+ fileDocClassify: '!=processAuditSuggest',
+ fileDocClassifyName: '',
+ hasDownload: true,
+ hasUpload: true,
+ height: 100
}
};
},
@@ -283,7 +308,7 @@
templateOid: {
handler(newval, oldval) {
this.parameter.code = newval;
- this.fileOptions.ownbizOid="0";
+ this.fileOptions.ownbizOid = "0";
this.parameter.vars.templateOid = newval
},
deep: true,
@@ -308,16 +333,6 @@
this.$refs.dataTable.doLayout()
}
},
- // 鍙戝竷
- setHandler() {
- if (this.selectRow.length <= 0) {
- this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
- } else {
- this.userName = localStorage.getItem("username");
- this.parameter.template = this.userName + "-鍙戝竷" + "[鐗╁搧]";
- this.visibleFlow = true;
- }
- },
openVis(visible) {
console.log(visible)
this[visible] = true
@@ -334,9 +349,14 @@
// if(uniqueFlag === 'CODEEDIT') return this.openBatchImport('batchApplyCode')
if (uniqueFlag === 'CODESTARTPROCESS') return this.setHandler()
if (uniqueFlag === 'CODEUPREVISION') return this.DataChange()
- if (uniqueFlag === 'CODERECYCLE') return this.huishouHandler()
if (uniqueFlag === 'CODEEXPORT') return this.openD()
if (uniqueFlag === 'CODEQUERY') return this.findHandler()
+ //鍋滅敤
+ if (uniqueFlag === 'CODEDISABLE') return this.Deactivate()
+ //鍚敤
+ if (uniqueFlag === 'CODEENABLE') return this.Enable()
+ //鍥炴敹
+ if (uniqueFlag === 'CODERECYCLE') return this.Recovery()
// 鐩镐技椤规煡璇�
// if(uniqueFlag === 'CODEEDIT') return this.similarHandler()
});
@@ -345,7 +365,7 @@
this.getListCodeByClassId();
},
async getListCodeByClassId() {
- this.dialogPush=true;
+ this.dialogPush = true;
this.transferData = [];
const response = await listCodeAttributeByClassId({
codeClassifyId: this.codeClassifyOid,
@@ -355,11 +375,79 @@
this.transferData = data;
}
},
- handelTransferSave(val){
- console.log('鍙戝竷',val)
+ handelTransferSave(val) {
+ console.log('鍙戝竷', val)
},
rend() {
this.tableData = this.tableHeadData;
+ },
+ // 鍙戝竷
+ setHandler() {
+ // let EditFlag1=false
+ // let EditFlag2=false
+ // if(EditFlag1){
+ // this.$message.warning('鍙湁鐘舵�佹槸銆愮紪杈戜腑銆戠殑鏁版嵁鎵嶅彲浠ュ彂璧锋祦绋�')
+ // }else if(EditFlag2){
+ // this.$message.warning('鎮ㄩ�夋嫨鐨勬暟鎹叏閮ㄤ负銆愮紪杈戜腑銆戞墠鍙互鍙戣捣娴佺▼')
+ // }
+ this.selectRow.forEach(item => {
+ if (this.selectRow.length === 1 && item.lcstatus !== "Editing") {
+ this.$message.warning('鍙湁鐘舵�佹槸銆愮紪杈戜腑銆戠殑鏁版嵁鎵嶅彲浠ュ彂璧锋祦绋�')
+ } else if (item.lcstatus !== 'Editing') {
+ this.$message.warning('鎮ㄩ�夋嫨鐨勬暟鎹叏閮ㄤ负銆愮紪杈戜腑銆戞墠鍙互鍙戣捣娴佺▼')
+ } else {
+ this.userName = localStorage.getItem("username");
+ this.parameter.template = this.userName + "-鍙戝竷" + "[鐗╁搧]";
+ this.parameter.type = 'PUBLIC'
+ this.title = '娴佺▼瀹℃壒'
+ this.visibleFlow = true;
+ }
+ })
+ // if (this.selectRow.length <= 0) {
+ // this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
+ // } else {
+ // this.userName = localStorage.getItem("username");
+ // this.parameter.template = this.userName + "-鍙戝竷" + "[鐗╁搧]";
+ // this.parameter.type='PUBLIC'
+ // this.title='娴佺▼瀹℃壒'
+ // this.visibleFlow = true;
+ // }
+ },
+ //鍋滅敤
+ Deactivate() {
+ if (this.selectRow.length <= 0) {
+ this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
+ } else {
+ this.userName = localStorage.getItem("username");
+ this.parameter.template = this.userName + "-鍙戝竷" + "[鐗╁搧]";
+ this.parameter.type = 'DISABLE'
+ this.title = '鍋滅敤锛堝喕缁擄級缂栫爜鏁版嵁'
+ this.visibleDeactivate = true;
+ }
+ },
+ //鍚敤
+ Enable() {
+ if (this.selectRow.length <= 0) {
+ this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
+ } else {
+ this.userName = localStorage.getItem("username");
+ this.parameter.template = this.userName + "-鍙戝竷" + "[鐗╁搧]";
+ this.parameter.type = 'ENABLE'
+ this.title = '鍚敤锛堣В鍐伙級缂栫爜鏁版嵁'
+ this.visibleEnable = true;
+ }
+ },
+ //鍥炴敹
+ Recovery() {
+ if (this.selectRow.length <= 0) {
+ this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
+ } else {
+ this.userName = localStorage.getItem("username");
+ this.parameter.template = this.userName + "-鍙戝竷" + "[鐗╁搧]";
+ this.parameter.type = 'ROLLBACK'
+ this.title = '鍥炴敹缂栫爜鏁版嵁'
+ this.visibleRecovery = true;
+ }
},
handleSizeChange(val) {
this.isLoading = true;
@@ -569,7 +657,40 @@
this.batchImportData.visible = true
this.batchImportData.type = type
this.batchImportData.codeClassifyOid = this.codeClassifyOid
+ },
+ //杈撳叆鍥炶溅鎼滅储
+ tableFindInp(event) {
+ console.log('鍥炶溅閿鎸変笅');
+ console.log(this.WupinFindValue)
+ console.log(this.tableData)
+ // 鍦ㄨ繖閲屾墽琛屼綘鐨勬搷浣�
+ // let referList=[]
+ // this.tableData.filter(item => {
+ // console.log(item.name.includes(this.WupinFindValue))
+ // console.log(item.name.indexOf(this.WupinFindValue)>=0)
+ // })
+ // const regex = new RegExp(this.WupinFindValue, 'i');
+ // this.tableData.filter(item => {
+ // console.log(regex.test(item.name))
+ // // return regex.test(item.name);
+ // });
+ if (this.WupinFindValue.trim() === '') {
+ this.searchResults = []; // 杈撳叆鍊间负绌猴紝娓呯┖鎼滅储缁撴灉
+ return;
+ }
+
+ this.tableData = this.tableData.filter(item => {
+ if (typeof item.name === 'string') {
+ return item.name.includes(this.WupinFindValue);
+ }else {
+ return false; // item.name涓嶆槸瀛楃涓茬被鍨嬶紝杩斿洖false
+ }
+
+ });
+ console.log(this.searchResults);
+
}
+
}
};
</script>
@@ -595,6 +716,7 @@
height: calc(100vh - 150px);
min-height: 400px;
}
+
.top {
overflow-y: scroll;
min-height: 55%;
@@ -605,7 +727,7 @@
overflow-y: scroll;
}
-.el-collapse-item__content{
+.el-collapse-item__content {
padding-bottom: 0;
}
</style>
--
Gitblit v1.9.3