合并分支 'dev_third_stage' 到 'master'
Dev third stage 查看合并请求 laws-nio/laws-weilai!79
This commit is contained in:
+4
-2
@@ -260,9 +260,11 @@
|
||||
this.selectedRowKeys = value
|
||||
if (this.selectedRowKeys.length > 1) {
|
||||
this.selectedRowKeys.shift()
|
||||
record.shift()
|
||||
}
|
||||
this.selectedRowKeysRecord = record
|
||||
this.selectedRowKeysRecord = record.filter(res=>{
|
||||
return res.id == this.selectedRowKeys[0]
|
||||
})
|
||||
this.selectedRowKeysRecord = [...this.selectedRowKeysRecord]
|
||||
},
|
||||
clickButtonToUpload(item) {
|
||||
this.$refs.uploadFile.perentHandleFunc()
|
||||
|
||||
+44
-4
@@ -6,14 +6,42 @@
|
||||
:data-source="dataList"
|
||||
:pagination="false"
|
||||
:loading="loading">
|
||||
|
||||
<span slot="evaluationMethod" slot-scope="text,result">
|
||||
<a-tree-select
|
||||
tree-node-filter-prop="title"
|
||||
v-model="result.evaluationMethods"
|
||||
:maxTagCount="1"
|
||||
:getPopupContainer="triggerNode=> triggerNode.parentNode"
|
||||
class="box-input"
|
||||
style="width: 80%;"
|
||||
:tree-data="gatherResultList"
|
||||
tree-checkable
|
||||
:placeholder="$t('PleaseSelect')+$t('evaluationMethod')"
|
||||
/>
|
||||
</span>
|
||||
<span slot="Assessor" slot-scope="text,result">
|
||||
<PersonnelSelection class="box-input"
|
||||
:personneQuery="result"
|
||||
:query="{db_field_name:'evaluatorIds',db_field_txt:$t('Assessor')}"
|
||||
:isInput="true"
|
||||
@change="PersonnelSelectionChange"
|
||||
v-model="result.evaluatorIdsName"/>
|
||||
</span>
|
||||
<span slot="operation" slot-scope="text,result">
|
||||
<a @click="deleteData(result)">{{$t('delete')}}</a>
|
||||
</span>
|
||||
</a-table>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import PersonnelSelection from '@/components/PersonnelSelection/index'
|
||||
export default {
|
||||
name: 'TermInformation',
|
||||
components:{
|
||||
PersonnelSelection
|
||||
},
|
||||
props:['gatherResultList'],
|
||||
data() {
|
||||
return {
|
||||
columns: [
|
||||
@@ -55,16 +83,28 @@
|
||||
scopedSlots: { customRender: 'operation' }
|
||||
}
|
||||
],
|
||||
dataList: [],
|
||||
dataList: [{}],
|
||||
loading: false
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
},
|
||||
methods: {}
|
||||
methods: {
|
||||
deleteData() {
|
||||
|
||||
},
|
||||
PersonnelSelectionChange(value, id) {
|
||||
this.formInline[value] = id
|
||||
this.formInline = { ...this.formInline }
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
.box-input {
|
||||
display: inline-block;
|
||||
width: 70%;
|
||||
height: 38px;
|
||||
}
|
||||
</style>
|
||||
+72
-50
@@ -42,7 +42,7 @@
|
||||
</div>
|
||||
<div class="title-text-content"
|
||||
:class="{'title-text-content-one':!isTrue}">
|
||||
件大事发的科技示范和的空间是否和是科技示范的空间是多少
|
||||
{{selectedRowKeysRecord[0] ? selectedRowKeysRecord[0].serialNumber :''}}
|
||||
</div>
|
||||
<div class="title-text-right" v-if="isTrue">
|
||||
<span @click="standardDecompositionDocumentClick">
|
||||
@@ -73,13 +73,14 @@
|
||||
<a-col :span="12">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text">
|
||||
<span class="title-text-text" :title="$t('enclosure')">{{$t('enclosure')}}</span>
|
||||
<span class="title-text-text"
|
||||
:title="$t('uploadRelevantMaterials')">{{$t('uploadRelevantMaterials')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel" prop="accessory_id">
|
||||
<a-button type="primary" class="button-text"
|
||||
@click="clickButtonToUpload('accessory_id')">
|
||||
{{ (formInline.accessory_id === 'null' || formInline.accessory_id === '' ||
|
||||
formInline.accessory_id == null) ? $t('clickUpload') : $t('viewUploadedFiles')
|
||||
@click="clickButtonToUpload('relatedDataFileId')">
|
||||
{{ (formInline.relatedDataFileId === 'null' || formInline.relatedDataFileId === '' ||
|
||||
formInline.relatedDataFileId == null) ? $t('clickUpload') : $t('viewUploadedFiles')
|
||||
}}
|
||||
</a-button>
|
||||
</a-form-model-item>
|
||||
@@ -94,7 +95,7 @@
|
||||
</div>
|
||||
<a-form-model-item class="itemModel" prop="taskExplain">
|
||||
<a-textarea :placeholder="$t('pleaseEnter')+$t('processBackground')"
|
||||
v-model="formInline.taskExplain"
|
||||
v-model="formInline.processBackground"
|
||||
:rows="4"/>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
@@ -108,7 +109,7 @@
|
||||
</div>
|
||||
<a-form-model-item class="itemModel" prop="remarks">
|
||||
<a-textarea :placeholder="$t('pleaseEnter')+$t('remarks')"
|
||||
v-model="formInline.remarks"
|
||||
v-model="formInline.remark"
|
||||
:rows="4"/>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
@@ -121,20 +122,18 @@
|
||||
<span class="Required">*</span>
|
||||
<span class="title-text-text" :title="$t('evaluationMethod')">{{$t('evaluationMethod')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel" prop="evaluatorIdsName">
|
||||
<a-select :placeholder="$t('PleaseSelect')+$t('evaluationMethod')"
|
||||
class="box-input"
|
||||
:getPopupContainer="triggerNode=> triggerNode.parentNode"
|
||||
allowClear
|
||||
v-model="formInline.gatherResult">
|
||||
<a-select-option v-for="(item, key) in gatherResultList"
|
||||
:key="key"
|
||||
:value="item.value">
|
||||
<span style="display: inline-block;width: 100%" :title=" item.name">
|
||||
{{ item.name }}
|
||||
</span>
|
||||
</a-select-option>
|
||||
</a-select>
|
||||
<a-form-model-item class="itemModel" prop="gatherResult">
|
||||
<a-tree-select
|
||||
tree-node-filter-prop="title"
|
||||
v-model="formInline.evaluationMethods"
|
||||
:maxTagCount="1"
|
||||
:getPopupContainer="triggerNode=> triggerNode.parentNode"
|
||||
class="box-input"
|
||||
style="width: 100%"
|
||||
:tree-data="gatherResultList"
|
||||
tree-checkable
|
||||
:placeholder="$t('PleaseSelect')+$t('evaluationMethod')"
|
||||
/>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
</a-col>
|
||||
@@ -144,19 +143,19 @@
|
||||
<span class="Required">*</span>
|
||||
<span class="title-text-text" :title="$t('Assessor')">{{$t('Assessor')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel" prop="evaluatorIdsName">
|
||||
<a-form-model-item class="itemModel" prop="evaluatorsName">
|
||||
<PersonnelSelection class="box-input"
|
||||
:personneQuery="formInline"
|
||||
:query="{db_field_name:'evaluatorIds',db_field_txt:$t('Assessor')}"
|
||||
:query="{db_field_name:'evaluators',db_field_txt:$t('Assessor')}"
|
||||
:isInput="true"
|
||||
@change="PersonnelSelectionChange"
|
||||
v-model="formInline.evaluatorIdsName"/>
|
||||
v-model="formInline.evaluatorsName"/>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
</a-col>
|
||||
</a-row>
|
||||
</a-form-model>
|
||||
<TermInformation v-if="isTrue"/>
|
||||
<TermInformation :gatherResultList="gatherResultList" v-if="isTrue"/>
|
||||
<footerProcess
|
||||
@submit="submit"
|
||||
:isSubmit="true"
|
||||
@@ -211,16 +210,7 @@
|
||||
pageSize: 10,
|
||||
pageNo: 1,
|
||||
formInline: {},
|
||||
gatherResultList: [
|
||||
{
|
||||
value: 'Underway',
|
||||
name: this.$t('inProgress')
|
||||
},
|
||||
{
|
||||
value: 'Completed',
|
||||
name: this.$t('Finished')
|
||||
}
|
||||
],
|
||||
gatherResultList: [],
|
||||
rules: {
|
||||
endTime: [
|
||||
{
|
||||
@@ -229,7 +219,7 @@
|
||||
trigger: 'change'
|
||||
}
|
||||
],
|
||||
evaluatorIdsName: [
|
||||
evaluatorsName: [
|
||||
{
|
||||
required: true,
|
||||
message: this.$t('Assessor') + this.$t('cannotEmpty'),
|
||||
@@ -288,6 +278,7 @@
|
||||
mounted() {
|
||||
document.title = this.$t('regulatoryEngineer') + this.$t('initiatingProcess')
|
||||
this.getList()
|
||||
this.getEvaluationMethodTree()
|
||||
if (this.$route.query.whetherTobring == '1') {
|
||||
this.isTrue = true
|
||||
} else {
|
||||
@@ -306,6 +297,15 @@
|
||||
},
|
||||
methods: {
|
||||
...mapGetters(['userInfo']),
|
||||
getEvaluationMethodTree() {
|
||||
getAction('/sys/category/getEvaluationMethodTree').then((res) => {
|
||||
if (res.success) {
|
||||
this.gatherResultList = res.result
|
||||
} else {
|
||||
this.gatherResultList = []
|
||||
}
|
||||
})
|
||||
},
|
||||
pageOnChange(page) {
|
||||
this.pageNo = page
|
||||
this.getList()
|
||||
@@ -336,11 +336,21 @@
|
||||
},
|
||||
onSelectChange(value, record) {
|
||||
this.selectedRowKeys = value
|
||||
this.selectedRowKeysRecord = []
|
||||
if (this.selectedRowKeys.length > 1) {
|
||||
this.selectedRowKeys.shift()
|
||||
record.shift()
|
||||
}
|
||||
this.selectedRowKeysRecord = record
|
||||
let content = record.filter(res => {
|
||||
return res.id == this.selectedRowKeys[0]
|
||||
})
|
||||
if (content && content.length > 0) {
|
||||
this.selectedRowKeysRecord.push({
|
||||
standId: content[0].id,
|
||||
serialNumber: content[0].serial_number,
|
||||
title: content[0].title,
|
||||
technologyTerritory: content[0].technology_territory_id
|
||||
})
|
||||
}
|
||||
},
|
||||
standardDecompositionDocumentClick() {
|
||||
if (this.selectedRowKeysRecord && this.selectedRowKeysRecord.length > 0) {
|
||||
@@ -392,7 +402,7 @@
|
||||
str[0] = str[8] = str[13] = str[18] = str[23] = '-'
|
||||
return str.join('')
|
||||
},
|
||||
submit() {
|
||||
submit(startTime) {
|
||||
this.$refs.ruleForm.validate(valid => {
|
||||
if (valid) {
|
||||
if (this.selectedRowKeysRecord && this.selectedRowKeysRecord.length == 0) {
|
||||
@@ -400,12 +410,20 @@
|
||||
} else {
|
||||
this.JLoading = true
|
||||
let value = Object.assign(this.formInline, this.selectedRowKeysRecord[0])
|
||||
value.standId = value.id
|
||||
if (this.isTrue) {
|
||||
value.evaluationType = 'Item evaluation'
|
||||
} else {
|
||||
value.evaluationType = 'Feedback evaluation'
|
||||
}
|
||||
value.startTime = startTime
|
||||
value.flowStatus = 'Underway'
|
||||
value.taskAffirmDueDate = value.endTime
|
||||
delete value.id
|
||||
value.id = this.getUUID()
|
||||
value.currentUserName = this.userInfo().username
|
||||
value.lawsTechnologyEvaluationId = this.getUUID()
|
||||
value.regulationOwnerId = this.userInfo().id
|
||||
Object.keys(value).forEach(res => {
|
||||
if (value[res] && value[res] instanceof Array) {
|
||||
value[res] = value[res].join(',')
|
||||
}
|
||||
if (value[res] && value[res] instanceof String) {
|
||||
value[res] = value[res].replace(/\"/g, '“')
|
||||
value[res] = value[res].replace(/\'/g, '‘')
|
||||
@@ -418,14 +436,21 @@
|
||||
},
|
||||
startProcess(value) {
|
||||
let query = {
|
||||
type: 5,
|
||||
msg: JSON.stringify(value).replace(/\"/g, '\'')
|
||||
type: 6,
|
||||
...value,
|
||||
msg: JSON.stringify(value.evaluators).replace(/\"/g, '\'')
|
||||
}
|
||||
postAction('/workFlow/startProcess', query).then((res) => {
|
||||
if (res.success) {
|
||||
this.completeTask(value, res.result)
|
||||
this.$message.success(this.$t('OperationSuccessful'))
|
||||
this.JLoading = false
|
||||
this.$router.push({
|
||||
path: '/technologyAssessment'
|
||||
})
|
||||
// this.completeTask(value, res.result)
|
||||
} else {
|
||||
this.JLoading = false
|
||||
this.$message.warning(this.$t('operationFailed'))
|
||||
}
|
||||
})
|
||||
},
|
||||
@@ -437,13 +462,10 @@
|
||||
}
|
||||
postAction('/workFlow/completeTask', query).then((res) => {
|
||||
if (res.success) {
|
||||
// setTimeout(() => {
|
||||
// window.close()
|
||||
// }, 1000)
|
||||
this.$message.success(this.$t('OperationSuccessful'))
|
||||
this.JLoading = false
|
||||
this.$router.push({
|
||||
path: '/collectionOfRegulatoryOpinions'
|
||||
path: '/technologyAssessment'
|
||||
})
|
||||
} else {
|
||||
this.JLoading = false
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
class="box-input"
|
||||
:getPopupContainer="triggerNode=> triggerNode.parentNode"
|
||||
allowClear
|
||||
v-model="queryParam.gatherResult">
|
||||
v-model="queryParam.flowStatus">
|
||||
<a-select-option v-for="(item, key) in gatherResultList"
|
||||
:key="key"
|
||||
:value="item.value">
|
||||
@@ -160,7 +160,7 @@
|
||||
return {
|
||||
//url传参严格按照当前命名
|
||||
url: {
|
||||
list: '',
|
||||
list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/page',
|
||||
getSysCategoryTree: '/sys/category/getSysCategoryTree'
|
||||
},
|
||||
visible: false,
|
||||
@@ -228,14 +228,14 @@
|
||||
align: 'center',
|
||||
width: 170,
|
||||
ellipsis: true,
|
||||
dataIndex: 'evaluationMethod'
|
||||
dataIndex: 'evaluationMethods'
|
||||
},
|
||||
{
|
||||
title: this.$t('ProcessStatus'),
|
||||
align: 'center',
|
||||
width: 170,
|
||||
ellipsis: true,
|
||||
dataIndex: 'ProcessStatus'
|
||||
dataIndex: 'flowStatus'
|
||||
},
|
||||
{
|
||||
title: this.$t('dateOfInitiation'),
|
||||
@@ -256,7 +256,7 @@
|
||||
align: 'center',
|
||||
ellipsis: true,
|
||||
width: 170,
|
||||
dataIndex: 'remarks'
|
||||
dataIndex: 'remark'
|
||||
},
|
||||
{
|
||||
title: this.$t('operation'),
|
||||
@@ -333,13 +333,13 @@
|
||||
this.$refs.ruleForm.validate(valid => {
|
||||
if (valid) {
|
||||
this.visible = false
|
||||
// let newUrl = this.$router.resolve({
|
||||
// path: '/evaluationInitiationProcess',
|
||||
// query: this.formInline
|
||||
// })
|
||||
let newUrl = this.$router.resolve({
|
||||
path: '/evaluationProcess'
|
||||
path: '/evaluationInitiationProcess',
|
||||
query: this.formInline
|
||||
})
|
||||
// let newUrl = this.$router.resolve({
|
||||
// path: '/evaluationProcess'
|
||||
// })
|
||||
window.open(newUrl.href, '_blank')
|
||||
}
|
||||
})
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
<a-col :span="24">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text" :title="$t('configure')">
|
||||
<span class="Required">*</span>
|
||||
<span>{{$t('configure')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel" prop="configIds">
|
||||
@@ -41,14 +42,23 @@
|
||||
<a-col :span="24">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text" :title="$t('CustomTemplateName')">
|
||||
<span class="Required">*</span>
|
||||
<span>{{$t('CustomTemplateName')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel" prop="certCategory">
|
||||
<j-dict-select-tag class="box-input" v-model="formInline.certCategory"
|
||||
:placeholder="$t('PleaseSelect')+$t('CustomTemplateName')"
|
||||
:type="'select'"
|
||||
@input="certCategoryName"
|
||||
:triggerChange="false" :dictCode="'cert_category'"/>
|
||||
<a-form-model-item class="itemModel" prop="exportTemplateId">
|
||||
<a-select v-model="formInline.exportTemplateId" class="box-input" :placeholder="$t('PleaseSelect')+$t('CustomTemplateName')">
|
||||
<a-select-option
|
||||
v-for="mode in exportTemplatetOptions"
|
||||
:key="mode.value"
|
||||
:value="mode.value">
|
||||
{{ mode.label }}
|
||||
</a-select-option>
|
||||
</a-select>
|
||||
<!-- <j-dict-select-tag class="box-input" v-model="formInline.exportTemplateId"-->
|
||||
<!-- :placeholder="$t('PleaseSelect')+$t('CustomTemplateName')"-->
|
||||
<!-- :type="'select'"-->
|
||||
<!-- @input="certCategoryName"-->
|
||||
<!-- :triggerChange="false" :dictCode="'cert_category'"/>-->
|
||||
</a-form-model-item>
|
||||
|
||||
</div>
|
||||
@@ -87,6 +97,7 @@ export default {
|
||||
confirmLoading: false,
|
||||
description:false,
|
||||
dictOptions:[],
|
||||
exportTemplatetOptions:[],
|
||||
visible: false,
|
||||
required:false,
|
||||
disabled:false,
|
||||
@@ -110,8 +121,8 @@ export default {
|
||||
description:[
|
||||
{ min:1, max: 200, message: this.$t('cantExeed')+'200'+this.$t('characters'), trigger: 'blur' },
|
||||
],
|
||||
status: [
|
||||
{ required: true, message: this.$t('PleaseSelect')+this.$t('status'), trigger: 'change' },
|
||||
exportTemplateId: [
|
||||
{ required: true, message: this.$t('PleaseSelect')+this.$t('CustomTemplateName'), trigger: 'change' },
|
||||
],
|
||||
fileConnectId: [
|
||||
{ required: true, message: this.$t('PleaseSelect')+this.$t('attachmentTemplate'), trigger: 'change' },
|
||||
@@ -160,9 +171,9 @@ export default {
|
||||
this.visible = true
|
||||
this.title = this.$t('CustomExport')
|
||||
this.formInline = {}
|
||||
this.formInline.separator = ','
|
||||
this.formInline = {...this.formInline}
|
||||
this.getConfigure()
|
||||
this.getexportTemplateId()
|
||||
|
||||
this.$nextTick(() => {
|
||||
this.$refs['ruleForm'].clearValidate()
|
||||
@@ -172,7 +183,7 @@ export default {
|
||||
let pram = {
|
||||
paramsManifestId: this.$route.query.id
|
||||
}
|
||||
getAction('report/detail/getConfigLabelList', pram).then((res) => {
|
||||
getAction('report/detail/getConfigLabelListCustom', pram).then((res) => {
|
||||
if (res.success) {
|
||||
console.log(res.result)
|
||||
this.dictOptions = res.result
|
||||
@@ -181,6 +192,16 @@ export default {
|
||||
}
|
||||
})
|
||||
},
|
||||
getexportTemplateId(){
|
||||
getAction('report/detail/getTemplateLabelList', {}).then((res) => {
|
||||
if (res.success) {
|
||||
console.log(res.result)
|
||||
this.exportTemplatetOptions = res.result
|
||||
} else {
|
||||
// this.$refs.uploadFile.perentHandleFunc()
|
||||
}
|
||||
})
|
||||
},
|
||||
editModel(value) {
|
||||
this.visible = true
|
||||
this.title = '编辑'
|
||||
@@ -213,17 +234,17 @@ export default {
|
||||
let url = this.url.ConventionalExport
|
||||
let Action = getAction
|
||||
let query = JSON.parse(JSON.stringify(this.formInline))
|
||||
Object.keys(query).forEach(res => {
|
||||
if (query[res] && query[res] instanceof Array) {
|
||||
query[res] = query[res].join(',')
|
||||
}
|
||||
})
|
||||
if(this.contentListStart){
|
||||
query.certCategoryName = this.contentListStart
|
||||
}
|
||||
// Object.keys(query).forEach(res => {
|
||||
// if (query[res] && query[res] instanceof Array) {
|
||||
// query[res] = query[res].join(',')
|
||||
// }
|
||||
// })
|
||||
// if(this.contentListStart){
|
||||
// query.certCategoryName = this.contentListStart
|
||||
// }
|
||||
query.paramsManifestId = this.$route.query.id
|
||||
this.confirmLoading = true
|
||||
downloadFile('report/detail/exportNormal', this.$t('GeneralExportInformation')+'.zip', query)
|
||||
downloadFile('report/detail/exportCustom', this.$t('CustomizeExportInformation')+'.zip', query)
|
||||
this.confirmLoading = false
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
<template>
|
||||
|
||||
<a-card :bordered="false">
|
||||
<div class="table-page-search-wrapper doc-detail">
|
||||
<div class="Virtual-detail-header" style="top: 0">
|
||||
@@ -225,6 +226,7 @@ export default {
|
||||
mounted() {
|
||||
// this.Getlist()
|
||||
this.getTableList()
|
||||
document.title = this.$t('ParameterViewPage')
|
||||
},
|
||||
methods:{
|
||||
Getlist() {
|
||||
|
||||
@@ -60,24 +60,39 @@
|
||||
</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('NtechnicalField')">{{$t('NtechnicalField')}}</span>-->
|
||||
<!-- </div>-->
|
||||
<!-- <a-form-model-item class="itemModel" prop="technologyTerritory">-->
|
||||
<!-- <a-tree-select-->
|
||||
<!-- tree-node-filter-prop="title"-->
|
||||
<!-- v-model="formInline.technologyTerritory"-->
|
||||
<!-- :maxTagCount="1"-->
|
||||
<!-- class="box-input"-->
|
||||
<!-- :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
|
||||
<!-- style="width: 100%"-->
|
||||
<!-- :tree-data="CategoryTreeList"-->
|
||||
<!-- tree-checkable-->
|
||||
<!-- :placeholder="$t('PleaseSelect')+$t('NtechnicalField')"-->
|
||||
<!-- />-->
|
||||
<!-- </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('NtechnicalField')">{{$t('NtechnicalField')}}</span>
|
||||
<span class="title-text-text" :title="$t('NareaOfResponsibility')">{{$t('NareaOfResponsibility')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel" prop="technologyTerritory">
|
||||
<a-tree-select
|
||||
tree-node-filter-prop="title"
|
||||
v-model="formInline.technologyTerritory"
|
||||
:maxTagCount="1"
|
||||
class="box-input"
|
||||
:getPopupContainer="triggerNode=> triggerNode.parentNode"
|
||||
style="width: 100%"
|
||||
:tree-data="CategoryTreeList"
|
||||
tree-checkable
|
||||
:placeholder="$t('PleaseSelect')+$t('NtechnicalField')"
|
||||
/>
|
||||
<a-form-model-item class="itemModel" prop="dutyTerritory">
|
||||
<j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory"
|
||||
:disabled="disabled"
|
||||
:placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')"
|
||||
:type="'select'"
|
||||
:triggerChange="false" :dictCode="'duty_territory'"/>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
</a-col>
|
||||
@@ -99,21 +114,7 @@
|
||||
</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('NareaOfResponsibility')">{{$t('NareaOfResponsibility')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel" prop="dutyTerritory">
|
||||
<j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory"
|
||||
:disabled="disabled"
|
||||
:placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')"
|
||||
:type="'select'"
|
||||
:triggerChange="false" :dictCode="'duty_territory'"/>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
</a-col>
|
||||
|
||||
</a-row>
|
||||
<a-row :gutter="24">
|
||||
<a-col :span="24">
|
||||
@@ -273,6 +274,7 @@
|
||||
style='height: 95px; width: 100%'
|
||||
:disabled="disabled"
|
||||
type="textarea"
|
||||
:maxLength="1000"
|
||||
v-model="item.description"
|
||||
:placeholder="$t('PleaseEnter')+$t('NParameterDescription')"/>
|
||||
</a-form-model-item>
|
||||
@@ -377,7 +379,7 @@ export default {
|
||||
{ required: true, message: this.$t('PleaseSelect')+this.$t('areaOfResponsibility'), trigger: 'change' },
|
||||
],
|
||||
description: [
|
||||
{ min:1, max: 200, message: this.$t('cantExeed')+'200'+this.$t('characters'), trigger: 'blur' },
|
||||
{ min:1, max: 1000, message: this.$t('cantExeed')+'1000'+this.$t('characters'), trigger: 'blur' },
|
||||
],
|
||||
controlType: [
|
||||
{ required: true, message: this.$t('pleaseSelect')+this.$t('controlType'), trigger: 'change' },
|
||||
@@ -602,11 +604,11 @@ export default {
|
||||
this.contentList = []
|
||||
this.contentListed = []
|
||||
this.visible = true
|
||||
if(value.technologyTerritory.split(',').length === 1){
|
||||
value.technologyTerritory = value.technologyTerritory
|
||||
} else {
|
||||
value.technologyTerritory = value.technologyTerritory.split(',')
|
||||
}
|
||||
// if(value.technologyTerritory.split(',').length === 1){
|
||||
// value.technologyTerritory = value.technologyTerritory
|
||||
// } else {
|
||||
// value.technologyTerritory = value.technologyTerritory.split(',')
|
||||
// }
|
||||
this.formInline = value
|
||||
this.title = this.$t('edit')
|
||||
this.flag = 0
|
||||
@@ -665,8 +667,8 @@ export default {
|
||||
}
|
||||
if(item.description !== undefined && item.description !== null){
|
||||
// 参数说明的限制
|
||||
if(item.description.length > 200){
|
||||
this.$message.warning(this.$t('ParameterDescription')+this.$t('cantExeed')+'200'+this.$t('Characters'))
|
||||
if(item.description.length > 1000){
|
||||
this.$message.warning(this.$t('ParameterDescription')+this.$t('cantExeed')+'1000'+this.$t('Characters'))
|
||||
falg = 0
|
||||
return
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user