From dedbadd96ab7e1533572b25511fd201678c64dad Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 17 十月 2024 09:56:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index e0e64c2..04d6918 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -2,7 +2,7 @@
<basic-container>
<div class="main">
<div class="top">
- <div class="testbox" style="">
+ <div class="testbox">
<div>
</div>
<el-row style="width: 100%;margin-bottom: 10px">
@@ -164,7 +164,8 @@
@current-change="handleCurrentChange">
</el-pagination>
</div>
- <el-dialog :visible.sync="syncDialogBox" append-to-body title="鎵嬪姩鍚屾" top="200px" @close="syncClose" v-loading="syncLoading"width="30%">
+ <el-dialog v-loading="syncLoading" :visible.sync="syncDialogBox" append-to-body title="鎵嬪姩鍚屾" top="200px"
+ width="30%" @close="syncClose">
<p style="display: inline-block">鏈�鍚庢洿鏂版椂闂达細</p>
<el-date-picker
v-model="SyncValue"
@@ -393,8 +394,6 @@
},
},
created() {
- // const index = this.$route.query.id.indexOf('@name=') + '@name='.length;
- // this.result = this.$route.query.id.substring(index);
getUserInfo().then(res => {
this.result = res.data.data.realName
})
@@ -439,6 +438,8 @@
fileDocClassifyName: '',
hasDownload: true,
hasUpload: true,
+ hasEdit: true,
+ hasDel: true,
height: 'auto'
}
} else {
@@ -623,12 +624,13 @@
if (this.SyncValue) {
this.syncLoading = true;
const response = await syncSearch({endDate: this.SyncValue})
- if (response.status === 200) {
+ console.log('response',response)
+ if (response.data.code === 200) {
this.$message.success('鍚屾鎴愬姛锛�')
this.syncLoading = false;
this.syncDialogBox = false;
this.SyncValue = "";
- }else {
+ } else {
this.syncLoading = false;
this.syncDialogBox = false;
this.SyncValue = "";
@@ -1202,7 +1204,6 @@
this.conditionMap = {};
// 瀛樺偍鏌ヨ鏉′欢锛屼富瑕佹槸涓轰簡鐐瑰嚮椤电爜鏃跺甫涓婅繖涓潯浠�
this.conditionMap["conditionMap[" + this.keyWordFind + "]"] = '*' + this.WupinFindValue + '*';
- console.log(this.conditionMap)
TableData({
templateOid: this.templateOid,
codeClassifyOid: this.codeClassifyOid,
@@ -1223,6 +1224,13 @@
</script>
<style lang="scss" scoped>
+
+/deep/ .el-table__fixed-body-wrapper {
+ .el-table__body {
+ padding-bottom: 15px;
+ }
+}
+
//鍥哄畾鍒楅珮搴�
/deep/ .el-table__fixed {
height: calc(100vh - 365px) !important;
--
Gitblit v1.9.3