diff --git a/jero-web/src/components/SplitBatForm/index.vue b/jero-web/src/components/SplitBatForm/index.vue
index 7fa15bb7c..78c515c3d 100644
--- a/jero-web/src/components/SplitBatForm/index.vue
+++ b/jero-web/src/components/SplitBatForm/index.vue
@@ -332,22 +332,11 @@
this.$message.success(this.$t('OperationSuccessful'))
// this.loadData()
this.$emit('addFormClick')
- eventBUs.$emit('searchReset')
+ // eventBUs.$emit('searchReset')
}else{
this.$message.warning(this.$t('operationFailed'))
}
})
-
-
- // postAction(url, formInline).then((res) => {
- // if (res.success) {
- // this.$message.success(this.$t('OperationSuccessful'))
- // eventBUs.$emit('searchReset')
- // this.$emit('addFormClick')
- // } else {
- // this.$message.warning(this.$t('operationFailed'))
- // }
- // })
} else {
return false
}
diff --git a/jero-web/src/components/SplitSearch/index.vue b/jero-web/src/components/SplitSearch/index.vue
index 9995e6145..b8bc4c5be 100644
--- a/jero-web/src/components/SplitSearch/index.vue
+++ b/jero-web/src/components/SplitSearch/index.vue
@@ -184,7 +184,7 @@
immediate:true,
handler(val){
this.menu_id=val
- console.log('menuId',this.menu_id)
+ // console.log('menuId',this.menu_id)
}
}
},
@@ -206,7 +206,7 @@
menu_id:'',
info_id:this.infoId
}
- console.log('queryparamssss',this.queryParam)
+ // console.log('queryparamssss',this.queryParam)
this.$emit('resetSearch')
eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(this.queryParam)))
},
diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue
index 33ab2256a..76f0d8de5 100644
--- a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue
+++ b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue
@@ -291,13 +291,28 @@
>
- {{$t('text')}}
- {{$t('picture')}}
- {{$t('table')}}
+ {{$t('text')}}
+ {{$t('picture')}}
+ {{$t('table')}}
-
{{$t('addQuantity')}}
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -369,9 +384,9 @@
TitlePreImg:'',
contentList:[],
content:{},
- selected:1,
+ selected:'TEXT',
selectedNum:true,
- textNumber:1,
+ textNumber:null,
Title:this.$t('add'),
confirmLoading: false,
visible:false,
@@ -518,7 +533,14 @@
loading:false,
token:Vue.ls.get(ACCESS_TOKEN),
submitFlag:false,
- deleteIds:[]
+ deleteIds:[],
+ numberForm:{},
+ validatorRules:{
+ textNumber:[
+ { required: true, message: this.$t('enterQuantity'),trigger: 'blur'},
+ ]
+ },
+ numberFlag:false,
}
},
props:{
@@ -557,7 +579,7 @@
},
watch:{
selected(val){
- if(this.selected==1){
+ if(this.selected==='TEXT'){
this.selectedNum=true
}else{
this.selectedNum=false
@@ -606,6 +628,7 @@
//增加按钮
splitAdd(val){
this.addConVisible=true
+ // this.numberForm.textNumber=null
if(val=='-1'){
this.addIndex=this.contentList.length-1
}else{
@@ -689,22 +712,6 @@
this.submitFlag=false
})
}
-
- // postAction(url, params).then((res) => {
- // if (res.success) {
- // this.confirmLoading = false
- // this.$message.success(this.$t('OperationSuccessful'))
- // eventBUs.$emit('searchReset')
- // this.$emit('addFormClick')
- // } else {
- // this.confirmLoading = false
- // if (res.message.indexOf('发布日期不能大于') >= 0) {
- // this.$message.warning(res.message)
- // } else {
- // this.$message.warning(this.$t('operationFailed'))
- // }
- // }
- // })
}
})
},
@@ -715,27 +722,39 @@
},
//确定增加的类型
handleOk(){
- this.addConVisible=false
+ // console.log('seletype',this.selected)
let contentLength=this.contentList.length
- if(this.selected==1){ //文本类型
- for(let i=this.contentList.length;i>this.addIndex;i--){
- this.contentList[i+contentLength-1]=this.contentList[i-1]
- }
- for(let j=0;j{
+ if(valid){
+ this.numberFlag=true
+ if(this.numberFlag){
+ for(let i=this.contentList.length;i>this.addIndex;i--){
+ this.contentList[i+this.numberForm.textNumber-1]=this.contentList[i-1]
+ }
+ for(let j=0;j
\ No newline at end of file
diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
index 1b408c582..04db16b6f 100644
--- a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
+++ b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
@@ -756,6 +756,12 @@
//批量设置确定提交
addFormClick(){
this.batSetVisible=false
+ let queryParam={
+ menu_id:this.menuId,
+ info_id: this.infoId,
+
+ }
+ eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(queryParam)))
},
//批量删除
handleBatCancel(){