Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
@@ -64,17 +64,6 @@ :show-overflow-tooltip="true" align="center" > <!-- 编辑和展示逻辑 --> <!-- <template slot-scope="{ row }">--> <!-- <el-input v-if="editingRow === row && editShow== item.prop" v-model="row[item.prop]" @blur="saveRow"></el-input>--> <!-- <span v-else>{{row[item.prop]}}</span>--> <!-- <el-switch--> <!-- v-if="editShow === 'true'"--> <!-- v-model="row[item.prop]"--> <!-- active-color="#13ce66"--> <!-- inactive-color="#ff4949">--> <!-- </el-switch>--> <!-- </template>--> </el-table-column> </el-table> </el-row> @@ -307,9 +296,6 @@ }, // 发布 setHandler() { console.log("1111"); console.log("父", this.parameter); if (this.selectRow.length <= 0) { this.$message.warning("请选择一条数据"); } else { @@ -453,6 +439,7 @@ row.forEach((item) => { this.parameter.ids.push(item.oid); }); console.log( ' this.parameter.ids',this.parameter.ids) }, //编辑 editHandler() { Source/UBCS-WEB/src/components/Tree/attrCrud.vue
@@ -1,9 +1,6 @@ <template> <!-- <avue-crud :data="ProData" :option="option" @sort-change="sortChange" @row-update="addUpdate"--> <!-- @cell-click="handleRowClick" @select="selectHandle" @row-del="CrudRowDel">--> <div> <div style="display: flex;flex-wrap: wrap;" v-if="this.crudArray.length>=1"> <div style="display: flex;flex-wrap: wrap;" v-if="this.crudArrayFlag"> <!--新增--> <el-button v-if="attrEditVisible == false && attrFlagChiledren==false" size="small" type="primary" @click="busineHandle">＋ 添加 {{ msg }} @@ -37,7 +34,6 @@ <!-- 编码申请预览--> <el-button size="small" @click="applicationHandle" style="">编码申请预览</el-button> <!-- 验证规则--> </div> <!-- 弹窗--> <div> @@ -203,7 +199,7 @@ </el-dialog> <!-- 全屏编辑--> <el-dialog :visible.sync="attrEditVisible" append-to-body fullscreen="true"> <attrCrud :ProData="this.ProData" :attrFlagChiledren="this.attrFlag"></attrCrud> <attrCrud :ProData="this.ProData" :attrFlagChiledren="this.attrFlag" :crudArrayFlag="this.crudArrayFlag"></attrCrud> </el-dialog> <!-- 组合规则--> <formula-editor :systemVariableTableData="systemVariableTableData" @@ -236,8 +232,7 @@ style="width: 100%" @cell-click="handleCellClicks" @select="selectHandle" v-if="this.crudArray.length>=1" v-if="this.crudArrayFlag" > <el-table-column type="selection" @@ -286,7 +281,6 @@ export default { name: "attrCrud .vue", // props: ['ProData','crudOid','crudArray','Formlist','codeClassifyOid'], props: { ProData: { type: Array, @@ -309,10 +303,29 @@ type: Boolean, default: false }, crudArrayFlag:{ type: Boolean, default: false } }, watch:{ crudArray:{ handler(newval,oldval){ if(newval != undefined){ if(newval.length>=1){ this.crudArrayFlag=true }else{ this.crudArrayFlag=false } } }, deep:true, immediate:true } }, data() { return { crudArrayFlag:false, editingRows: null, editShows:"", attrFlag: false, @@ -1169,21 +1182,10 @@ methods: { formAttr(row, column) { console.log(row,column) // if (column.property === "keyAttrFlag" // ||column.property === "queryAttrFlag" // ||column.property === "seniorQueryAttrFlag" // ||column.property === "sameRepeatAttrFlag" // ||column.property === "requireFlag" // ||column.property === "formDisplayFlag" // ||column.property === "tableDisplayFlag" // ||column.property === "sortAttrFlag") { // return row[column.property] =='true'? "是" : "否"; // } // return row[column.property]; }, //属性分组按钮 attrVisibleHandle() { this.formatBoolean() if (this.CrudSelect.length > 1) { this.$message.warning('只能选择一条模板属性') } else if (this.CrudSelect < 1) { @@ -1230,14 +1232,10 @@ }, // 从业务类型中选择数据 busineHandle() { if (this.crudArray.length < 1) { this.$message.error('请选择一条模板') } else { this.addVisible = true; AttrByBtm({'conditionMap[oid]': this.crudOid}).then(res => { this.businessData = res.data.data; }) } }, // 级联属性按钮 CascadeHandle() { @@ -1264,7 +1262,7 @@ }, //保存 addsHandler() { batchAddSave(JSON.parse(JSON.stringify(this.ProData).replace(/classifyTemplateOid/g,"classifytemplateoid"))).then(res => { batchAddSave(JSON.parse(JSON.stringify(this.ProData))).then(res => { this.$message.success('保存成功') }) }, Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
@@ -791,8 +791,7 @@ message: '请先从树上选择一条数据!' }); } else { let codeClassifyOid = this.codeClassifyOid this.$set(row, "codeclassifyoid", codeClassifyOid) this.$set(row, "codeclassifyoid", this.nodeClickList.oid) addSave(row).then(() => { this.$message({ type: "success", @@ -807,6 +806,7 @@ }); }) } console.log('123',this.codeClassifyOid) }, //模板管理修改 CrudRowUpdata(row,index,done) { Source/UBCS-WEB/src/components/template/SetPersonnel.vue
@@ -90,7 +90,12 @@ }, deep:true, immediate:true } }, parameter:{ handler(newval,oldval){ console.log('子',newval) } } }, data() { return { @@ -112,8 +117,6 @@ }, mounted() { // this.apiInit() // this.apiDict() console.log('---',this.parameter) }, created() { Source/UBCS-WEB/src/components/work/BusinessWork.vue
@@ -37,8 +37,6 @@ handler(newval,oldval){ this.BuinessOids=newval; this.BuinseseRend() console.log(newval) console.log(this.BuinessOids) }, deep:true } @@ -48,8 +46,6 @@ mounted() { }, methods:{ HandlerRend(){ }, BuinseseRend(){ businese({ btmType:'wupin', Source/UBCS-WEB/vue.config.js
@@ -26,8 +26,8 @@ proxy: { '/api': { //本地服务接口地址 target: 'http://localhost:37000', // target: 'http://192.168.1.51:37000', // target: 'http://localhost:37000', target: 'http://192.168.1.51:37000', // target: 'http://192.168.1.46:37000', // target: 'http://dev.vci-tech.com:37000', // target: 'http://192.168.1.51:37000/', Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateAttrDTO.java
@@ -38,110 +38,110 @@ /** * 所属模板 */ private String classifytemplateoid; private String classifyTemplateOid; /** * 所属模板显示文本 */ private String classifytemplateoidName; private String classifyTemplateOidName; /** * 所属分类中的属性主键 */ private String classifyattributeoid; private String classifyAttributeOid; /** * 所属分类中的属性主键显示文本 */ private String classifyattributeoidName; private String classifyAttributeOidName; /** * 属性的类型 */ private String attributedatatype; private String attributeDataType; /** * 是否关键属性 */ private String keyattrflag; private String keyAttrFlag; /** * 是否快速查询属性 */ private String queryattrflag; private String queryAttrFlag; /** * 是否高级查询属性 */ private String seniorqueryattrflag; private String seniorQueryAttrFlag; /** * 相似查重属性 */ private String samerepeatattrflag; private String sameRepeatAttrFlag; /** * 是否排序 */ private String sortattrflag; private String sortAttrFlag; /** * 是否生成二维码 */ private String qrcodeflag; private String qrcodeFlag; /** * 是否生成一维码 */ private String barcodeflag; private String barcodeFlag; /** * 组合规则 */ private String componentrule; private String componentRule; /** * 验证规则 */ private String verifyrule; private String verifyRule; /** * 分类注入层级 */ private String classifyinvokelevel; private String classifyInvokeLevel; /** * 分类注入的属性英文名称 */ private String classifyinvokeattr; private String classifyInvokeAttr; /** * 分类注入的属性中文名称 */ private String classifyinvokeattrname; private String classifyInvokeAttrName; /** * 分类注入是否可以编辑 */ private String classifyinvokeeditflag; private String classifyInvokeEditFlag; /** * 码值序号 */ private Integer ordernum; private Integer orderNum; /** * 表单里是否显示 */ private String formdisplayflag; private String formDisplayFlag; /** * 列表里是否显示 */ private String tabledisplayflag; private String tableDisplayFlag; /** * 所属属性分组 */ private String attributegroup; private String attributeGroup; /** * 使用枚举注入的字符串格式 @@ -151,27 +151,27 @@ /** * 使用枚举英文编号 */ private String enumid; private String enumId; /** * 使用枚举中文名称 */ private String enumname; private String enumName; /** * 枚举是否可以编辑 */ private String enumeditflag; private String enumEditFlag; /** * 参照的业务类型英文名称 */ private String referbtmid; private String referBtmId; /** * 参照的业务类型中文名称 */ private String referbtmname; private String referBtmName; /** * 参照窗口配置 @@ -181,97 +181,97 @@ /** * 是否必输 */ private String requireflag; private String requireFlag; /** * 是否只读 */ private String readonlyflag; private String readOnlyFlag; /** * 属性控制输入的长度 */ private Integer controllength; private Integer controlLength; /** * 表单里显示的样式 */ private String formdisplaystyle; private String formDisplayStyle; /** * 表格里显示的样式 */ private String tabledisplaystyle; private String tableDisplayStyle; /** * 表单中超链接内容 */ private String formhref; private String formHref; /** * 表格中超链接内容 */ private String tablehref; private String tableHref; /** * 小数精度 */ private Integer precisionlength; private Integer precisionLength; /** * 小数刻度 */ private Integer scalelength; private Integer scaleLength; /** * 取值范围 */ private String valuearea; private String valueArea; /** * 时间格式 */ private String codedateformat; private String codeDateFormat; /** * 表格里显示调用的js */ private String tabledisplayjs; private String tableDisplayJs; /** * 是否显示多行文本 */ private String textareaflag; private String textAreaFlag; /** * 预览图 */ private String imageflag; private String imageFlag; /** * 默认值 */ private String defaultvalue; private String defaultValue; /** * 前缀 */ private String prefixvalue; private String prefixValue; /** * 后缀 */ private String suffixvalue; private String suffixValue; /** * 选择数据时过滤的属性 */ private String filtersourceattr; private String filterSourceAttr; /** * 选择数据时过滤的属性名称 */ private String filtersourceattrname; private String filterSourceAttrName; /** * 属性列表中的宽度 @@ -306,5 +306,9 @@ */ //@Column(columnDefinition = "级联查询属性") private String parentQueryAttr; /** * 输入提示 */ private String inputTip; } Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImprotParmaDatVO.java
@@ -5,7 +5,7 @@ public class CodeImprotParmaDatVO { private List<CodeImprotSaveDatVO> codeImprotSaveDatVOList; private String classifyAttr; private Boolean isImprot; private Boolean improt; public List<CodeImprotSaveDatVO> getCodeImprotSaveDatVOList() { return codeImprotSaveDatVOList; @@ -24,18 +24,18 @@ } public Boolean getImprot() { return isImprot; return this.improt; } public void setImprot(Boolean improt) { isImprot = improt; this.improt = improt; } @Override public String toString() { return "CodeImprotParmaDatVO{" + "codeImprotSaveDatVOList=" + codeImprotSaveDatVOList + ", isImprot=" + isImprot + ", isImprot=" + improt + '}'; } } Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
@@ -36,7 +36,7 @@ import com.vci.ubcs.starter.web.util.VciDateUtil; import com.vci.ubcs.system.entity.DictBiz; import com.vci.ubcs.system.feign.IDictBizClient; import org.springblade.core.log.exception.ServiceException; import com.vci.ubcs.core.log.exception.ServiceException; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -398,7 +398,7 @@ throw new VciBaseException("{0}{1}属性的时间格式不符合要求",new String[]{codeClassifyTemplateAttrDO.getId(),codeClassifyTemplateAttrDO.getName()}); } //如果是组合规则，里面使用的属性不能缺失，也都得显示 String componentrule = codeClassifyTemplateAttrDTO.getComponentrule(); String componentrule = codeClassifyTemplateAttrDTO.getComponentRule(); boolean isContainsDynamicParameter = PatternUtil.isContainsDynamicParameter(componentrule); if(isContainsDynamicParameter){ List<String> userdAttrList = PatternUtil.getKeyListByContent(componentrule);//包含的所有${xxx}中的xxx @@ -409,7 +409,7 @@ } //要看看表单是否显示 String unFormDisplayAttr = userdAttrList.stream().filter(s -> !VciBaseUtil.getBoolean(attrDTOMap.getOrDefault(s.toLowerCase(Locale.ROOT), new CodeClassifyTemplateAttrDTO()).getFormdisplayflag())).collect(Collectors.joining(",")); new CodeClassifyTemplateAttrDTO()).getFormDisplayFlag())).collect(Collectors.joining(",")); if(StringUtils.isNotBlank(unFormDisplayAttr)){ throw new VciBaseException("{0}属性是组合规则，但是规则里包含的属性[{1}]在当前模板中没有设置 表单显示 ",new String[]{codeClassifyTemplateAttrDO.getName(),unFormDisplayAttr}); } @@ -417,7 +417,7 @@ } if(CLASSIFYTEMPLATEOID==null){ CLASSIFYTEMPLATEOID = codeClassifyTemplateAttrDTO.getClassifytemplateoid(); CLASSIFYTEMPLATEOID = codeClassifyTemplateAttrDTO.getClassifyTemplateOid(); } } @@ -439,7 +439,7 @@ } // BatchCBO batchCBOTemplateDelete = new BatchCBO(); if(!CollectionUtils.isEmpty(oids)){ baseMapper.deleteBatchIds(oids); this.removeBatchByIds(oids); } //再新增 @@ -542,7 +542,7 @@ } //判断传过来的参照配置是否是json格式 if(StringUtils.isNotBlank(codeClassifyTemplateAttrDTO.getReferbtmid())&&!checkKVObj(codeClassifyTemplateAttrDTO.getReferbtmid())){ if(StringUtils.isNotBlank(codeClassifyTemplateAttrDTO.getReferBtmId())&&!checkKVObj(codeClassifyTemplateAttrDTO.getReferBtmId())){ throw new VciBaseException("枚举注入数据格式错误!"); }
@@ -54,6 +54,7 @@ import org.apache.poi.ss.usermodel.Font; import org.apache.poi.ss.usermodel.RichTextString; import org.apache.poi.ss.usermodel.Workbook; import org.springblade.core.cache.utils.CacheUtil; import org.springblade.core.redis.cache.BladeRedis; import org.springblade.core.tool.api.R; import org.springframework.beans.BeanUtils; @@ -1379,8 +1380,7 @@ public List<CodeImportTemplateVO> gridclassifys(String redisOid) { List<CodeImportTemplateVO> codeImportTemplateVOs=new ArrayList<>(); VciBaseUtil.alertNotNull(redisOid,"分类",redisOid,"分类缓存主键"); List<CodeImportTemplateVO> redisServiceCacheObjects=bladeRedis.lRange(redisOid,0,-1); List<CodeImportTemplateVO> redisServiceCacheObjects=bladeRedis.get(redisOid); if(redisServiceCacheObjects!=null){ codeImportTemplateVOs= redisServiceCacheObjects; } @@ -1396,7 +1396,7 @@ @Override public DataGrid<Map<String, String>> gridDatas(String codeClssifyOid, String redisOid) { VciBaseUtil.alertNotNull(redisOid,"导入相似数据",redisOid,"数据缓存主键"); List<CodeImprotDataVO> codeImprotDataVOs = bladeRedis.lRange(redisOid+"-"+codeClssifyOid,0,-1); List<CodeImprotDataVO> codeImprotDataVOs = bladeRedis.get(redisOid+"-"+codeClssifyOid); // redisService.getCacheList(redisOid+"-"+codeClssifyOid); CodeImprotDataVO codeImprotDataVO=new CodeImprotDataVO(); if(!CollectionUtils.isEmpty(codeImprotDataVOs)){ @@ -1430,7 +1430,7 @@ @Override public DataGrid<Map<String,String>> gridRowResemble(String oid,String redisOid){ VciBaseUtil.alertNotNull(redisOid,"导入相似数据",redisOid,"数据缓存主键"); List<DataResembleVO> codeImprotDataVOs = bladeRedis.lRange(redisOid,0,-1);; List<DataResembleVO> codeImprotDataVOs = bladeRedis.get(redisOid);; DataGrid<Map<String, String>> dataGrid = new DataGrid<>(); List<Map<String, String>> dataList = new ArrayList<>();
