From 1f0a10ab714699acc85430b90bcb5a1eeaad1eec Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期一, 17 七月 2023 10:14:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue | 291 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 201 insertions(+), 90 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
index 137ee2c..26286f1 100644
--- a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
@@ -1,87 +1,119 @@
<template>
<basic-container>
- <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>
- <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> -->
- <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 class="main">
+ <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>
+ <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)"
+ @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" :height="tableHeight" ref="dataTable"
+ @cell-click="handleCellClick" @row-click="handleRowClick" @select="handleSelection" @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"
+ :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" :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="'宸插彂甯冩暟鎹洿鏀�'"
+ :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 :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>
</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>
- <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>
- </el-table>
- </el-row>
- <FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
- :disabledProp="disabledProp" :templateOid="templateOid" type="add" :visible.sync="addvisible" @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>
- <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>
- <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>
+ <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">
+ <fileInHtml :options="fileOptions"></fileInHtml>
+ </el-collapse-item>
+ </el-collapse>
+ </div>
</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">
- </el-pagination>
- </div>
- <BatchImport v-if="batchImportData.visible" :visible.sync="batchImportData.visible" v-bind="batchImportData">
- </BatchImport>
</basic-container>
</template>
<script>
-import { MasterTable, TableData, FindData } from "@/api/GetItem";
-import { listCodeAttributeByClassId } from "@/api/integration/integration.js";
+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";
import ResembleQueryDialog from "@/components/FormTemplate/ResembleQueryDialog.vue";
import BatchImport from '@/components/BatchImport'
-import { validatenull } from "@/util/validate";
+import {validatenull} from "@/util/validate";
+import fileInHtml from "@/components/file/inHtml.vue";
+
export default {
components: {
integrationTransfer,
SetPersonnel,
ResembleQueryDialog,
- BatchImport
+ BatchImport,
+ fileInHtml
},
name: "Crud.vue",
props: {
@@ -126,6 +158,8 @@
},
data() {
return {
+ //棣栭〉鍙充晶鎼滅储
+ WupinFindValue: "",
//鐩镐技椤规煡璇�
similarVisible: false,
//鍙戝竷
@@ -135,9 +169,11 @@
type: "PUBLIC",
template: "",
vars: {
- codeClassifyOid: ""
+ codeClassifyOid: "",
+ templateOid:""
}
},
+ visibleNames:[],
visibleFlow: false,
transferData: [],
transferProps: {
@@ -168,6 +204,7 @@
datetime: "datetime",
},
tableData: [],
+ tableHeight:'calc(100vh - 330px)',
DataVisible: false,
tableHeadData: [],
items: {},
@@ -180,12 +217,23 @@
codeClassifyOid: ''
},
// 涓绘暟鎹寜閽�
- masterVrBtnList: []
+ masterVrBtnList: [],
+ fileOptions:{
+ ownbizOid:"0",
+ ownbizBtm:"0",
+ fileDocClassify:'!=processAuditSuggest',
+ fileDocClassifyName:'',
+ hasDownload:true,
+ hasUpload:true,
+ height:100
+ }
};
},
computed: {},
- created() { },
- mounted() { },
+ created() {
+ },
+ mounted() {
+ },
activated() {
// this.doLayout();
},
@@ -218,7 +266,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' ? '鏄�' : '鍚�'
+ }
}
}
})
@@ -233,6 +283,8 @@
templateOid: {
handler(newval, oldval) {
this.parameter.code = newval;
+ this.fileOptions.ownbizOid="0";
+ this.parameter.vars.templateOid = newval
},
deep: true,
},
@@ -246,6 +298,16 @@
}
},
methods: {
+ //灞曞紑闄勪欢
+ handleCollapse(activeNames) {
+ if (activeNames.length > 0) {
+ this.tableHeight = 'calc(100vh - 630px)';
+ this.$refs.dataTable.doLayout()
+ } else {
+ this.tableHeight = 'calc(100vh - 330px)';
+ this.$refs.dataTable.doLayout()
+ }
+ },
// 鍙戝竷
setHandler() {
if (this.selectRow.length <= 0) {
@@ -261,12 +323,13 @@
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()
if (uniqueFlag === 'CODEBATCHADD') return this.openBatchImport('batchImportApply')
if (uniqueFlag === 'CODEIMPORTHISTORY') return this.openBatchImport('historyImport')
+ if (uniqueFlag === 'batchApplyCode') return this.openBatchImport('batchApplyCode')
// 鎵归噺鐢宠缂栫爜
// if(uniqueFlag === 'CODEEDIT') return this.openBatchImport('batchApplyCode')
if (uniqueFlag === 'CODESTARTPROCESS') return this.setHandler()
@@ -282,6 +345,7 @@
this.getListCodeByClassId();
},
async getListCodeByClassId() {
+ this.dialogPush=true;
this.transferData = [];
const response = await listCodeAttributeByClassId({
codeClassifyId: this.codeClassifyOid,
@@ -290,6 +354,9 @@
const data = response.data.data;
this.transferData = data;
}
+ },
+ handelTransferSave(val){
+ console.log('鍙戝竷',val)
},
rend() {
this.tableData = this.tableHeadData;
@@ -316,6 +383,11 @@
this.editShow = column.property;
this.rowOid = row.oid;
},
+ handleRowClick(row, column) {
+ this.fileOptions.ownbizOid = row.oid;
+ this.fileOptions.ownbizBtm = row.btmname;
+ this.$refs.dataTable.toggleRowSelection(row);
+ },
//鍒犻櫎
enumDeleteRow(row) {
this.tableData.splice(row, 1);
@@ -334,8 +406,7 @@
CrudHeaderRend() {
if (this.codeClassifyOid != "") {
MasterTable({
- codeClassifyOid: this.codeClassifyOid,
- functionId: 5,
+ codeClassifyOid: this.codeClassifyOid
}).then((res) => {
this.options = res.data.tableDefineVO.seniorQueryColumns;
this.List = res.data.tableDefineVO.cols[0];
@@ -396,25 +467,31 @@
await TableData({
templateOid: this.templateOid,
codeClassifyOid: this.codeClassifyOid,
- page: val.currentPage,
- limit: val.pageSize,
+ page: this.page.currentPage,
+ limit: this.page.pageSize,
}).then((res) => {
- this.data = res.data.data;
+ this.tableData = res.data.data;
});
},
//澶氶��
- handleSelectionChange(row) {
- if (this.row) {
- this.rowOid = row[0].oid;
- } else {
- this.rowOid = "";
- }
- this.selectRow = row;
+ handleSelectionChange(list) {
+ this.selectRow = list;
this.parameter.ids = [];
- row.forEach((item) => {
+ list.forEach((item) => {
this.parameter.ids.push(item.oid);
});
- console.log(' this.parameter.ids', this.parameter.ids)
+ },
+ //閫夋嫨
+ handleSelection(list, row) {
+ this.fileOptions.ownbizOid = row.oid;
+ this.fileOptions.ownbizBtm = row.btmname;
+
+ },
+ //閫夋嫨鍏ㄩ儴
+ handleSelectionAll() {
+ this.fileOptions.ownbizOid = '0';
+ this.fileOptions.ownbizBtm = '0';
+
},
//缂栬緫
editHandler() {
@@ -468,18 +545,32 @@
}
},
//澧炲姞淇濆瓨
- AddSumbit() {
+ AddSumbit(val) {
this.addvisible = false;
+ console.log(val)
+ addSaveCode(val).then(res => {
+ console.log(res)
+ this.$nextTick(() => {
+ this.onLoad()
+ })
+ })
},
EditSumbit(val) {
this.editvisible = false;
+ console.log(val)
+ editSaveCode(val).then(res => {
+ console.log(res)
+ this.$nextTick(() => {
+ this.onLoad()
+ })
+ })
},
openBatchImport(type) {
this.batchImportData.visible = true
this.batchImportData.type = type
this.batchImportData.codeClassifyOid = this.codeClassifyOid
}
- },
+ }
};
</script>
@@ -497,4 +588,24 @@
/deep/ .el-button {
margin: 0 10px 10px 0;
}
+
+.main {
+ display: flex;
+ flex-direction: column;
+ height: calc(100vh - 150px);
+ min-height: 400px;
+}
+.top {
+ overflow-y: scroll;
+ min-height: 55%;
+}
+
+.bottom {
+ margin-top: 20px;
+ overflow-y: scroll;
+}
+
+.el-collapse-item__content{
+ padding-bottom: 0;
+}
</style>
--
Gitblit v1.9.3