From 14d39ee4fab77642a9ab7c4229407a1a3b0defac Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 06 十二月 2023 16:13:20 +0800
Subject: [PATCH] 标准需求优化
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 145 +++++++++++++++++++++++++++++-------------------
1 files changed, 88 insertions(+), 57 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index df6a0b6..b164fb7 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -47,7 +47,7 @@
</el-table-column>
<!-- 鐢熷懡鍛ㄦ湡-->
<el-table-column v-for="(item,index) in lcstatusArray"
- v-if=" lcstatusArray.length !== 0 && !item.hidden"
+ v-if=" lcstatusArray.length >= 0 && !item.hidden"
key="index" :show-overflow-tooltip="true" :sortable="item.sortable"
:width="item.width" align="center" label="鐢熷懡鍛ㄦ湡鍊�"
prop="lcstatus">
@@ -99,9 +99,9 @@
</FormTemplateDialog>
<!-- 淇-->
<FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
- :disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid" :title="'淇敼缂栫爜淇℃伅'"
- :visible.sync="amendvisible" status="amend"
- type="edit" @submit="amendSumbit"></FormTemplateDialog>
+ :disabledProp="disabledProp" :selectRow="selectRow" :templateOid="templateOid"
+ :title="'鏁版嵁淇'" :visible.sync="amendvisible" status="amend"
+ type="add" @submit="amendSumbit"></FormTemplateDialog>
<!-- 鏂板-->
<FormTemplateDialog :TreeValue="TreeValue" :codeClassifyOid="this.codeClassifyOid"
:codeRuleOid="this.codeRuleOid" :disabledProp="disabledProp" :templateOid="templateOid"
@@ -111,9 +111,9 @@
</FormTemplateDialog>
<!-- 淇敼-->
<FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
- :disabledProp="disabledProp" :templateOid="templateOid" :title="'淇敼缂栫爜淇℃伅'"
+ :disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid"
+ :title="'淇敼缂栫爜淇℃伅'"
:visible.sync="editvisible"
- rowOid="rowOid"
type="edit" @submit="EditSumbit"></FormTemplateDialog>
<!-- 鎵归噺缂栬緫-->
<!-- <MasterEditBulk :visible.sync="bulkeditvisible" ></MasterEditBulk>-->
@@ -187,7 +187,8 @@
upSaveCode,
applyGroupCode,
receiveEditApply,
- applySaveCode
+ applySaveCode,
+ exportGroupCodeExcel
} from "@/api/GetItem";
import {processTS, changeStatus} from "@/api/template/setPersonnel"
import {listCodeAttributeByClassId} from "@/api/integration/integration.js";
@@ -392,6 +393,11 @@
this.doLayout()
},
watch: {
+ isLoading: {
+ handler(newval) {
+ // console.log(newval)
+ }
+ },
tableHeadDataFateher: {
handler(newval, oldval) {
this.options = newval.tableDefineVO.seniorQueryColumns
@@ -407,7 +413,7 @@
handler(newval, oldval) {
this.tableData = newval;
this.searchResults = newval
- this.doLayout()
+ this.doLayout();
},
},
tableHeadFindData: {
@@ -432,33 +438,31 @@
}
})
this.tableHeadFindDatas = newval;
- // console.log('new',newval)
- if (!this.isCodeArrayPushed) {
+ if (newval) {
+ this.CodeArray = [];
if (newval.find(item => item.prop === 'id')) {
this.CodeArray.push(newval.find(item => item.prop === 'id'));
} else {
- this.CodeArray.push([]);
+ this.CodeArray = [];
}
- // console.log('CodeArray', this.CodeArray);
- this.isCodeArrayPushed = true;
+
}
- if (!this.islcstatusPushed) {
+ if (newval) {
+ this.lcstatusArray = [];
if (newval.find(item => item.prop === 'lcstatus')) {
this.lcstatusArray.push(newval.find(item => item.prop === 'lcstatus'));
} else {
- this.lcstatusArray.push([]);
+ this.lcstatusArray = [];
}
- // console.log('lcstatusArray', this.lcstatusArray);
- this.islcstatusPushed = true;
}
- if (!this.isReferPushed) {
+ if (newval) {
+ this.referArray = [];
if (newval.find(item => Object.keys(item.referConfig).length > 0)) {
this.referArray.push(newval.find(item => Object.keys(item.referConfig).length > 0));
} else {
- this.referArray.push([])
+ this.referArray = [];
}
}
- this.isReferPushed = true;
this.WupinFindValue = ''
},
},
@@ -485,8 +489,7 @@
this.LinkObject = row;
this.LinkVisible = true;
this.LinkList = Object.keys(row).map(property => property)
- // console.log(result);
- // console.log(this.LinkObject)
+
},
//鐘舵�佹悳绱�
cellSelectHandler(row) {
@@ -497,6 +500,7 @@
}
},
cellStatusFind(lcstatus) {
+ this.isLoading = true;
TableData({
templateOid: this.templateOid,
codeClassifyOid: this.codeClassifyOid,
@@ -504,7 +508,10 @@
limit: this.page.pageSize,
'conditionMap[lcstatus]': lcstatus
}).then(res => {
- this.tableData = res.data.data
+ // console.log(res)
+ this.tableData = res.data.data;
+ this.page.total = res.data.total;
+ this.isLoading = false;
})
},
//灞曞紑闄勪欢
@@ -554,7 +561,36 @@
if (uniqueFlag === 'CODEAMEND') return this.codeAMENDHandler()
//鎵归噺缂栬緫
if (uniqueFlag === 'bulkEdit') return this.bulkEditHandler("bulkEdit")
+ //闆嗗洟鐮佸鍑�
+ if (uniqueFlag === 'excelGroupCode') return this.excelGroupCode()
+ //闆嗗洟鐮佸鍏�
+ if (uniqueFlag === 'importGroupCode') return this.importGroupCode("groupCode")
});
+ },
+ importGroupCode(type) {
+ this.batchImportData.visible = true
+ this.batchImportData.type = type
+ this.batchImportData.codeClassifyOid = this.codeClassifyOid
+ },
+ //闆嗗洟鐮佸鍑�
+ excelGroupCode() {
+ this.isLoading = true;
+ exportGroupCodeExcel({
+ codeClassifyOid: this.codeClassifyOid,
+ }).then(res => {
+ console.log(res)
+ if (res) {
+ func.downloadFileByBlobHandler(res);
+ this.$message.success('涓嬭浇鎴愬姛锛岃鏌ョ湅锛�');
+ this.isLoading = false;
+ }
+ }).catch(error => {
+ console.log(error)
+ if (error) {
+ this.$message.error('璇锋煡鐪嬩笅杞界殑閿欒鏂囦欢锛�');
+ }
+ this.isLoading = false;
+ })
},
//鏍囧噯鐢宠
codeApplyHandler() {
@@ -589,45 +625,49 @@
//鏍囧噯淇
codeAMENDHandler() {
let foundItem = false;
-
this.tableHeadFindData.forEach(item => {
if (item.field === "oldcode" && Object.keys(item.referConfig).length >= 1) {
foundItem = true;
}
});
-
if (foundItem) {
- this.amendvisible = true;
- this.rowOid = this.selectRow[0].oid;
- } else {
- if (this.selectRow.length !== 1) {
- this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
+ if (this.selectRow.length >= 1) {
+ this.$confirm('宸叉湁鍙傜収鏄惁鍙栨秷鍕鹃�夌户缁墽琛岋紵', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ this.selectRow = [];
+ //鍙栨秷鍕鹃�夌姸鎬�
+ this.$refs.dataTable.clearSelection();
+ this.amendvisible = true;
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '宸插彇娑堝綋鍓嶆搷浣�'
+ });
+ });
} else {
this.amendvisible = true;
- this.rowOid = this.selectRow[0].oid;
+ }
+ } else {
+ if (this.selectRow.length <= 0) {
+ this.$message.warning("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�");
+ } else {
+ this.amendvisible = true;
+
}
}
},
//鎵归噺缂栬緫
bulkEditHandler(type) {
- // console.log(this.nodeClickList)
if (this.nodeClickList.children.length >= 1) {
this.$message.warning('褰撳墠閫夋嫨鐨勫垎绫讳笉鏄彾瀛愯妭鐐癸紝涓嶅厑璁告壒閲忕紪杈戯紒')
return;
}
- if (this.selectRow.length <= 0) {
- this.$message.warning('璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹紒')
- return;
- }
- const Editing = this.selectRow.every(item => item.lcstatus === 'Editing');
-
- if (Editing) {
- this.batchImportData.visible = true
- this.batchImportData.type = type
- this.batchImportData.codeClassifyOid = this.codeClassifyOid
- } else {
- this.$message.warning('閫夋嫨鐨勬暟鎹腑鏈夌紪鐮佺姸鎬佷笉鏄�滅紪杈戜腑鈥濓紝涓嶅彲缂栬緫锛�');
- }
+ this.batchImportData.visible = true
+ this.batchImportData.type = type
+ this.batchImportData.codeClassifyOid = this.codeClassifyOid
},
addSaveHandler() {
this.$nextTick(() => {
@@ -639,10 +679,6 @@
if (this.selectRow.length <= 0) {
this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹ā鏉匡紒')
} else {
- // const requestData = this.selectRow.forEach(item => {
- // return { oids: item.oid, btmName: item.btmname };
- // });
-
const oids = this.selectRow.map(item => item.oid).join(',');
applyGroupCode({oids, btmName: this.selectRow[0].btmname}).then(res => {
if (res.data.code == 200) {
@@ -657,9 +693,6 @@
if (this.selectRow.length <= 0) {
this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹ā鏉匡紒')
} else {
- // const requestData = this.selectRow.forEach(item => {
- // return { oids: item.oid, btmName: item.btmname };
- // });
const oids = this.selectRow.map(item => item.oid).join(',');
receiveEditApply({oids, btmName: this.selectRow[0].btmname}).then(res => {
if (res.data.code == 200) {
@@ -1035,10 +1068,7 @@
},
//杈撳叆鍥炶溅鎼滅储
tableFindInp() {
- /*if (this.WupinFindValue.trim() === '') {
- this.$message.warning('杈撳叆鍊间笉鑳戒负绌�')
- return;
- }*/
+ this.isLoading = true;
TableData({
templateOid: this.templateOid,
codeClassifyOid: this.codeClassifyOid,
@@ -1047,7 +1077,8 @@
['conditionMap[' + this.keyWordFind + ']']: '*' + this.WupinFindValue + '*'
}).then(res => {
this.tableData = res.data.data;
- // this.page.total = res.data.data.total;
+ this.page.total = res.data.total;
+ this.isLoading = false;
})
}
--
Gitblit v1.9.3