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:
zyx.net
2023-03-28 11:02:17 +08:00
parent 2396354595 07cc484331
commit 69ceffa1a8
19 changed files with 208 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+3
View File
@@ -1727,4 +1727,7 @@ module.exports = {
notetwo:'\n1. Provide the modified or expanded batch of "Announcement" and supporting materials;\n2. Verification materials shall be submitted to ensure that products meet the relevant requirements of national laws and regulations, technologies, standards and technical specifications;\n', notetwo:'\n1. Provide the modified or expanded batch of "Announcement" and supporting materials;\n2. Verification materials shall be submitted to ensure that products meet the relevant requirements of national laws and regulations, technologies, standards and technical specifications;\n',
notethree:'Provide supporting materials', notethree:'Provide supporting materials',
verifyComplianceConfirmReturnReason:'Verify compliance Confirm return reason', verifyComplianceConfirmReturnReason:'Verify compliance Confirm return reason',
theDeliverablesCannotReferencedPleaseReselect:'The deliverables of this project cannot be referenced, please reselect',
regulationListModuleMaintenance:'Regulation list module maintenance',
regulationListModule:'Regulation list module',
} }
jero-web/src/common/lang/zh-cn.js
+3
View File
@@ -1829,4 +1829,7 @@ module.exports = {
notetwo:'\n1、提供变更或扩展后的《公告》批次及证明材料;\n2、应提交验证材料，保障产品符合国家法律法规、技术、标准及技术规范等相关要求;\n', notetwo:'\n1、提供变更或扩展后的《公告》批次及证明材料;\n2、应提交验证材料，保障产品符合国家法律法规、技术、标准及技术规范等相关要求;\n',
notethree:'\n提供证明材料\n', notethree:'\n提供证明材料\n',
verifyComplianceConfirmReturnReason:'验证符合性确认退回原因', verifyComplianceConfirmReturnReason:'验证符合性确认退回原因',
theDeliverablesCannotReferencedPleaseReselect:'不能引用本项目的交付物，请重新选择',
regulationListModuleMaintenance:'法规清单模块维护',
regulationListModule:'法规清单模块',
} }
jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+3 -3
View File
@@ -6,7 +6,7 @@
<!-- <a-icon @click="iconClick" type="arrow-left" style="margin-right: 6px;font-size: 26px;"/>--> <!-- <a-icon @click="iconClick" type="arrow-left" style="margin-right: 6px;font-size: 26px;"/>-->
<!-- </span>--> <!-- </span>-->
<span> <span>
{{isTrue ? $t('maintainVirtualList'):$t('virtualListDetails')}} {{isTrue ? $t('regulationListModuleMaintenance'):$t('regulationListModuleMaintenance')}}
</span> </span>
</div> </div>
<div class="Virtual-detail-right"> <div class="Virtual-detail-right">
@@ -23,8 +23,8 @@
<div class="Virtual-detail-content"> <div class="Virtual-detail-content">
<div class="box-title-text-add"> <div class="box-title-text-add">
<div class="title-text-add"> <div class="title-text-add">
<span class="text-left" :title="$t('VirtualListName')"> <span class="text-left" :title="$t('regulationListModule')">
{{$t('VirtualListName')}} {{$t('regulationListModule')}}
</span> </span>
<span class="text-right" style="margin-right: 100px" :title="$route.query.name"> <span class="text-right" style="margin-right: 100px" :title="$route.query.name">
{{$route.query.name}} {{$route.query.name}}
jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue
+34 -22
View File
@@ -13,13 +13,13 @@
<a-spin :spinning="confirmLoading"> <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="24"> <a-col :span="20">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="title-text-text" :title="$t ('implementedupgrade')">{{$t('implementedupgrade')}}</span> <span class="title-text-text" :title="$t ('implementedupgrade')">{{$t('implementedupgrade')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="implementedupgrade"> <a-form-model-item class="itemModel" prop="implementedupgrade">
<a-radio-group style="margin-top: 2px" class="box-input" v-model="formInline.implementedupgrade"> <a-radio-group style="margin-top: 2px" class="box-input" v-model="formInline.implementedupgrade" :disabled="disabled">
<a-radio value="0"> <a-radio value="0">
{{$t('yes')}} {{$t('yes')}}
</a-radio> </a-radio>
@@ -27,16 +27,13 @@
{{$t('not')}} {{$t('not')}}
</a-radio> </a-radio>
</a-radio-group> </a-radio-group>
<!-- <j-dict-select-tag class="box-input"-->
<!-- :disabled="disabled"-->
<!-- @input="handleInput('implementedupgrade')"-->
<!-- v-model="formInline.implementedupgrade"-->
<!-- :placeholder="$t('PleaseSelect')+$t('implementedupgrade')"-->
<!-- :type="'select'"-->
<!-- :triggerChange="false" :dictCode="'duty_territory'"/>-->
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
<a-col :span="4" v-if="showButton">
<a-button type="primary" @click="isEdit">编辑</a-button>
</a-col>
</a-row> </a-row>
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :span="24"> <a-col :span="24">
@@ -61,6 +58,7 @@
</div> </div>
<a-form-model-item class="itemModel" prop="VINcodelist"> <a-form-model-item class="itemModel" prop="VINcodelist">
<a-button type="primary" class="button-text" <a-button type="primary" class="button-text"
:disabled="disabled"
@click="clickButtonToUpload('VINcodelist')"> @click="clickButtonToUpload('VINcodelist')">
{{ (formInline.VINcodelist === 'null' || formInline.VINcodelist === '' || {{ (formInline.VINcodelist === 'null' || formInline.VINcodelist === '' ||
formInline.VINcodelist == null) ? $t('clickUpload') : $t('viewUploadedFiles') formInline.VINcodelist == null) ? $t('clickUpload') : $t('viewUploadedFiles')
@@ -76,7 +74,7 @@
{{$t('vehicleshavenotcompletedonlineupgrade')}} {{$t('vehicleshavenotcompletedonlineupgrade')}}
<a-icon class="icon-text" @click="addClick(index)" type="plus-circle"/> <a-icon class="icon-text" @click="addClick(index)" type="plus-circle"/>
<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" :disabled="disabled"/>
</div> </div>
<div style='margin-left: 25px'> <div style='margin-left: 25px'>
<a-row :gutter="24"> <a-row :gutter="24">
@@ -87,6 +85,7 @@
</div> </div>
<a-form-model-item class="itemModel"> <a-form-model-item class="itemModel">
<a-input class="box-input" <a-input class="box-input"
:disabled="disabled"
v-model="item.cause" v-model="item.cause"
:placeholder="$t('PleaseEnter')+$t('cause')"/> :placeholder="$t('PleaseEnter')+$t('cause')"/>
</a-form-model-item> </a-form-model-item>
@@ -102,6 +101,7 @@
<!-- {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-form-model-item class="itemModel"> <a-form-model-item class="itemModel">
<a-input class="box-input" <a-input class="box-input"
:disabled="disabled"
v-model="item.Quantity" v-model="item.Quantity"
:placeholder="$t('PleaseEnter')+$t('Quantity')"/> :placeholder="$t('PleaseEnter')+$t('Quantity')"/>
</a-form-model-item> </a-form-model-item>
@@ -119,6 +119,7 @@
<!-- {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-form-model-item class="itemModel"> <a-form-model-item class="itemModel">
<a-button type="primary" class="button-text" <a-button type="primary" class="button-text"
:disabled="disabled"
@click="clickButtonToUpload('VINcodelist')"> @click="clickButtonToUpload('VINcodelist')">
{{ (formInline.VINcodelist === 'null' || formInline.VINcodelist === '' || {{ (formInline.VINcodelist === 'null' || formInline.VINcodelist === '' ||
formInline.VINcodelist == null) ? $t('clickUpload') : $t('viewUploadedFiles') formInline.VINcodelist == null) ? $t('clickUpload') : $t('viewUploadedFiles')
@@ -140,6 +141,7 @@
</div> </div>
<a-form-model-item class="itemModel" prop="implementationrecords"> <a-form-model-item class="itemModel" prop="implementationrecords">
<a-textarea :placeholder="$t('pleaseEnter')+$t('implementationrecords')" <a-textarea :placeholder="$t('pleaseEnter')+$t('implementationrecords')"
:disabled="disabled"
:rows="2" v-model="formInline.remarks"/> :rows="2" v-model="formInline.remarks"/>
</a-form-model-item> </a-form-model-item>
</div> </div>
@@ -182,7 +184,6 @@ import { mapGetters } from 'vuex'
export default { export default {
name:"addModel", name:"addModel",
props: ['url'],
components:{ components:{
uploadFile uploadFile
}, },
@@ -190,6 +191,7 @@ export default {
return { return {
visible: false, visible: false,
disabled: false, disabled: false,
showButton:false,
formInline: {}, formInline: {},
confirmLoading: false, confirmLoading: false,
acceptcode:'', acceptcode:'',
@@ -223,6 +225,9 @@ export default {
} }
], ],
}, },
url:{
addModel:''
}
} }
}, },
mounted() { mounted() {
@@ -230,14 +235,17 @@ export default {
}, },
methods: { methods: {
...mapGetters(['userInfo']), ...mapGetters(['userInfo']),
addModel() { addModel(flag) {
if(flag=='1')
this.disabled=true
this.showButton=true
this.visible = true this.visible = true
this.formInline = {} this.formInline = {}
this.formInline.dataList = [{}] this.formInline.dataList = [{}]
this.$nextTick(() => { this.$nextTick(() => {
this.formInline = { ...this.formInline } this.formInline = { ...this.formInline }
this.$refs.ruleForm.clearValidate() this.$refs.ruleForm.clearValidate()
this.$refs.codeNumber.number() // this.$refs.codeNumber.number()
}) })
}, },
handleCancel() { handleCancel() {
@@ -255,17 +263,18 @@ export default {
this.formInline.authDummyInventoryBaseId = this.$route.query.id this.formInline.authDummyInventoryBaseId = this.$route.query.id
let query = JSON.parse(JSON.stringify(this.formInline)) let query = JSON.parse(JSON.stringify(this.formInline))
this.confirmLoading = true this.confirmLoading = true
postAction(this.url.addModel, query).then((res) => { // postAction(this.url.addModel, query).then((res) => {
if (res.success) { // if (res.success) {
this.confirmLoading = false // this.confirmLoading = false
this.$message.success(this.$t('OperationSuccessful')) // this.$message.success(this.$t('OperationSuccessful'))
// } else {
// this.$message.warning(res.message)
// this.confirmLoading = false
// }
// })
this.visible = false this.visible = false
this.$emit('addModelList') this.$emit('addModelList')
} else {
this.$message.warning(res.message)
this.confirmLoading = false
}
})
} }
}) })
}, },
@@ -334,6 +343,9 @@ export default {
this.formInline[this.uploadName] = attIdList.join(',') this.formInline[this.uploadName] = attIdList.join(',')
this.formInline = { ...this.formInline } this.formInline = { ...this.formInline }
}, },
isEdit(){
this.disabled=false
}
} }
} }
</script> </script>
jero-web/src/views/otamanagement/upgradeactivity/index.vue
+12 -5
View File
@@ -141,8 +141,11 @@
@click="detailclick(record)">{{$t('See')}}</a> @click="detailclick(record)">{{$t('See')}}</a>
<a class="text-operation" <a class="text-operation"
@click="maintenanceClick(record)">{{$t('maintenance')}}</a> @click="maintenanceClick(record)">{{$t('maintenance')}}</a>
<a class="text-operation" <a class="text-operation"
@click="endUpgrade(record)">{{$t('endUpgrade')}}</a> @click="endUpgrade(record , '0')" v-if="!onShow">{{$t('endUpgrade')}}</a>
<a class="text-operation"
@click="endUpgrade(record , '1')" v-if="onShow">{{$t('upgradecompletion')}}</a>
<a class="text-operation" <a class="text-operation"
@click="handleExport(record)">{{$t('export')}}</a> @click="handleExport(record)">{{$t('export')}}</a>
<a class="text-operation" <a class="text-operation"
@@ -164,7 +167,7 @@
</div> </div>
</div> </div>
<maintenance @getList="getList" ref="maintenanceRef"/> <maintenance @getList="getList" ref="maintenanceRef"/>
<upgradecompletion ref="upgradecompletionRef"/> <upgradecompletion ref="upgradecompletionRef" @addModelList="addModelList"/>
</a-card> </a-card>
</template> </template>
@@ -306,7 +309,8 @@ export default {
} }
], ],
userInfoQuery: {}, userInfoQuery: {},
administrators: false administrators: false,
onShow:false
} }
}, },
mounted() { mounted() {
@@ -440,8 +444,8 @@ export default {
downloadFile(this.url.exportData, text + '.xls', query, this.Deselect) downloadFile(this.url.exportData, text + '.xls', query, this.Deselect)
}, },
// 结束升级 // 结束升级
endUpgrade(){ endUpgrade(record,flag){
this.$refs.upgradecompletionRef.addModel() this.$refs.upgradecompletionRef.addModel(flag)
}, },
// 查看 // 查看
detailclick(){ detailclick(){
@@ -464,6 +468,9 @@ export default {
handleModule(){ handleModule(){
downloadFile('params/paramsInfo/exportTemplate', this.$t('parameterTemplateExportName') + '.xlsx', {}) downloadFile('params/paramsInfo/exportTemplate', this.$t('parameterTemplateExportName') + '.xlsx', {})
}, },
addModelList(){
this.onShow=true
}
} }
} }
</script> </script>
jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue
+12 -10
View File
@@ -23,25 +23,25 @@
style="margin-bottom: 20px" style="margin-bottom: 20px"
> >
<span slot="functionname" slot-scope="text,record"> <span slot="functionname" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" :title="$t('ifNot')" v-model="record.gnmc"></a-input> <a-input :placeholder="$t('pleaseEnter')" :title="$t('ifNot')" v-model="record.gnmc" :max-length="50"></a-input>
</span> </span>
<span slot="upgradedestinationype" slot-scope="text,record"> <span slot="upgradedestinationype" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" :title="$t('ifNot')" v-model="record.sjmdlx"></a-input> <a-input :placeholder="$t('pleaseEnter')" :title="$t('ifNot')" v-model="record.sjmdlx" :max-length="50"></a-input>
</span> </span>
<span slot="preupgrade" slot-scope="text,record"> <span slot="preupgrade" slot-scope="text,record">
<a-input :placeholder="$t('ifNot')" :title="$t('ifNot')" v-model="record.sjqbgcs"></a-input> <a-input :placeholder="$t('ifNot')" :title="$t('ifNot')" v-model="record.sjqbgcs" :max-length="500"></a-input>
</span> </span>
<span slot="afterupgrade" slot-scope="text,record"> <span slot="afterupgrade" slot-scope="text,record">
<a-input :placeholder="$t('ifNot')" :title="$t('ifNot')" v-model="record.sjhbgcs"></a-input> <a-input :placeholder="$t('ifNot')" :title="$t('ifNot')" v-model="record.sjhbgcs":max-length="500"></a-input>
</span> </span>
<span slot="functionalchangedescription" slot-scope="text,record"> <span slot="functionalchangedescription" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.gnbgms" ></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.gnbgms" :max-length="500"></a-input>
</span> </span>
<span slot="variationofapplicableconditions" slot-scope="text,record"> <span slot="variationofapplicableconditions" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" :title="$t('ifNot')" v-model="record.sytjbg"></a-input> <a-input :placeholder="$t('pleaseEnter')" :title="$t('ifNot')" v-model="record.sytjbg" :max-length="500"></a-input>
</span> </span>
<span slot="upgradetheelectroniccontrollerinvolved" slot-scope="text,record"> <span slot="upgradetheelectroniccontrollerinvolved" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" :title="$t('ifNot')" v-model="record.sjsjkzq"></a-input> <a-input :placeholder="$t('pleaseEnter')" :title="$t('ifNot')" v-model="record.sjsjkzq" :max-length="500"></a-input>
</span> </span>
@@ -225,9 +225,11 @@ export default {
}) })
}, },
save(){ save(){
postAction('/ota/otaBaSjSjfzbh/add' ,{otaId:localStorage.getItem('otaId')== undefined ? '' :localStorage.getItem('otaId'),list:this.dataSource,fj:this.fileList}).then(res=>{ postAction('/ota/otaBaSjSjfzbh/add' ,{otaId:localStorage.getItem('otaId')== undefined ? '' :localStorage.getItem('otaId'),list:this.dataSource}).then(res=>{
console.log(res); if(res.code==200){
this.$message.success(this.$t('SavedSuccessfully')) this.$message.success(this.$t('SavedSuccessfully'))
this.getData()
}
}) })
}, },
uploadSuccess(data) { uploadSuccess(data) {
jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue
+6 -3
View File
@@ -12,7 +12,8 @@
<a-form-model-item class="itemModel" prop="dutyTerritory"> <a-form-model-item class="itemModel" prop="dutyTerritory">
<a-input <a-input
:placeholder="$t('pleaseEnter')" :placeholder="$t('pleaseEnter')"
v-model.trim="queryParam.rwmc"></a-input> v-model.trim="queryParam.rwmc"
:max-length="500"></a-input>
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
@@ -108,8 +109,10 @@ export default {
} }
this.queryParam.otaId = otaId this.queryParam.otaId = otaId
postAction('/ota/otaBaSjQtsjxx/add' ,this.queryParam).then(res=>{ postAction('/ota/otaBaSjQtsjxx/add' ,this.queryParam).then(res=>{
this.$message.success(this.$t('SavedSuccessfully')) if(res.code==200){
console.log(res); this.$message.success(this.$t('SavedSuccessfully'))
this.getData()
}
}) })
}, },
jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue
+5 -1
View File
@@ -54,7 +54,8 @@
<a-form-model-item class="itemModel" prop="VINcodelist"> <a-form-model-item class="itemModel" prop="VINcodelist">
<a-textarea :placeholder="$t('pleaseEnter')+$t('VINcodelist')" <a-textarea :placeholder="$t('pleaseEnter')+$t('VINcodelist')"
v-model="formInline.vinList" v-model="formInline.vinList"
:rows="4"/> :rows="4"
:max-length="500"/>
</a-form-model-item> </a-form-model-item>
<!-- <a-form-model-item class="itemModel" prop="VINcodelist">--> <!-- <a-form-model-item class="itemModel" prop="VINcodelist">-->
<!-- <a-button type="primary" class="button-text"--> <!-- <a-button type="primary" class="button-text"-->
@@ -164,7 +165,10 @@ export default {
obj.vinList = this.formInline.vinList obj.vinList = this.formInline.vinList
postAction('/ota/otaBaSjSjmbcl/add',obj).then(res=>{ postAction('/ota/otaBaSjSjmbcl/add',obj).then(res=>{
if(res.code==200){
this.$message.success(this.$t('SavedSuccessfully')) this.$message.success(this.$t('SavedSuccessfully'))
this.getData()
}
}) })
}, },
next(){ next(){
jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue
+14 -12
View File
@@ -23,39 +23,39 @@
style="margin-bottom: 20px" style="margin-bottom: 20px"
> >
<span slot="systemname" slot-scope="text,record"> <span slot="systemname" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.xtmc"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.xtmc" :max-length="50"></a-input>
</span> </span>
<!-- 升级前--> <!-- 升级前-->
<span slot="preupgrade" slot-scope="text,record"> <span slot="preupgrade" slot-scope="text,record">
<a-input :placeholder="$t('ifNot')" :title="$t('ifNot')" v-model="record.sjqbgcs"></a-input> <a-input :placeholder="$t('ifNot')" :title="$t('ifNot')" v-model="record.sjqbgcs" :max-length="500"></a-input>
</span> </span>
<!-- 升级后--> <!-- 升级后-->
<span slot="afterupgrade" slot-scope="text,record"> <span slot="afterupgrade" slot-scope="text,record">
<a-input :placeholder="$t('ifNot')" :title="$t('ifNot')" v-model="record.sjhbgcs"></a-input> <a-input :placeholder="$t('ifNot')" :title="$t('ifNot')" v-model="record.sjhbgcs" :max-length="500"></a-input>
</span> </span>
<span slot="nameoftheupgradedelectroniccontroller" slot-scope="text,record"> <span slot="nameoftheupgradedelectroniccontroller" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.sjkzqmc" ></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.sjkzqmc" :max-length="50"></a-input>
</span> </span>
<span slot="adaptivehardwareversion" slot-scope="text,record"> <span slot="adaptivehardwareversion" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.yjbb"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.yjbb" :max-length="50"></a-input>
</span> </span>
<span slot="beforethesoftwareversionupgraded" slot-scope="text,record"> <span slot="beforethesoftwareversionupgraded" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.sjqrjbb" ></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.sjqrjbb" :max-length="50"></a-input>
</span> </span>
<span slot="afterthesoftwareversionupgraded" slot-scope="text,record"> <span slot="afterthesoftwareversionupgraded" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.sjhrjbb"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.sjhrjbb" :max-length="50"></a-input>
</span> </span>
<span slot="beforetheOSversionupgraded" slot-scope="text,record"> <span slot="beforetheOSversionupgraded" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.sjqczxt"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.sjqczxt" :max-length="50"></a-input>
</span> </span>
<span slot="aftertheoperatingsystemversionupgraded" slot-scope="text,record"> <span slot="aftertheoperatingsystemversionupgraded" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.sjhczxt"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.sjhczxt" :max-length="50"></a-input>
</span> </span>
<span slot="upgradepackageintegrityverificationdata" slot-scope="text,record"> <span slot="upgradepackageintegrityverificationdata" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.sjbyzsj" ></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.sjbyzsj" :max-length="500"></a-input>
</span> </span>
<span slot="upgradepackagesize" slot-scope="text,record"> <span slot="upgradepackagesize" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.sjbdx"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.sjbdx" :max-length="50"></a-input>
</span> </span>
<span slot="differentialupgradeornot" slot-scope="text,record"> <span slot="differentialupgradeornot" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.sfcfsj"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.sfcfsj"></a-input>
@@ -290,8 +290,10 @@ export default {
}, },
save(){ save(){
postAction('/ota/otaBaSjSjxtbh/add' ,{otaId:localStorage.getItem('otaId')== undefined ? '' :localStorage.getItem('otaId'),list:this.dataSource}).then(res=>{ postAction('/ota/otaBaSjSjxtbh/add' ,{otaId:localStorage.getItem('otaId')== undefined ? '' :localStorage.getItem('otaId'),list:this.dataSource}).then(res=>{
console.log(res); if(res.code==200){
this.$message.success(this.$t('SavedSuccessfully')) this.$message.success(this.$t('SavedSuccessfully'))
this.getData()
}
}) })
}, },
last(){ last(){
jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
+4 -2
View File
@@ -398,8 +398,10 @@ this.$forceUpdate()
} }
this.form.otaId=otaId this.form.otaId=otaId
postAction('/ota/otaBaSjSjyxpg/add',this.form).then(res=>{ postAction('/ota/otaBaSjSjyxpg/add',this.form).then(res=>{
this.$message.success(this.$t('SavedSuccessfully')) if(res.code==200){
console.log(res); this.$message.success(this.$t('SavedSuccessfully'))
this.getData()
}
}) })
}, },
last(){ last(){
jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
+4 -1
View File
@@ -207,8 +207,11 @@ import ImportFile from '@/components/ImportFileData/index'
otaId='' otaId=''
} }
postAction('/ota/otaBaSjSjmbcx/add',{otaId:otaId,...this.form}).then(res=>{ postAction('/ota/otaBaSjSjmbcx/add',{otaId:otaId,...this.form}).then(res=>{
this.$message.success(this.$t('SavedSuccessfully')) if(res.code==200){
localStorage.setItem('otaId', res.result.otaId) localStorage.setItem('otaId', res.result.otaId)
this.$message.success(this.$t('SavedSuccessfully'))
this.getData()
}
}) })
}, },
next(){ next(){
jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue
+10 -2
View File
@@ -22,6 +22,7 @@
<a-form-model-item class="itemModel" prop="sjmd"> <a-form-model-item class="itemModel" prop="sjmd">
<a-input class="box-input" <a-input class="box-input"
:disabled="disabled" :disabled="disabled"
:max-length="500"
v-model='formInline.sjmd' v-model='formInline.sjmd'
:placeholder="$t('pleaseEnter')"></a-input> :placeholder="$t('pleaseEnter')"></a-input>
</a-form-model-item> </a-form-model-item>
@@ -35,6 +36,7 @@
<a-form-model-item class="itemModel" prop="gxbh"> <a-form-model-item class="itemModel" prop="gxbh">
<a-input class="box-input" <a-input class="box-input"
:disabled="disabled" :disabled="disabled"
:max-length="500"
v-model='formInline.gxbh' v-model='formInline.gxbh'
:placeholder="$t('pleaseEnter')"></a-input> :placeholder="$t('pleaseEnter')"></a-input>
</a-form-model-item> </a-form-model-item>
@@ -48,6 +50,7 @@
<a-form-model-item class="itemModel" prop="sjsj"> <a-form-model-item class="itemModel" prop="sjsj">
<a-input class="box-input" <a-input class="box-input"
:disabled="disabled" :disabled="disabled"
:max-length="50"
v-model='formInline.sjsj' v-model='formInline.sjsj'
:placeholder="$t('pleaseEnter')"></a-input> :placeholder="$t('pleaseEnter')"></a-input>
</a-form-model-item> </a-form-model-item>
@@ -61,6 +64,7 @@
<a-form-model-item class="itemModel" prop="sjky"> <a-form-model-item class="itemModel" prop="sjky">
<a-input class="box-input" <a-input class="box-input"
:disabled="disabled" :disabled="disabled"
:max-length="50"
v-model='formInline.sjky' v-model='formInline.sjky'
:placeholder="$t('pleaseEnter')"></a-input> :placeholder="$t('pleaseEnter')"></a-input>
</a-form-model-item> </a-form-model-item>
@@ -74,6 +78,7 @@
<a-form-model-item class="itemModel" prop="sjbkygn"> <a-form-model-item class="itemModel" prop="sjbkygn">
<a-input class="box-input" <a-input class="box-input"
:disabled="disabled" :disabled="disabled"
:max-length="50"
v-model='formInline.sjbkygn' v-model='formInline.sjbkygn'
:placeholder="$t('pleaseEnter')"></a-input> :placeholder="$t('pleaseEnter')"></a-input>
</a-form-model-item> </a-form-model-item>
@@ -87,6 +92,7 @@
<a-form-model-item class="itemModel" prop="zdxx"> <a-form-model-item class="itemModel" prop="zdxx">
<a-input class="box-input" <a-input class="box-input"
:disabled="disabled" :disabled="disabled"
:max-length="500"
v-model='formInline.zdxx' v-model='formInline.zdxx'
:placeholder="$t('pleaseEnter')"></a-input> :placeholder="$t('pleaseEnter')"></a-input>
</a-form-model-item> </a-form-model-item>
@@ -252,8 +258,10 @@ export default {
} }
this.formInline.otaId = otaId this.formInline.otaId = otaId
postAction('/ota/otaBaSjGgnrfs/add' ,this.formInline).then(res=>{ postAction('/ota/otaBaSjGgnrfs/add' ,this.formInline).then(res=>{
this.$message.success(this.$t('SavedSuccessfully')) if(res.code==200){
console.log(res); this.$message.success(this.$t('SavedSuccessfully'))
this.getData()
}
}) })
}, },
jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
+5 -5
View File
@@ -35,7 +35,7 @@
</div> </div>
<a-form-model-item class="itemModel"> <a-form-model-item class="itemModel">
<a-input <a-input
:max-length="500" :max-length="50"
:disabled="disabled" :disabled="disabled"
class="box-input" class="box-input"
:placeholder="$t('pleaseEnter')" :placeholder="$t('pleaseEnter')"
@@ -53,7 +53,7 @@
<a-form-model-item class="itemModel" prop="djbh"> <a-form-model-item class="itemModel" prop="djbh">
<a-input <a-input
:max-length="500" :max-length="50"
:disabled="disabled" :disabled="disabled"
class="box-input" class="box-input"
:placeholder="$t('pleaseEnter')" :placeholder="$t('pleaseEnter')"
@@ -102,7 +102,7 @@
</div> </div>
<a-form-model-item class="itemModel"> <a-form-model-item class="itemModel">
<a-input <a-input
:max-length="500" :max-length="50"
:disabled="disabled" :disabled="disabled"
class="box-input" class="box-input"
:placeholder="$t('pleaseEnter')" :placeholder="$t('pleaseEnter')"
@@ -118,7 +118,7 @@
</div> </div>
<a-form-model-item class="itemModel"> <a-form-model-item class="itemModel">
<a-input <a-input
:max-length="500" :max-length="50"
:disabled="disabled" :disabled="disabled"
class="box-input" class="box-input"
:placeholder="$t('pleaseEnter')" :placeholder="$t('pleaseEnter')"
@@ -135,7 +135,7 @@
</div> </div>
<a-form-model-item class="itemModel"> <a-form-model-item class="itemModel">
<a-input <a-input
:max-length="500" :max-length="50"
:disabled="disabled" :disabled="disabled"
class="box-input" class="box-input"
:placeholder="$t('pleaseEnter')" :placeholder="$t('pleaseEnter')"
jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
+6 -6
View File
@@ -59,23 +59,23 @@
<a-input :placeholder="$t('ifNot')" :title="record.sytj ? record.sytj:$t('ifNot')" v-model="record.sytj" :max-length="500"></a-input> <a-input :placeholder="$t('ifNot')" :title="record.sytj ? record.sytj:$t('ifNot')" v-model="record.sytj" :max-length="500"></a-input>
</span> </span>
<span slot="functiondeelectronicscription" slot-scope="text,record"> <span slot="functiondeelectronicscription" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.kzqmc" :max-length="500"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.kzqmc" :max-length="50"></a-input>
</span> </span>
<span slot="electroniccontrollerproductionenterprises" slot-scope="text,record"> <span slot="electroniccontrollerproductionenterprises" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.kzqscqy" :max-length="500"> </a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.kzqscqy" :max-length="50"> </a-input>
</span> </span>
<span slot="electroniccontrollertypeone" slot-scope="text,record"> <span slot="electroniccontrollertypeone" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.kzqxh" :max-length="500"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.kzqxh" :max-length="50"></a-input>
</span> </span>
<span slot="hardwareversioninformation" slot-scope="text,record"> <span slot="hardwareversioninformation" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.yjbbxx" :max-length="500"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.yjbbxx" :max-length="50"></a-input>
</span> </span>
<span slot="softwaredevelopmententerprise" slot-scope="text,record"> <span slot="softwaredevelopmententerprise" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.rjkfqy" :max-length="500"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.rjkfqy" :max-length="50"></a-input>
</span> </span>
<span slot="operatingsystemversion" slot-scope="text,record"> <span slot="operatingsystemversion" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.czxtbbh" :max-length="500"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.czxtbbh" :max-length="50"></a-input>
</span> </span>
<span slot="inflammatorydata" slot-scope="text,record"> <span slot="inflammatorydata" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.csyzsj" :max-length="500"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.csyzsj" :max-length="500"></a-input>
jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue
+8 -8
View File
@@ -218,7 +218,7 @@
<div style='width: 700px'> <div style='width: 700px'>
<span class='content-text' style='background: #f3f6f6;line-height: 50px;text-align: center;color: #191E29;font-weight: bold'>{{$t('fillincontent')}}</span> <span class='content-text' style='background: #f3f6f6;line-height: 50px;text-align: center;color: #191E29;font-weight: bold'>{{$t('fillincontent')}}</span>
<span v-for='(item,index) in dataSource' class='content-text'> <span v-for='(item,index) in dataSource' class='content-text'>
<a-input v-model="item.val" class="item-input" :placeholder="item.fillincontent" :max-length="500"/> <a-input v-model="item.val" class="item-input" :placeholder="item.fillincontent" :max-length="50"/>
</span><br> </span><br>
</div> </div>
</div> </div>
@@ -234,7 +234,7 @@
style="margin-bottom: 20px" style="margin-bottom: 20px"
> >
<span slot="componentname" slot-scope="text,record"> <span slot="componentname" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.bjmc" :max-length="500"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.bjmc" :max-length="50"></a-input>
</span> </span>
<!-- 可升级--> <!-- 可升级-->
<span slot="systemclass" slot-scope="text,record" > <span slot="systemclass" slot-scope="text,record" >
@@ -244,22 +244,22 @@
</a-radio-group> </a-radio-group>
</span> </span>
<span slot="controllername" slot-scope="text,record"> <span slot="controllername" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.kzqmc" :max-length="500"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.kzqmc" :max-length="50"></a-input>
</span> </span>
<span slot="hardwarespecificationmodel" slot-scope="text,record"> <span slot="hardwarespecificationmodel" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.yjggxh" :max-length="500"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.yjggxh" :max-length="50"></a-input>
</span> </span>
<span slot="hardwaremanufacturer" slot-scope="text,record"> <span slot="hardwaremanufacturer" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.yjscqy" :max-length="500"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.yjscqy" :max-length="50"></a-input>
</span> </span>
<span slot="softwareversion" slot-scope="text,record"> <span slot="softwareversion" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.rjbb" :max-length="500"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.rjbb" :max-length="50"></a-input>
</span> </span>
<span slot="softwaredevelopmententerprise" slot-scope="text,record"> <span slot="softwaredevelopmententerprise" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.rjkfqy" :max-length="500"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.rjkfqy" :max-length="50"></a-input>
</span> </span>
<span slot="layoutposition" slot-scope="text,record"> <span slot="layoutposition" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.bzwz" :max-length="500"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.bzwz" :max-length="50"></a-input>
</span> </span>
<!-- 操作列--> <!-- 操作列-->
<span slot="operation" slot-scope="text,record"> <span slot="operation" slot-scope="text,record">
jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue
+10 -10
View File
@@ -43,37 +43,37 @@
</a-button> </a-button>
</span> </span>
<span slot="electronicController" slot-scope="text,record"> <span slot="electronicController" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.kzqmc" :max-length="500"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.kzqmc" :max-length="50"></a-input>
</span> </span>
<span slot="electroniccontrollername" slot-scope="text,record"> <span slot="electroniccontrollername" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.aqwzxdj" :max-length="500"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.aqwzxdj" :max-length="50"></a-input>
</span> </span>
<span slot="electroniccontrollerproductionenterprises" slot-scope="text,record"> <span slot="electroniccontrollerproductionenterprises" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.kzqscqy" :max-length="500"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.kzqscqy" :max-length="50"></a-input>
</span> </span>
<span slot="electroniccontrollertype" slot-scope="text,record"> <span slot="electroniccontrollertype" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.kzqxh" :max-length="500"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.kzqxh" :max-length="50"></a-input>
</span> </span>
<span slot="hardwareversioninformation" slot-scope="text,record"> <span slot="hardwareversioninformation" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.yjbbxx" :max-length="500"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.yjbbxx" :max-length="50"></a-input>
</span> </span>
<span slot="initialsoftwareversionnumber" slot-scope="text,record"> <span slot="initialsoftwareversionnumber" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.csrjbbh" :max-length="500"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.csrjbbh" :max-length="50"></a-input>
</span> </span>
<span slot="initialpackageforintegrityinflammatorydata" slot-scope="text,record"> <span slot="initialpackageforintegrityinflammatorydata" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.csrjbwzsj" :max-length="500"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.csrjbwzsj" :max-length="500"></a-input>
</span> </span>
<span slot="environmentalprotection" slot-scope="text,record"> <span slot="environmentalprotection" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.sjsfyx" :max-length="500"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.sjsfyx" :max-length="50"></a-input>
</span> </span>
<span slot="operatingsystemtype" slot-scope="text,record"> <span slot="operatingsystemtype" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.czxtlx" :max-length="500"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.czxtlx" :max-length="50"></a-input>
</span> </span>
<span slot="operatingsystemmanufacturer" slot-scope="text,record"> <span slot="operatingsystemmanufacturer" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.czxtscqy" :max-length="500"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.czxtscqy" :max-length="50"></a-input>
</span> </span>
<span slot="operatingsystemversion" slot-scope="text,record"> <span slot="operatingsystemversion" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.czxtbbh" :max-length="500"></a-input> <a-input :placeholder="$t('pleaseEnter')" v-model="record.czxtbbh" :max-length="50"></a-input>
</span> </span>
<!-- 操作列--> <!-- 操作列-->
<span slot="operation" slot-scope="text,record" > <span slot="operation" slot-scope="text,record" >
jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue
+18 -3
View File
@@ -96,16 +96,18 @@
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
total: 0, total: 0,
ids: '' ids: '',
detailedWarningList: []
} }
}, },
mounted() { mounted() {
}, },
methods: { methods: {
transferModel(ids) { transferModel(ids, detailedWarningList) {
this.visible = true this.visible = true
this.queryParam = {} this.queryParam = {}
this.detailedWarningList = detailedWarningList
this.selectedRowKeys = [] this.selectedRowKeys = []
this.ids = ids.join(',') this.ids = ids.join(',')
this.replacePage() this.replacePage()
@@ -154,10 +156,20 @@
handleCancel() { handleCancel() {
this.visible = false this.visible = false
}, },
failedMessageOne(data) {
let detailedWarningList = data
this.$warning({
content: ( < div > { detailedWarningList } < /div>)
})
},
handleSubmit() { handleSubmit() {
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
this.confirmLoading = true
let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
if (selectedRowKeys.join(',') == this.$route.query.id) {
this.$message.warning(this.$t('theDeliverablesCannotReferencedPleaseReselect'))
return
}
this.confirmLoading = true
postAction('/project/projectCertificationInventoryEO/citeDeliverable', { postAction('/project/projectCertificationInventoryEO/citeDeliverable', {
projectCertificationInventoryIds: this.ids, projectCertificationInventoryIds: this.ids,
projectLibraryId: this.$route.query.id, projectLibraryId: this.$route.query.id,
@@ -173,6 +185,9 @@
this.visible = false this.visible = false
this.selectedRowKeys = [] this.selectedRowKeys = []
this.$emit('referenceDeliverablesListForm') this.$emit('referenceDeliverablesListForm')
if (this.detailedWarningList && this.detailedWarningList.length > 0) {
this.failedMessageOne(this.detailedWarningList)
}
} else { } else {
if (res.result) { if (res.result) {
this.$message.warning(res.result) this.$message.warning(res.result)
jero-web/src/views/projectManagement/components/certificationList/index.vue
+46 -12
View File
@@ -78,7 +78,8 @@
</div> </div>
<!-- 保存--> <!-- 保存-->
<div @click="preservationClick(1)" v-if="roleSwitchingCode == 2 || roleSwitchingCode == 0" class="operator-text"> <div @click="preservationClick(1)" v-if="roleSwitchingCode == 2 || roleSwitchingCode == 0"
class="operator-text">
<a-icon type="check-circle"/> <a-icon type="check-circle"/>
{{ $t('preservation') }} {{ $t('preservation') }}
</div> </div>
@@ -687,7 +688,7 @@
title: this.$t('DeliverablesResult'), title: this.$t('DeliverablesResult'),
align: 'left', align: 'left',
dataIndex: 'deliveryResult', dataIndex: 'deliveryResult',
width: 180, width: 210,
ellipsis: true, ellipsis: true,
scopedSlots: { customRender: 'DeliverablesResult' } scopedSlots: { customRender: 'DeliverablesResult' }
}, },
@@ -1406,17 +1407,45 @@
referenceDeliverablesClick() { referenceDeliverablesClick() {
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
let isTrue let isTrue
for (let i = 0; i < this.selectedRowKeysList.length; i++) { let ids = []
if (this.selectedRowKeysList[i].flowStatus == 'Results to be submitted') { let notConditions = []
isTrue = true let notConditionsOne = []
} else { let data = ''
isTrue = false let dataOne = ''
this.$message.warning(this.$t('youCanOnlySelectStatusClearSubmit')) let detailedWarningList= []
return if (this.roleSwitchingCode == 20) {
for (let i = 0; i < this.selectedRowKeysList.length; i++) {
if (this.selectedRowKeysList[i].dutyPersonName == this.userInfo().username) {
if (this.selectedRowKeysList[i].flowStatus == 'Results to be submitted') {
ids.push(this.selectedRowKeysList[i].id)
} else {
notConditions.push(this.selectedRowKeysList[i].inspectionItem)
}
} else {
notConditionsOne.push(this.selectedRowKeysList[i].inspectionItem)
}
}
} else {
for (let i = 0; i < this.selectedRowKeysList.length; i++) {
if (this.selectedRowKeysList[i].flowStatus == 'Results to be submitted') {
ids.push(this.selectedRowKeysList[i].id)
} else {
notConditions.push(this.selectedRowKeysList[i].inspectionItem)
}
} }
} }
if (isTrue) { if (notConditions && notConditions.length > 0) {
this.$refs.referenceDeliverablesListRef.transferModel(JSON.parse(JSON.stringify(this.selectedRowKeys))) data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyDataStatusSubmittedCanBeSelected')
detailedWarningList.push(<div>{data}</div>)
}
if (notConditionsOne && notConditionsOne.length > 0){
dataOne = this.$t('inspectionItems') + '"' + notConditionsOne.join('、')+'"'+this.$t('operationWithoutPermission')
detailedWarningList.push(<div>{dataOne}</div>)
}
if (ids && ids.length > 0) {
this.$refs.referenceDeliverablesListRef.transferModel(ids,detailedWarningList)
} else {
this.failedMessageOne(detailedWarningList)
} }
} else { } else {
this.$message.warning(this.$t('selectLeastOne')) this.$message.warning(this.$t('selectLeastOne'))
@@ -1738,7 +1767,12 @@
content: ( < div > { detailedWarningList } < /div>) content: ( < div > { detailedWarningList } < /div>)
}) })
}, },
failedMessageOne(data) {
let detailedWarningList = data
this.$warning({
content: ( < div > { detailedWarningList } < /div>)
})
},
submitTask(value, prompt, ids, notConditions, data) { submitTask(value, prompt, ids, notConditions, data) {
let _this = this let _this = this
this.$confirm({ this.$confirm({
jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
+5 -5
View File
@@ -310,14 +310,14 @@
title: this.$t('configurationItem'), title: this.$t('configurationItem'),
align: 'left', align: 'left',
dataIndex: 'configItem', dataIndex: 'configItem',
width: 150, width: 200,
ellipsis: true ellipsis: true
}, },
{ {
title: 'WVTA ID', title: 'WVTA ID',
align: 'left', align: 'left',
dataIndex: 'wvtaId', dataIndex: 'wvtaId',
width: 150, width: 200,
ellipsis: true ellipsis: true
}, },
{ {
@@ -338,14 +338,14 @@
title: this.$t('typeOfDeliverables'), title: this.$t('typeOfDeliverables'),
align: 'left', align: 'left',
dataIndex: 'deliverableTypeName', dataIndex: 'deliverableTypeName',
width: 200, width: 330,
ellipsis: true ellipsis: true
}, },
{ {
title: this.$t('operation'), title: this.$t('operation'),
align: 'left', align: 'left',
fixed: 'right', fixed: 'right',
width: 200, width: 250,
scopedSlots: { customRender: 'operation' } scopedSlots: { customRender: 'operation' }
} }
], ],
@@ -544,7 +544,7 @@
</script> </script>
<style lang='less' scoped> <style lang='less' scoped>
@import '~@assets/less/common.less'; @import'~@assets/less/common.less';
.doc-detail { .doc-detail {
background: #fff; background: #fff;