WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

Browse Source
This commit is contained in:
wangzhijiang
2023-03-15 18:09:48 +08:00
parent 098578d89f 5f101301b7
commit 4927eeb7c8
5 changed files with 131 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java
+3
View File
@@ -267,6 +267,9 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
if(StringUtils.isNotEmpty(authDummyInventoryInfoEO.getBussDocumentLibraryId())){ if(StringUtils.isNotEmpty(authDummyInventoryInfoEO.getBussDocumentLibraryId())){
updateAuthDummyEO.setBussDocumentLibraryId(authDummyInventoryInfoEO.getBussDocumentLibraryId()); updateAuthDummyEO.setBussDocumentLibraryId(authDummyInventoryInfoEO.getBussDocumentLibraryId());
} }
if(StringUtils.isNotEmpty(authDummyInventoryInfoEO.getDeliverableType())){
updateAuthDummyEO.setDeliverableType(authDummyInventoryInfoEO.getDeliverableType());
}
updateList.add(updateAuthDummyEO); updateList.add(updateAuthDummyEO);
} }
jero-web/src/views/virtualAuthenticationList/components/addModel.vue
+112 -90
View File
@@ -1,14 +1,15 @@
<template> <template>
<a-drawer <div>
:title="$t('add')" <a-drawer
:maskClosable="false" :title="$t('add')"
:width="1000" :maskClosable="false"
placement="right" :width="1000"
:closable="true" placement="right"
@close="handleCancel" :closable="true"
:visible="visible" @close="handleCancel"
style="height: 100%;overflow: auto;padding-bottom: 53px;"> :visible="visible"
<a-spin :spinning="confirmLoading"> style="height: 100%;overflow: auto;padding-bottom: 53px;">
<a-spin :spinning="confirmLoading">
<a-form-model :model="formInline" :rules="rules" ref="ruleForm"> <a-form-model :model="formInline" :rules="rules" ref="ruleForm">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :span="12"> <a-col :span="12">
@@ -18,7 +19,10 @@
<span class="title-text-text" :title="$t ('regulationNo')">{{$t('regulationNo')}}</span> <span class="title-text-text" :title="$t ('regulationNo')">{{$t('regulationNo')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="serialNumber"> <a-form-model-item class="itemModel" prop="serialNumber">
<codeNumber @regulation="regulation"/> <a-input @click.native="serialNumberClick"
class="box-input"
:placeholder="$t('PleaseSelect')+$t('regulationNo')"
v-model="formInline.serialNumber"></a-input>
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
@@ -31,6 +35,7 @@
<a-form-model-item class="itemModel" prop="dutyTerritory"> <a-form-model-item class="itemModel" prop="dutyTerritory">
<j-dict-select-tag class="box-input" <j-dict-select-tag class="box-input"
:disabled="disabled" :disabled="disabled"
@input="handleInput('dutyTerritory')"
v-model="formInline.dutyTerritory" v-model="formInline.dutyTerritory"
:placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')" :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
:type="'select'" :type="'select'"
@@ -62,92 +67,95 @@
<a-icon class="icon-text" v-if="formInline.dataList.length > 1" @click="deleteClick(index)" <a-icon class="icon-text" v-if="formInline.dataList.length > 1" @click="deleteClick(index)"
type="minus-circle"/> type="minus-circle"/>
</div> </div>
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required">*</span> <span class="Required">*</span>
<span class="title-text-text" :title="$t('category')">{{$t('category')}}</span> <span class="title-text-text" :title="$t('category')">{{$t('category')}}</span>
</div> </div>
<a-form-model-item class="itemModel" <a-form-model-item class="itemModel"
:prop="'dataList.'+index+'.category'" :prop="'dataList.'+index+'.category'"
:rules="[{ required: true, message: $t('category') + $t('cannotEmpty'), trigger: 'blur'}, :rules="[{ required: true, message: $t('category') + $t('cannotEmpty'), trigger: 'blur'},
{max: 300,message: $t('category') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'}]" {max: 300,message: $t('category') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'}]"
> >
<a-input class="box-input" <a-input class="box-input"
v-model="item.category" v-model="item.category"
:placeholder="$t('PleaseEnter')+$t('category')"/> :placeholder="$t('PleaseEnter')+$t('category')"/>
</a-form-model-item> </a-form-model-item>
</div>
</a-col>
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('inspectionItems')">{{$t('inspectionItems')}}</span>
</div> </div>
<a-form-model-item class="itemModel" </a-col>
:prop="'dataList.'+index+'.inspectionItem'" <a-col :span="12">
:rules="[{ required: true, message: $t('inspectionItems') + $t('cannotEmpty'), trigger: 'blur'}, <div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('inspectionItems')">{{$t('inspectionItems')}}</span>
</div>
<a-form-model-item class="itemModel"
:prop="'dataList.'+index+'.inspectionItem'"
:rules="[{ required: true, message: $t('inspectionItems') + $t('cannotEmpty'), trigger: 'blur'},
{max: 300,message: $t('inspectionItems') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'}]" {max: 300,message: $t('inspectionItems') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'}]"
> >
<a-input class="box-input" <a-input class="box-input"
v-model="item.inspectionItem" v-model="item.inspectionItem"
:placeholder="$t('PleaseEnter')+$t('inspectionItems')"/> :placeholder="$t('PleaseEnter')+$t('inspectionItems')"/>
</a-form-model-item> </a-form-model-item>
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('configurationItem')">{{$t('configurationItem')}}</span>
</div> </div>
<a-form-model-item class="itemModel" </a-col>
:prop="'dataList.'+index+'.configItem'" </a-row>
:rules="[{ required: true, message: $t('configurationItem') + $t('cannotEmpty'), trigger: 'blur'}, <a-row :gutter="24">
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('configurationItem')">{{$t('configurationItem')}}</span>
</div>
<a-form-model-item class="itemModel"
:prop="'dataList.'+index+'.configItem'"
:rules="[{ required: true, message: $t('configurationItem') + $t('cannotEmpty'), trigger: 'blur'},
{max: 300,message: $t('configurationItem') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur' {max: 300,message: $t('configurationItem') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
}]"> }]">
<a-input class="box-input" <a-input class="box-input"
v-model="item.configItem" v-model="item.configItem"
:placeholder="$t('PleaseEnter')+$t('configurationItem')"/> :placeholder="$t('PleaseEnter')+$t('configurationItem')"/>
</a-form-model-item> </a-form-model-item>
</div>
</a-col>
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
</div> </div>
<a-form-model-item class="itemModel" </a-col>
:prop="'dataList.'+index+'.deliverableType'" <a-col :span="12">
:rules="[{ required: true, message: $t('typeOfDeliverables') + $t('cannotEmpty'), trigger: 'change'},]" <div class="box-title-text">
> <div class="title-text">
<a-tree-select <span class="Required">*</span>
tree-node-filter-prop="title" <span class="title-text-text" :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
v-model="item.deliverableType" </div>
:maxTagCount="1" <a-form-model-item class="itemModel"
:getPopupContainer="triggerNode=> triggerNode.parentNode" :prop="'dataList.'+index+'.deliverableType'"
class="box-input" :rules="[{ required: true, message: $t('typeOfDeliverables') + $t('cannotEmpty'), trigger: 'change'},]"
style="width: 100%" >
:tree-data="DeliverableTreeList" <a-tree-select
:placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')" tree-node-filter-prop="title"
/> v-model="item.deliverableType"
</a-form-model-item> :maxTagCount="1"
</div> :getPopupContainer="triggerNode=> triggerNode.parentNode"
</a-col> class="box-input"
</a-row> style="width: 100%"
:tree-data="DeliverableTreeList"
:placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
/>
</a-form-model-item>
</div>
</a-col>
</a-row>
</div> </div>
</a-form-model> </a-form-model>
</a-spin> </a-spin>
<div class="drawer-bootom-button"> <div class="drawer-bootom-button">
<a-button style="margin-right: .8rem" @click="handleCancel">{{$t('cancel')}}</a-button> <a-button style="margin-right: .8rem" @click="handleCancel">{{$t('cancel')}}</a-button>
<a-button type="primary" @click="handleSubmit" :loading="confirmLoading">{{$t('submit')}}</a-button> <a-button type="primary" @click="handleSubmit" :loading="confirmLoading">{{$t('submit')}}</a-button>
</div> </div>
</a-drawer> </a-drawer>
<codeNumber ref="codeNumber" @regulation="regulation" />
</div>
</template> </template>
<script> <script>
@@ -188,7 +196,7 @@ export default {
{ {
required: true, required: true,
message: 'WVTA ID' + this.$t('regulationNo'), message: 'WVTA ID' + this.$t('regulationNo'),
trigger: 'change' trigger: 'blur'
}, },
{ {
max: 300, max: 300,
@@ -209,14 +217,21 @@ export default {
this.visible = true this.visible = true
this.formInline = {} this.formInline = {}
this.formInline.dataList = [{}] this.formInline.dataList = [{}]
this.formInline = { ...this.formInline }
this.$nextTick(() => { this.$nextTick(() => {
this.formInline = { ...this.formInline }
this.$refs.ruleForm.clearValidate() this.$refs.ruleForm.clearValidate()
this.$refs.codeNumber.number()
}) })
}, },
handleCancel() { handleCancel() {
this.visible = false this.visible = false
}, },
handleInput(value) {
this.$nextTick(() => {
this.formInline = { ...this.formInline }
this.$refs.ruleForm.validateField([value])
})
},
handleSubmit() { handleSubmit() {
this.$refs.ruleForm.validate(valid => { this.$refs.ruleForm.validate(valid => {
if (valid) { if (valid) {
@@ -274,9 +289,16 @@ export default {
} }
}) })
}, },
serialNumberClick(){
this.$refs.codeNumber.add()
},
regulation(item,data) { regulation(item,data) {
this.formInline.serialNumber = item this.formInline.serialNumber = item
this.formInline.bussDocumentLibraryId = data this.formInline.bussDocumentLibraryId = data
this.$nextTick(()=>{
this.formInline = {... this.formInline}
this.$refs.ruleForm.validateField(['serialNumber'])
})
} }
} }
} }
jero-web/src/views/virtualAuthenticationList/components/batSetting.vue
+2
View File
@@ -82,8 +82,10 @@ export default {
}, },
handleOk() { handleOk() {
if (this.formInline.dutyTerritory) { if (this.formInline.dutyTerritory) {
this.formInline.authDummyInventoryBaseId = this.$route.query.id
this.handleOnTwo() this.handleOnTwo()
} else { } else {
this.formInline.authDummyInventoryBaseId = this.$route.query.id
this.handleOkOne() this.handleOkOne()
} }
}, },
jero-web/src/views/virtualAuthenticationList/components/codeNumber.vue
+10 -8
View File
@@ -1,9 +1,9 @@
<template> <template>
<div> <div>
<a-input allowClear <!-- <a-input allowClear-->
@click="add" <!-- @click="add"-->
:placeholder="$t('PleaseSelect')+$t('regulationNo')" <!-- :placeholder="$t('PleaseSelect')+$t('regulationNo')"-->
v-model="regulation"></a-input> <!-- v-model="regulation"></a-input>-->
<a-drawer <a-drawer
:title="$t('regulationNo')" :title="$t('regulationNo')"
:width="1000" :width="1000"
@@ -204,6 +204,9 @@ export default {
this.replacePage() this.replacePage()
this.queryConditionInventory() this.queryConditionInventory()
}, },
// number() {
// this.regulation = ''
// },
searchQuery() { searchQuery() {
this.pageNo = 1 this.pageNo = 1
this.replacePage() this.replacePage()
@@ -284,12 +287,11 @@ export default {
this.confirmLoading = true this.confirmLoading = true
let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
if (this.selectedRowKeys.length < 2){ if (this.selectedRowKeys.length < 2){
let fgid = '' let fgid = this.selectedRowList[0].id
this.fgid = this.selectedRowList[0].id let regulationIndex = this.selectedRowList[0].serial_number
this.regulation = this.selectedRowList[0].serial_number
this.confirmLoading = false this.confirmLoading = false
this.visible = false this.visible = false
this.$emit('regulation',this.regulation,this.fgid) this.$emit('regulation',regulationIndex,fgid)
} else { } else {
this.$message.warning(this.$t('OnlyOneSelected')) this.$message.warning(this.$t('OnlyOneSelected'))
this.confirmLoading = false this.confirmLoading = false
jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
+4
View File
@@ -400,6 +400,7 @@ export default {
created() { created() {
if (this.$route.query.title == '虚拟认证清单详情') { if (this.$route.query.title == '虚拟认证清单详情') {
document.title = this.$t('virtualAuthenticationListDetails') document.title = this.$t('virtualAuthenticationListDetails')
this.columns.splice(7,1)
} else { } else {
document.title = this.$t('certificationListMaintenance') document.title = this.$t('certificationListMaintenance')
} }
@@ -716,4 +717,7 @@ export default {
color: #000F16; color: #000F16;
} }
::v-deep .ant-table-placeholder {
margin-top: 8px!important;
}
</style> </style>