Merge branch 'feature_dev_20230222_FJDSS' into dev_2nd_LCYH
# Conflicts: # jero-boot/db/蔚来标准sql/dev_2nd_period.sql # jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
This commit is contained in:
高嵩
@@ -109,7 +109,7 @@
|
||||
}
|
||||
})
|
||||
if (this.triggerChange) {
|
||||
this.$emit('change', val)
|
||||
this.$emit('change', val,content)
|
||||
} else {
|
||||
this.$emit('input', val)
|
||||
this.$emit('changeQuery', content, this.db_field_name)
|
||||
|
||||
@@ -225,11 +225,184 @@
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
</a-col>
|
||||
|
||||
</div>
|
||||
</a-row>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="header-text" style='margin-bottom: 0px'>
|
||||
{{$t('DetailsPhasedImplementation')}}
|
||||
</div>
|
||||
<a-button key="submit" type="primary" @click="newlyAdded" style='float: right; z-index: 99; margin-bottom: 5px'>
|
||||
{{ $t('newlyAdded') }}
|
||||
</a-button>
|
||||
<a-table
|
||||
:loading="loading"
|
||||
:pagination="false"
|
||||
:data-source="dataGradto"
|
||||
:columns="columnsGrading"
|
||||
rowKey='id'
|
||||
:scroll="{x: '100%'}"
|
||||
>
|
||||
<span slot="Gradoperation" slot-scope="text,result,index">
|
||||
<a @click="handeredit(result,index)" style="margin-right: 10px">
|
||||
{{$t('edit')}}
|
||||
</a>
|
||||
<a @click="deleteLib(result,index)" style="margin-right: 10px">
|
||||
{{$t("deleteLib")}}
|
||||
</a>
|
||||
</span>
|
||||
</a-table>
|
||||
</div>
|
||||
<a-modal
|
||||
:title="$t('newlyAdded')"
|
||||
:width="900"
|
||||
:visible="visibleGrad"
|
||||
:confirm-loading="confirmLoading"
|
||||
:maskClosable="false"
|
||||
@cancel="visibleGrad = false"
|
||||
>
|
||||
<a-form-model :rules="tablerules" :model="tabledataGrad"
|
||||
ref="tableruleForm">
|
||||
<a-row :gutter="24">
|
||||
<a-col :span="12">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text">
|
||||
<span>{{$t('Statutenumberclause')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel" prop="standNumberOrClause">
|
||||
<a-input class="box-input" v-model="tabledataGrad.standNumberOrClause"
|
||||
:placeholder="$t('PleaseEnter')+$t('Statutenumberclause')"/>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text">
|
||||
<span>{{$t('Typeofimplementation')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel">
|
||||
<j-multi-select-tag class="box-input" v-model="tabledataGrad.implementationType"
|
||||
:placeholder="$t('PleaseSelect')+$t('Typeofimplementation')"
|
||||
:type="'select'"
|
||||
@changeQuery='implementationTypeChange'
|
||||
:triggerChange="false" dictCode="shi2_shi1_lei4_xing2"/>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text">
|
||||
<span>{{$t('ImplementationDate')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel">
|
||||
<a-date-picker class="box-input" v-model="tabledataGrad.implementationDate"
|
||||
:placeholder="$t('PleaseSelect')+$t('ImplementationDate')"
|
||||
format="YYYY-MM-DD"
|
||||
@change='dateChangeOne'
|
||||
style="width: 100%"/>
|
||||
<!-- :disabledDate="disabledDate"-->
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text">
|
||||
<span>{{$t('remarks')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel" style="height: auto" prop="remarks">
|
||||
<a-textarea :placeholder="$t('pleaseEnter')+$t('remarks')"
|
||||
:rows="4" v-model="tabledataGrad.remarks"/>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
</a-col>
|
||||
</a-row>
|
||||
</a-form-model>
|
||||
<template slot="footer">
|
||||
<a-button key="back" @click="visibleGrad = false">
|
||||
{{ $t('cancel') }}
|
||||
</a-button>
|
||||
<a-button key="submit" type="primary" @click="handleSubmit">
|
||||
{{ $t('determine') }}
|
||||
</a-button>
|
||||
</template>
|
||||
</a-modal>
|
||||
<a-modal
|
||||
:title="$t('edit')"
|
||||
:width="900"
|
||||
:visible="tablevisibleGrad"
|
||||
:confirm-loading="confirmLoading"
|
||||
:maskClosable="false"
|
||||
@cancel="tablevisibleGrad = false"
|
||||
>
|
||||
<a-form-model :rules="tablerules" :model="tabledataGrad"
|
||||
ref="tableruleFormedit">
|
||||
<a-row :gutter="24">
|
||||
<a-col :span="12">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text">
|
||||
<span>{{$t('Statutenumberclause')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel" prop="standNumberOrClause">
|
||||
<a-input class="box-input" v-model="tabledataGrad.standNumberOrClause"
|
||||
:placeholder="$t('PleaseEnter')+$t('Statutenumberclause')"/>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text">
|
||||
<span>{{$t('Typeofimplementation')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel">
|
||||
<j-multi-select-tag class="box-input" v-model="tabledataGrad.implementationType"
|
||||
:placeholder="$t('PleaseSelect')+$t('Typeofimplementation')"
|
||||
:type="'select'"
|
||||
@changeQuery='implementationTypeChange'
|
||||
:triggerChange="false" dictCode="shi2_shi1_lei4_xing2"/>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text">
|
||||
<span>{{$t('ImplementationDate')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel">
|
||||
<a-date-picker class="box-input" v-model="tabledataGrad.implementationDate"
|
||||
:placeholder="$t('PleaseSelect')+$t('ImplementationDate')"
|
||||
format="YYYY-MM-DD"
|
||||
@change='dateChangeOne'
|
||||
style="width: 100%"/>
|
||||
<!-- :disabledDate="disabledDate"-->
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text">
|
||||
<span>{{$t('remarks')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel" style="height: auto" prop="remarks">
|
||||
<a-textarea :placeholder="$t('pleaseEnter')+$t('remarks')"
|
||||
:rows="4" v-model="tabledataGrad.remarks"/>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
</a-col>
|
||||
</a-row>
|
||||
</a-form-model>
|
||||
<template slot="footer">
|
||||
<a-button key="back" @click="tablevisibleGrad = false">
|
||||
{{ $t('cancel') }}
|
||||
</a-button>
|
||||
<a-button key="submit" type="primary" @click="tablehandleSubmit">
|
||||
{{ $t('determine') }}
|
||||
</a-button>
|
||||
</template>
|
||||
</a-modal>
|
||||
<uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"></uploadFile>
|
||||
</a-form-model>
|
||||
</a-spin>
|
||||
@@ -266,9 +439,32 @@
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
tablevisibleGrad: false,
|
||||
visibleGrad: false,
|
||||
loading: false,
|
||||
formInline: {},
|
||||
tabledataGrad: {},
|
||||
dataGradto: [],
|
||||
isFormInline: false,
|
||||
rules: {},
|
||||
tablerules: {
|
||||
standNumberOrClause: [
|
||||
{
|
||||
// required: true,
|
||||
max: 200,
|
||||
message: this.$t('Statutenumberclause') + this.$t('cannotExceed') + 200 + this.$t('Characters'),
|
||||
trigger: 'blur'
|
||||
}
|
||||
],
|
||||
remarks: [
|
||||
{
|
||||
// required: true,
|
||||
max: 1000,
|
||||
message: this.$t('remarks') + this.$t('cannotExceed') + 1000 + this.$t('Characters'),
|
||||
trigger: 'blur'
|
||||
}
|
||||
]
|
||||
},
|
||||
labelCol: {
|
||||
xs: { span: 24 },
|
||||
sm: { span: 6 }
|
||||
@@ -296,13 +492,88 @@
|
||||
text: this.$t('relatedInformation'),
|
||||
content: []
|
||||
}
|
||||
]
|
||||
],
|
||||
columnsGrading: [
|
||||
{
|
||||
title: this.$t('Statutenumberclause'),
|
||||
dataIndex: 'standNumberOrClause',
|
||||
align: 'left',
|
||||
ellipsis: true,
|
||||
width: 160
|
||||
},
|
||||
{
|
||||
title: this.$t('Typeofimplementation'),
|
||||
dataIndex: 'implementationTypeText',
|
||||
align: 'left',
|
||||
ellipsis: true,
|
||||
width: 150
|
||||
},
|
||||
{
|
||||
title: this.$t('ImplementationDate'),
|
||||
dataIndex: 'implementationDate',
|
||||
align: 'left',
|
||||
ellipsis: true,
|
||||
width: 150
|
||||
},
|
||||
{
|
||||
title: this.$t('remarks'),
|
||||
dataIndex: 'remarks',
|
||||
align: 'left',
|
||||
ellipsis: true,
|
||||
width: 204
|
||||
},
|
||||
{
|
||||
title: this.$t('operation'),
|
||||
align: 'left',
|
||||
fixed: 'right',
|
||||
width: 180,
|
||||
scopedSlots: { customRender: 'Gradoperation' }
|
||||
}
|
||||
],
|
||||
dataGrad: [],
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
|
||||
},
|
||||
methods: {
|
||||
tablehandleSubmit(){
|
||||
this.$refs.tableruleFormedit.validate((valid) => {
|
||||
if(valid){
|
||||
this.tablevisibleGrad = false
|
||||
console.log(this.tabledataGrad)
|
||||
this.dataGradto[this.tabledataIndex] = this.tabledataGrad
|
||||
this.dataGradto= [... this.dataGradto]
|
||||
}
|
||||
})
|
||||
},
|
||||
deleteLib(val,index) {
|
||||
let _this = this
|
||||
this.$confirm({
|
||||
content: _this.$t('ConfirmDelete'),
|
||||
onOk() {
|
||||
_this.dataGradto.splice(index,1)
|
||||
_this.dataGradto = [..._this.dataGradto]
|
||||
}
|
||||
})
|
||||
},
|
||||
newlyAdded(){
|
||||
this.tabledataGrad = {}
|
||||
this.visibleGrad = true
|
||||
},
|
||||
handeredit(result,index){
|
||||
this.tablevisibleGrad = true
|
||||
this.tabledataIndex = index
|
||||
this.tabledataGrad = JSON.parse(JSON.stringify(result))
|
||||
},
|
||||
handleSubmit(){
|
||||
this.$refs.tableruleForm.validate(valid => {
|
||||
if (valid){
|
||||
this.dataGradto.push(this.tabledataGrad)
|
||||
this.visibleGrad = false
|
||||
}
|
||||
})
|
||||
},
|
||||
disabledDate(current) {
|
||||
return current && current < moment().subtract(1, 'day')
|
||||
},
|
||||
@@ -314,6 +585,7 @@
|
||||
this.formInline = { ...this.formInline }
|
||||
},
|
||||
sumber() {
|
||||
// this.postTable()
|
||||
this.$refs.ruleForm.validate(valid => {
|
||||
if (valid) {
|
||||
this.confirmLoading = true
|
||||
@@ -329,6 +601,7 @@
|
||||
formInline[res] = formInline[res].join(',')
|
||||
}
|
||||
})
|
||||
formInline.phasedImplementationDetailsEOList = this.dataGradto
|
||||
postAction(url, formInline).then((res) => {
|
||||
if (res.success) {
|
||||
this.confirmLoading = false
|
||||
@@ -361,6 +634,13 @@
|
||||
dateChange(item) {
|
||||
this.formInline[item.db_field_name] = this.formInline[item.db_field_name] ? moment(this.formInline[item.db_field_name]).format('YYYY-MM-DD') : ''
|
||||
},
|
||||
dateChangeOne(item) {
|
||||
this.tabledataGrad.implementationDate = this.tabledataGrad.implementationDate ? moment(this.tabledataGrad.implementationDate).format('YYYY-MM-DD') : ''
|
||||
console.log(this.tabledataGrad.implementationDate)
|
||||
},
|
||||
implementationTypeChange(val){
|
||||
this.tabledataGrad.implementationTypeText = val
|
||||
},
|
||||
onChange(item) {
|
||||
let dateOne = moment(this.formInline[item][0]).format('YYYY-MM-DD')
|
||||
let dateTwo = moment(this.formInline[item][1]).format('YYYY-MM-DD')
|
||||
@@ -479,18 +759,33 @@
|
||||
}
|
||||
})
|
||||
},
|
||||
postTable(){
|
||||
let params = this.dataGradto
|
||||
postAction(this.url.getDocumentInfo, params).then((res) => {
|
||||
if (res.success) {
|
||||
this.$message.success(this.$t('OperationSuccessful'))
|
||||
}
|
||||
})
|
||||
},
|
||||
edit(item) {
|
||||
this.type = 'edit'
|
||||
this.loading = true
|
||||
this.getForm(() => {
|
||||
getAction(this.url.getDocumentInfo, { id: item.id }).then((res) => {
|
||||
if (res.success) {
|
||||
this.formInline = res.result[0]
|
||||
this.dataGrad = res.result[0].phasedImplementationDetailsEOList
|
||||
this.dataGradto = this.dataGrad
|
||||
this.loading = false
|
||||
} else {
|
||||
this.loading = false
|
||||
}
|
||||
})
|
||||
})
|
||||
},
|
||||
add() {
|
||||
this.formInline = {}
|
||||
this.dataGrad = []
|
||||
this.type = 'add'
|
||||
this.getForm()
|
||||
},
|
||||
@@ -642,4 +937,13 @@
|
||||
line-height: 6px;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.table {
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
.page {
|
||||
text-align: right;
|
||||
margin-top: 20px;
|
||||
}
|
||||
</style>
|
||||
Reference in New Issue
Block a user