From d5129a9d3f2be1d73adbe0e4a7478e8f7e8fc9bc Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 06 十二月 2023 16:18:46 +0800
Subject: [PATCH] 菜单管理-从其它模板克隆对话框优化
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 75 +++++++++++++++++++++----------------
1 files changed, 42 insertions(+), 33 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 0ffc633..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,8 +99,8 @@
</FormTemplateDialog>
<!-- 淇-->
<FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
- :disabledProp="disabledProp" :templateOid="templateOid" :title="'鏁版嵁淇'"
- :visible.sync="amendvisible" status="amend" :selectRow="selectRow"
+ :disabledProp="disabledProp" :selectRow="selectRow" :templateOid="templateOid"
+ :title="'鏁版嵁淇'" :visible.sync="amendvisible" status="amend"
type="add" @submit="amendSumbit"></FormTemplateDialog>
<!-- 鏂板-->
<FormTemplateDialog :TreeValue="TreeValue" :codeClassifyOid="this.codeClassifyOid"
@@ -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>-->
@@ -393,6 +393,11 @@
this.doLayout()
},
watch: {
+ isLoading: {
+ handler(newval) {
+ // console.log(newval)
+ }
+ },
tableHeadDataFateher: {
handler(newval, oldval) {
this.options = newval.tableDefineVO.seniorQueryColumns
@@ -408,7 +413,7 @@
handler(newval, oldval) {
this.tableData = newval;
this.searchResults = newval
- this.doLayout()
+ this.doLayout();
},
},
tableHeadFindData: {
@@ -433,31 +438,31 @@
}
})
this.tableHeadFindDatas = 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 = [];
}
- 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 = ''
},
},
@@ -495,6 +500,7 @@
}
},
cellStatusFind(lcstatus) {
+ this.isLoading = true;
TableData({
templateOid: this.templateOid,
codeClassifyOid: this.codeClassifyOid,
@@ -502,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;
})
},
//灞曞紑闄勪欢
@@ -558,26 +567,28 @@
if (uniqueFlag === 'importGroupCode') return this.importGroupCode("groupCode")
});
},
- importGroupCode(type){
+ importGroupCode(type) {
this.batchImportData.visible = true
this.batchImportData.type = type
this.batchImportData.codeClassifyOid = this.codeClassifyOid
},
//闆嗗洟鐮佸鍑�
- excelGroupCode(){
- debugger
+ excelGroupCode() {
this.isLoading = true;
exportGroupCodeExcel({
codeClassifyOid: this.codeClassifyOid,
}).then(res => {
- console.log(res.data)
+ console.log(res)
if (res) {
func.downloadFileByBlobHandler(res);
this.$message.success('涓嬭浇鎴愬姛锛岃鏌ョ湅锛�');
this.isLoading = false;
}
- }).catch(error=>{
- this.$message.error(error);
+ }).catch(error => {
+ console.log(error)
+ if (error) {
+ this.$message.error('璇锋煡鐪嬩笅杞界殑閿欒鏂囦欢锛�');
+ }
this.isLoading = false;
})
},
@@ -620,7 +631,7 @@
}
});
if (foundItem) {
- if(this.selectRow.length >= 1){
+ if (this.selectRow.length >= 1) {
this.$confirm('宸叉湁鍙傜収鏄惁鍙栨秷鍕鹃�夌户缁墽琛岋紵', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -636,7 +647,7 @@
message: '宸插彇娑堝綋鍓嶆搷浣�'
});
});
- }else {
+ } else {
this.amendvisible = true;
}
} else {
@@ -654,9 +665,9 @@
this.$message.warning('褰撳墠閫夋嫨鐨勫垎绫讳笉鏄彾瀛愯妭鐐癸紝涓嶅厑璁告壒閲忕紪杈戯紒')
return;
}
- this.batchImportData.visible = true
- this.batchImportData.type = type
- this.batchImportData.codeClassifyOid = this.codeClassifyOid
+ this.batchImportData.visible = true
+ this.batchImportData.type = type
+ this.batchImportData.codeClassifyOid = this.codeClassifyOid
},
addSaveHandler() {
this.$nextTick(() => {
@@ -1057,10 +1068,7 @@
},
//杈撳叆鍥炶溅鎼滅储
tableFindInp() {
- /*if (this.WupinFindValue.trim() === '') {
- this.$message.warning('杈撳叆鍊间笉鑳戒负绌�')
- return;
- }*/
+ this.isLoading = true;
TableData({
templateOid: this.templateOid,
codeClassifyOid: this.codeClassifyOid,
@@ -1069,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