| Source/UBCS-WEB/src/api/GetItem.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Source/UBCS-WEB/src/views/docking/info.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Source/UBCS-WEB/src/views/docking/infoForm.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Source/UBCS-WEB/vue.config.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Source/UBCS/pom.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Source/UBCS/ubcs-service/ubcs-code/pom.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Source/UBCS/ubcs-service/ubcs-omd/pom.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Source/UBCS-WEB/src/api/GetItem.js
@@ -100,3 +100,13 @@ } }) } // 更新集团码值数据 export function receiveEditApply(params) { return request({ url: 'api/ubcs-applyjtcodeservice/DockingPreApplyCode/receiveEditApply', method: 'post', params: { ...params } }) } Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -219,7 +219,7 @@ rules: [ { required: formItem.required, message: `请${message}${formItem.text}`, message: `${message}${formItem.text}`, trigger, }, { Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -116,7 +116,7 @@ </basic-container> </template> <script> import {MasterTable, TableData, FindData, addSaveCode, editSaveCode, deleteCode, upSaveCode,applyGroupCode} from "@/api/GetItem"; import {MasterTable, TableData, FindData, addSaveCode, editSaveCode, deleteCode, upSaveCode,applyGroupCode,receiveEditApply} from "@/api/GetItem"; import {processTS, changeStatus} from "@/api/template/setPersonnel" import {listCodeAttributeByClassId} from "@/api/integration/integration.js"; import integrationTransfer from "@/views/integration/integrationTransfer"; @@ -415,7 +415,7 @@ //申请集团码数据 if (uniqueFlag === 'applyGroupCode') return this.applyGroupCode() //更新集团码数据 // if (uniqueFlag === 'applyGroupCode') return this.applyGroupCode() if (uniqueFlag === 'receiveEditApply') return this.receiveEditApply() // 相似项查询 // if(uniqueFlag === 'CODEEDIT') return this.similarHandler() }); @@ -429,8 +429,28 @@ // return { oids: item.oid, btmName: item.btmname }; // }); const oids = this.selectRow.map(item => item.oid).join(','); applyGroupCode({ oids, btmName: this.selectRow[0].btmname }).then(res => { console.log(res); applyGroupCode({ oids, btmName: this.selectRow[0].btmname }).then(res=>{ if(res.data.code==200){ this.$message.success('申请成功') } this.onLoad() }) } }, //更新集团码数据 receiveEditApply(){ if(this.selectRow.length <= 0){ this.$message.warning('请选择一条数据模板！') }else { // const requestData = this.selectRow.forEach(item => { // return { oids: item.oid, btmName: item.btmname }; // }); const oids = this.selectRow.map(item => item.oid).join(','); receiveEditApply({ oids, btmName: this.selectRow[0].btmname }).then(res => { if(res.data.code==200){ this.$message.success('更新成功') this.onLoad() } }); } }, Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
@@ -288,8 +288,13 @@ } } getList(Object.assign(params,this.params,this.query, query),page.currentPage, page.pageSize, this.url, this.method).then(res => { this.data = res.data.records || res.data.data.records; this.page.total=res.data.total || res.data.data.total; if(res.data.records){ this.data = res.data.records this.page.total=res.data.total ; }else{ this.data = res.data.data.records; this.page.total=res.data.data.total; } this.loading = false; this.selectionClear(); }).catch(error=>{ Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
@@ -347,8 +347,13 @@ } } getList(Object.assign(params,this.params,this.query, query),page.currentPage, page.pageSize, this.url).then(res => { this.data = res.data.records || res.data.data.records; this.page.total=res.data.total || res.data.data.total; if(res.data.records){ this.data = res.data.records this.page.total=res.data.total ; }else{ this.data = res.data.data.records; this.page.total=res.data.data.total; } this.loading = false; this.selectionClear(); }).catch(error=>{ Source/UBCS-WEB/src/views/docking/info.vue
@@ -232,6 +232,12 @@ this.$refs.infoForm.formData = { dataFlowType:'push', pushType:'1', sourceSystemName:'编码系统', sourceSystemOid:'code00000001', sourceSystemId:'CODE', targetSystemName:'', targetSystemOid:'', targetSystemId:'', sysIntParamVOs:[], sysIntHeaderVOs:[] }; Source/UBCS-WEB/src/views/docking/infoForm.vue
@@ -4,7 +4,7 @@ style="height: 110vh;" top="-5%"> <el-form ref="form" :model="formData" show-message="true" inline size="medium" label-suffix=":" class="dockingForm" :rules="rules" status-icon="true"> <el-form-item label="dataFlowType" prop="dataFlowType"> <el-form-item label="接口类型" prop="dataFlowType"> <el-select v-model="formData.dataFlowType" placeholder="请选择" @change="dataFlowTypeChange"> <el-option v-for="item in dataFlowTypeList" :key="item.value" :label="item.label" :value="item.value"> </el-option> @@ -28,9 +28,10 @@ </el-option> </el-select> </el-form-item> <el-form-item label="分类选择" prop="classifyName"> <vciWebRefer :referConfig="{ <div v-if="formData.dataFlowType=='push'"> <el-form-item label="分类选择" prop="classifyName"> <vciWebRefer :referConfig="{ title: '分类选择', showField: 'classifyName', field: 'classifyOid', @@ -38,80 +39,59 @@ placeholder: '请选择分类选择', options: {isMuti: false, type: 'tree', url: 'api/ubcs-code/codeClassify/treeCodeClassify'}, }" :value="formData.classifyOid" :text="formData.classifyName" :disabled="false" :display="true" @setReferValue="setReferValue" ></vciWebRefer> </el-form-item> <el-form-item v-if="formData.dataFlowType=='push'" label="集成系统" prop="targetSystemName"> <vciWebRefer :referConfig="{ :value="formData.classifyOid" :text="formData.classifyName" :disabled="false" :display="true" @setReferValue="setReferValue" ></vciWebRefer> </el-form-item> <el-form-item label="集成系统" prop="targetSystemName"> <vciWebRefer :referConfig="{ title: '集成系统', showField: 'targetSystemName', field: 'targetSystemOid', fieldMap:{'targetSystemId':'id'}, placeholder: '请选择', options: {isMuti: false, type: 'default', url: 'api/ubcs-code/codeBasicSecController/gridCodeBasicSec'}, options: {isMuti: false, type: 'default', url: 'api/ubcs-code/dockingManagement/gridDockingSystem'}, }" :value="formData.targetSystemOid" :text="formData.targetSystemName" :disabled="false" :display="true" @setReferValue="setReferValue" ></vciWebRefer> </el-form-item> <el-form-item v-if="formData.dataFlowType=='push'" label="编码系统" prop="sourceSystemName"> <vciWebRefer :referConfig="{ title: '编码系统', showField: 'sourceSystemName', field: 'sourceSystemOid', fieldMap:{'sourceSystemId':'id'}, placeholder: '请选择', options: {isMuti: false, type: 'default', url: 'api/ubcs-code/codeBasicSecController/gridCodeBasicSec'}, }" :value="formData.sourceSystemOid" :text="formData.sourceSystemName" :disabled="false" :display="true" @setReferValue="setReferValue" ></vciWebRefer> </el-form-item> <el-form-item v-if="formData.dataFlowType=='accept'" label="编码系统" prop="targetSystemName"> <vciWebRefer :referConfig="{ title: '编码系统', showField: 'targetSystemName', field: 'targetSystemOid', fieldMap:{'targetSystemId':'id'}, placeholder: '请选择', options: {isMuti: false, type: 'default', url: 'api/ubcs-code/codeBasicSecController/gridCodeBasicSec'}, }" :value="formData.targetSystemOid" :text="formData.targetSystemName" :disabled="false" :display="true" @setReferValue="setReferValue" ></vciWebRefer> </el-form-item> <el-form-item v-if="formData.dataFlowType=='accept'" label="集成系统" prop="sourceSystemName"> <vciWebRefer :referConfig="{ :value="formData.targetSystemOid" :text="formData.targetSystemName" :disabled="false" :display="true" @setReferValue="setReferValue" ></vciWebRefer> </el-form-item> </div> <div v-else> <el-form-item label="分类选择" prop="classifyName" style="display: none"> </el-form-item> <el-form-item label="集成系统" prop="sourceSystemName"> <vciWebRefer :referConfig="{ title: '集成系统', showField: 'sourceSystemName', field: 'sourceSystemOid', fieldMap:{'sourceSystemId':'id'}, placeholder: '请选择', options: {isMuti: false, type: 'default', url: 'api/ubcs-code/codeBasicSecController/gridCodeBasicSec'}, options: {isMuti: false, type: 'default', url: 'api/ubcs-code/dockingManagement/gridDockingSystem'}, }" :value="formData.sourceSystemOid" :text="formData.sourceSystemName" :disabled="false" :display="true" @setReferValue="setReferValue" ></vciWebRefer> :value="formData.sourceSystemOid" :text="formData.sourceSystemName" :disabled="false" :display="true" @setReferValue="setReferValue" ></vciWebRefer> </el-form-item> </div> <el-form-item label="接口方式" prop="interfaceType"> <el-select v-model="formData.interfaceType" clearable placeholder="请选择"> <el-option v-for="item in interfaceTypeList" :key="item.value" :label="item.label" :value="item.value"> </el-option> </el-select> </el-form-item> <el-form-item v-if="formData.pushType=='1'" label="是否推送集团码" prop="isGroupCodeFlag"> <el-switch v-model="formData.isGroupCodeFlag" ></el-switch> @@ -127,12 +107,6 @@ </el-form-item> <el-form-item label="系统描述" style="width: 850px;"> <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 5}" v-model="formData.description" style="width: 740px;"></el-input> </el-form-item> <el-form-item label="接口类型" prop="interfaceType"> <el-select v-model="formData.interfaceType" clearable placeholder="请选择"> <el-option v-for="item in interfaceTypeList" :key="item.value" :label="item.label" :value="item.value"> </el-option> </el-select> </el-form-item> <el-form-item v-if="formData.interfaceType=='http'" label="请求方式" prop="requestMethod"> <el-select v-model="formData.requestMethod" placeholder="请选择"> @@ -263,9 +237,9 @@ label: 'Json', value: 'json' }], dataFlowTypeList: [{ label: 'push', value: 'push' label: '推送', value: 'push' }, { label: 'accept', value: 'accept' label: '接受', value: 'accept' }], //推送类型 pushTypeList: [{value: '1', label: '数据推送'}, @@ -419,10 +393,23 @@ {value: '6', label: '含规则信息的分类查询'}, {value: '7', label: '数据查询'}] this.formData.pushType='' this.formData.targetSystemName='编码系统'; this.formData.targetSystemOid='code00000001'; this.formData.targetSystemId='CODE'; this.formData.sourceSystemName=''; this.formData.sourceSystemOid=''; this.formData.sourceSystemId=''; }else { this.pushTypeList=[{value: '1', label: '数据推送'}, {value: '2', label: '分类推送'}] this.formData.pushType='1' this.formData.pushType='1' ; this.formData.sourceSystemName='编码系统'; this.formData.sourceSystemOid='code00000001'; this.formData.sourceSystemId='CODE'; this.formData.targetSystemName=''; this.formData.targetSystemOid=''; this.formData.targetSystemId=''; } }, methods: { @@ -482,8 +469,13 @@ submitAttribute() { const that = this; let pass=true if(validatenull(this.formData.classifyName)||validatenull(this.formData.sourceSystemName)||validatenull(this.formData.targetSystemName)){ if(this.formData.dataFlowType=='push' && (validatenull(this.formData.classifyName)||validatenull(this.formData.targetSystemName))){ that.$message.error('必填项不能为空'); pass=false return; } if(this.formData.dataFlowType=='accept' && (validatenull(this.formData.sourceSystemName))){ that.$message.error('集成系统不能为空'); pass=false return; } @@ -539,7 +531,13 @@ if(value=='push'){ this.pushTypeList=[{value: '1', label: '数据推送'}, {value: '2', label: '分类推送'}] this.formData.pushType='数据推送' this.formData.pushType='1'; this.formData.sourceSystemName='编码系统'; this.formData.sourceSystemOid='code00000001'; this.formData.sourceSystemId='CODE'; this.formData.targetSystemName=''; this.formData.targetSystemOid=''; this.formData.targetSystemId=''; }else if(value=='accept'){ this.pushTypeList=[ {value: '3', label: '编码申请'}, @@ -547,7 +545,14 @@ {value: '5', label: '分类查询'}, {value: '6', label: '含规则信息的分类查询'}, {value: '7', label: '数据查询'}] this.formData.pushType='' this.formData.pushType=''; this.formData.targetSystemName='编码系统'; this.formData.targetSystemOid='code00000001'; this.formData.targetSystemId='CODE'; this.formData.sourceSystemName=''; this.formData.sourceSystemOid=''; this.formData.sourceSystemId=''; }else{ this.pushTypeList=[]; } Source/UBCS-WEB/vue.config.js
@@ -28,10 +28,11 @@ //本地服务接口地址 // target: 'http://127.0.0.1', // target: 'http://192.168.1.51:37000', // target: 'http://dev.vci-tech.com:37000', target: 'http://dev.vci-tech.com:37000', // target: 'http://192.168.1.16:37000', // target: 'http://192.168.0.105:37000', target: 'http://192.168.43.251:37000', //xiejun // 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
@@ -10,7 +10,6 @@ <properties> <bladex.project.version>3.0.1.RELEASE</bladex.project.version> <java.version>1.8</java.version> <maven.plugin.version>3.8.0</maven.plugin.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -41,7 +40,7 @@ <module>ubcs-plugin-api</module> <module>ubcs-service</module> <module>ubcs-service-api</module> <module>ubcs-codeApply</module> <!-- <module>ubcs-codeApply</module>--> </modules> <dependencyManagement> @@ -204,6 +203,61 @@ </compilerArgs> </configuration> </plugin> <!-- 打包时剔除jar，放置在lib当中 --> <!-- <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> <version>${spring.boot.version}</version> <!– 如果 spring.boot.version 版本修改，则这里也要跟着修改 –> <configuration> <fork>true</fork> <!–解决windows命令行窗口中文乱码–> <jvmArguments>-Dfile.encoding=UTF-8</jvmArguments> <!– 拆开依赖–> <mainClass>cn.iocoder.qingning.server.QingningServerApplication</mainClass> <layout>ZIP</layout> <includes> <include> <!– 排除所有Jar –> <groupId>nothing</groupId> <artifactId>nothing</artifactId> </include> </includes> </configuration> <executions> <execution> <goals> <goal>repackage</goal> <!– 将引入的 jar 打入其中 –> </goals> </execution> </executions> </plugin> <!–此插件用于将依赖包抽出–> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <executions> <execution> <id>copy-dependencies</id> <phase>package</phase> <goals> <goal>copy-dependencies</goal> </goals> <configuration> <outputDirectory>../target/lib</outputDirectory> <excludeTransitive>false</excludeTransitive> <stripVersion>false</stripVersion> <includeScope>runtime</includeScope> </configuration> </execution> </executions> </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <skip>true</skip> </configuration> </plugin>--> </plugins> </build>
@@ -164,24 +164,49 @@ <build> <plugins> <plugin> <groupId>com.spotify</groupId> <artifactId>dockerfile-maven-plugin</artifactId> <configuration> <username>${docker.username}</username> <password>${docker.password}</password> <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository> <tag>${project.version}</tag> <useMavenSettingsForAuth>true</useMavenSettingsForAuth> <buildArgs> <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE> </buildArgs> <skip>false</skip> </configuration> </plugin> <!--设置应用 Main 参数启动依赖查找的地址指向外部 lib 文件夹--> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId> <configuration> <archive> <manifest> <addClasspath>true</addClasspath> <!-- 项目所依赖的jar位于同一级的lib目录下--> <classpathPrefix>lib/</classpathPrefix> </manifest> </archive> </configuration> </plugin> <!--设置 SpringBoot 打包插件不包含任何 Jar 依赖包--> <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> <configuration> <includes> <include> <groupId>nothing</groupId> <artifactId>nothing</artifactId> </include> </includes> </configuration> </plugin> <!--设置将 lib 拷贝到应用 Jar 外面--> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <executions> <execution> <id>copy-dependencies</id> <phase>prepare-package</phase> <goals> <goal>copy-dependencies</goal> </goals> <configuration> <outputDirectory>${project.build.directory}/lib</outputDirectory> </configuration> </execution> </executions> </plugin> </plugins> </build> Source/UBCS/ubcs-service/ubcs-omd/pom.xml
@@ -85,25 +85,57 @@ <build> <plugins> <!-- <plugin>--> <!-- <groupId>com.spotify</groupId>--> <!-- <artifactId>dockerfile-maven-plugin</artifactId>--> <!-- <configuration>--> <!-- <username>${docker.username}</username>--> <!-- <password>${docker.password}</password>--> <!-- <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>--> <!-- <tag>${project.version}</tag>--> <!-- <useMavenSettingsForAuth>true</useMavenSettingsForAuth>--> <!-- <buildArgs>--> <!-- <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>--> <!-- </buildArgs>--> <!-- <skip>false</skip>--> <!-- </configuration>--> <!-- </plugin>--> <!-- <plugin>--> <!-- <groupId>org.apache.maven.plugins</groupId>--> <!-- <artifactId>maven-antrun-plugin</artifactId>--> <!-- </plugin>--> <plugin> <groupId>com.spotify</groupId> <artifactId>dockerfile-maven-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <version>2.6</version> <configuration> <username>${docker.username}</username> <password>${docker.password}</password> <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository> <tag>${project.version}</tag> <useMavenSettingsForAuth>true</useMavenSettingsForAuth> <buildArgs> <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE> </buildArgs> <skip>false</skip> <archive> <manifest> <addClasspath>true</addClasspath> <classpathPrefix>lib/</classpathPrefix> <mainClass>com.vci.ubcs.omd.OmdApplication</mainClass> </manifest> </archive> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId> <version>2.10</version> <executions> <execution> <id>copy-dependencies</id> <phase>package</phase> <goals> <goal>copy-dependencies</goal> </goals> <configuration> <outputDirectory>${project.build.directory}/lib</outputDirectory> </configuration> </execution> </executions> </plugin> </plugins> </build>
