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

修改参数多值顺序问题

Browse Source
This commit is contained in:
高嵩
2023-07-12 14:36:21 +08:00
parent 0a90b461d1
commit 6fa6c0e678
8 changed files with 619 additions and 543 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+7 -5
View File
@@ -831,7 +831,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
ParamsConfigDataEO paramsConfigDataEO = this.getConfigDataEOByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId, paramsConfigDataEOList); // 参数配置数据 ParamsConfigDataEO paramsConfigDataEO = this.getConfigDataEOByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId, paramsConfigDataEOList); // 参数配置数据
List<ParamsConfigDataVO> paramsConfigDataVOList = this.getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据 List<ParamsConfigDataVO> paramsConfigDataVOList = this.getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据
String key = UUID.randomUUID().toString().replaceAll("-", ""); String key = UUID.randomUUID().toString().replaceAll("-", "");
paramsConfigDataVO.put(key, paramsConfigDataVOList); paramsConfigDataVO.put("0+" + key, paramsConfigDataVOList);
} }
configMap.put("controlType",controlType); configMap.put("controlType",controlType);
configMap.put("paramsConfigData",paramsConfigDataVO); configMap.put("paramsConfigData",paramsConfigDataVO);
@@ -1637,6 +1637,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
paramsConfigDataEO.setId(oldConfigDataEOs.get(0).getId()); paramsConfigDataEO.setId(oldConfigDataEOs.get(0).getId());
} }
} }
paramsConfigDataEO.setId(configDataMap.getKey());
paramsConfigDataEO.setParamsCollectManifestId(paramsCollectManifestId); paramsConfigDataEO.setParamsCollectManifestId(paramsCollectManifestId);
paramsConfigDataEO.setParamsConfigId(paramsConfigEOId); paramsConfigDataEO.setParamsConfigId(paramsConfigEOId);
@@ -1737,9 +1738,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
pcdRemoveWrap.lambda().in(ParamsConfigDataEO::getParamsCollectManifestId,paramsCollectManifestIdList); pcdRemoveWrap.lambda().in(ParamsConfigDataEO::getParamsCollectManifestId,paramsCollectManifestIdList);
this.paramsConfigDataEOService.remove(pcdRemoveWrap); this.paramsConfigDataEOService.remove(pcdRemoveWrap);
newConfigDataEOList.forEach(newConfigDataEO -> { // newConfigDataEOList.forEach(newConfigDataEO -> {
newConfigDataEO.setId(UUID.randomUUID().toString().replace("-","")); // newConfigDataEO.setId(UUID.randomUUID().toString().replace("-",""));
}); // });
this.paramsConfigDataEOService.saveOrUpdateBatch(newConfigDataEOList); this.paramsConfigDataEOService.saveOrUpdateBatch(newConfigDataEOList);
} }
@@ -1780,6 +1781,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
Integer orderNum = (Integer) paramsConfigDataVOList.get(0).get("orderNum"); Integer orderNum = (Integer) paramsConfigDataVOList.get(0).get("orderNum");
if (CollectionUtil.isNotEmpty(paramsConfigDataVOList)) { if (CollectionUtil.isNotEmpty(paramsConfigDataVOList)) {
ParamsConfigDataEO paramsConfigDataEO = new ParamsConfigDataEO(); ParamsConfigDataEO paramsConfigDataEO = new ParamsConfigDataEO();
paramsConfigDataEO.setId(configDataMap.getKey());
for (Map<String, Object> paramsConfigDataVO : paramsConfigDataVOList) { for (Map<String, Object> paramsConfigDataVO : paramsConfigDataVOList) {
@@ -3374,7 +3376,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
for (ParamsConfigDataEO configDataEO : configDataEOList) { for (ParamsConfigDataEO configDataEO : configDataEOList) {
ParamsReportConfigDataEO addReportConfigDataEO = new ParamsReportConfigDataEO(); ParamsReportConfigDataEO addReportConfigDataEO = new ParamsReportConfigDataEO();
BeanUtils.copyProperties(configDataEO, addReportConfigDataEO); BeanUtils.copyProperties(configDataEO, addReportConfigDataEO);
addReportConfigDataEO.setId(UUID.randomUUID().toString().replace("-", "")); // addReportConfigDataEO.setId(UUID.randomUUID().toString().replace("-", ""));
addReportConfigDataEO.setParamsConfigId(configIdMap.get(configEO.getId())); addReportConfigDataEO.setParamsConfigId(configIdMap.get(configEO.getId()));
addReportConfigDataEO.setParamsCollectManifestId(reportDetailId); addReportConfigDataEO.setParamsCollectManifestId(reportDetailId);
addReportConfigDataEOList.add(addReportConfigDataEO); addReportConfigDataEOList.add(addReportConfigDataEO);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
+1
View File
@@ -2042,6 +2042,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
paramsReportConfigDataEO.setParamsCollectManifestId(paramsCollectManifestId); paramsReportConfigDataEO.setParamsCollectManifestId(paramsCollectManifestId);
paramsReportConfigDataEO.setParamsConfigId(paramsReportConfigEOId); paramsReportConfigDataEO.setParamsConfigId(paramsReportConfigEOId);
paramsReportConfigDataEO.setId(configDataId);
newConfigDataEOList.add(paramsReportConfigDataEO); newConfigDataEOList.add(paramsReportConfigDataEO);
} }
jero-web/public/iframe.css
Vendored
+4 -1
View File
@@ -1,3 +1,6 @@
img { .my-photo {
width: 100%; width: 100%;
} }
.container{
padding: 0!important;
}
jero-web/src/common/lang/en-us.js
+1 -1
View File
@@ -1828,7 +1828,7 @@ module.exports = {
proportion:'Proportion', proportion:'Proportion',
projectProgressStatistics:'Project Progress Statistics', projectProgressStatistics:'Project Progress Statistics',
GRPSystemProjectProgressStatistics:'GRP system project progress statistics', GRPSystemProjectProgressStatistics:'GRP system project progress statistics',
statisticalNodes:'Statistical Nodes', statisticalNodes:'Responsible Department',
proportionWithInTheAreaOfResponsibility:'Proportion within the area of responsibility', proportionWithInTheAreaOfResponsibility:'Proportion within the area of responsibility',
contentsearch:'Content Search', contentsearch:'Content Search',
masterProject:'Master Project', masterProject:'Master Project',
jero-web/src/common/lang/zh-cn.js
+2 -2
View File
@@ -1928,7 +1928,7 @@ module.exports = {
proportion:'占比', proportion:'占比',
projectProgressStatistics:'项目进度统计', projectProgressStatistics:'项目进度统计',
GRPSystemProjectProgressStatistics:'GRP系统项目进度统计', GRPSystemProjectProgressStatistics:'GRP系统项目进度统计',
statisticalNodes:'统计节点', statisticalNodes:'责任部门',
proportionWithInTheAreaOfResponsibility:'责任领域内占比', proportionWithInTheAreaOfResponsibility:'责任领域内占比',
contentsearch:'内容搜索', contentsearch:'内容搜索',
masterProject:'主项目', masterProject:'主项目',
@@ -3833,7 +3833,7 @@ module.exports = {
proportion:'占比', proportion:'占比',
projectProgressStatistics:'项目进度统计', projectProgressStatistics:'项目进度统计',
GRPSystemProjectProgressStatistics:'GRP系统项目进度统计', GRPSystemProjectProgressStatistics:'GRP系统项目进度统计',
statisticalNodes:'统计节点', statisticalNodes:'责任部门',
proportionWithInTheAreaOfResponsibility:'责任领域内占比', proportionWithInTheAreaOfResponsibility:'责任领域内占比',
contentsearch:'内容搜索', contentsearch:'内容搜索',
masterProject:'主项目', masterProject:'主项目',
jero-web/src/components/CollectionType/index.vue
+125 -89
View File
@@ -1,11 +1,11 @@
<template> <template>
<div style="height: 100%"> <div style="height: 100%">
<div class='box'> <div class="box">
<!-- 纯文本--> <!-- 纯文本-->
<div v-if='detailDate.controlType === "1" && detailDate.paramsConfigData' class='add_flex'> <div v-if='detailDate.controlType === "1" && detailDate.paramsConfigData' class="add_flex">
<div v-for='(item,index) in Object.keys(detailDate.paramsConfigData)' :key='index' class='add-width'> <div v-for="(item,index) in key" :key="index" class="add-width">
<div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1' <div v-for="(itemval,index1) in detailDate.paramsConfigData[item]" :key="index1"
style="display: inline-block" class='valflex'> style="display: inline-block" class="valflex">
<div class="textClass" v-if='itemval.type==="text"'> <div class="textClass" v-if='itemval.type==="text"'>
<!-- 文本校验 分情况--> <!-- 文本校验 分情况-->
<!-- 1 无--> <!-- 1 无-->
@@ -100,11 +100,11 @@
</div> </div>
<span v-if="(currentPersonRole == 'dre' && !detailDate.referencesColFlag) || <span v-if="(currentPersonRole == 'dre' && !detailDate.referencesColFlag) ||
(currentPersonRole == 'homo' && detailDate.referencesColFlag)"> (currentPersonRole == 'homo' && detailDate.referencesColFlag)">
<div @click="addconfig" class='addicon' <div @click="addconfig" class="addicon"
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9"> v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
<a-icon type="plus" /> <a-icon type="plus" />
</div> </div>
<div @click="delconfig(item)" class='delicon' <div @click="delconfig(item,index)" class="delicon"
v-if="Object.keys(detailDate.paramsConfigData).length > 1"> v-if="Object.keys(detailDate.paramsConfigData).length > 1">
<a-icon type="minus" /> <a-icon type="minus" />
</div> </div>
@@ -112,10 +112,10 @@
</div> </div>
</div> </div>
<!-- 默认值--> <!-- 默认值-->
<div v-if='detailDate.controlType === "11" && detailDate.paramsConfigData' class='add_flex'> <div v-if='detailDate.controlType === "11" && detailDate.paramsConfigData' class="add_flex">
<div v-for='(item,index) in Object.keys(detailDate.paramsConfigData)' :key='index' class='add-width'> <div v-for="(item,index) in key" :key="index" class="add-width">
<div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1' <div v-for="(itemval,index1) in detailDate.paramsConfigData[item]" :key="index1"
style="display: inline-block" class='valflex'> style="display: inline-block" class="valflex">
<div class="textClass" v-if='itemval.type==="text"'> <div class="textClass" v-if='itemval.type==="text"'>
<!-- 文本校验 分情况--> <!-- 文本校验 分情况-->
<!-- 1 无--> <!-- 1 无-->
@@ -139,11 +139,11 @@
</div> </div>
<span v-if="(currentPersonRole == 'dre' && !detailDate.referencesColFlag) || <span v-if="(currentPersonRole == 'dre' && !detailDate.referencesColFlag) ||
(currentPersonRole == 'homo' && detailDate.referencesColFlag)"> (currentPersonRole == 'homo' && detailDate.referencesColFlag)">
<div @click="addconfig" class='addicon' <div @click="addconfig" class="addicon"
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9"> v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
<a-icon type="plus" /> <a-icon type="plus" />
</div> </div>
<div @click="delconfig(item)" class='delicon' <div @click="delconfig(item,index)" class="delicon"
v-if="Object.keys(detailDate.paramsConfigData).length > 1"> v-if="Object.keys(detailDate.paramsConfigData).length > 1">
<a-icon type="minus" /> <a-icon type="minus" />
</div> </div>
@@ -151,14 +151,14 @@
</div> </div>
</div> </div>
<!-- 纯下拉单选--> <!-- 纯下拉单选-->
<div v-else-if='detailDate.controlType === "2" && detailDate.paramsConfigData' class='add_flex'> <div v-else-if='detailDate.controlType === "2" && detailDate.paramsConfigData' class="add_flex">
<div v-for='(item,index) in Object.keys(detailDate.paramsConfigData)' :key='index' class='add-width'> <div v-for="(item,index) in key" :key="index" class="add-width">
<div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1' <div v-for="(itemval,index1) in detailDate.paramsConfigData[item]" :key="index1"
style="display: inline-block" class='valflex'> style="display: inline-block" class="valflex">
<div class="textClass" v-if='itemval.type === "pull"'> <div class="textClass" v-if='itemval.type === "pull"'>
<a-select v-model="itemval.dataValue" @change='selectChange' <a-select v-model="itemval.dataValue" @change="selectChange"
:getPopupContainer="triggerNode=> triggerNode.parentNode" :getPopupContainer="triggerNode=> triggerNode.parentNode"
class='selectWid' :disabled="itemval.isLock == '1' ? true: false" class="selectWid" :disabled="itemval.isLock == '1' ? true: false"
allowClear> allowClear>
<a-select-option v-for="(item, key) in itemval.controlValue" :key="key" :value="item.value"> <a-select-option v-for="(item, key) in itemval.controlValue" :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 ">
@@ -170,11 +170,11 @@
</div> </div>
<span v-if="(currentPersonRole == 'dre' && !detailDate.referencesColFlag) || <span v-if="(currentPersonRole == 'dre' && !detailDate.referencesColFlag) ||
(currentPersonRole == 'homo' && detailDate.referencesColFlag)"> (currentPersonRole == 'homo' && detailDate.referencesColFlag)">
<div @click="addconfig" class='addicon' <div @click="addconfig" class="addicon"
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9"> v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
<a-icon type="plus" /> <a-icon type="plus" />
</div> </div>
<div @click="delconfig(item)" class='delicon' <div @click="delconfig(item,index)" class="delicon"
v-if="Object.keys(detailDate.paramsConfigData).length > 1"> v-if="Object.keys(detailDate.paramsConfigData).length > 1">
<a-icon type="minus" /> <a-icon type="minus" />
</div> </div>
@@ -182,16 +182,16 @@
</div> </div>
</div> </div>
<!-- 纯下拉多选--> <!-- 纯下拉多选-->
<div v-else-if='detailDate.controlType === "3" && detailDate.paramsConfigData' class='add_flex'> <div v-else-if='detailDate.controlType === "3" && detailDate.paramsConfigData' class="add_flex">
<div v-for='(item,index) in Object.keys(detailDate.paramsConfigData)' :key='index' style='flex: 1' <div v-for="(item,index) in key" :key="index" style="flex: 1"
class='add-width'> class="add-width">
<div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1' <div v-for="(itemval,index1) in detailDate.paramsConfigData[item]" :key="index1"
style="display: inline-block;" class='valflex' style="display: inline-block;" class="valflex"
:class="{'multiple':itemval.type==='pull_more'?true:false}"> :class="{'multiple':itemval.type==='pull_more'?true:false}">
<div class="textClass" v-if='itemval.type==="pull_more"'> <div class="textClass" v-if='itemval.type==="pull_more"'>
<a-select v-model="itemval.dataValue" <a-select v-model="itemval.dataValue"
:getPopupContainer="triggerNode=> triggerNode.parentNode" :getPopupContainer="triggerNode=> triggerNode.parentNode"
mode="multiple" class='selectWid' mode="multiple" class="selectWid"
:disabled="itemval.isLock == '1' ? true: false" allowClear> :disabled="itemval.isLock == '1' ? true: false" allowClear>
<a-select-option v-for="(item, key) in itemval.controlValue" :key="key" :value="item.value"> <a-select-option v-for="(item, key) in itemval.controlValue" :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 ">
@@ -203,11 +203,11 @@
</div> </div>
<span v-if="(currentPersonRole == 'dre' && !detailDate.referencesColFlag) || <span v-if="(currentPersonRole == 'dre' && !detailDate.referencesColFlag) ||
(currentPersonRole == 'homo' && detailDate.referencesColFlag)"> (currentPersonRole == 'homo' && detailDate.referencesColFlag)">
<div @click="addconfig" class='addicon' <div @click="addconfig" class="addicon"
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9"> v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
<a-icon type="plus" /> <a-icon type="plus" />
</div> </div>
<div @click="delconfig(item)" class='delicon' <div @click="delconfig(item,index)" class="delicon"
v-if="Object.keys(detailDate.paramsConfigData).length > 1"> v-if="Object.keys(detailDate.paramsConfigData).length > 1">
<a-icon type="minus" /> <a-icon type="minus" />
</div> </div>
@@ -215,11 +215,11 @@
</div> </div>
</div> </div>
<!-- 纯附件--> <!-- 纯附件-->
<div v-else-if='detailDate.controlType === "4" && detailDate.paramsConfigData' class='add_flex'> <div v-else-if='detailDate.controlType === "4" && detailDate.paramsConfigData' class="add_flex">
<div v-for='(item,index) in Object.keys(detailDate.paramsConfigData)' :key='index' style='flex: 1' <div v-for="(item,index) in key" :key="index" style="flex: 1"
class='add-width'> class="add-width">
<div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1' <div v-for="(itemval,index1) in detailDate.paramsConfigData[item]" :key="index1"
style="display: inline-block" class='valflex'> style="display: inline-block" class="valflex">
<div class="textClass" v-if='itemval.type==="file"'> <div class="textClass" v-if='itemval.type==="file"'>
<a-button type="primary" class="button-text inputWid" <a-button type="primary" class="button-text inputWid"
@click="clickButtonToUpload(item,itemval,index1)"> @click="clickButtonToUpload(item,itemval,index1)">
@@ -230,11 +230,11 @@
</div> </div>
<span v-if="(currentPersonRole == 'dre' && !detailDate.referencesColFlag) || <span v-if="(currentPersonRole == 'dre' && !detailDate.referencesColFlag) ||
(currentPersonRole == 'homo' && detailDate.referencesColFlag)"> (currentPersonRole == 'homo' && detailDate.referencesColFlag)">
<div @click="addconfig" class='addicon' <div @click="addconfig" class="addicon"
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9"> v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
<a-icon type="plus" /> <a-icon type="plus" />
</div> </div>
<div @click="delconfig(item)" class='delicon' <div @click="delconfig(item,index)" class="delicon"
v-if="Object.keys(detailDate.paramsConfigData).length > 1"> v-if="Object.keys(detailDate.paramsConfigData).length > 1">
<a-icon type="minus" /> <a-icon type="minus" />
</div> </div>
@@ -242,14 +242,14 @@
</div> </div>
</div> </div>
<!-- 文本+下拉单选--> <!-- 文本+下拉单选-->
<div v-else-if='detailDate.controlType === "5" && detailDate.paramsConfigData' class='add_flex'> <div v-else-if='detailDate.controlType === "5" && detailDate.paramsConfigData' class="add_flex">
<div v-for='(item,index) in Object.keys(detailDate.paramsConfigData)' :key='index' class='add-width'> <div v-for="(item,index) in key" :key="index" class="add-width">
<div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1' <div v-for="(itemval,index1) in detailDate.paramsConfigData[item]" :key="index1"
style="display: inline-block" class='valflex'> style="display: inline-block" class="valflex">
<div class="textClass" v-if='itemval.type==="pull"'> <div class="textClass" v-if='itemval.type==="pull"'>
<a-select v-model="itemval.dataValue" <a-select v-model="itemval.dataValue"
:getPopupContainer="triggerNode=> triggerNode.parentNode" :getPopupContainer="triggerNode=> triggerNode.parentNode"
class='selectWid' :disabled="itemval.isLock == '1' ? true: false" class="selectWid" :disabled="itemval.isLock == '1' ? true: false"
allowClear> allowClear>
<a-select-option v-for="(itemin, key) in itemval.controlValue" :key="key" :value="itemin.value"> <a-select-option v-for="(itemin, key) in itemval.controlValue" :key="key" :value="itemin.value">
<span style="display: inline-block;width: 100%" :title=" itemin.label "> <span style="display: inline-block;width: 100%" :title=" itemin.label ">
@@ -352,11 +352,11 @@
</div> </div>
<span v-if="(currentPersonRole == 'dre' && !detailDate.referencesColFlag) || <span v-if="(currentPersonRole == 'dre' && !detailDate.referencesColFlag) ||
(currentPersonRole == 'homo' && detailDate.referencesColFlag)"> (currentPersonRole == 'homo' && detailDate.referencesColFlag)">
<div @click="addconfig" class='addicon' <div @click="addconfig" class="addicon"
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9"> v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
<a-icon type="plus" /> <a-icon type="plus" />
</div> </div>
<div @click="delconfig(item)" class='delicon' <div @click="delconfig(item,index)" class="delicon"
v-if="Object.keys(detailDate.paramsConfigData).length > 1"> v-if="Object.keys(detailDate.paramsConfigData).length > 1">
<a-icon type="minus" /> <a-icon type="minus" />
</div> </div>
@@ -364,16 +364,16 @@
</div> </div>
</div> </div>
<!-- 文本+下拉多选--> <!-- 文本+下拉多选-->
<div v-else-if='detailDate.controlType === "6" && detailDate.paramsConfigData' class='add_flex'> <div v-else-if='detailDate.controlType === "6" && detailDate.paramsConfigData' class="add_flex">
<div v-for='(item,index) in Object.keys(detailDate.paramsConfigData)' :key='index' class='add-width'> <div v-for="(item,index) in key" :key="index" class="add-width">
<div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1' <div v-for="(itemval,index1) in detailDate.paramsConfigData[item]" :key="index1"
style="display: inline-block" style="display: inline-block"
:class="{'multiple':itemval.type==='pull_more'?true:false}" :class="{'multiple':itemval.type==='pull_more'?true:false}"
class='valflex'> class="valflex">
<div class="textClass" v-if='itemval.type==="pull_more"'> <div class="textClass" v-if='itemval.type==="pull_more"'>
<a-select v-model="itemval.dataValue" <a-select v-model="itemval.dataValue"
:getPopupContainer="triggerNode=> triggerNode.parentNode" :getPopupContainer="triggerNode=> triggerNode.parentNode"
mode="multiple" class='selectWid' mode="multiple" class="selectWid"
:disabled="itemval.isLock == '1' ? true: false" allowClear> :disabled="itemval.isLock == '1' ? true: false" allowClear>
<a-select-option v-for="(item, key) in itemval.controlValue" :key="key" :value="item.value"> <a-select-option v-for="(item, key) in itemval.controlValue" :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 ">
@@ -476,11 +476,11 @@
</div> </div>
<span v-if="(currentPersonRole == 'dre' && !detailDate.referencesColFlag) || <span v-if="(currentPersonRole == 'dre' && !detailDate.referencesColFlag) ||
(currentPersonRole == 'homo' && detailDate.referencesColFlag)"> (currentPersonRole == 'homo' && detailDate.referencesColFlag)">
<div @click="addconfig" class='addicon' <div @click="addconfig" class="addicon"
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9"> v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
<a-icon type="plus" /> <a-icon type="plus" />
</div> </div>
<div @click="delconfig(item)" class='delicon' <div @click="delconfig(item,index)" class="delicon"
v-if="Object.keys(detailDate.paramsConfigData).length > 1"> v-if="Object.keys(detailDate.paramsConfigData).length > 1">
<a-icon type="minus" /> <a-icon type="minus" />
</div> </div>
@@ -488,10 +488,10 @@
</div> </div>
</div> </div>
<!-- 文本+附件--> <!-- 文本+附件-->
<div v-else-if='detailDate.controlType === "7" && detailDate.paramsConfigData' class='add_flex'> <div v-else-if='detailDate.controlType === "7" && detailDate.paramsConfigData' class="add_flex">
<div v-for='(item,index) in Object.keys(detailDate.paramsConfigData)' :key='index' class='add-width'> <div v-for="(item,index) in key" :key="index" class="add-width">
<div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1' <div v-for="(itemval,index1) in detailDate.paramsConfigData[item]" :key="index1"
style="display: inline-block" class='valflex'> style="display: inline-block" class="valflex">
<div class="textClass" v-if='itemval.type==="text"'> <div class="textClass" v-if='itemval.type==="text"'>
<!-- 文本校验 分情况--> <!-- 文本校验 分情况-->
<!-- 1 无--> <!-- 1 无-->
@@ -593,11 +593,11 @@
</div> </div>
<span v-if="(currentPersonRole == 'dre' && !detailDate.referencesColFlag) || <span v-if="(currentPersonRole == 'dre' && !detailDate.referencesColFlag) ||
(currentPersonRole == 'homo' && detailDate.referencesColFlag)"> (currentPersonRole == 'homo' && detailDate.referencesColFlag)">
<div @click="addconfig" class='addicon' <div @click="addconfig" class="addicon"
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9"> v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
<a-icon type="plus" /> <a-icon type="plus" />
</div> </div>
<div @click="delconfig(item)" class='delicon' <div @click="delconfig(item,index)" class="delicon"
v-if="Object.keys(detailDate.paramsConfigData).length > 1"> v-if="Object.keys(detailDate.paramsConfigData).length > 1">
<a-icon type="minus" /> <a-icon type="minus" />
</div> </div>
@@ -605,15 +605,15 @@
</div> </div>
</div> </div>
<!-- 下拉单选+附件--> <!-- 下拉单选+附件-->
<div v-else-if='detailDate.controlType === "8" && detailDate.paramsConfigData' class='add_flex'> <div v-else-if='detailDate.controlType === "8" && detailDate.paramsConfigData' class="add_flex">
<div v-for='(item,index) in Object.keys(detailDate.paramsConfigData)' :key='index' class='add-width'> <div v-for="(item,index) in key" :key="index" class="add-width">
<div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' <div v-for="(itemval,index1) in detailDate.paramsConfigData[item]"
:key='index1' style="display: inline-block" class='valflex'> :key="index1" style="display: inline-block" class="valflex">
<!-- <div v-for='(itemval,val) in val' :key='val'>--> <!-- <div v-for='(itemval,val) in val' :key='val'>-->
<div class="textClass" v-if='itemval.type==="pull"'> <div class="textClass" v-if='itemval.type==="pull"'>
<a-select v-model="itemval.dataValue" <a-select v-model="itemval.dataValue"
:getPopupContainer="triggerNode=> triggerNode.parentNode" :getPopupContainer="triggerNode=> triggerNode.parentNode"
class='selectWid' :disabled="itemval.isLock == '1' ? true: false" class="selectWid" :disabled="itemval.isLock == '1' ? true: false"
allowClear> allowClear>
<a-select-option v-for="(itemin, key) in itemval.controlValue" :key="key" :value="itemin.value"> <a-select-option v-for="(itemin, key) in itemval.controlValue" :key="key" :value="itemin.value">
<span style="display: inline-block;width: 100%" :title=" itemin.label "> <span style="display: inline-block;width: 100%" :title=" itemin.label ">
@@ -633,11 +633,11 @@
</div> </div>
<span v-if="(currentPersonRole == 'dre' && !detailDate.referencesColFlag) || <span v-if="(currentPersonRole == 'dre' && !detailDate.referencesColFlag) ||
(currentPersonRole == 'homo' && detailDate.referencesColFlag)"> (currentPersonRole == 'homo' && detailDate.referencesColFlag)">
<div @click="addconfig" class='addicon' <div @click="addconfig" class="addicon"
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9"> v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
<a-icon type="plus" /> <a-icon type="plus" />
</div> </div>
<div @click="delconfig(item)" class='delicon' <div @click="delconfig(item,index)" class="delicon"
v-if="Object.keys(detailDate.paramsConfigData).length > 1"> v-if="Object.keys(detailDate.paramsConfigData).length > 1">
<a-icon type="minus" /> <a-icon type="minus" />
</div> </div>
@@ -645,17 +645,17 @@
</div> </div>
</div> </div>
<!-- 下拉多选+附件--> <!-- 下拉多选+附件-->
<div v-else-if='detailDate.controlType === "9" && detailDate.paramsConfigData' class='add_flex'> <div v-else-if='detailDate.controlType === "9" && detailDate.paramsConfigData' class="add_flex">
<div v-for='(item,index) in Object.keys(detailDate.paramsConfigData)' :key='index' class='add-width'> <div v-for="(item,index) in key" :key="index" class="add-width">
<div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1' <div v-for="(itemval,index1) in detailDate.paramsConfigData[item]" :key="index1"
style="display: inline-block" style="display: inline-block"
:class="{'multiple':itemval.type==='pull_more'?true:false}" :class="{'multiple':itemval.type==='pull_more'?true:false}"
class='valflex'> class="valflex">
<!-- <div v-for='(itemval,val) in val' :key='val'>--> <!-- <div v-for='(itemval,val) in val' :key='val'>-->
<div class="textClass" v-if='itemval.type==="pull_more"'> <div class="textClass" v-if='itemval.type==="pull_more"'>
<a-select v-model="itemval.dataValue" <a-select v-model="itemval.dataValue"
:getPopupContainer="triggerNode=> triggerNode.parentNode" :getPopupContainer="triggerNode=> triggerNode.parentNode"
mode="multiple" class='selectWid' mode="multiple" class="selectWid"
:disabled="itemval.isLock == '1' ? true: false" allowClear> :disabled="itemval.isLock == '1' ? true: false" allowClear>
<a-select-option v-for="(item, key) in itemval.controlValue" :key="key" :value="item.value"> <a-select-option v-for="(item, key) in itemval.controlValue" :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 ">
@@ -675,11 +675,11 @@
</div> </div>
<span v-if="(currentPersonRole == 'dre' && !detailDate.referencesColFlag) || <span v-if="(currentPersonRole == 'dre' && !detailDate.referencesColFlag) ||
(currentPersonRole == 'homo' && detailDate.referencesColFlag)"> (currentPersonRole == 'homo' && detailDate.referencesColFlag)">
<div @click="addconfig" class='addicon' <div @click="addconfig" class="addicon"
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9"> v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
<a-icon type="plus" /> <a-icon type="plus" />
</div> </div>
<div @click="delconfig(item)" class='delicon' <div @click="delconfig(item,index)" class="delicon"
v-if="Object.keys(detailDate.paramsConfigData).length > 1"> v-if="Object.keys(detailDate.paramsConfigData).length > 1">
<a-icon type="minus" /> <a-icon type="minus" />
</div> </div>
@@ -687,16 +687,16 @@
</div> </div>
</div> </div>
<!-- 文本+下拉单选+附件--> <!-- 文本+下拉单选+附件-->
<div v-else-if='detailDate.controlType === "10" && detailDate.paramsConfigData' class='add_flex'> <div v-else-if='detailDate.controlType === "10" && detailDate.paramsConfigData' class="add_flex">
<div v-for='(item,index) in Object.keys(detailDate.paramsConfigData)' :key='index' class='add-width'> <div v-for="(item,index) in key" :key="index" class="add-width">
<!-- <div v-for='(item,index) in detailDateList' :key='index' class='add-width'>--> <!-- <div v-for='(item,index) in detailDateList' :key='index' class='add-width'>-->
<div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1' <div v-for="(itemval,index1) in detailDate.paramsConfigData[item]" :key="index1"
style="display: inline-block" class='valflex'> style="display: inline-block" class="valflex">
<!-- <div v-for='(itemval,val) in val' :key='val'>--> <!-- <div v-for='(itemval,val) in val' :key='val'>-->
<div class="textClass" v-if='itemval.type==="pull"'> <div class="textClass" v-if='itemval.type==="pull"'>
<a-select v-model="itemval.dataValue" <a-select v-model="itemval.dataValue"
:getPopupContainer="triggerNode=> triggerNode.parentNode" :getPopupContainer="triggerNode=> triggerNode.parentNode"
class='selectWid' :disabled="itemval.isLock == '1' ? true: false" class="selectWid" :disabled="itemval.isLock == '1' ? true: false"
allowClear> allowClear>
<a-select-option v-for="(itemin, key) in itemval.controlValue" :key="key" :value="itemin.value"> <a-select-option v-for="(itemin, key) in itemval.controlValue" :key="key" :value="itemin.value">
<span style="display: inline-block;width: 100%" class="itemOption" :title=" itemin.label "> <span style="display: inline-block;width: 100%" class="itemOption" :title=" itemin.label ">
@@ -806,11 +806,11 @@
</div> </div>
<span v-if="(currentPersonRole == 'dre' && !detailDate.referencesColFlag) || <span v-if="(currentPersonRole == 'dre' && !detailDate.referencesColFlag) ||
(currentPersonRole == 'homo' && detailDate.referencesColFlag)"> (currentPersonRole == 'homo' && detailDate.referencesColFlag)">
<div @click="addconfig" class='addicon' <div @click="addconfig" class="addicon"
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9"> v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
<a-icon type="plus" /> <a-icon type="plus" />
</div> </div>
<div @click="delconfig(item)" class='delicon' <div @click="delconfig(item,index)" class="delicon"
v-if="Object.keys(detailDate.paramsConfigData).length > 1"> v-if="Object.keys(detailDate.paramsConfigData).length > 1">
<a-icon type="minus" /> <a-icon type="minus" />
</div> </div>
@@ -821,7 +821,7 @@
</div> </div>
<uploadFileChangeDown ref="uploadFile" @uploadSuccess="uploadSuccess" <uploadFileChangeDown ref="uploadFile" @uploadSuccess="uploadSuccess"
:detailDate='detailDate' watermark='download'></uploadFileChangeDown> :detailDate="detailDate" watermark="download"></uploadFileChangeDown>
</div> </div>
</template> </template>
@@ -866,7 +866,8 @@
paramsConfigData: {}, paramsConfigData: {},
fileNameOne: '', fileNameOne: '',
fileNameTwo: '', fileNameTwo: '',
fileIndex: '' fileIndex: '',
key:[]
} }
}, },
components: { components: {
@@ -876,8 +877,6 @@
this.detailDateList = [] this.detailDateList = []
this.paramsConfigData = this.detailDate.paramsConfigData this.paramsConfigData = this.detailDate.paramsConfigData
let name = [] let name = []
console.log(this.detailDate)
console.log(this.currentPersonRole)
// this.columName.forEach(item => { // this.columName.forEach(item => {
// if (item.db_field_name && item.db_field_name != '') { // if (item.db_field_name && item.db_field_name != '') {
// name.push(item.db_field_name) // name.push(item.db_field_name)
@@ -902,8 +901,18 @@
// }) // })
// this.detailDatetransformation.push(item) // this.detailDatetransformation.push(item)
}) })
console.log(this.detailDate) // const ordered = {}
console.log(this.detailDateList, 'oooooo') // let that = this
// Object.keys(this.detailDate.paramsConfigData).sort().forEach(function(key) {
// ordered[key] = that.detailDate.paramsConfigData[key]
// })
this.key = Object.keys(this.detailDate.paramsConfigData).sort((a, b) => {
let index = a.lastIndexOf('+')
let index1 = b.lastIndexOf('+')
return a.slice(0, index) - b.slice(0, index1)
})
// this.detailDate.paramsConfigData = ordered
// this.detailDate.paramsConfigData = { ...this.detailDate.paramsConfigData }
}, },
methods: { methods: {
selectChange(val) { selectChange(val) {
@@ -968,7 +977,7 @@
}, },
generateRandom(size = 16) { generateRandom(size = 16) {
let urlAlphabet = let urlAlphabet =
'useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict' 'useandom-26T198340PX75pxJACKVERYMINDBUSHWOLFGQZ_bfghjklqvwyzrict'
let id = '' let id = ''
// A compact alternative for `for (var i = 0; i < step; i++)`. // A compact alternative for `for (var i = 0; i < step; i++)`.
@@ -981,13 +990,28 @@
// return Math.random().toString(32) // return Math.random().toString(32)
}, },
addconfig() { addconfig() {
let paramsConfigData = Object.keys(this.detailDate.paramsConfigData) let paramsConfigData = Object.keys(this.detailDate.paramsConfigData).sort((a, b) => {
let index = a.lastIndexOf('+')
let index1 = b.lastIndexOf('+')
return a.slice(0, index) - b.slice(0, index1)
})
// let paramsConfigData = Object.keys(this.detailDate.paramsConfigData)
for (let i = 0; i < paramsConfigData.length; i++) { for (let i = 0; i < paramsConfigData.length; i++) {
// this.detailDate.paramsConfigData[paramsConfigData[i]][0].orderNum = i + 1
if (i == paramsConfigData.length - 1) { if (i == paramsConfigData.length - 1) {
let name = paramsConfigData[i] let name = paramsConfigData[i]
let generateRandom = this.generateRandom() let index = name.lastIndexOf('+')
let num
if (index == '-1') {
num = 0
} else {
num = name.slice(0, index)
}
console.log(num)
num = parseInt(num)
let generateRandom = (num + 1) + '+' + this.generateRandom()
this.detailDate.paramsConfigData[generateRandom] = JSON.parse(JSON.stringify(this.detailDate.paramsConfigData[name])) this.detailDate.paramsConfigData[generateRandom] = JSON.parse(JSON.stringify(this.detailDate.paramsConfigData[name]))
this.detailDate.paramsConfigData[generateRandom].forEach(res => { this.detailDate.paramsConfigData[generateRandom].forEach((res, index) => {
if (res.type === 'pull_more') { if (res.type === 'pull_more') {
res.dataValue = [] res.dataValue = []
} else { } else {
@@ -996,7 +1020,18 @@
}) })
} }
} }
this.detailDate.paramsConfigData = { ...this.detailDate.paramsConfigData } const ordered = {}
let that = this
Object.keys(this.detailDate.paramsConfigData).sort().forEach(function(key) {
ordered[key] = that.detailDate.paramsConfigData[key]
})
this.key = Object.keys(this.detailDate.paramsConfigData).sort((a, b) => {
let index = a.lastIndexOf('+')
let index1 = b.lastIndexOf('+')
return a.slice(0, index) - b.slice(0, index1)
})
this.detailDate.paramsConfigData = { ...ordered }
this.$emit('consolidateData') this.$emit('consolidateData')
// postAction('params/configData/add', { // postAction('params/configData/add', {
// paramsCollectManifestId: this.recordList.id, // paramsCollectManifestId: this.recordList.id,
@@ -1008,8 +1043,9 @@
// } // }
// }) // })
}, },
delconfig(item) { delconfig(item,index) {
delete this.detailDate.paramsConfigData[item] delete this.detailDate.paramsConfigData[item]
this.key.splice(index,1)
this.detailDate.paramsConfigData = { ...this.detailDate.paramsConfigData } this.detailDate.paramsConfigData = { ...this.detailDate.paramsConfigData }
this.$emit('consolidateData') this.$emit('consolidateData')
// for (const key in this.detailDate.paramsConfigData) { // for (const key in this.detailDate.paramsConfigData) {
jero-web/src/components/CollectionTypeDisabled/index.vue
+62 -29
View File
@@ -3,7 +3,7 @@
<div class='box'> <div class='box'>
<!-- 纯文本--> <!-- 纯文本-->
<div v-if='detailDate.controlType === "1" && detailDate.paramsConfigData' class='add_flex'> <div v-if='detailDate.controlType === "1" && detailDate.paramsConfigData' class='add_flex'>
<div v-for='(item,index) in Object.keys(detailDate.paramsConfigData)' :key='index' class='add-width'> <div v-for='(item,index) in key' :key='index' class='add-width'>
<div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1' <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
style="display: inline-block" class='valflex'> style="display: inline-block" class='valflex'>
<div class="textClass" v-if='itemval.type==="text"'> <div class="textClass" v-if='itemval.type==="text"'>
@@ -93,7 +93,7 @@
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9"> v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
<a-icon type="plus"/> <a-icon type="plus"/>
</div> </div>
<div @click="delconfig(item)" class='delicon' <div @click="delconfig(item,index)" class='delicon'
v-if="Object.keys(detailDate.paramsConfigData).length > 1"> v-if="Object.keys(detailDate.paramsConfigData).length > 1">
<a-icon type="minus"/> <a-icon type="minus"/>
</div> </div>
@@ -101,7 +101,7 @@
</div> </div>
<!-- 默认值--> <!-- 默认值-->
<div v-if='detailDate.controlType === "11" && detailDate.paramsConfigData' class='add_flex'> <div v-if='detailDate.controlType === "11" && detailDate.paramsConfigData' class='add_flex'>
<div v-for='(item,index) in Object.keys(detailDate.paramsConfigData)' :key='index' class='add-width'> <div v-for='(item,index) in key' :key='index' class='add-width'>
<div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1' <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
style="display: inline-block" class='valflex'> style="display: inline-block" class='valflex'>
<div class="textClass" v-if='itemval.type==="text"'> <div class="textClass" v-if='itemval.type==="text"'>
@@ -128,7 +128,7 @@
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9"> v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
<a-icon type="plus"/> <a-icon type="plus"/>
</div> </div>
<div @click="delconfig(item)" class='delicon' <div @click="delconfig(item,index)" class='delicon'
v-if="Object.keys(detailDate.paramsConfigData).length > 1"> v-if="Object.keys(detailDate.paramsConfigData).length > 1">
<a-icon type="minus"/> <a-icon type="minus"/>
</div> </div>
@@ -136,7 +136,7 @@
</div> </div>
<!-- 纯下拉单选--> <!-- 纯下拉单选-->
<div v-else-if='detailDate.controlType === "2" && detailDate.paramsConfigData' class='add_flex'> <div v-else-if='detailDate.controlType === "2" && detailDate.paramsConfigData' class='add_flex'>
<div v-for='(item,index) in Object.keys(detailDate.paramsConfigData)' :key='index' class='add-width'> <div v-for='(item,index) in key' :key='index' class='add-width'>
<div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1' <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
style="display: inline-block" class='valflex'> style="display: inline-block" class='valflex'>
<div class="textClass" v-if='itemval.type === "pull"'> <div class="textClass" v-if='itemval.type === "pull"'>
@@ -156,7 +156,7 @@
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9"> v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
<a-icon type="plus"/> <a-icon type="plus"/>
</div> </div>
<div @click="delconfig(item)" class='delicon' <div @click="delconfig(item,index)" class='delicon'
v-if="Object.keys(detailDate.paramsConfigData).length > 1"> v-if="Object.keys(detailDate.paramsConfigData).length > 1">
<a-icon type="minus"/> <a-icon type="minus"/>
</div> </div>
@@ -164,7 +164,7 @@
</div> </div>
<!-- 纯下拉多选--> <!-- 纯下拉多选-->
<div v-else-if='detailDate.controlType === "3" && detailDate.paramsConfigData' class='add_flex'> <div v-else-if='detailDate.controlType === "3" && detailDate.paramsConfigData' class='add_flex'>
<div v-for='(item,index) in Object.keys(detailDate.paramsConfigData)' :key='index' style='flex: 1' <div v-for='(item,index) in key' :key='index' style='flex: 1'
class='add-width'> class='add-width'>
<div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1' <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
style="display: inline-block;" class='valflex' style="display: inline-block;" class='valflex'
@@ -186,7 +186,7 @@
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9"> v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
<a-icon type="plus"/> <a-icon type="plus"/>
</div> </div>
<div @click="delconfig(item)" class='delicon' <div @click="delconfig(item,index)" class='delicon'
v-if="Object.keys(detailDate.paramsConfigData).length > 1"> v-if="Object.keys(detailDate.paramsConfigData).length > 1">
<a-icon type="minus"/> <a-icon type="minus"/>
</div> </div>
@@ -194,7 +194,7 @@
</div> </div>
<!-- 纯附件--> <!-- 纯附件-->
<div v-else-if='detailDate.controlType === "4" && detailDate.paramsConfigData' class='add_flex'> <div v-else-if='detailDate.controlType === "4" && detailDate.paramsConfigData' class='add_flex'>
<div v-for='(item,index) in Object.keys(detailDate.paramsConfigData)' :key='index' style='flex: 1' <div v-for='(item,index) in key' :key='index' style='flex: 1'
class='add-width'> class='add-width'>
<div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1' <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
style="display: inline-block" class='valflex'> style="display: inline-block" class='valflex'>
@@ -210,7 +210,7 @@
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9"> v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
<a-icon type="plus"/> <a-icon type="plus"/>
</div> </div>
<div @click="delconfig(item)" class='delicon' <div @click="delconfig(item,index)" class='delicon'
v-if="Object.keys(detailDate.paramsConfigData).length > 1"> v-if="Object.keys(detailDate.paramsConfigData).length > 1">
<a-icon type="minus"/> <a-icon type="minus"/>
</div> </div>
@@ -218,7 +218,7 @@
</div> </div>
<!-- 文本+下拉单选--> <!-- 文本+下拉单选-->
<div v-else-if='detailDate.controlType === "5" && detailDate.paramsConfigData' class='add_flex'> <div v-else-if='detailDate.controlType === "5" && detailDate.paramsConfigData' class='add_flex'>
<div v-for='(item,index) in Object.keys(detailDate.paramsConfigData)' :key='index' class='add-width'> <div v-for='(item,index) in key' :key='index' class='add-width'>
<div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1' <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
style="display: inline-block" class='valflex'> style="display: inline-block" class='valflex'>
<div class="textClass" v-if='itemval.type==="pull"'> <div class="textClass" v-if='itemval.type==="pull"'>
@@ -320,7 +320,7 @@
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9"> v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
<a-icon type="plus"/> <a-icon type="plus"/>
</div> </div>
<div @click="delconfig(item)" class='delicon' <div @click="delconfig(item,index)" class='delicon'
v-if="Object.keys(detailDate.paramsConfigData).length > 1"> v-if="Object.keys(detailDate.paramsConfigData).length > 1">
<a-icon type="minus"/> <a-icon type="minus"/>
</div> </div>
@@ -328,7 +328,7 @@
</div> </div>
<!-- 文本+下拉多选--> <!-- 文本+下拉多选-->
<div v-else-if='detailDate.controlType === "6" && detailDate.paramsConfigData' class='add_flex'> <div v-else-if='detailDate.controlType === "6" && detailDate.paramsConfigData' class='add_flex'>
<div v-for='(item,index) in Object.keys(detailDate.paramsConfigData)' :key='index' class='add-width'> <div v-for='(item,index) in key' :key='index' class='add-width'>
<div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1' <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
style="display: inline-block" style="display: inline-block"
:class="{'multiple':itemval.type==='pull_more'?true:false}" :class="{'multiple':itemval.type==='pull_more'?true:false}"
@@ -432,7 +432,7 @@
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9"> v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
<a-icon type="plus"/> <a-icon type="plus"/>
</div> </div>
<div @click="delconfig(item)" class='delicon' <div @click="delconfig(item,index)" class='delicon'
v-if="Object.keys(detailDate.paramsConfigData).length > 1"> v-if="Object.keys(detailDate.paramsConfigData).length > 1">
<a-icon type="minus"/> <a-icon type="minus"/>
</div> </div>
@@ -440,7 +440,7 @@
</div> </div>
<!-- 文本+附件--> <!-- 文本+附件-->
<div v-else-if='detailDate.controlType === "7" && detailDate.paramsConfigData' class='add_flex'> <div v-else-if='detailDate.controlType === "7" && detailDate.paramsConfigData' class='add_flex'>
<div v-for='(item,index) in Object.keys(detailDate.paramsConfigData)' :key='index' class='add-width'> <div v-for='(item,index) in key' :key='index' class='add-width'>
<div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1' <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
style="display: inline-block" class='valflex'> style="display: inline-block" class='valflex'>
<div class="textClass" v-if='itemval.type==="text"'> <div class="textClass" v-if='itemval.type==="text"'>
@@ -537,7 +537,7 @@
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9"> v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
<a-icon type="plus"/> <a-icon type="plus"/>
</div> </div>
<div @click="delconfig(item)" class='delicon' <div @click="delconfig(item,index)" class='delicon'
v-if="Object.keys(detailDate.paramsConfigData).length > 1"> v-if="Object.keys(detailDate.paramsConfigData).length > 1">
<a-icon type="minus"/> <a-icon type="minus"/>
</div> </div>
@@ -545,7 +545,7 @@
</div> </div>
<!-- 下拉单选+附件--> <!-- 下拉单选+附件-->
<div v-else-if='detailDate.controlType === "8" && detailDate.paramsConfigData' class='add_flex'> <div v-else-if='detailDate.controlType === "8" && detailDate.paramsConfigData' class='add_flex'>
<div v-for='(item,index) in Object.keys(detailDate.paramsConfigData)' :key='index' class='add-width'> <div v-for='(item,index) in key' :key='index' class='add-width'>
<div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]'
:key='index1' style="display: inline-block" class='valflex'> :key='index1' style="display: inline-block" class='valflex'>
<!-- <div v-for='(itemval,val) in val' :key='val'>--> <!-- <div v-for='(itemval,val) in val' :key='val'>-->
@@ -574,7 +574,7 @@
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9"> v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
<a-icon type="plus"/> <a-icon type="plus"/>
</div> </div>
<div @click="delconfig(item)" class='delicon' <div @click="delconfig(item,index)" class='delicon'
v-if="Object.keys(detailDate.paramsConfigData).length > 1"> v-if="Object.keys(detailDate.paramsConfigData).length > 1">
<a-icon type="minus"/> <a-icon type="minus"/>
</div> </div>
@@ -582,7 +582,7 @@
</div> </div>
<!-- 下拉多选+附件--> <!-- 下拉多选+附件-->
<div v-else-if='detailDate.controlType === "9" && detailDate.paramsConfigData' class='add_flex'> <div v-else-if='detailDate.controlType === "9" && detailDate.paramsConfigData' class='add_flex'>
<div v-for='(item,index) in Object.keys(detailDate.paramsConfigData)' :key='index' class='add-width'> <div v-for='(item,index) in key' :key='index' class='add-width'>
<div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1' <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
style="display: inline-block" style="display: inline-block"
:class="{'multiple':itemval.type==='pull_more'?true:false}" :class="{'multiple':itemval.type==='pull_more'?true:false}"
@@ -613,7 +613,7 @@
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9"> v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
<a-icon type="plus"/> <a-icon type="plus"/>
</div> </div>
<div @click="delconfig(item)" class='delicon' <div @click="delconfig(item,index)" class='delicon'
v-if="Object.keys(detailDate.paramsConfigData).length > 1"> v-if="Object.keys(detailDate.paramsConfigData).length > 1">
<a-icon type="minus"/> <a-icon type="minus"/>
</div> </div>
@@ -621,7 +621,7 @@
</div> </div>
<!-- 文本+下拉单选+附件--> <!-- 文本+下拉单选+附件-->
<div v-else-if='detailDate.controlType === "10" && detailDate.paramsConfigData' class='add_flex'> <div v-else-if='detailDate.controlType === "10" && detailDate.paramsConfigData' class='add_flex'>
<div v-for='(item,index) in Object.keys(detailDate.paramsConfigData)' :key='index' class='add-width'> <div v-for='(item,index) in key' :key='index' class='add-width'>
<!-- <div v-for='(item,index) in detailDateList' :key='index' class='add-width'>--> <!-- <div v-for='(item,index) in detailDateList' :key='index' class='add-width'>-->
<div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1' <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
style="display: inline-block" class='valflex'> style="display: inline-block" class='valflex'>
@@ -732,7 +732,7 @@
v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9"> v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
<a-icon type="plus"/> <a-icon type="plus"/>
</div> </div>
<div @click="delconfig(item)" class='delicon' <div @click="delconfig(item,index)" class='delicon'
v-if="Object.keys(detailDate.paramsConfigData).length > 1"> v-if="Object.keys(detailDate.paramsConfigData).length > 1">
<a-icon type="minus"/> <a-icon type="minus"/>
</div> </div>
@@ -765,7 +765,8 @@
detailDatetransformation: [], detailDatetransformation: [],
fileNameOne: '', fileNameOne: '',
fileNameTwo: '', fileNameTwo: '',
fileIndex: '' fileIndex: '',
key:[],
} }
}, },
components: { components: {
@@ -788,6 +789,11 @@
// }) // })
// this.detailDatetransformation.push(item) // this.detailDatetransformation.push(item)
}) })
this.key = Object.keys(this.detailDate.paramsConfigData).sort((a, b) => {
let index = a.lastIndexOf('+')
let index1 = b.lastIndexOf('+')
return a.slice(0, index) - b.slice(0, index1)
})
}, },
methods: { methods: {
onInput(r) { onInput(r) {
@@ -857,14 +863,27 @@
}, },
addconfig() { addconfig() {
let paramsConfigData = Object.keys(this.detailDate.paramsConfigData) let paramsConfigData = Object.keys(this.detailDate.paramsConfigData).sort((a, b) => {
let index = a.lastIndexOf('+')
let index1 = b.lastIndexOf('+')
return a.slice(0, index) - b.slice(0, index1)
})
for (let i = 0; i < paramsConfigData.length; i++) { for (let i = 0; i < paramsConfigData.length; i++) {
// this.detailDate.paramsConfigData[paramsConfigData[i]][0].orderNum = i + 1
if (i == paramsConfigData.length - 1) { if (i == paramsConfigData.length - 1) {
let name = paramsConfigData[i] let name = paramsConfigData[i]
let generateRandom = this.generateRandom() let index = name.lastIndexOf('+')
console.log(generateRandom) let num
if (index == '-1') {
num = 0
} else {
num = name.slice(0, index)
}
console.log(num)
num = parseInt(num)
let generateRandom = (num + 1) + '+' + this.generateRandom()
this.detailDate.paramsConfigData[generateRandom] = JSON.parse(JSON.stringify(this.detailDate.paramsConfigData[name])) this.detailDate.paramsConfigData[generateRandom] = JSON.parse(JSON.stringify(this.detailDate.paramsConfigData[name]))
this.detailDate.paramsConfigData[generateRandom].forEach(res => { this.detailDate.paramsConfigData[generateRandom].forEach((res, index) => {
if (res.type === 'pull_more') { if (res.type === 'pull_more') {
res.dataValue = [] res.dataValue = []
} else { } else {
@@ -873,7 +892,20 @@
}) })
} }
} }
this.detailDate.paramsConfigData = { ...this.detailDate.paramsConfigData } const ordered = {}
let that = this
Object.keys(this.detailDate.paramsConfigData).sort().forEach(function(key) {
ordered[key] = that.detailDate.paramsConfigData[key]
})
console.log(ordered)
this.key = Object.keys(this.detailDate.paramsConfigData).sort((a, b) => {
let index = a.lastIndexOf('+')
let index1 = b.lastIndexOf('+')
return a.slice(0, index) - b.slice(0, index1)
})
console.log(this.key)
this.detailDate.paramsConfigData = { ...ordered }
this.$emit('consolidateData') this.$emit('consolidateData')
// postAction('params/configData/add', { // postAction('params/configData/add', {
// paramsCollectManifestId: this.recordList.id, // paramsCollectManifestId: this.recordList.id,
@@ -885,8 +917,9 @@
// } // }
// }) // })
}, },
delconfig(item) { delconfig(item,index) {
delete this.detailDate.paramsConfigData[item] delete this.detailDate.paramsConfigData[item]
this.key.splice(index,1)
this.detailDate.paramsConfigData = { ...this.detailDate.paramsConfigData } this.detailDate.paramsConfigData = { ...this.detailDate.paramsConfigData }
this.$emit('consolidateData') this.$emit('consolidateData')
// for (const key in this.detailDate.paramsConfigData) { // for (const key in this.detailDate.paramsConfigData) {
jero-web/src/views/phoneView/problemKnowledgeBaseFile.vue
+9 -8
View File
@@ -9,6 +9,7 @@
<script> <script>
import { kkFileView } from '@/utils/kkfileView' import { kkFileView } from '@/utils/kkfileView'
import { Dialog } from 'vant'
export default { export default {
name: 'phoneProblemKnowledgeBaseFile', name: 'phoneProblemKnowledgeBaseFile',
@@ -24,15 +25,15 @@
}, },
methods: { methods: {
loadFrame() { loadFrame() {
const iframe = document.getElementById("iframeEle"); const iframe = document.getElementById('iframeEle')
const body = iframe.contentWindow.document; const body = iframe.contentWindow.document
const head = body.getElementsByTagName('head') const head = body.getElementsByTagName('head')
const cssLink = document.createElement("link"); const cssLink = document.createElement('link')
cssLink.href = "/iframe.css"; cssLink.href = '/iframe.css'
cssLink.rel = "stylesheet"; cssLink.rel = 'stylesheet'
cssLink.type = "text/css"; cssLink.type = 'text/css'
head[0].appendChild(cssLink); head[0].appendChild(cssLink)
}, }
} }
} }
</script> </script>