Merge remote-tracking branch 'origin/master'
# Conflicts: # jero-web/src/views/projectManagement/components/listOfRegulations.vue
This commit is contained in:
wangzhijiang
@@ -706,6 +706,12 @@ module.exports = {
|
||||
uploadTime: 'Upload time',
|
||||
enclosure: 'enclosure',
|
||||
// 认证
|
||||
attachmentTemplate: 'attachment Template',
|
||||
controlAlternatives: 'control Alternatives',
|
||||
controlVerification: 'control Verification',
|
||||
controlType: 'control Type',
|
||||
certificationCategory: 'certification Category',
|
||||
parameterBatch: 'parameter Batch',
|
||||
releaseVersion: 'release Version',
|
||||
parameterTemplate: 'parameter Template',
|
||||
contentDescription: 'content Description',
|
||||
@@ -720,4 +726,7 @@ module.exports = {
|
||||
taskDataConfirmation: 'Please select the data whose list confirmation status is accepted and task confirmation status is not initiated or rejected, and the regulatory engineer and certification engineer are not empty',
|
||||
selectIssuer:'Select issuer',
|
||||
sendBack:'send back',
|
||||
taskConfirmationProcess:'Task confirmation process',
|
||||
notFinished:'not finished',
|
||||
Finished:'Finished',
|
||||
}
|
||||
@@ -712,6 +712,12 @@ module.exports = {
|
||||
uploadTime:'上传时间',
|
||||
enclosure:'附件',
|
||||
// 认证
|
||||
attachmentTemplate: '附件模板',
|
||||
controlAlternatives: '控件备选值',
|
||||
controlVerification: '控件校验',
|
||||
controlType: '控件类型',
|
||||
certificationCategory: '认证类别',
|
||||
parameterBatch: '参数批次',
|
||||
releaseVersion: '发布版本',
|
||||
parameterTemplate: '参数模板',
|
||||
contentDescription: '内容说明',
|
||||
@@ -725,4 +731,7 @@ module.exports = {
|
||||
operationNode:'操作节点',
|
||||
selectIssuer:'选择下发人',
|
||||
sendBack:'退回',
|
||||
taskConfirmationProcess:'任务确认流程',
|
||||
notFinished:'未完成',
|
||||
Finished:'已完成',
|
||||
}
|
||||
@@ -94,8 +94,15 @@
|
||||
})
|
||||
this.content=item.join(',')
|
||||
})
|
||||
|
||||
console.log('value111',this.content)
|
||||
let arrayLabel = []
|
||||
this.dictOptions.forEach((item) => {
|
||||
this.arrayValue.forEach((val) => {
|
||||
if(item.value === val) {
|
||||
arrayLabel.push(item)
|
||||
}
|
||||
})
|
||||
})
|
||||
this.$emit('changelabel', arrayLabel);
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
<a-form-model-item class="itemModel" prop="paramsTemplateName">
|
||||
<a-input class="box-input"
|
||||
:disabled="disabled"
|
||||
v-model="formInline.paramsTemplateName"
|
||||
v-model="formInline.nioNumber"
|
||||
:placeholder="$t('PleaseEnter')+$t('NiONumber')"/>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
@@ -31,10 +31,10 @@
|
||||
<span class="title-text-text" :title="$t('Required')">{{$t('Required')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel" prop="state">
|
||||
<a-select :placeholder="$t('PleaseSelect')+$t('Required')">
|
||||
<a-select :placeholder="$t('PleaseSelect')+$t('Required')" v-model="formInline.isMust">
|
||||
<a-select-option v-for="(item, key) in isRequired" :key="key" :value="item.value">
|
||||
<span style="display: inline-block;width: 100%" :title=" item.text || item.label ">
|
||||
{{ item.text || item.label }}
|
||||
<span style="display: inline-block;width: 100%" :title=" item.label ">
|
||||
{{ item.label }}
|
||||
</span>
|
||||
</a-select-option>
|
||||
</a-select>
|
||||
@@ -52,7 +52,7 @@
|
||||
<a-form-model-item class="itemModel" prop="paramsTemplateName">
|
||||
<a-input class="box-input"
|
||||
:disabled="disabled"
|
||||
v-model="formInline.paramsTemplateName"
|
||||
v-model="formInline.paramsName"
|
||||
:placeholder="$t('PleaseEnter')+$t('ParameterName')"/>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
@@ -76,6 +76,195 @@
|
||||
</div>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<a-row :gutter="24">
|
||||
<a-col :span="12">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text">
|
||||
<span class="title-text-text"
|
||||
:title="$t('parameterBatch')">{{$t('parameterBatch')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel" prop="paramsTemplateName">
|
||||
<j-dict-select-tag class="box-input" v-model="formInline.paramsBatch"
|
||||
:disabled="disabled"
|
||||
:placeholder="$t('PleaseSelect')+$t('parameterBatch')"
|
||||
:type="'select'"
|
||||
:triggerChange="false" :dictCode="'params_batch'"/>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text">
|
||||
<span class="title-text-text" :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel" prop="technologyTerritory">
|
||||
<j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory"
|
||||
:disabled="disabled"
|
||||
:placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
|
||||
:type="'select'"
|
||||
:triggerChange="false" :dictCode="'duty_territory'"/>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<a-row :gutter="24">
|
||||
<a-col :span="24">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text">
|
||||
<span class="title-text-text"
|
||||
:title="$t('ParameterDescription')">{{$t('ParameterDescription')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel" prop="paramsTemplateName">
|
||||
<a-input class="box-input"
|
||||
:disabled="disabled"
|
||||
v-model="formInline.description"
|
||||
:placeholder="$t('PleaseEnter')+$t('ParameterDescription')"/>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<a-row :gutter="24">
|
||||
<a-col :span="24">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text">
|
||||
<span class="title-text-text"
|
||||
:title="$t('ParameterName')">{{$t('certificationCategory')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel" prop="paramsTemplateName">
|
||||
<j-multi-select-tag class="box-input" v-model="formInline.certCategory"
|
||||
@change='Onchange'
|
||||
v-on:changelabel='Onchangelabel'
|
||||
:disabled="disabled"
|
||||
:placeholder="$t('PleaseSelect')+$t('certificationCategory')"
|
||||
:type="'checkbox'"
|
||||
:triggerChange="false" :dictCode="'cert_category'"/>
|
||||
</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="title-text-text"
|
||||
:title="$t('controlType')">{{$t('controlType')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel" prop="controlType">
|
||||
<a-select :placeholder="$t('PleaseSelect')+$t('controlType')" v-model="formInline.controlType">
|
||||
<a-select-option v-for="(item, key) in controlType" :key="key" :value="item.value">
|
||||
<span style="display: inline-block;width: 100%" :title=" item.label ">
|
||||
{{ item.label }}
|
||||
</span>
|
||||
</a-select-option>
|
||||
</a-select>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text">
|
||||
<span class="title-text-text" :title="$t('controlVerification')">{{$t('controlVerification')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel" prop="technologyTerritory">
|
||||
<a-select :placeholder="$t('PleaseSelect')+$t('controlVerification')" v-model="formInline.controlVerify">
|
||||
<a-select-option v-for="(item, key) in controlVerification" :key="key" :value="item.value">
|
||||
<span style="display: inline-block;width: 100%" :title=" item.label ">
|
||||
{{ item.label }}
|
||||
</span>
|
||||
</a-select-option>
|
||||
</a-select>
|
||||
</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="title-text-text"
|
||||
:title="$t('controlAlternatives')">{{$t('controlAlternatives')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel" prop="paramsTemplateName">
|
||||
<a-input class="box-input"
|
||||
:disabled="disabled"
|
||||
v-model="formInline.controlValues"
|
||||
:placeholder="$t('PleaseEnter')+$t('controlAlternatives')"/>
|
||||
</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="title-text-text"
|
||||
:title="$t('attachmentTemplate')">{{$t('attachmentTemplate')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel" prop="paramsTemplateName">
|
||||
<a-button type="primary" class="button-text"
|
||||
@click="clickButtonToUpload(item)">
|
||||
<!-- {{ (formInline[item.db_field_name] === 'null' || formInline[item.db_field_name] === '' ||-->
|
||||
<!-- formInline[item.db_field_name] == null) ? $t('clickUpload') : $t('viewUploadedFiles')-->
|
||||
<!-- }}-->
|
||||
{{ $t('clickUpload') }}
|
||||
</a-button>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<a-row :gutter="24">
|
||||
<a-col :span="24" >
|
||||
<a-tabs>
|
||||
<a-tab-pane v-for='(item,index) in certCategoryParamsInfoEOList' :tab="item.textVal" :key="index + 1">
|
||||
<a-row :gutter="24">
|
||||
<a-col :span="12">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text">
|
||||
<span class="title-text-text"
|
||||
:title="$t('standard')">{{$t('standard')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel" prop="paramsTemplateName">
|
||||
<a-input class="box-input"
|
||||
:disabled="disabled"
|
||||
v-model="item.textVal"
|
||||
:placeholder="$t('PleaseEnter')+$t('standard')"/>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text">
|
||||
<span class="title-text-text" :title="$t('ParameterName')">{{$t('ParameterName')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel" prop="technologyTerritory">
|
||||
<a-input class="box-input"
|
||||
:disabled="disabled"
|
||||
v-model="item.paramsName"
|
||||
:placeholder="$t('PleaseEnter')+$t('ParameterName')"/>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<a-row :gutter="24">
|
||||
<a-col :span="24">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text">
|
||||
<span class="title-text-text"
|
||||
:title="$t('ParameterDescription')">{{$t('ParameterDescription')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel" prop="paramsTemplateName">
|
||||
<a-input class="box-input"
|
||||
:disabled="disabled"
|
||||
v-model="item.description"
|
||||
:placeholder="$t('PleaseEnter')+$t('ParameterDescription')"/>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
</a-col>
|
||||
</a-row>
|
||||
</a-tab-pane>
|
||||
</a-tabs>
|
||||
</a-col>
|
||||
</a-row>
|
||||
</a-form-model>
|
||||
</a-spin>
|
||||
<div class="drawer-bootom-button">
|
||||
@@ -96,11 +285,35 @@ export default {
|
||||
props: ['url'],
|
||||
data() {
|
||||
return {
|
||||
isRequired: [
|
||||
isRequired: [ // 是否必填
|
||||
{value:1, label: '是' },
|
||||
{value:0, label: '否' }
|
||||
],
|
||||
CategoryTreeList: [],
|
||||
controlType: [ // 控件类型
|
||||
{value:1, label: '文本' },
|
||||
{value:2, label: '下拉单选' },
|
||||
{value:3, label: '下拉多选' },
|
||||
{value:4, label: '附件' },
|
||||
{value:5, label: '文本+下拉单选' },
|
||||
{value:6, label: '文本+下拉多选' },
|
||||
{value:7, label: '文本+附件' },
|
||||
{value:8, label: '下拉单选+附件' },
|
||||
{value:9, label: '下拉多选+附件' },
|
||||
{value:10, label: '文本+下拉单选+附件' },
|
||||
],
|
||||
controlVerification: [ // 控件校验
|
||||
{value:1, label: '无' },
|
||||
{value:2, label: '中文' },
|
||||
{value:3, label: '正整数' },
|
||||
{value:4, label: '正浮点数' },
|
||||
{value:5, label: '整数或小数' },
|
||||
{value:6, label: '一位小数' },
|
||||
{value:7, label: '两位小数' },
|
||||
{value:8, label: '三位小数' },
|
||||
{value:9, label: '四位小数' },
|
||||
],
|
||||
CategoryTreeList: [], // 技术领域
|
||||
certCategoryParamsInfoEOList: [], // 认证类别得tab栏
|
||||
formInline: {},
|
||||
confirmLoading: false,
|
||||
visible: false,
|
||||
@@ -126,7 +339,8 @@ export default {
|
||||
},
|
||||
disabled: false,
|
||||
projectNameList: [],
|
||||
title: ''
|
||||
title: '',
|
||||
stateOne: ''
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
@@ -134,6 +348,39 @@ export default {
|
||||
this.getSysCategoryTree()
|
||||
},
|
||||
methods: {
|
||||
clickButtonToUpload(item) {
|
||||
// this.$refs.uploadFile.perentHandleFunc()
|
||||
// this.$refs.uploadFile.state = item.flag
|
||||
// this.$refs.uploadFile.visible = true
|
||||
// this.uploadName = item.db_field_name
|
||||
// getAction('sys/common/getFileInfos', { id: this.formInline[item.db_field_name] }).then((res) => {
|
||||
// if (res.success) {
|
||||
// this.$refs.uploadFile.perentHandleFunc(res.result)
|
||||
// } else {
|
||||
// this.$refs.uploadFile.perentHandleFunc()
|
||||
// }
|
||||
// })
|
||||
},
|
||||
Onchangelabel(val) {
|
||||
this.certCategoryParamsInfoEOList = []
|
||||
console.log(val,'val。。。')
|
||||
val.forEach((item) => {
|
||||
let _tt = {
|
||||
textVal: item.text, // tab
|
||||
certCategory: '', // 所属认证类别
|
||||
paramsNumber: '', // 编号
|
||||
paramsName: '', // 参数名称
|
||||
description: ''// 参数说明
|
||||
}
|
||||
this.certCategoryParamsInfoEOList.push(_tt)
|
||||
})
|
||||
},
|
||||
Onchange() {
|
||||
|
||||
},
|
||||
callback() {
|
||||
|
||||
},
|
||||
getSysCategoryTree() {
|
||||
getAction('/sys/category/getSysCategoryTree', {}).then((res) => {
|
||||
if (res.success) {
|
||||
|
||||
@@ -109,11 +109,11 @@ export default {
|
||||
dataSource: [],
|
||||
confirmLoading: false,
|
||||
url: {
|
||||
list: 'params/template/page',
|
||||
add: 'params/template/add',
|
||||
edit: 'params/template/edit',
|
||||
deleteBatch: 'params/template/delete',
|
||||
deleteAll: 'params/template/deleteBatch'
|
||||
list: 'params/paramsInfo/page',
|
||||
add: 'params/paramsInfo/add',
|
||||
edit: 'params/paramsInfo/edit',
|
||||
deleteBatch: 'params/paramsInfo/delete',
|
||||
deleteAll: 'params/paramsInfo/deleteBatch'
|
||||
},
|
||||
total: 0,
|
||||
pageSize: 10,
|
||||
@@ -124,12 +124,12 @@ export default {
|
||||
title: this.$t('NiONumber'),
|
||||
align: 'center',
|
||||
width: '10%',
|
||||
dataIndex: 'region_dictText',
|
||||
dataIndex: 'nioNumber',
|
||||
},
|
||||
{
|
||||
title: this.$t('ParameterName'),
|
||||
align: 'center',
|
||||
dataIndex: 'paramsTemplateName'
|
||||
dataIndex: 'paramsName'
|
||||
},
|
||||
{
|
||||
title: this.$t('ParameterDescription'),
|
||||
@@ -139,7 +139,7 @@ export default {
|
||||
{
|
||||
title: this.$t('areaOfResponsibility'),
|
||||
align: 'center',
|
||||
dataIndex: 'state_dictText'
|
||||
dataIndex: 'dutyTerritory'
|
||||
},
|
||||
{
|
||||
title: this.$t('createTime'),
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
{{prcTypeName[text]}}
|
||||
</span>
|
||||
<span slot="isEnd" slot-scope="text,record">
|
||||
{{text && text == 0 ? '未完成':'已完成'}}
|
||||
{{text && text == 0 ? $t('notFinished'):$t('Finished')}}
|
||||
</span>
|
||||
<span slot="operation" slot-scope="record">
|
||||
<a @click="classAdd(record)" style="margin-right:8px">{{$t('See')}}</a>
|
||||
@@ -49,7 +49,7 @@
|
||||
pageSize: 10,
|
||||
selectedRowKeys: [],
|
||||
prcTypeName: {
|
||||
1: '任务确认流程'
|
||||
1: this.$t('taskConfirmationProcess')
|
||||
},
|
||||
columns: [
|
||||
{
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
{{prcTypeName[text]}}
|
||||
</span>
|
||||
<span slot="isEnd" slot-scope="text,record">
|
||||
{{text && text == 0 ? '未完成':'已完成'}}
|
||||
{{text && text == 0 ? $t('notFinished'):$t('Finished')}}
|
||||
</span>
|
||||
<span slot="operation" slot-scope="record">
|
||||
<a @click="classAdd(record)" style="margin-right:8px">{{$t('See')}}</a>
|
||||
@@ -50,7 +50,7 @@
|
||||
pageSize: 10,
|
||||
selectedRowKeys: [],
|
||||
prcTypeName: {
|
||||
1: '任务确认流程'
|
||||
1: this.$t('taskConfirmationProcess')
|
||||
},
|
||||
columns: [
|
||||
{
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
{{prcTypeName[text]}}
|
||||
</span>
|
||||
<span slot="isEnd" slot-scope="text,record">
|
||||
{{text && text == 0 ? '未完成':'已完成'}}
|
||||
{{text && text == 0 ? $t('notFinished'):$t('Finished')}}
|
||||
</span>
|
||||
<span slot="operation" slot-scope="record">
|
||||
<a @click="classAdd(record)" style="margin-right:8px">{{$t('See')}}</a>
|
||||
@@ -50,7 +50,7 @@
|
||||
pageSize: 10,
|
||||
selectedRowKeys: [],
|
||||
prcTypeName: {
|
||||
1: '任务确认流程'
|
||||
1: this.$t('taskConfirmationProcess')
|
||||
},
|
||||
columns: [
|
||||
{
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
pageSize: 10,
|
||||
selectedRowKeys: [],
|
||||
prcTypeName: {
|
||||
1: '任务确认流程'
|
||||
1: this.$t('taskConfirmationProcess')
|
||||
},
|
||||
columns: [
|
||||
{
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -17,7 +17,7 @@
|
||||
<a-icon type="export" :rotate="-90"/>
|
||||
{{$t('export')}}
|
||||
</div>
|
||||
<div class="operator-text">
|
||||
<div class="operator-text" v-if="this.$route.query.studioEngineer == this.userInfo().id">
|
||||
<ImportFile :url="url" :projectId="$route.query.id" :isTrue="true" :accept="'.xls'"
|
||||
@getList="getPersonnelList"/>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user