-
+
@@ -595,6 +585,8 @@
// }
},
mounted() {
+
+
this.visible=this.addVisible
// this.formInline=this.item
// console.log('form',this.formInline,this.item)
@@ -983,7 +975,7 @@
|| res.field_show_type === '11') {
rule.push({
max: res.db_length,
- message: res.db_field_txt + '不能超出' + res.db_length + '个字符',
+ message: res.db_field_txt + this.$t('cantExeed') + res.db_length + this.$t('characters'),
trigger: 'blur'
})
}
@@ -1119,6 +1111,9 @@
margin-bottom: 20px;
text-align: right;
}
+
+ }
+ .split-content-row{
.split-row{
display: flex;
justify-content: space-between;
@@ -1264,6 +1259,11 @@
.ant-input-number{
width: 100%;
}
+ .split-form-row{
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: start;
+ }
}
.split-img{
.ant-modal-body{
diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
index 2b0e526eb..e1e3c892f 100644
--- a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
+++ b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
@@ -20,10 +20,19 @@
-
+
{{ title.substr(0, title.indexOf(searchValue)) }}{{ searchValue }}{{ title.substr(title.indexOf(searchValue) + searchValue.length) }}
- {{ title }}
+
+
+
+
+
+
+
+
+ {{title && title.length > 18?title.slice(0,17)+'...':title}}
+
onContextMenuClick(treeKey, menuKey, record)">
{{$t('newNode')}}
@@ -81,6 +90,7 @@
{
+ that.screenWidth = window.screenWidth || document.body.clientWidth;
+ client = document.querySelector('.split-detail-table .ant-table-content').getBoundingClientRect()
+ // console.log('screenWidth',that.screenWidth)
+ width = that.screenWidth - client.left
+ document.querySelector('.split-detail-table .ant-table-content').style.width = width - 20 + 'px'
+ }, false);
+
+
this.infoId=this.$route.query.infoId
// console.log('info',this.$route.query)
@@ -329,6 +357,7 @@
return parentKey;
},
onExpand(expandedKeys){
+ // console.log('expandedKeys',expandedKeys)
this.expandedKeys = expandedKeys;
this.autoExpandParent = false;
},
@@ -359,6 +388,10 @@
if (res.success) {
this.data = this.toTree(res.result)
this.gData= [...this.data]
+ Object.assign(this, {
+ expandedKeys:this.expandedKeys,
+ autoExpandParent: true,
+ })
}
}).finally(()=>{
this.loading=false
@@ -521,8 +554,10 @@
if(res.success){
this.menuRightVisible=false
this.$message.success(this.$t('OperationSuccessful'))
- this.onExpand(expandId)
+ // this.onExpand(expandId)
this.form={}
+ this.expandedKeys.push(this.nodeItem.id)
+ // console.log('expandedKeys1111',this.expandedKeys)
this.loadMenuData()
let queryParam={
menu_id:this.menuId,
@@ -633,6 +668,8 @@
.then((res) => {
if (res.data.success) {
this.$message.success(this.$t('OperationSuccessful'))
+ this.$emit('selectClear')
+ this.selectClear()
// this.loadData()
this.loadMenuData()
let queryParam={
@@ -726,7 +763,13 @@
parameter: this.parameter
}
- downloadFile('split/sarFileSplitItems/exportSplitInfoZip', name, query)
+ downloadFile('split/sarFileSplitItems/exportSplitInfoZip', name, query,this.selectClear)
+ },
+ selectClear() {
+ this.$refs.splitDetailTabel.selectedRowKeys = []
+ this.selectedRowKeys=[]
+ this.selectedRows=[]
+ this.selecIds=[]
},
//模板下载
handleDownManage(){
@@ -757,6 +800,7 @@
.then( (res) => {
if (res.data.success) {
this.$message.success(this.$t('OperationSuccessful'))
+ this.selectClear()
this.loadMenuData()
let queryParam={
menu_id:this.menuId,
@@ -799,6 +843,7 @@
//批量设置确定提交
addFormClick(){
this.batSetVisible=false
+ this.selectClear()
let queryParam={
menu_id:this.menuId,
info_id: this.infoId,
@@ -1066,7 +1111,10 @@
}
},
- }
+ },
+ beforeDestroy() {
+ window.removeEventListener('resize', {}, false);
+ },
}
@@ -1080,11 +1128,11 @@
display: flex;
justify-content: space-between;
.split-detail-left{
- width: 260px;
+
padding-right: 20px;
border-right: 1px solid #E6E7EC;
.split-detail-left-tree{
- width: 240px;
+
}
.menu-item{
padding: 2px 8px;
@@ -1185,17 +1233,33 @@
}
}
.split-detail-left{
- .ant-tree-treenode-switcher-open{
+
.ant-tree-node-content-wrapper-normal{
- width:200px;
- white-space:nowrap;
- overflow:hidden;
- text-overflow:ellipsis;
- }
- .ant-tree-title{
}
- }
+ .ant-tree-title{
+ span{
+ display: block;
+ width: 240px;
+ overflow:hidden;
+ text-overflow:ellipsis;
+
+ }
+
+ }
+ .ant-tree-child-tree{
+ .ant-tree-title{
+ span{
+ display: block;
+ width: 240px;
+ overflow:hidden;
+ text-overflow:ellipsis;
+
+ }
+
+ }
+ }
+
}
.split-detail-table{
.ant-table-body{
diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitText.vue b/jero-web/src/views/documentManage/splitting/modules/SplitText.vue
index 48099d62a..6d463f787 100644
--- a/jero-web/src/views/documentManage/splitting/modules/SplitText.vue
+++ b/jero-web/src/views/documentManage/splitting/modules/SplitText.vue
@@ -20,25 +20,25 @@
-
文件类型:
-
+ {{$t('fileType')}}
+
GSO
- 韩国
+ {{$t('Korea')}}
- 美国
+ {{$t('America')}}
- 欧洲
+ {{$t('Europe')}}
- 日本
+ {{$t('Japan')}}
- 中国
+ {{$t('China')}}
@@ -79,7 +79,7 @@
data(){
return{
visible:false,
- fileGroup:'',
+ fileGroup:undefined,
tableSource:[], //列表数据
selectedRowKeys:[],
queryParams:{
@@ -192,7 +192,7 @@
},
//拆分
submitSplit(){
- if(this.fileGroup.length == 0){
+ if(this.fileGroup.length == 0||this.fileGroup==undefined){
this.$message.warning(this.$t('selectFileType'))
}else if(this.rows&&this.rows.length>1){
this.$message.warning(this.$t('OnlyOneSelected'))
@@ -275,15 +275,22 @@
}
.operator-select{
margin-bottom: 20px;
- margin-left: 60px;
+ /*margin-left: 60px;*/
.operator-file-type{
/*width: 100px;*/
+ min-width: 110px;
+ text-align: right;
line-height: 32px;
display: inline-block;
+ margin-right: 16px;
}
.operator-select-type{
display: flex;
justify-content: start;
+ .file-type-select{
+ min-width: 120px;
+
+ }
}
}
@@ -296,4 +303,13 @@
}
}
}
+ .operator-select-type{
+ .ant-select-selection{
+ height: 38px;
+ .ant-select-selection__rendered{
+ height: 38px;
+ line-height: 38px;
+ }
+ }
+ }
\ No newline at end of file