From 004d3fdba7d6819aa2fcb32cd954d45bfaf111a4 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 21 十一月 2023 09:49:21 +0800
Subject: [PATCH] 整合代码
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 108 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 83 insertions(+), 25 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 2a5807d..cb2027c 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -6,15 +6,15 @@
<div>
</div>
<el-row style="width: 100%;margin-bottom: 10px">
- <div style="margin-bottom: 10px">
- <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="handleBtnClick(item)">{{
- item.name
- }}
- </el-button>
+ <div style="margin-bottom: 10px" >
+ <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="handleBtnClick(item)">{{
+ item.name
+ }}
+ </el-button>
<span v-if="tableHeadFindData.length > 0">
<el-select slot="prepend" v-model="keyWordFind" placeholder="璇烽�夋嫨" size="small">
<el-option v-for="item in tableHeadFindData" :key="item.id" :label="item.label"
@@ -75,6 +75,18 @@
</el-table>
</div>
</el-row>
+ <!-- 鐢宠-->
+ <FormTemplateDialog :TreeValue="TreeValue" :codeClassifyOid="this.codeClassifyOid"
+ :codeRuleOid="this.codeRuleOid" :disabledProp="disabledProp" :templateOid="templateOid"
+ :visible.sync="applyvisible"
+ type="add"
+ @submit="applySumbit">
+ </FormTemplateDialog>
+ <!-- 淇-->
+ <FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
+ :disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid" :title="'淇敼缂栫爜淇℃伅'"
+ :visible.sync="amendvisible"
+ type="edit" @submit="amendSumbit"></FormTemplateDialog>
<!-- 鏂板-->
<FormTemplateDialog :TreeValue="TreeValue" :codeClassifyOid="this.codeClassifyOid"
:codeRuleOid="this.codeRuleOid" :disabledProp="disabledProp" :templateOid="templateOid"
@@ -87,6 +99,8 @@
:disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid" :title="'淇敼缂栫爜淇℃伅'"
:visible.sync="editvisible"
type="edit" @submit="EditSumbit"></FormTemplateDialog>
+ <!-- 鎵归噺缂栬緫-->
+ <MasterEditBulk :visible.sync="bulkeditvisible" ></MasterEditBulk>
<!-- 鏁版嵁璇︽儏-->
<FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
:rowOid="this.LinkObject.oid" :templateOid="templateOid"
@@ -132,6 +146,7 @@
</div>
</div>
<div>
+<!-- 瀵煎叆-->
<BatchImport v-if="batchImportData.visible" v-bind="batchImportData" :resetTable="CrudRend"
:visible.sync="batchImportData.visible">
</BatchImport>
@@ -164,6 +179,7 @@
import SetPersonnel from "@/components/template/SetPersonnel";
import ResembleQueryDialog from "@/components/FormTemplate/ResembleQueryDialog.vue";
import BatchImport from '@/components/BatchImport'
+import MasterEditBulk from '@/components/Master/MasterEditBulk'
import {validatenull} from "@/util/validate";
import fileInHtml from "@/components/file/inHtml.vue";
import {getUserInfo} from "@/api/system/user";
@@ -175,7 +191,8 @@
SetPersonnel,
ResembleQueryDialog,
BatchImport,
- fileInHtml
+ fileInHtml,
+ MasterEditBulk
},
name: "Crud.vue",
props: {
@@ -228,6 +245,8 @@
},
data() {
return {
+ //鎵归噺缂栬緫瀵硅瘽妗�
+ bulkeditvisible:false,
LinkVisible: false,
LinkObject: {}, // 缂栫爜鏁版嵁
LinkList: [],
@@ -273,6 +292,8 @@
label: "name",
},
tableHeadFindDatas: [],
+ applyvisible:false,
+ amendvisible:false,
addvisible: false,
editvisible: false,
findvisible: false,
@@ -424,9 +445,7 @@
},
tableHeadBtnData: {
handler(newval) {
- if (newval.length !== 0) {
this.masterVrBtnList = newval
- }
},
deep: true
},
@@ -499,10 +518,52 @@
if (uniqueFlag === 'receiveEditApply') return this.receiveEditApply()
// 鐩镐技椤规煡璇�
// if(uniqueFlag === 'CODEEDIT') return this.similarHandler()
+ // 鏍囧噯鐢宠
+ if (uniqueFlag === 'CODEAPPLY') return this.codeApplyHandler()
+ // 鏍囧噯淇
+ if (uniqueFlag === 'CODEAMEND') return this.codeAMENDHandler()
+ //鎵归噺缂栬緫
+ if (uniqueFlag === 'bulkEdit') return this.bulkEditHandler()
});
},
- addSaveHandler(){
+ //鏍囧噯鐢宠
+ codeApplyHandler(){
+ this.$nextTick(() => {
+ this.applyvisible = true;
+ });
+ },
+ applySumbit(){
+ },
+ amendSumbit(){
+
+ },
+ //鏍囧噯淇
+ codeAMENDHandler(){
+ if (this.selectRow.length !== 1) {
+ this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
+ } else if (this.selectRow[0].lcstatus !== "Editing") {
+ this.$message.warning("缂栫爜鐘舵�佷笉鏄�滅紪杈戜腑鈥濓紝涓嶅彲缂栬緫");
+ } else {
+ this.amendvisible = true;
+ this.rowOid = this.selectRow[0].oid;
+ }
+ },
+ //鎵归噺缂栬緫
+ bulkEditHandler(){
+ if(this.selectRow.length <= 0){
+ this.$message.warning('璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹紒')
+ return;
+ }
+ const Editing = this.selectRow.every(item => item.lcstatus === 'Editing');
+
+ if (Editing) {
+ this.bulkeditvisible = true;
+ } else {
+ this.$message.warning('閫夋嫨鐨勬暟鎹腑鏈夌紪鐮佺姸鎬佷笉鏄�滅紪杈戜腑鈥濓紝涓嶅彲缂栬緫锛�');
+ }
+ },
+ addSaveHandler(){
this.$nextTick(() => {
this.addvisible = true;
});
@@ -693,25 +754,24 @@
});
const endTime = performance.now();
this.elapsedTime = Math.floor(endTime - startTime) * 1;
- console.log(this.elapsedTime)
this.page.total = res.data.total;
this.data = res.data.data;
this.tableData = res.data.data;
},
async handleSizeChange(val) {
- this.isLoading = true;
- await this.CrudRend();
this.page.pageSize = val;
this.$emit("pageSize", val);
+ this.isLoading = true;
+ await this.CrudRend();
this.isLoading = false;
},
async handleCurrentChange(val) {
- this.isLoading = true;
- await this.CrudRend();
this.page.currentPage = val;
this.$emit("currentPage", val);
+ this.isLoading = true;
+ await this.CrudRend();
this.isLoading = false;
},
// 鐩戝惉鍗曞厓鏍肩偣鍑讳簨浠跺苟瀛樺偍姝ｅ湪缂栬緫鐨勮
@@ -817,15 +877,13 @@
},
//缂栬緫
editHandler() {
- if (this.selectRow.length <= 0) {
+ if (this.selectRow.length !== 1) {
this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
- } else if (this.selectRow.length > 1) {
- this.$message.warning("鍙兘閫夋嫨涓�鏉℃暟鎹�");
- } else if (this.selectRow[0].lcstatus != "Editing") {
- this.$message.warning("缂栫爜鐘舵�佷笉鏄�滅紪杈戜腑鈥�,涓嶅彲缂栬緫");
+ } else if (this.selectRow[0].lcstatus !== "Editing") {
+ this.$message.warning("缂栫爜鐘舵�佷笉鏄�滅紪杈戜腑鈥濓紝涓嶅彲缂栬緫");
} else {
this.editvisible = true;
- this.rowOid = this.selectRow[0]['oid']
+ this.rowOid = this.selectRow[0].oid;
}
},
//楂樼骇鏌ヨ鎸夐挳
@@ -868,7 +926,7 @@
},
//澧炲姞淇濆瓨
AddSumbit(val) {
- //console.log(val)
+ // console.log('val',val)
if(func.notEmpty(val.ts)) {
val.ts = func.formattedDateTime(val.ts);
//console.log(val.ts);
--
Gitblit v1.9.3