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

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

Browse Source
This commit is contained in:
wangzhijiang
2022-07-04 13:59:50 +08:00
parent 7d2998cd52 06877cf2c8
commit 1a813cc0dd
11 changed files with 162 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
+2 -2
View File
@@ -76,7 +76,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
// @RequiresPermissions("params:collectManifest:list") // @RequiresPermissions("params:collectManifest:list")
public Result<?> queryList(ParamsCollectManifestEO paramsCollectManifestEO, public Result<?> queryList(ParamsCollectManifestEO paramsCollectManifestEO,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="500") Integer pageSize, @RequestParam(name="pageSize", defaultValue="100") Integer pageSize,
@RequestParam(name = "cut") String cut) { @RequestParam(name = "cut") String cut) {
if (StringUtils.isNotEmpty(paramsCollectManifestEO.getNioNumber())) { if (StringUtils.isNotEmpty(paramsCollectManifestEO.getNioNumber())) {
paramsCollectManifestEO.setNioNumber(paramsCollectManifestEO.getNioNumber().replace("%","\\%")); paramsCollectManifestEO.setNioNumber(paramsCollectManifestEO.getNioNumber().replace("%","\\%"));
@@ -487,7 +487,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
*/ */
@AutoLog(value = "参数项收集清单-带入工程接口人") @AutoLog(value = "参数项收集清单-带入工程接口人")
@ApiOperation(value="参数项收集清单-带入工程接口人", notes="参数项收集清单-带入工程接口人") @ApiOperation(value="参数项收集清单-带入工程接口人", notes="参数项收集清单-带入工程接口人")
@PostMapping(value = "/bringSdtInto") @GetMapping(value = "/bringSdtInto")
// @RequiresPermissions("params:collectManifest:bring") // @RequiresPermissions("params:collectManifest:bring")
public Result<?> bringSdtInto(ParamsCollectManifestVO paramsCollectManifestVO) { public Result<?> bringSdtInto(ParamsCollectManifestVO paramsCollectManifestVO) {
paramsCollectManifestEOService.bringSdtInto(paramsCollectManifestVO); paramsCollectManifestEOService.bringSdtInto(paramsCollectManifestVO);
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java
+8 -3
View File
@@ -1,6 +1,8 @@
package com.jero.modules.cert.report.controller; package com.jero.modules.cert.report.controller;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.base.controller.JeroController;
@@ -62,8 +64,10 @@ public class ParamsReportDetailEOController extends JeroController<ParamsReportD
@ApiOperation(value="上报库参数项-列表查询", notes="上报库参数项-列表查询") @ApiOperation(value="上报库参数项-列表查询", notes="上报库参数项-列表查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
// @RequiresPermissions("report:detail:list") // @RequiresPermissions("report:detail:list")
public Result<List<Map<String, Object>>> queryList(ParamsReportDetailEO paramsReportDetailEO, public Result<?> queryList(ParamsReportDetailEO paramsReportDetailEO,
@RequestParam(name = "cut") String cut) { @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="100") Integer pageSize,
@RequestParam(name = "cut") String cut) {
if (StringUtils.isNotEmpty(paramsReportDetailEO.getNioNumber())) { if (StringUtils.isNotEmpty(paramsReportDetailEO.getNioNumber())) {
paramsReportDetailEO.setNioNumber(paramsReportDetailEO.getNioNumber().replace("%","\\%")); paramsReportDetailEO.setNioNumber(paramsReportDetailEO.getNioNumber().replace("%","\\%"));
} }
@@ -77,7 +81,8 @@ public class ParamsReportDetailEOController extends JeroController<ParamsReportD
paramsReportDetailEO.setDre(paramsReportDetailEO.getDre().replace("%","\\%")); paramsReportDetailEO.setDre(paramsReportDetailEO.getDre().replace("%","\\%"));
} }
List<Map<String, Object>> list = paramsReportDetailEOService.queryList(paramsReportDetailEO, cut); IPage page = new Page(pageNo, pageSize);
IPage list = paramsReportDetailEOService.queryList(page, paramsReportDetailEO, cut);
return Result.OK(list); return Result.OK(list);
} }
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java
+3
View File
@@ -1,6 +1,7 @@
package com.jero.modules.cert.report.mapper; package com.jero.modules.cert.report.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO; import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
import com.jero.modules.cert.report.entity.ParamsReportDetailEO; import com.jero.modules.cert.report.entity.ParamsReportDetailEO;
import com.jero.modules.cert.report.vo.ParamsReportDetailVO; import com.jero.modules.cert.report.vo.ParamsReportDetailVO;
@@ -19,6 +20,8 @@ public interface ParamsReportDetailEOMapper extends BaseMapper<ParamsReportDetai
List<ParamsReportDetailEO> listInfo(@Param("paramsReportDetailEO") ParamsReportDetailEO paramsReportDetailEO); List<ParamsReportDetailEO> listInfo(@Param("paramsReportDetailEO") ParamsReportDetailEO paramsReportDetailEO);
IPage pageInfo(@Param("page") IPage page, @Param("paramsReportDetailEO") ParamsReportDetailEO paramsReportDetailEO);
List<Map<String, Object>> listInfoForExport(@Param("idList") List<String> idList, List<Map<String, Object>> listInfoForExport(@Param("idList") List<String> idList,
@Param("paramsReportDetailVO") ParamsReportDetailVO paramsReportDetailVO); @Param("paramsReportDetailVO") ParamsReportDetailVO paramsReportDetailVO);
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
+7
View File
@@ -91,6 +91,13 @@
order by nio_number asc, sync_time desc order by nio_number asc, sync_time desc
</select> </select>
<select id="pageInfo" resultMap="ParamsReportDetailEOResultMap">
select *
from params_report_detail
<include refid="BaseQuerySql"/>
order by nio_number asc, sync_time desc
</select>
<select id="listInfoForExport" resultType="java.util.LinkedHashMap"> <select id="listInfoForExport" resultType="java.util.LinkedHashMap">
select select
prd.id as id, prd.id as id,
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java
+3 -1
View File
@@ -1,5 +1,6 @@
package com.jero.modules.cert.report.service; package com.jero.modules.cert.report.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.modules.cert.report.entity.ParamsReportDetailEO; import com.jero.modules.cert.report.entity.ParamsReportDetailEO;
import com.jero.modules.cert.report.vo.ParamsReportDetailVO; import com.jero.modules.cert.report.vo.ParamsReportDetailVO;
@@ -19,11 +20,12 @@ public interface IParamsReportDetailEOService extends IService<ParamsReportDetai
/** /**
* 列表查询 * 列表查询
* @param page
* @param paramsReportDetailEO * @param paramsReportDetailEO
* @param cut * @param cut
* @return * @return
*/ */
List<Map<String, Object>> queryList(ParamsReportDetailEO paramsReportDetailEO, String cut); IPage queryList(IPage page, ParamsReportDetailEO paramsReportDetailEO, String cut);
/** /**
* 列表表头中英文切换 * 列表表头中英文切换
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
+6 -3
View File
@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.ZipUtil; import cn.hutool.core.util.ZipUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.jero.common.constant.enums.CutEnum; import com.jero.common.constant.enums.CutEnum;
@@ -101,10 +102,11 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
* @return * @return
*/ */
@Override @Override
public List<Map<String, Object>> queryList(ParamsReportDetailEO paramsReportDetailEO, String cut) { public IPage queryList(IPage page, ParamsReportDetailEO paramsReportDetailEO, String cut) {
String paramsManifestId = paramsReportDetailEO.getParamsManifestId(); String paramsManifestId = paramsReportDetailEO.getParamsManifestId();
List<ParamsReportDetailEO> list = paramsReportDetailEOMapper.listInfo(paramsReportDetailEO); // 查询固定列 IPage pageInfo = paramsReportDetailEOMapper.pageInfo(page, paramsReportDetailEO); // 查询固定列
List<ParamsReportDetailEO> list = pageInfo.getRecords(); // 查询固定列
List<ParamsReportConfigEO> paramsConfigEOList = paramsReportConfigEOService.queryList(paramsManifestId); // 查询配置列 List<ParamsReportConfigEO> paramsConfigEOList = paramsReportConfigEOService.queryList(paramsManifestId); // 查询配置列
// 普通数据字典 // 普通数据字典
@@ -193,7 +195,8 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
listMap.add(manifestMap); listMap.add(manifestMap);
}); });
return listMap; pageInfo.setRecords(listMap);
return pageInfo;
} }
/** /**
jero-web/src/common/lang/en-us.js
+10 -8
View File
@@ -942,14 +942,14 @@ module.exports = {
reportNotUploaded: 'Report not uploaded', reportNotUploaded: 'Report not uploaded',
position: 'position', position: 'position',
// 认证权限状态 // 认证权限状态
CollectionInitiated: 'Collection to be initiated', CollectionInitiated: 'Wait Collect',
handledInterface: 'To be handled by the project interface', handledInterface: 'Wait Sdt',
ReturnedPerson: 'Returned by project contact person', ReturnedPerson: 'Sdt Back',
completed: 'To be completed', completed: 'Wait Fill',
Filledreturn: 'Filled by return', Filledreturn: 'Dre Back',
Submitted: 'Submitted', Submitted: 'Submit',
ReturnedEngineer: 'Returned by Certification Engineer', ReturnedEngineer: 'Cert Back',
SynchronizedLibrary: 'Synchronized to the upper reporting Library', SynchronizedLibrary: 'Sync Report',
Statusis: 'Statusis', Statusis: 'Statusis',
toHavePermission: 'To Have Permission', toHavePermission: 'To Have Permission',
and: 'and', and: 'and',
@@ -1073,4 +1073,6 @@ module.exports = {
theProjectContactEmpty:'The project contact person of cannot be empty', theProjectContactEmpty:'The project contact person of cannot be empty',
pleaseSelectinitiatedOrRejected:'Please select the data whose list confirmation status is not initiated or rejected', pleaseSelectinitiatedOrRejected:'Please select the data whose list confirmation status is not initiated or rejected',
TheEngineerAndCertification:'The regulatory engineer and Certification Engineer of cannot be empty', TheEngineerAndCertification:'The regulatory engineer and Certification Engineer of cannot be empty',
bringInTheProjectInterface:'Bring in the project interface',
theCurrentListSaved:'The current list data has been submitted and cannot be temporarily saved',
} }
jero-web/src/common/lang/zh-cn.js
+2
View File
@@ -1077,4 +1077,6 @@ module.exports = {
newNiONumber: 'NIO编号', newNiONumber: 'NIO编号',
English:'英文', English:'英文',
requiredParametersEmpty:'必填参数不能为空', requiredParametersEmpty:'必填参数不能为空',
bringInTheProjectInterface:'带入工程接口人',
theCurrentListSaved:'当前列表数据已全部提交，无法进行暂存',
} }
jero-web/src/components/CollectionType/index.vue
+10 -5
View File
@@ -28,7 +28,8 @@
<a-input class="box-input inputWid" <a-input class="box-input inputWid"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')+$t('chinese')" :placeholder="$t('pleaseEnter')+$t('chinese')"
onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')" event.returnValue="false"
onkeyup="(this.a=function(){this.value=this.value.replace(/[^\u4e00-\u9fa5]/g,'');}).call(this)"
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 正整数 --> <!-- 正整数 -->
@@ -179,9 +180,10 @@
<div v-else-if="item.controlVerify == '2'"> <div v-else-if="item.controlVerify == '2'">
<a-input class="box-input inputWid" <a-input class="box-input inputWid"
:maxLength="1000" :maxLength="1000"
event.returnValue="false"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')+$t('chinese')" :placeholder="$t('pleaseEnter')+$t('chinese')"
onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')" onkeyup="(this.a=function(){this.value=this.value.replace(/[^\u4e00-\u9fa5]/g,'');}).call(this)"
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 正整数 --> <!-- 正整数 -->
@@ -274,9 +276,10 @@
<div v-else-if="item.controlVerify == '2'"> <div v-else-if="item.controlVerify == '2'">
<a-input class="box-input inputWid" <a-input class="box-input inputWid"
:maxLength="1000" :maxLength="1000"
event.returnValue="false"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')+$t('chinese')" :placeholder="$t('pleaseEnter')+$t('chinese')"
onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')" onkeyup="(this.a=function(){this.value=this.value.replace(/[^\u4e00-\u9fa5]/g,'');}).call(this)"
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 正整数 --> <!-- 正整数 -->
@@ -381,9 +384,10 @@
<div v-else-if="item.controlVerify == '2'"> <div v-else-if="item.controlVerify == '2'">
<a-input class="box-input inputWid" <a-input class="box-input inputWid"
:maxLength="1000" :maxLength="1000"
event.returnValue="false"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')+$t('chinese')" :placeholder="$t('pleaseEnter')+$t('chinese')"
onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')" onkeyup="(this.a=function(){this.value=this.value.replace(/[^\u4e00-\u9fa5]/g,'');}).call(this)"
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 正整数 --> <!-- 正整数 -->
@@ -544,8 +548,9 @@
<a-input class="box-input inputWid" <a-input class="box-input inputWid"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:maxLength="1000" :maxLength="1000"
event.returnValue="false"
:placeholder="$t('pleaseEnter')+$t('chinese')" :placeholder="$t('pleaseEnter')+$t('chinese')"
onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')" onkeyup="(this.a=function(){this.value=this.value.replace(/[^\u4e00-\u9fa5]/g,'');}).call(this)"
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 正整数 --> <!-- 正整数 -->
jero-web/src/components/ReferenceParameter/index.vue
+4 -4
View File
@@ -81,7 +81,7 @@
</a-row> </a-row>
</a-form-model> </a-form-model>
</a-spin> </a-spin>
<div class='drawer-bootom-button'> <div class='drawer-bootom-button' style="margin-top: 4px">
<a-button style='margin-right: .8rem' @click='handleCancel'>{{ $t('cancel') }}</a-button> <a-button style='margin-right: .8rem' @click='handleCancel'>{{ $t('cancel') }}</a-button>
<a-button @click='handleSubmit' type='primary' :loading='confirmLoading'>{{ $t('submit') }}</a-button> <a-button @click='handleSubmit' type='primary' :loading='confirmLoading'>{{ $t('submit') }}</a-button>
</div> </div>
@@ -284,9 +284,9 @@
<style lang='less' scoped> <style lang='less' scoped>
@import '~@assets/less/common.less'; @import '~@assets/less/common.less';
/deep/ .ant-form-explain { /*/deep/ .ant-form-explain {*/
padding-left: 62px; /* padding-left: 62px;*/
} /*}*/
.diolag-area { .diolag-area {
.table-area { .table-area {
jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+107 -25
View File
@@ -64,6 +64,26 @@
v-model="formInline.dre"></a-input> v-model="formInline.dre"></a-input>
</div> </div>
</a-col> </a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('status')">
<span>{{$t('status')}}</span>
</div>
<a-select :placeholder="$t('PleaseSelect')+$t('status')"
class="box-input"
allowClear
:getPopupContainer="triggerNode=> triggerNode.parentNode"
v-model="formInline.state">
<a-select-option v-for="(item, key) in statusList"
:key="key"
:value="item.value">
<span style="display: inline-block;width: 100%" :title=" item.name ">
{{ item.name}}
</span>
</a-select-option>
</a-select>
</div>
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" <span style="float: right;overflow: hidden;margin-right: 11px"
class="table-page-search-submitButtons"> class="table-page-search-submitButtons">
<a-col :md="6" :sm="24"> <a-col :md="6" :sm="24">
@@ -115,6 +135,10 @@
<a-icon type="delete"/> <a-icon type="delete"/>
{{$t('BatchDelete')}} {{$t('BatchDelete')}}
</div> </div>
<div @click="bringInTheProjectInterfaceClick" class="operator-text-title">
<a-icon type="profile"/>
{{$t('bringInTheProjectInterface')}}
</div>
</template> </template>
<div class="operator-text" style="position: relative"> <div class="operator-text" style="position: relative">
<span style="position: absolute;left: -13px;top: -4px">...</span>{{ $t('more') }} <span style="position: absolute;left: -13px;top: -4px">...</span>{{ $t('more') }}
@@ -180,29 +204,29 @@
<!-- 冻结配置---> <!-- 冻结配置--->
<a-modal v-model="areaVisibleFreeze" :title="$t('FreezeConfiguration')" width='600px' :footer="null"> <a-modal v-model="areaVisibleFreeze" :title="$t('FreezeConfiguration')" width='600px' :footer="null">
<a-spin :spinning="confirmLoading"> <a-spin :spinning="confirmLoading">
<a-form-model <a-form-model
class='tag-module' class='tag-module'
ref='ruleForm' ref='ruleForm'
:model='Dateline' :model='Dateline'
:rules='rules' :rules='rules'
:label-col='labelCol' :label-col='labelCol'
:wrapper-col='wrapperCol' :wrapper-col='wrapperCol'
> >
<a-row :gutter='24'> <a-row :gutter='24'>
<a-col :span='24'> <a-col :span='24'>
<a-form-model-item ref='region' :label="$t('FreezeConfiguration')" prop='region'> <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('PleaseSelect')+$t('FreezeConfiguration')" v-model="Dateline.paramsConfig"
allowClear mode="multiple"> allowClear mode="multiple">
<a-select-option v-for="(item, key) in FreezeList" :key="key" :value="item.value"> <a-select-option v-for="(item, key) in FreezeList" :key="key" :value="item.value">
<span style="display: inline-block;width: 100%" :title=" item.label "> <span style="display: inline-block;width: 100%" :title=" item.label ">
{{ item.label }} {{ item.label }}
</span> </span>
</a-select-option> </a-select-option>
</a-select> </a-select>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row> </a-row>
</a-form-model> </a-form-model>
</a-spin> </a-spin>
<div style='padding-left: 60px;color: red'> <div style='padding-left: 60px;color: red'>
{{$t('Attentionfreeze')}} {{$t('Attentionfreeze')}}
@@ -387,6 +411,44 @@
SynchronousSubmissionLibrary SynchronousSubmissionLibrary
}, },
data() { data() {
this.statusList = [
{
value: '1',
name: this.$t('CollectionInitiated')
},
{
value: '2',
name: this.$t('handledInterface')
},
{
value: '3',
name: this.$t('ReturnedPerson')
},
{
value: '4',
name: this.$t('completed')
},
{
value: '5',
name: this.$t('Filledreturn')
},
{
value: '6',
name: this.$t('Submitted')
},
{
value: '7',
name: this.$t('ReturnedEngineer')
},
{
value: '8',
name: this.$t('SynchronizedLibrary')
},
{
value: '9',
name: this.$t('alteration')
}
]
return { return {
// 认证工程师 homo // 认证工程师 homo
// 工程接口人 sdt // 工程接口人 sdt
@@ -464,7 +526,7 @@
templatetitleId: '', templatetitleId: '',
rowId: '', rowId: '',
version: 0, version: 0,
confirmLoading:false, confirmLoading: false,
itemId: '', itemId: '',
selectedRowKeysValue: [], // table列表所选得数据 selectedRowKeysValue: [], // table列表所选得数据
token: Vue.ls.get(ACCESS_TOKEN), token: Vue.ls.get(ACCESS_TOKEN),
@@ -528,6 +590,22 @@
handleCancelRoleSwitching() { handleCancelRoleSwitching() {
this.visibleRoleSwitching = false this.visibleRoleSwitching = false
}, },
bringInTheProjectInterfaceClick() {
let query = {
paramsManifestId: this.paramsManifest.id,
projectId: this.$route.query.projectId
}
this.textLoading = true
getAction('/params/collectManifest/bringSdtInto', query).then((res) => {
if (res.success) {
this.$message.success(this.$t('OperationSuccessful'))
this.$refs.CollectionTabel.getTableList()
} else {
this.$message.warning(this.$t('operationFailed'))
}
this.textLoading = false
})
},
handleOkRoleSwitching() { handleOkRoleSwitching() {
this.$refs.ruleFormRoleSwitching.validate(valid => { this.$refs.ruleFormRoleSwitching.validate(valid => {
if (valid) { if (valid) {
@@ -856,7 +934,7 @@
this.Dateline = {} this.Dateline = {}
// 获取冻结配置数据 // 获取冻结配置数据
this.confirmLoading = true this.confirmLoading = true
this.getFreeze(()=> { this.getFreeze(() => {
this.getLockedConfigIdList() this.getLockedConfigIdList()
}) })
}, },
@@ -865,8 +943,8 @@
{ paramsManifestId: this.paramsManifest.id }).then((res) => { { paramsManifestId: this.paramsManifest.id }).then((res) => {
if (res.success) { if (res.success) {
this.Dateline.paramsConfig = res.result this.Dateline.paramsConfig = res.result
this.Dateline = {...this.Dateline} this.Dateline = { ...this.Dateline }
}else{ } else {
this.Dateline.paramsConfig = [] this.Dateline.paramsConfig = []
} }
this.confirmLoading = false this.confirmLoading = false
@@ -1094,6 +1172,10 @@
} }
} }
}) })
} else {
if (num && num == 1) {
this.$message.warning(this.$t('theCurrentListSaved'))
}
} }
}, },
// 提交数据 // 提交数据
@@ -1342,7 +1424,7 @@
if (res.data.success) { if (res.data.success) {
_this.$message.success(_this.$t('OperationSuccessful')) _this.$message.success(_this.$t('OperationSuccessful'))
_this.selectedRowKeys = [] _this.selectedRowKeys = []
_this.$refs.CollectionTabel.getData() // _this.$refs.CollectionTabel.getData()
_this.$refs.CollectionTabel.getTableList() _this.$refs.CollectionTabel.getTableList()
_this.textLoading = false _this.textLoading = false
} else { } else {