From bb4b009b55f66e3ff40f4073f7566c963adb1d1b Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 19 七月 2023 17:49:03 +0800
Subject: [PATCH] 代码提交
---
Source/UBCS-WEB/src/components/code-dialog-page/referConfigDialog.vue | 12 +++---
Source/UBCS-WEB/src/views/code/code.vue | 48 ++++++++++++++++-------
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java | 2
Source/UBCS-WEB/src/api/code/mdmrule.js | 17 ++++++++
Source/UBCS/service-start.sh | 4 +-
5 files changed, 58 insertions(+), 25 deletions(-)
diff --git a/Source/UBCS-WEB/src/api/code/mdmrule.js b/Source/UBCS-WEB/src/api/code/mdmrule.js
index b0f0d13..41c9729 100644
--- a/Source/UBCS-WEB/src/api/code/mdmrule.js
+++ b/Source/UBCS-WEB/src/api/code/mdmrule.js
@@ -130,4 +130,19 @@
oids
}
})
-}
\ No newline at end of file
+}
+
+/**
+ * 瑙勫垯鍙戝竷鍓嶆牎楠岃鍒�
+ * @param {*} codeRuleDTO
+ * @returns
+ */
+export const checkLikeCodeRule = (oid) => {
+ return request({
+ url: '/api/ubcs-code/mdmRule/checkLikeCodeRule',
+ method: 'get',
+ params: {
+ oid
+ }
+ })
+}
diff --git a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigDialog.vue b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigDialog.vue
index 4e3101f..c561341 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigDialog.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigDialog.vue
@@ -44,16 +44,16 @@
openReconfigInterFace(preReferConfigForm){
const form = preReferConfigForm;
let data = {
- referTypeName: form.referBtmName,
- referType: form.referBtmId,
+ referTypeName: form.referBtmName || '',
+ referType: form.referBtmId || '',
}
if(this.referConfigOption.referConfig){
// 缂栬緫鐮佹鏃秗eferConfig鍙兘浼氬湪涓恒�愬弬鐓у紩鐢ㄧ殑涓氬姟绫诲瀷銆戦�夊彇鍊间箣鍚庢敼鍙�
let referConfigValue =JSON.parse(form.referConfig);
- if(referConfigValue.referType != form.referBtmId){
- referConfigValue.referType = form.referBtmId || '';
- referConfigValue.referTypeName = form.referBtmName || form.referBtmId;
- this.referConfigOption.referConfig = JSON.stringify(referConfigValue);
+ if(referConfigValue.referType != form.referBtmId && data.referType){
+ referConfigValue.referType = form.referBtmId || '';
+ referConfigValue.referTypeName = form.referBtmName || form.referBtmId;
+ this.referConfigOption.referConfig = JSON.stringify(referConfigValue);
}
this.$set(data,"referConfig",this.referConfigOption.referConfig)
}
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index b54b160..b074ce1 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -37,6 +37,7 @@
icon="el-icon-position"
v-show="scope.row.lcStatus=='Editing' ? true:false"
plain
+ :disabled="releadDisabled"
@click="enableOrDeactivatse(scope.row.oid,'release')">鍙� 甯�
</el-button>
<el-button type="text"
@@ -820,17 +821,8 @@
</template>
<script>
- import { gridCodeRule, getDetail, add, update, remove, listUseRange, updateStatus,clone,clearAllCode } from "@/api/code/mdmrule";
- import {
- gridCodeBasicSec,
- downOrderNum,
- upOrderNum,
- deleteData,
- editSave,
- cloneCodeBasic,
- addSave,
- refDataGridClassifySec,
- } from "@/api/code/codebasic";
+ import { gridCodeRule, getDetail, add, update, remove, listUseRange, updateStatus,clone,clearAllCode,checkLikeCodeRule } from "@/api/code/mdmrule";
+ import { gridCodeBasicSec, downOrderNum, upOrderNum, deleteData, editSave, cloneCodeBasic, addSave, refDataGridClassifySec } from "@/api/code/codebasic";
import { listClassifyLinkAttr } from "@/api/code/codeclassify";
import { gridCodeFixedValue,addSaveCodeFixedValue,deleteCodeFixedValue,editCodeFixedValue,saveOrder } from "@/api/code/codeFixedValue";
import { treeCodeClassifyValue,addSaveCodeClassifyValue,editCodeClassifyValue,deleteCodeClassifyValue,saveCodeClassifyValueOrder } from "@/api/code/codeClassifyValue";
@@ -884,7 +876,8 @@
escapeOwnerVisible: false,
ruleAdminUserList: [], //瑙勫垯绠＄悊鍛樺垪琛�
ruleOwner: '', // 褰撳墠瑕佽浆绉荤粰鍝釜瑙勫垯绠＄悊鍛樼殑ID
-
+ releadDisabled: false, // 閬垮厤瑙勫垯鍙戝竷閲嶅鎻愪氦
+
/*浣跨敤鑼冨洿瀵硅瘽妗嗘樉绀烘帶鍒�*/
codeRangeSettingBox: false,
useRangeData: [],
@@ -1807,9 +1800,9 @@
refreshUseRangeChange(){
this.getRangeCodeList();
},
- /** 鍚敤涓庡仠鐢�*/
- enableOrDeactivatse(oId,update){
- updateStatus({"oid":oId,"ts":new Date().getTime,"update":update}).then(() => {
+ /** 淇敼瑙勫垯鐘舵��:鍚敤銆佸仠鐢ㄣ�佸彂甯� */
+ updateStatus(oid,update){
+ updateStatus({"oid":oid,"ts":new Date().getTime,"update":update}).then(() => {
this.onLoad(this.page);
this.$message({
type: "success",
@@ -1819,6 +1812,31 @@
window.console.log(error);
});
},
+ /** 鍙戝竷缂栫爜瑙勫垯 */
+ async enableOrDeactivatse(oid,update){
+ // 閬垮厤鐢ㄦ埛閲嶅鐐瑰嚮鎸夐挳
+ this.releadDisabled = true;
+ await checkLikeCodeRule(oid).then(res => {
+ if(res.data.success){
+ this.updateStatus(oid,update);
+ }else{
+ this.$confirm('test', '鎻愮ず', {
+ distinguishCancelAndClose: true,
+ confirmButtonText: '缁х画鍙戝竷',
+ cancelButtonText: '鍙栨秷'
+ }).then(() => {
+ //this.updateStatus();
+ })
+ .catch(action => {
+ this.$message({
+ type: 'info',
+ message: '鍙栨秷鍙戝竷!',
+ })
+ });
+ }
+ })
+ this.releadDisabled = false;
+ },
/** 鎵撳紑缂栫爜瑙勫垯鍏嬮殕瀵硅瘽妗�*/
openCodeRuleDialog() {
if (!this.tipsMessage(this.selectionList)) {
diff --git a/Source/UBCS/service-start.sh b/Source/UBCS/service-start.sh
index 27a55c6..14e2797 100644
--- a/Source/UBCS/service-start.sh
+++ b/Source/UBCS/service-start.sh
@@ -26,8 +26,8 @@
docker run -d -p 36004:36004 --name ubcs-flow vci-ubcs/ubcs-flow:latest
#鍚姩develop鏈嶅姟
- docker build -f ./ubcs-ops/ubcs-develop/Dockerfile -t vci-ubcs/ubcs-develop .
- docker run -d -p 36003:36003 --name ubcs-develop vci-ubcs/ubcs-develop:latest
+# docker build -f ./ubcs-ops/ubcs-develop/Dockerfile -t vci-ubcs/ubcs-develop .
+# docker run -d -p 36003:36003 --name ubcs-develop vci-ubcs/ubcs-develop:latest
#鍚姩jobAdmin鏈嶅姟
# docker build -f ./ubcs-ops/ubcs-xxljob-admin/Dockerfile -t vci-ubcs/ubcs-jobadmin .
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java
index 4483a04..e49b382 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java
@@ -224,7 +224,7 @@
@GetMapping("/checkLikeCodeRule")
@ApiOperationSupport(order = 15)
@ApiOperation(value = "妫�鏌ョ浉浼肩紪鐮佽鍒�", notes = "浼犲叆oid")
- public R checkLikeCodeRule(String oid){
+ public R checkLikeCodeRule(@Valid @RequestParam String oid){
return codeRuleService.checkLikeCodeRule(oid);
}
--
Gitblit v1.9.3