Source/UBCS-WEB/public/index.html
@@ -19,8 +19,8 @@ <script src="<%= BASE_URL %>cdn/xlsx/FileSaver.min.js"></script> <script src="<%= BASE_URL %>cdn/xlsx/xlsx.full.min.js"></script> <link rel="icon" href="<%= BASE_URL %>favicon.png"> <script src="https://cdn.staticfile.org/FileSaver.js/2014-11-29/FileSaver.min.js"></script> <script src="https://cdn.staticfile.org/xlsx/0.18.2/xlsx.full.min.js"></script> <!-- <script src="https://cdn.staticfile.org/FileSaver.js/2014-11-29/FileSaver.min.js"></script>--> <!-- <script src="https://cdn.staticfile.org/xlsx/0.18.2/xlsx.full.min.js"></script>--> <title>ubcs企业平台</title> <style> html, Source/UBCS-WEB/src/App.vue
@@ -31,4 +31,7 @@ .avue-dialog .el-dialog__body { margin-bottom: 10px } .avue-crud__pagination { padding: 10px 0 2px 20px; } </style> Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -84,7 +84,7 @@ trendsSpan: { type: Number, default: 8, }, } }, data() { return { @@ -130,7 +130,6 @@ methods: { // 渲染表单模板 templateRender(formItemList) { console.log(formItemList, "formItemList"); // 无需分组数据 let column = []; let group = []; @@ -242,7 +241,6 @@ } }); this.slotColumnList = slotColumnList; console.log(column, "column"); this.$set(this.option, "column", column); this.$set(this.option, "group", group); this.updateIndex++; Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -275,7 +275,6 @@ "coderefersec", //属性码段 "codeattrsec", // "codelevelsec", //日期码段 "codedatesec", ]; Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -5,7 +5,7 @@ <div class="testbox" style=""> <div> </div> <el-row style="width: 100%;margin-bottom: 20px"> <el-row style="width: 100%;margin-bottom: 10px"> <div> <el-button v-for="(item, index) in masterVrBtnList" v-if="!['PREVIEW', 'DELETEFILE', 'revisefile', 'DOWNLOADFILE', 'UPLOADFILE'].includes(item.uniqueFlag)" Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
@@ -14,7 +14,7 @@ lock-scroll class="avue-dialog avue-dialog--top" top="-3%" :close-on-click-modal="false" destroy-on-close @close="recoverPage"> <div class="search-total"> <!-- 头部按钮区域 --> Source/UBCS-WEB/src/components/code-dialog-page/formulaEditor.vue
@@ -5,16 +5,16 @@ append-to-body :visible.sync="isShowformulaEdit" @close="closeFormulaEdit" width="78%" style="height: 150vh; margin-top: -13vh; overflow: hidden"> <div style="overflow-y: auto; height: 80vh"> width="75%" class="avue-dialog avue-dialog--top" top="-3%" style="height: 100vh;"> <div> <el-row> <!-- 左侧公式内容 --> <el-col :span="14" style="overflow: hidden"> <el-card class="box-card" style="height: 33vh; overflow-y: auto; overflow-x: auto"> style="height: 29.5vh; overflow-y: auto; overflow-x: auto;margin-right: 10px"> <div slot="header" class="clearfix"> <span style="font-size: medium">公式内容</span> <el-button @@ -35,8 +35,8 @@ <div class="text item"> <el-input type="textarea" :rows="5" style="width: 560px" :rows="6" style="width: 100%" v-model="formulaContent" ></el-input> </div> @@ -47,7 +47,7 @@ <el-card class="box-card formula-box-card" data-v-49729759 style="height: 35vh;"> style="height: 29.5vh;"> <div slot="header" class="clearfix"> <span style="font-size: medium">运算符</span> </div> @@ -216,11 +216,10 @@ </el-row> <el-row> <!-- 左侧公式选择区域 --> <el-col :span="14" style="overflow: hidden"> <el-col :span="14" style="overflow: hidden;"> <el-card class="box-card" style="height: 40vh; overflow-y: auto; overflow-x: auto" > style="height: 35vh; overflow-y: auto; overflow-x: auto;margin-right: 10px"> <div slot="header" class="clearfix"> <span style="font-size: medium">公式选择</span> </div> @@ -235,7 +234,7 @@ > <el-table-column prop="formula" width="300"> </el-table-column> <el-table-column prop="desc" width="300"> </el-table-column> <el-table-column prop="desc"> </el-table-column> </el-table> </el-tab-pane> @@ -248,7 +247,7 @@ > <el-table-column prop="formula" width="300"> </el-table-column> <el-table-column prop="desc" width="300"> </el-table-column> <el-table-column prop="desc"> </el-table-column> </el-table> </el-tab-pane> @@ -261,7 +260,7 @@ > <el-table-column prop="formula" width="300"> </el-table-column> <el-table-column prop="desc" width="300"> </el-table-column> <el-table-column prop="desc"> </el-table-column> </el-table> </el-tab-pane> @@ -274,7 +273,7 @@ > <el-table-column prop="formula" width="300"> </el-table-column> <el-table-column prop="desc" width="300"> </el-table-column> <el-table-column prop="desc"> </el-table-column> </el-table> </el-tab-pane> @@ -287,7 +286,7 @@ > <el-table-column prop="formula" width="300"> </el-table-column> <el-table-column prop="desc" width="300"> </el-table-column> <el-table-column prop="desc" > </el-table-column> </el-table> </el-tab-pane> </el-tabs> @@ -298,7 +297,7 @@ <el-col :span="10" style="overflow: hidden"> <el-card class="box-card" style="height: 40vh; overflow-y: auto; overflow-x: auto" style="height: 35vh; overflow-y: auto; overflow-x: auto" > <div slot="header" class="clearfix"> <span style="font-size: medium">变量</span> @@ -312,9 +311,9 @@ :show-header="false" style="width: 100%" > <el-table-column prop="formula" width="120"> <el-table-column prop="formula" width="300"> </el-table-column> <el-table-column prop="desc" width="200"> </el-table-column> <el-table-column prop="desc"> </el-table-column> </el-table> </el-tab-pane> <el-tab-pane label="系统变量" name="second"> @@ -324,9 +323,9 @@ :show-header="false" style="width: 100%" > <el-table-column prop="formula" width="200"> <el-table-column prop="formula" width="300"> </el-table-column> <el-table-column prop="desc" width="200"> </el-table-column> <el-table-column prop="desc"> </el-table-column> </el-table> </el-tab-pane> </el-tabs> @@ -729,8 +728,8 @@ } .formula-editor-btn-sm { width: 4.5vw; height: 4vh; width: 68px; height: 34px; margin-left: 10px; text-align: center; line-height: 0; Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue
@@ -1,5 +1,5 @@ <template> <el-dialog title="最大流水号" width="30%" append-to-body="true" :visible.sync="dialogVisible"> <el-dialog title="最大流水号" width="30%" append-to-body="true" class="avue-dialog avue-dialog--top" top="-3%" :visible.sync="dialogVisible"> <el-form :label-position="right" ref="ruleForm" label-width="80px" :model="formModel" :rules="rules"> <el-form-item label="流水号" prop="maxSecNum"> <el-input v-model="formModel.maxSecNum"></el-input> @@ -72,13 +72,13 @@ ], }, selfColumnType: { codefixedsec: "combox", codeclassifysec: "refer", codevariablesec: "text", codefixedsec: "combox",//固定码段 codeclassifysec: "refer",//分类码段 codevariablesec: "text",//可变码段 coderefersec: "refer",//引用码段 codeattrsec: "text", codelevelsec: "text", coderefersec: "refer", codedatesec: "date", codedatesec: "date" }, selfColumnConfig: { function: { @@ -129,13 +129,11 @@ typeList.includes(item.secType) ); if (this.secVOList.length > 0) { // this.showCodeApply = true; this.$nextTick(() => { this.$refs.CodeApply.templateRender(this.secVOList); }); } else { // this.showCodeApply = false; this.$refs.CodeApply.loading = false; } } }, @@ -176,12 +174,10 @@ }) this.formModel['secDTOList'] = arrCode this.formModel['codeRuleOid'] = this.ruleOid console.log(this.formModel) this.confirmLoadding = true const rule = await this.$refs.CodeApply.validate() this.$refs.ruleForm.validate(res => { if (rule && res) { console.log(rule) saveMaxSerialNum(this.formModel).then(res => { if (res.data.success) { this.$message.success('操作成功！'); @@ -197,7 +193,6 @@ }, // 参照组件数据变更 referConfigDataUpdate(data) { // console.log(data) const { field } = data; this.secVOList = this.secVOList.map((item) => { if (item.parentClassifySecOid === field) { @@ -226,7 +221,6 @@ } }, getReferConfig(item) { // console.log(item) let params = {}; if (item.secType == "codeclassifysec") { params = { Source/UBCS-WEB/src/const/code/fixedValueMgrDialog.js
@@ -1,6 +1,6 @@ export default { //width: '70%', height: '60vh', height: '58vh', calcHeight: 30, tip: false, editBtn: false, Source/UBCS-WEB/src/const/code/selectAttrOptionDialog.js
@@ -1,5 +1,5 @@ export default { height: '41vh', height: '45vh', calcHeight: 30, tip: false, editBtn: false, Source/UBCS-WEB/src/views/code/code.vue
@@ -130,11 +130,13 @@ append-to-body :visible.sync="codeRangeSettingBox" width="800px" style="height: 116vh; margin-top: -10vh;"> class="avue-dialog avue-dialog--top" style="height: 100vh;" top="-3%"> <avue-crud :option="dialogeOption" :table-loading="dialogLoading" :data="useRangeData" style="margin-top:-40px" @refresh-change="refreshUseRangeChange"> </avue-crud> </el-dialog> @@ -144,8 +146,9 @@ append-to-body :visible.sync="cloneSettingBox" width="800px" style="height: 120vh; margin-top: -14vh; overflow: hidden;"> <div style="overflow-y: auto; height: 78vh"> class="avue-dialog avue-dialog--top" style="height: 100vh;" top="-3%"> <div> <el-row> <el-form ref="form" :model="form" label-width="80px" :inline="true"> <el-form-item label="编号" required> @@ -160,7 +163,7 @@ </el-form> </el-row> <el-row> <p style="margin: -3vh 0px 16px 50%; font-weight: 500; font-size: 16px; color: #000;">码段管理</p> <p style="margin: 0 0px 16px 50%; font-weight: 500; font-size: 20px; color: #000;">码段管理</p> <avue-crud class="clone-avue-crud" :option="cloneOption" @@ -187,7 +190,7 @@ </avue-crud> </el-row> </div> <div slot="footer" class="dialog-footer" style="height: 50px; margin-top: -4vh;"> <div slot="footer" class="dialog-footer"> <el-button type="primary" @click="saveCloneCodeRule">保 存</el-button> <el-button @click="cloneSettingBox = false">取 消</el-button> </div> @@ -196,13 +199,14 @@ <!-- 编码规则,从其他规则克隆对话框 --> <el-dialog title="克隆编码规则的基础信息" append-to-body class="avue-dialog avue-dialog--top" :visible.sync="cloneOtherCodeRuleSettingBox" width="800px" style="height: 150vh; margin-top: -14vh;" style="height: 100vh;" top="-3%" destroy-on-close> <div> <el-row> <p style="margin-top: -12px; margin-bottom: 4px; font-weight: 570; font-size: 19px; color: #0e2d5f;">编码规则</p> <p style="margin-top: -20px; margin-bottom: 4px; font-weight: 570; font-size: 19px; color: #0e2d5f;">编码规则</p> <avue-crud class="other-clone-coderule-crud" :option="cloneCodeRuleOption" @@ -216,8 +220,8 @@ @on-load="onLoad"> </avue-crud> </el-row> <el-row> <p style="margin-top: -12px; margin-bottom: 4px; font-weight: 570; font-size: 19px; color: #0e2d5f;">码段信息</p> <el-row style="margin-top:10px;border-top: 1px solid #EBEEF5;"> <p style="margin-top: 10px; margin-bottom: 4px; font-weight: 570; font-size: 19px; color: #0e2d5f;">码段信息</p> <avue-crud class="other-clone-codebasic-crud" :option="cloneBasicOption" @@ -229,7 +233,7 @@ </avue-crud> </el-row> </div> <div slot="footer" class="dialog-footer" style="height: 50px; margin-top: -4vh;"> <div slot="footer" class="dialog-footer" style="height: 50px;"> <el-button type="primary" @click="saveOtherCodeBasic">保 存</el-button> <el-button @click="cloneOtherCodeRuleSettingBox = false">取 消</el-button> </div> @@ -352,7 +356,8 @@ :visible.sync="isShowBasicSecCodeValueMgr" :width="isShowFixedForm ? '69vw':'50vw'" append-to-body style="height: 116vh; margin-top: -10vh;" class="avue-dialog avue-dialog--top" style="height: 100vh;" top="-3%" @close="clearFixedOrClassifyForm('close')" destroy-on-close> <!-- 分类码段码值管理 --> @@ -366,7 +371,7 @@ :data="classifyValueTreeData" :option="classisyValueTreeOption" @node-click="classisyValueTreeOnodeClick" style="overflow-y: auto; height: 54vh"/> style=""/> </div> </basic-container> </div> @@ -401,7 +406,7 @@ <el-row v-show="isShowFixedForm"> <el-col :span="15"> <basic-container> <div class="box fixedbox" style="height:65vh; margin-bottom:-40px"> <div class="box fixedbox" style="height:63vh; margin-bottom:-40px"> <avue-crud class="fixed-avue-crud" ref="crudFixedValue" @@ -417,15 +422,15 @@ </template> </avue-crud> </div> <div style="margin-top:20px;"> <div style="margin-top:10px;"> <el-button size="mini" type="primary" icon="el-icon-success" class="button" @click="saveCodeFixedOrClassifyValueOption('fixedValue')">保存</el-button> </div> </basic-container> </el-col> <el-col :span="9"> <basic-container> <div class="box" style="height: 65vh; margin-bottom:-40px; overflow:hidden;" > <div style="overflow-y:auto;height: 60vh;"> <div class="box" style="height: 63vh; margin-bottom:-40px; overflow:hidden;" > <div style="overflow-y:auto;height: 58vh;"> <el-form> <el-form-item label="码值:" label-width="54px" required> <el-input style="width: 19.5vw" v-model="codeFixdForm.id"></el-input> @@ -436,7 +441,7 @@ </el-form> </div> </div> <div style="margin-top:20px; display: flex; align-items:center; justify-content:center;"> <div style="margin-top:10px; display: flex; align-items:center; justify-content:center;"> <el-button :disabled="selectedFixedOrCodeclassifyValue!=''" size="mini" type="primary" icon="el-icon-circle-plus" class="button" @click="addCodeSecValue('codefixedsec')">添加</el-button> <el-button :disabled="selectedFixedOrCodeclassifyValue==''" size="mini" type="success" plain icon="el-icon-edit-outline" class="button" @click="editCodeSecValue('codefixedsec')">修改</el-button> <el-button :disabled="selectedFixedOrCodeclassifyValue==''" size="mini" type="danger" icon="el-icon-close" class="button" @click="delCodeSecValue('codefixedsec')">删除</el-button> @@ -452,14 +457,15 @@ :visible.sync="addBasicCodeSettingBox" width="60vw" append-to-body style="height: 115vh; margin-top: -13vh; overflow: hidden" class="avue-dialog avue-dialog--top" style="height: 100vh;" top="-3%" destroy-on-close lock-scroll :close-on-click-modal="false" @close="clearBasicAddForm"> <!-- 第一层对话框,添加码段信息对话框中的内容 --> <div class="add-basicsec-total" style="overflow-y: auto; height: 70vh"> <div class="add-basicsec-total" style="overflow-y: auto; height: 58vh"> <el-form :model="form" class="add-basicsec-form"> <span class="left"> <el-form-item label="码段编号:" :label-width="leftFormLabelWidth" required> @@ -731,7 +737,8 @@ append-to-body :visible.sync="isShowSelectAttrOption" width="78%" style="height: 100%; margin-top: -8vh; overflow: hidden"> class="avue-dialog avue-dialog--top" top="-3%" style="height: 100%;"> <div style="overflow-y: auto; height: 60vh"> <el-row> <!-- 左侧主题库分类树 --> @@ -898,13 +905,15 @@ /*使用范围对话框配置*/ dialogeOption: { height: 'auto', calcHeight: 30, calcHeight: 150, tip: false, searchShow: false, searchMenuSpan: 6, border: true, index: true, disablePage:false, refreshBtn:false, columnBtn:false, viewBtn: false, addBtn: false, menu: false, @@ -1903,7 +1912,7 @@ return; } if(this.selectionList[0].lcStatus != 'Editing'){ this.$message.warning("编码规则已被引用，不允许编辑或删除!"); this.$message.warning("编码规则已被引用，不允许编辑!"); return; } this.cloneOtherCodeRuleSettingBox = true; @@ -1954,7 +1963,6 @@ this.$message.warning("需要克隆的编码规则与被克隆的编码规则相同!"); return; } //console.log(res); let oidArr = []; fromDialogPkCodebasic.forEach(ele => { oidArr.push(ele.oid); @@ -2421,7 +2429,7 @@ /** 判断数据是否选择以及只能选择单条数据*/ tipsMessage(list){ if(list.length != 1){ this.$message.warning("请选择一条编码规则数据!"); this.$message.warning("请选择一条数据!"); return false; } return true; @@ -2485,7 +2493,6 @@ const data = res.data.data; if(this.cloneSettingBox){ this.cloneData = data.records; // console.log(tihs.cloneData); this.cloneTableLoading = false; }else { this.basicData = data.records; @@ -2498,7 +2505,6 @@ selectionBasicChange(list) { this.selectionBasicList = list; this.$refs.crudBasic.setCurrentRow(this.selectionBasicList[list.length-1]); //console.log(this.selectionBasicList); }, /** 基础码段被单击表格行时触发*/ codeBasicSecRowClick(row){ @@ -2508,7 +2514,6 @@ this.$refs.crudBasic.toggleRowSelection(row); //选中当前行 }, basicSearchChange(params, done){ //console.log(this.$refs.crudBasic); this.sendGridCodeBasicSec(Object.assign(params,{"pkCodeRule":this.selectionList[this.selectionList.length-1].oid}),false); done(); }, @@ -2542,7 +2547,6 @@ return; } let codeRuleOid = this.selectionList[0].oid; //console.log(this.selectionList); if (this.selectionList[0].lcStatus != 'Editing') { this.$message.warning("只有编码规则的状态是 [编辑中] 的时候，才能调整码段顺序!"); return; @@ -2832,10 +2836,6 @@ margin-bottom: -15px; } .code-rule-crud > .avue-crud__pagination { padding: 14px 0 2px 20px; } .clone-input-textarea > .el-form-item__content { width: 495px; } @@ -2907,7 +2907,6 @@ /** 新增码段 */ .add-basicsec-total { width: 100%; padding: 20px 0 0 0; } .add-basicsec-total .el-input__inner,.add-basicsec-total .el-textarea__inner { Source/UBCS-WEB/vue.config.js
@@ -26,12 +26,11 @@ proxy: { '/api': { //本地服务接口地址 // target: 'http://localhost', target: 'http://localhost:37000', // target: 'http://192.168.1.51:37000', target: 'http://dev.vci-tech.com:37000', // target: 'http://192.168.1.16:37000', // target: 'http://dev.vci-tech.com:37000', // target: 'http://192.168.1.104:37000', // target: 'http://192.168.0.105:37000', // target: 'http://192.168.43.251:37000', // target: 'http://192.168.0.103:37000', // target: 'http://192.168.1.63:37000', // target: 'http://192.168.3.7:37000', Source/UBCS/pom.xml
@@ -107,11 +107,11 @@ <resources> <resource> <directory>src/main/resources</directory> <excludes> <!-- <excludes> <exclude>bootstrap.yml</exclude> <exclude>application.yml</exclude> <exclude>application-prop.yml</exclude> </excludes> <exclude>application-prod.yml</exclude> </excludes>--> </resource> <resource> <directory>src/main/java</directory> Source/UBCS/ubcs-gateway/src/main/resources/application-prod.yml
@@ -9,14 +9,3 @@ prior-ip-pattern: - 192.168.0.* - 127.0.0.1 server: port: 80 spring: cloud: gateway: discovery: locator: enabled: true loadbalancer: retry: enabled: true
