合并分支 'dev_third_stage' 到 'master'
Dev third stage 查看合并请求 laws-nio/laws-weilai!131
This commit is contained in:
李雪涛
@@ -244,7 +244,7 @@
|
||||
yAxis: yAxis,
|
||||
grid: {
|
||||
left: '10%',
|
||||
bottom: '15%'
|
||||
bottom: '20%'
|
||||
},
|
||||
series: [
|
||||
{
|
||||
|
||||
@@ -17,19 +17,19 @@
|
||||
<a-row :gutter="24" style='margin-left: -90px;'>
|
||||
<a-col :md="6" :sm="8">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text" :title="$t('newNiONumber')">
|
||||
<span>{{$t('newNiONumber')}}</span>
|
||||
<div class="title-text" :title="$t('NNiONumber')">
|
||||
<span>{{$t('NNiONumber')}}</span>
|
||||
</div>
|
||||
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('newNiONumber')"
|
||||
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('NNiONumber')"
|
||||
v-model="formInline.nioNumber"></j-input>
|
||||
</div>
|
||||
</a-col>
|
||||
<a-col :md="6" :sm="8">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text" :title="$t('ParameterName')">
|
||||
<span>{{$t('ParameterName')}}</span>
|
||||
<div class="title-text" :title="$t('NParameterName')">
|
||||
<span>{{$t('NParameterName')}}</span>
|
||||
</div>
|
||||
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('ParameterName')"
|
||||
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('NParameterName')"
|
||||
v-model="formInline.paramsName"></j-input>
|
||||
</div>
|
||||
</a-col>
|
||||
@@ -46,21 +46,21 @@
|
||||
<!-- </a-col>-->
|
||||
<a-col :md="6" :sm="8">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text" :title="$t('areaOfResponsibility')">
|
||||
<span>{{$t('areaOfResponsibility')}}</span>
|
||||
<div class="title-text" :title="$t('NareaOfResponsibility')">
|
||||
<span>{{$t('NareaOfResponsibility')}}</span>
|
||||
</div>
|
||||
<j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory"
|
||||
:placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
|
||||
:placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')"
|
||||
:type="'select'"
|
||||
:triggerChange="false" :dictCode="'duty_territory'"/>
|
||||
</div>
|
||||
</a-col>
|
||||
<a-col :md="6" :sm="8">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text" :title="$t('completedBy')">
|
||||
<span>{{$t('completedBy')}}</span>
|
||||
<div class="title-text" :title="$t('dre')">
|
||||
<span>{{$t('dre')}}</span>
|
||||
</div>
|
||||
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('completedBy')"
|
||||
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('dre')"
|
||||
v-model="formInline.dre"></j-input>
|
||||
</div>
|
||||
</a-col>
|
||||
@@ -163,6 +163,10 @@
|
||||
<a-icon type="profile"/>
|
||||
{{$t('bringInTheProjectInterface')}}
|
||||
</div>
|
||||
<div @click="AdjustareasofresponsibilityClick" class="operator-text-title" v-if='currentPersonRole == "homo"'>
|
||||
<a-icon type="solution"/>
|
||||
{{$t('Adjustareasofresponsibility')}}
|
||||
</div>
|
||||
</template>
|
||||
<div class="operator-text" style="position: relative " @click='morepop' v-if='currentPersonRole == "homo" || currentPersonRole == "sdt"'>
|
||||
<span style="position: absolute;left: -13px;top: -4px">...</span>{{ $t('more') }}
|
||||
@@ -251,7 +255,7 @@
|
||||
<a-row :gutter='24'>
|
||||
<a-col :span='24'>
|
||||
<a-form-model-item ref='region' :label="$t('FreezeConfiguration')" prop='region'>
|
||||
<a-select :placeholder="$t('PleaseSelect')+$t('FreezeConfiguration')" v-model="Dateline.paramsConfig"
|
||||
<a-select :placeholder="$t('freeze')" v-model="Dateline.paramsConfig"
|
||||
allowClear mode="multiple">
|
||||
<a-select-option v-for="(item, key) in FreezeList" :key="key" :value="item.value">
|
||||
<span style="display: inline-block;width: 100%" :title=" item.label ">
|
||||
@@ -295,7 +299,12 @@
|
||||
@GetgetTableList='GetgetTableList'
|
||||
@areaVisibleTaskCutOffTimeAll='areaVisibleTaskCutOffTimeAll'/>
|
||||
</a-modal>
|
||||
|
||||
<!-- 调整责任领域-->
|
||||
<a-modal v-model="Adjustareasofrespon" :title="$t('Adjustareasofresponsibility')" width='620px' :footer="null">
|
||||
<adjustarea-sofrespon v-if='Adjustareasofrespon' :selectedRowKeysArray='selectedRowKeysArray'
|
||||
@GetgetTableList='GetgetTableList'
|
||||
@AdjustareasofresponAll='AdjustareasofresponAll'/>
|
||||
</a-modal>
|
||||
<!-- 引用参数--->
|
||||
<a-modal v-model="areaVisiblereferenceparameter" :title="$t('referenceparameter')" width='650px' :footer="null">
|
||||
<reference-parameter v-if='areaVisiblereferenceparameter' :paramsManifest='paramsManifest'
|
||||
@@ -439,6 +448,7 @@
|
||||
import SynchronousSubmissionLibrary from '@/components/SynchronousSubmissionLibrary/index'
|
||||
import TaskCutOffTime from '@/components/TaskCutOffTime/index'
|
||||
import TaskTime from '@/components/TaskCutOffTime/indexonekey'
|
||||
import AdjustareaSofrespon from '@/components/AdjustareaSofrespon/index'
|
||||
import ReferenceParameter from '@/components/ReferenceParameter/index'
|
||||
import AssignedBy from '@/components/AssignedBy/index'
|
||||
import axios from 'axios'
|
||||
@@ -452,6 +462,7 @@
|
||||
TableCollection,
|
||||
ParameterLibraryAdd,
|
||||
AssignedBy,
|
||||
AdjustareaSofrespon,
|
||||
TaskCutOffTime,
|
||||
ReferenceParameter,
|
||||
SynchronousSubmissionLibrary,
|
||||
@@ -614,6 +625,7 @@
|
||||
areaVisibleAssignedby: false, // 分配填写人弹框
|
||||
areaVisibleTaskCutOffTime: false, // 截至时间弹框
|
||||
OneclickCollection:false,
|
||||
Adjustareasofrespon:false,
|
||||
areaVisiblereferenceparameter: false, // 引用参数弹框
|
||||
areaVisibsynchronous: false, // 同步上报库弹框
|
||||
visibleoperationFailed: false, // 数据失败的弹框
|
||||
@@ -1160,6 +1172,14 @@
|
||||
_this.confirmLoading = false
|
||||
})
|
||||
},
|
||||
// 调整责任领域
|
||||
AdjustareasofresponsibilityClick(){
|
||||
if(this.selectedRowKeysValue.length == 0){
|
||||
this.$message.warning(this.$t('selectLeastOne'))
|
||||
}else{
|
||||
this.Adjustareasofrespon = true
|
||||
}
|
||||
},
|
||||
// 下发收集的权限
|
||||
distributionAndCollectionJurisdiction() {
|
||||
if(this.selectedRowKeysValue.length == 0){
|
||||
@@ -1517,6 +1537,11 @@
|
||||
this.OneclickCollection = val
|
||||
this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
|
||||
},
|
||||
AdjustareasofresponAll(val){
|
||||
console.log(val)
|
||||
this.Adjustareasofrespon = val
|
||||
this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
|
||||
},
|
||||
//引用参数
|
||||
referenceparameter() {
|
||||
let dreJurisdictionreferenceParameter = this.dreJurisdictionreferenceParameter()
|
||||
|
||||
@@ -174,7 +174,7 @@
|
||||
dataIndex: 'createBy'
|
||||
},
|
||||
{
|
||||
title: this.$t('createTime'),
|
||||
title: this.$t('created'),
|
||||
align: 'center',
|
||||
width: 160,
|
||||
ellipsis: true,
|
||||
|
||||
Reference in New Issue
Block a user