Source/UBCS-WEB/src/components/BatchImport/index.vue
@@ -61,7 +61,7 @@ > </el-upload> <template #footer> <div v-if="type !== 'groupCode'"> <div style="display: inline-block"> <el-button v-if="type !== 'bulkEdit' " :loading="downloadLoading" @@ -78,7 +78,10 @@ >下载编辑模板 </el-button> </div> <div style="display: inline-block"> <el-button size="small" @click="dialogVisible = false">关闭</el-button> </div> </template> <ShowImportData v-if="showVisible" Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -14,10 +14,10 @@ v-if="dialogVisible" key="masterForm" ref="FormTemplate" v-bind="$attrs" :selectRow="selectRow" :TreeValue="TreeValue" :eventList="eventList" :rowOid="rowOid" :selectRow="selectRow" :status="status" :templateOid="templateOid" :type="type" @@ -39,11 +39,11 @@ <el-tab-pane v-if="showCodeApply" label="码值申请" name="codeApply"> <FormTemplate key="codeApplyForm" ref="CodeApply" :selectRow="selectRow" :selfColumnConfig="selfColumnConfig" :selfColumnType="selfColumnType" :type="type" :status="status" :selectRow="selectRow" :type="type" data-key="codeApplyForm" secDTOListv-bind="$attrs" @attrList="attrListForm" @@ -248,9 +248,7 @@ }, }, }, watch: { }, watch: {}, methods: { openDialog() { //新增和修改共同调用(有改动 不需要在使用edit，方法没什么影响) Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
@@ -10,7 +10,8 @@ <el-radio :label="1">全部</el-radio> <el-radio :label="2">页码</el-radio> </el-radio-group> <span v-if="radio === 2" style="margin-left: 20px;"><el-input v-model="pageExport" style="width: 150px"></el-input> （输入页码或者页面范围，如：1-10）</span> <span v-if="radio === 2" style="margin-left: 20px;"><el-input v-model="pageExport" style="width: 150px"></el-input> （输入页码或者页面范围，如：1-10）</span> </div> </div> <div style="text-align: center"> Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -2,49 +2,48 @@ <template> <el-container> <!-- 左侧菜单--> <el-aside style="width: 20%;"> <el-aside> <basic-container> <el-collapse accordion> <el-collapse-item style="padding-left: 3px;"> <template slot="title"> <div style="display: flex;justify-content: space-around;"> <el-button v-if="permissionList.TreeAddStatus" plain size="mini" type="primary" @click="TreeAdd">添加 <div> <div> <div style="display: flex; flex-direction: column;"> <div style="display: flex;"> <el-button v-if="permissionList.TreeAddStatus" plain size="small" type="primary" @click="TreeAdd">添加 </el-button> <el-button v-if="permissionList.TreeEditStatus" plain size="mini" type="primary" @click="TreeEdit">修改 <el-button v-if="permissionList.TreeEditStatus" plain size="small" type="primary" @click="TreeEdit">修改 </el-button> <el-button v-if="permissionList.TreeDelStatus" plain size="mini" type="primary" @click="TreeDel">删除 <el-button v-if="permissionList.TreeDelStatus" plain size="small" type="primary" @click="TreeDel">删除 </el-button> <el-button v-if="permissionList.flushedStatus" plain size="mini" type="primary" @click="flushed">刷新 <el-button v-if="permissionList.flushedStatus" plain size="small" type="primary" @click="flushed">刷新 </el-button> </div> </template> <div> <el-button v-if="permissionList.EnableStatus" plain size="mini" type="primary" @click="Enable">启用 <div style="display: flex; margin-top: 10px"> <el-button v-if="permissionList.EnableStatus" plain size="small" type="primary" @click="Enable">启用 </el-button> <el-button v-if="permissionList.DeactivateStatus" plain size="mini" type="primary" @click="Deactivate"> <el-button v-if="permissionList.DeactivateStatus" plain size="small" type="primary" @click="Deactivate"> 停用 </el-button> <el-button v-if="permissionList.ImportExcelStatus" plain size="mini" type="primary" <el-button v-if="permissionList.ImportExcelStatus" plain size="small" type="primary" @click.native="ImportExcel">导入 </el-button> <el-button v-if="permissionList.ExportExcelStatus" plain size="mini" type="primary" <el-button v-if="permissionList.ExportExcelStatus" plain size="small" type="primary" @click="ExportExcel">导出 </el-button> </div> <div style="margin-top: 10px;margin-bottom: 10px"> <el-button v-if="permissionList.ExportExcelStatus" plain size="mini" type="primary" @click="testHandler">流水处理 </div> <div style="display: flex;margin-top: 5px;margin-bottom: 5px"> <el-button v-if="permissionList.flowingBtnStuatus" plain size="mini" type="primary" @click="testHandler">流水处理 </el-button> </div> </el-collapse-item> </el-collapse> </div> </div> <!-- 左侧树--> <div style="height: calc(100vh - 194px);overflow: auto;"> <div style="height: calc(100vh - 230px);overflow: auto"> <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="CloneTreedata" :defaultExpandAll="false" :option="Treeoption" class="classifyTree" style="height: calc(100vh - 280px);" style="height: calc(100vh - 280px)" @node-click="nodeClick" > </avue-tree> @@ -822,6 +821,7 @@ FindStatus: this.vaildData(this.permission.classifyTree.manage_search, false), TemRefreshStatus: this.vaildData(this.permission.classifyTree.manage_break, false), CloneBtnStuatus: this.vaildData(this.permission.classifyTree.manage_clone, false), flowingBtnStuatus: this.vaildData(this.permission.classifyTree.tree_flowing, false), } }, crudTreeOption() { Source/UBCS-WEB/src/views/modeling/Business.vue
@@ -14,8 +14,9 @@ </div> </el-header> <el-container> <el-aside width="240px"> <el-aside style="width:250px"> <basic-container class="businessTreeContainer"> <div class="app"> <p style="margin-top: 10px;font-weight: 570;font-size: 19px">{{ treeOption.title }}</p> <avue-tree id="basic" :data="treeData" :option="treeOption" class="businessTree" @node-click="nodeClick"> <span slot-scope="{ node, data }" class="el-tree-node__label"> @@ -25,6 +26,8 @@ </span> </span> </avue-tree> </div> </basic-container> </el-aside> <el-container> Source/UBCS-WEB/src/views/system/menu.vue
@@ -55,11 +55,11 @@ </avue-crud> <!-- 从其他菜单克隆按钮 --> <el-dialog :visible.sync="cloneOtherMenuButtons.cloneButtonSettingBox" class="avue-dialog avue-dialog--top" top="0" append-to-body class="avue-dialog avue-dialog--top" style="height: 110vh; margin-top: -10vh;" title="从其他菜单克隆按钮" top="0" width="1100px" @close="cleanCloneSelections"> <avue-crud ref="cloneCrud" Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/resources/application-prod.yml
@@ -8,3 +8,7 @@ url: ${ubcs.datasource.mdm.prod.url} username: ${ubcs.datasource.mdm.prod.username} password: ${ubcs.datasource.mdm.prod.password} #关闭驼峰命名映射 mybatis-plus: configuration : map-underscore-to-camel-case: false Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java
@@ -844,7 +844,7 @@ */ @GetMapping("/exportGroupCodeExcel") @VciBusinessLog(operateName = "导出集团码") public R exportGroupCodeExcel(String codeClassifyOid, HttpServletResponse response) throws IOException{ public R exportGroupCodeExcel(String codeClassifyOid, HttpServletResponse response){ try { String excelName = mdmIOService.exportGroupCodeExcel(codeClassifyOid); ControllerUtil.writeFileToResponse(response,excelName); @@ -854,6 +854,14 @@ if(StringUtils.isBlank(msg)){ msg = "未知错误"; } String errorFile = LocalFileUtil.getDefaultTempFolder() + File.separator + "错误.txt"; LocalFileUtil.writeContentToFile(LangBaseUtil.getErrorMsg(e),errorFile); try { ControllerUtil.writeFileToResponse(response,errorFile); } catch (IOException ex) { ex.printStackTrace(); } String uuid=ControllerUtil.putErrorFile(errorFile); return R.fail(msg); // ControllerUtil.writeDataToResponse(response,msg.getBytes(StandardCharsets.UTF_8),null); }
