diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index f291121ab..e68a2d6ed 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -555,4 +555,7 @@ module.exports = { deleteNode:'delete node', ImplementationDate:'Implementation Date', vehicleInProductionDate:'vehicle in Production Date', + deleteNodes:'If there are child nodes under this node, they will be deleted synchronously. Are you sure to delete this data?', + leastTwo: 'please select at least two pieces of data', + vehicleInProductionDate:'vehicle in Production Date', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 0fc7f9703..04c38c570 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -559,4 +559,8 @@ module.exports = { deleteNode:'删除节点', ImplementationDate:'新车型实施日期', vehicleInProductionDate:'在产车实施日期', + vehicleInProductionDate:'在产车实施日期', + deleteNodes:'该节点下若有子节点将同步删除,确认删除该条数据?', + leastTwo:'请选择至少两条数据', + } \ No newline at end of file diff --git a/jero-web/src/components/SplitDetailTable/index.vue b/jero-web/src/components/SplitDetailTable/index.vue new file mode 100644 index 000000000..3212ba5f0 --- /dev/null +++ b/jero-web/src/components/SplitDetailTable/index.vue @@ -0,0 +1,267 @@ + + + + + diff --git a/jero-web/src/components/SplitTable/index.vue b/jero-web/src/components/SplitTable/index.vue index 63481cf52..8e36dbeb8 100644 --- a/jero-web/src/components/SplitTable/index.vue +++ b/jero-web/src/components/SplitTable/index.vue @@ -13,12 +13,12 @@ @change="tableOnChange" > - - - {{ol.text}} - - + + + {{ol.text}} + + @@ -61,6 +61,10 @@ showAction: { type: Boolean, default: false + }, + infoId: { + type:String, + default:'' } }, data() { @@ -129,7 +133,7 @@ }) if (res.click) { this.columns[index].scopedSlots = { - customRender: 'detailClick' + customRender: 'showContent' } } else { this.columns[index].scopedSlots = { @@ -167,9 +171,11 @@ ...this.searchParmes, orderBy: this.orderBy, orderByField: this.orderByField, + infoId:this.infoId, pageNo: pageNo + '', pageSize: pageSize + '' } + console.log('parmsss',params) this.loading = true getAction(this.url.tableList, params).then((res) => { if (res.success) { @@ -204,6 +210,9 @@ }, detailClick(item, index) { this.$emit('detailClick', item) + }, + showContent(item, index) { + this.$emit('showContent', item) } } } diff --git a/jero-web/src/views/documentManage/splitting/index.vue b/jero-web/src/views/documentManage/splitting/index.vue index 182a725f0..2727cc0d1 100644 --- a/jero-web/src/views/documentManage/splitting/index.vue +++ b/jero-web/src/views/documentManage/splitting/index.vue @@ -376,5 +376,8 @@ display: flex; } } + .ant-col-sm-8{ + min-width: 300px; + } } \ No newline at end of file diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue index b93bfaeab..fa36f3214 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue @@ -10,300 +10,302 @@ @close="onClose" width="900" > - - - -
+ + + + +
- -
-
- * - {{item.db_field_txt}} + +
+
+ * + {{item.db_field_txt}} +
+ + +
- - - -
- + - -
-
- * - {{item.db_field_txt}} + +
+
+ * + {{item.db_field_txt}} +
+ + +
- - - -
- + - -
-
- * - {{item.db_field_txt}} + +
+
+ * + {{item.db_field_txt}} +
+ + +
- - - -
- + - -
-
- * - {{item.db_field_txt}} + +
+
+ * + {{item.db_field_txt}} +
+ + +
- - - -
- - -
-
- * - {{item.db_field_txt}} + + +
+
+ * + {{item.db_field_txt}} +
+ + + +
- - - - -
- - -
-
- * - {{item.db_field_txt}} + + +
+
+ * + {{item.db_field_txt}} +
+ + +
- - - -
- + - -
-
- * - {{item.db_field_txt}} + +
+
+ * + {{item.db_field_txt}} +
+ + + {{ (formInline[item.db_field_name] === 'null' || formInline[item.db_field_name] === '' || + formInline[item.db_field_name] == null) ? $t('clickUpload') : $t('viewUploadedFiles') + }} + + + + +
- - - {{ (formInline[item.db_field_name] === 'null' || formInline[item.db_field_name] === '' || - formInline[item.db_field_name] == null) ? $t('clickUpload') : $t('viewUploadedFiles') - }} - - - - - -
- + - -
-
- * - {{item.db_field_txt}} + +
+
+ * + {{item.db_field_txt}} +
+ + +
- - - -
- + - -
-
- * - {{item.db_field_txt}} + +
+
+ * + {{item.db_field_txt}} +
+ + +
- - - -
- + - -
-
- * - {{item.db_field_txt}} + +
+
+ * + {{item.db_field_txt}} +
+ + +
- - - -
- + - -
-
- * - {{item.db_field_txt}} + +
+
+ * + {{item.db_field_txt}} +
+ + +
- - - -
- + - -
-
- * - {{item.db_field_txt}} + +
+
+ * + {{item.db_field_txt}} +
+ + +
- - - -
- + - -
-
- * - {{item.db_field_txt}} + +
+
+ * + {{item.db_field_txt}} +
+ + +
- - - -
- + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{$t('contentValidity')}} + +
+
+ + {{$t('Add')}} +
+
+ +
+
+ + +
+
+
+ {{$t('Add')}} + {{$t('delete')}}
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{$t('contentValidity')}} - -
-
- - {{$t('Add')}} -
-
- -
-
- - -
-
- {{$t('Add')}} - {{$t('delete')}} -
-
-
- - - + + + + + { + if(res.success){ + this.contentList=[...res.result] + + console.log('res',res.result) + } + }).finally(()=>{ + this.loading=false + }) + }, afterVisibleChange(){ }, @@ -616,10 +642,70 @@ }, //保存 splitSave(){ - console.log('formInline',this.formInline) + // console.log('formInline',this.formInline) this.$refs.splitEditForm.validate(valid=>{ if(valid){ + this.submitFlag=true + this.confirmLoading = true + if(this.submitFlag){ + let url = '' + if (this.formInline.id) { + url = this.url.updateInfo + } else { + url = this.url.addInfo + } + let params = JSON.parse(JSON.stringify(this.formInline)) + // console.log('item',this.item,JSON.stringify(this.item)=="{}") + if(JSON.stringify(this.item)=="{}"){ + params.info_id=this.infoId + params.menu_id=this.menuId + } + // params.menuId=this.menuId + params.itemValEOList=this.contentList + // console.log('paramsformInline',params) + axios({ + url: url, + method: 'post', + data: params, + headers: { + 'X-Access-Token':this.token + } + }) + .then( (res) =>{ + if (res.data.success) { + this.confirmLoading = false + this.$message.success(this.$t('OperationSuccessful')) + this.visible=false + // this.$emit('closeVisible',false) + eventBUs.$emit('searchReset') + }else{ + this.$message.warning(this.$t('operationFailed')) + } + }) + .catch( (error) =>{ + console.log(error); + }).finally(()=>{ + this.confirmLoading=false + 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')) + // } + // } + // }) } }) }, @@ -638,9 +724,9 @@ } for(let j=0;j 0){ imgs.forEach(item => { this.contentList[++this.addIndex]={ + id:'', type:'IMG', - src:item.thumbUrl + itemContent:item.thumbUrl } }) } @@ -679,7 +766,7 @@ }, //点击图片预览 preImg(item){ - this.itemSrc=item.src + this.itemSrc=item.itemContent this.preImgVisible=true }, //关闭预览图片 @@ -845,7 +932,7 @@ } }) this.$set(this, 'rules', rules) - console.log(this.rules) + // console.log('rules',this.rules) this.isFormInline = true this.confirmLoading = false }, diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue index d60f92808..4d57a57c2 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue @@ -105,10 +105,13 @@ :url="url" :flag="'4'" :OperationList="OperationList" + :infoId="infoId" + :menuId="menuId" showAction @onSelectChange="onSelectChange" @deleteClick="deleteClick" @editClick="editClick" + @showContent="showContent" > @@ -174,7 +177,7 @@ - +
@@ -184,9 +187,10 @@