From e6e375997692ac712eb43ca76b16752f6a9a1c67 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 23 八月 2023 00:00:41 +0800
Subject: [PATCH] 提交代码
---
Source/UBCS-WEB/src/views/code/code.vue | 101 ++++++++++++++++++++++++++++----------------------
1 files changed, 57 insertions(+), 44 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index b7734a3..c297664 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -227,7 +227,7 @@
<el-button @click="cloneOtherCodeRuleSettingBox = false">鍙� 娑�</el-button>
</div>
</el-dialog>
-
+
<!-- 缂栫爜瑙勫垯,杞Щ鎵�鏈夎�呭璇濇 -->
<el-dialog
:visible.sync="escapeOwnerVisible"
@@ -340,7 +340,7 @@
<!-- 鐮佹鐮佸�肩鐞嗗璇濇 -->
<el-dialog title="鐮佹鐮佸�肩鐞�"
:visible.sync="isShowBasicSecCodeValueMgr"
- :width="isShowFixedForm ? '68vw':'50vw'"
+ :width="isShowFixedForm ? '69vw':'50vw'"
append-to-body
style="height: 116vh; margin-top: -10vh;"
@close="clearFixedOrClassifyForm('close')"
@@ -349,8 +349,7 @@
<el-row v-show="!isShowFixedForm">
<el-col :span="11">
<basic-container>
- <div class="box classify_value_box" style="height:65vh; margin-bottom:-40px">
- <el-scrollbar style="border-bottom-right-radius:8px ">
+ <div class="box classify_value_box" style="height:60vh; margin-bottom:-40px">
<basic-container>
<div class="abox" style="height:54vh">
<avue-tree
@@ -360,7 +359,6 @@
style="overflow-y: auto; height: 54vh"/>
</div>
</basic-container>
- </el-scrollbar>
</div>
<div style="margin-top:20px; display: flex; align-items:center; justify-content:center;">
<el-button size="mini" type="primary" icon="el-icon-arrow-up" class="button" @click="codeClassifyValueOpetion('up')">涓婄Щ</el-button>
@@ -370,7 +368,7 @@
</el-col>
<el-col :span="13">
<basic-container>
- <div class="box" style="height:65vh; margin-bottom:-40px">
+ <div class="box" style="height:60vh; margin-bottom:-40px">
<el-form>
<el-form-item label="鐮佸��:" :label-width="50" required>
<el-input style="width: 18vw" v-model="codeClassifyForm.id"></el-input>
@@ -422,8 +420,8 @@
<el-form-item label="鐮佸��:" label-width="54px" required>
<el-input style="width: 19.5vw" v-model="codeFixdForm.id"></el-input>
</el-form-item >
- <el-form-item label="鎻忚堪:">
- <el-input type="textarea" style="width: 20vw;" v-model="codeFixdForm.description"></el-input>
+ <el-form-item label="鎻忚堪:" label-width="54px">
+ <el-input type="textarea" style="width: 19.5vw;" v-model="codeFixdForm.description"></el-input>
</el-form-item>
</el-form>
</div>
@@ -767,7 +765,6 @@
<formula-editor
ref="formulaEditor"
@updateFormulaContent="updateFormulaContent"
- :componentRuleText="form.getValueClass"
:visible.sync="formulaEditorParams.formulaEditorSettingBox"
:thisSceneTableData="formulaEditorParams.thisSceneTableData"
:systemVariableTableData="formulaEditorParams.systemVariableTableData">
@@ -838,6 +835,7 @@
import fixedValueOption from "@/const/code/fixedValueMgrDialog";
import {mapGetters} from "vuex";
import {getByRoleUserList} from "@/api/system/user";
+ import func from "@/util/func";
export default {
data() {
@@ -876,7 +874,7 @@
ruleAdminUserList: [], //瑙勫垯绠＄悊鍛樺垪琛�
ruleOwner: '', // 褰撳墠瑕佽浆绉荤粰鍝釜瑙勫垯绠＄悊鍛樼殑ID
releadDisabled: false, // 閬垮厤瑙勫垯鍙戝竷閲嶅鎻愪氦
-
+
/*浣跨敤鑼冨洿瀵硅瘽妗嗘樉绀烘帶鍒�*/
codeRangeSettingBox: false,
useRangeData: [],
@@ -1245,7 +1243,7 @@
parentClsParam.classifyDialogLoading = true;
let oid = this.selectionList.length==0 ? this.form.pkCodeRule:this.selectionList[0].oid;
let conditionMaps = {};
-
+
conditionMaps['conditionMap[pkCodeRule]'] = oid;
conditionMaps['conditionMap[oid_notequal]'] = this.form.oid;
refDataGridClassifySec(
@@ -1505,7 +1503,7 @@
}else{
if(this.checkClassUpdate(this.codefixedsecOrCodeclassifysec.oid,this.codeClassifyForm.codeClassifySecOid)){
return;
- }
+ }
//鍒嗙被鐮佹鐮佸�煎垹闄�
this.$confirm("鏄惁鍒犻櫎杩欐潯鏁版嵁锛熷鏋滆寮曠敤灏嗕笉鑳借鍒犻櫎锛�", {
confirmButtonText: "纭畾",
@@ -1567,7 +1565,7 @@
codeClassifyValueOpetion(condition){
if(this.checkClassUpdate(this.codefixedsecOrCodeclassifysec.oid,this.codeClassifyForm.codeClassifySecOid)){
return;
- }
+ }
//姝ゅ娑夊強鍒版繁娴呮嫹璐濋棶棰橈紝浣嗘槸鎵ц涓婁笅绉讳繚瀛樻搷浣滀箣鍚庝細閲嶆柊鍔犺浇treedata锛屾墍浠ュ奖鍝嶄笉澶�
let currentTreeList = this.getCodeClassifyValueTreeData();
let saveData = [];
@@ -1813,28 +1811,33 @@
},
/** 鍙戝竷缂栫爜瑙勫垯 */
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: '鍙栨秷鍙戝竷!',
+ if(update==="release"){
+ // 閬垮厤鐢ㄦ埛閲嶅鐐瑰嚮鎸夐挳
+ this.releadDisabled = true;
+ await checkLikeCodeRule(oid).then(res => {
+ console.log(res)
+ if(res.data.success){
+ this.updateStatus(oid,update);
+ }else{
+ this.$confirm(res.data.msg, '鎻愮ず', {
+ distinguishCancelAndClose: true,
+ confirmButtonText: '缁х画鍙戝竷',
+ cancelButtonText: '鍙栨秷'
+ }).then(() => {
+ //this.updateStatus();
})
- });
- }
- })
- this.releadDisabled = false;
+ .catch(action => {
+ this.$message({
+ type: 'info',
+ message: '鍙栨秷鍙戝竷!',
+ })
+ });
+ }
+ })
+ this.releadDisabled = false;
+ }else {
+ this.updateStatus(oid,update);
+ }
},
/** 鎵撳紑缂栫爜瑙勫垯鍏嬮殕瀵硅瘽妗�*/
openCodeRuleDialog() {
@@ -2572,6 +2575,7 @@
this.loadlistClassifyLinkAttr();
}else if(condition === 'value'){
//鎵撳紑鍏紡缂栬緫妗嗭紝绗簩灞傚祵濂楀璇濇
+ //this.$refs.formulaEditor.isShowformulaEdit = true;
this.formulaEditorParams.formulaEditorSettingBox = true;
}else if(condition === 'parentClassifySecOid'){
this.parentClsfyParams.isShowParentClassifySettingBox = true;
@@ -2618,7 +2622,7 @@
/** 鐮佹绫诲瀷鏀瑰彉鏃讹紝澧炲姞瀵瑰簲鐨刦orm琛ㄥ崟涓殑灞炴��*/
changeSectypeFormItems(row){
//console.log(row);
- if(this.enumParam.secTypeList.length==0){
+ if(func.isEmpty(this.enumParam.secTypeList) || this.enumParam.secTypeList.length==0){
this.loadCodeSecType();
}
if(row != null){
@@ -2754,41 +2758,50 @@
},
/** 鏋氫妇鍜屽彲杈撳彲閫夊唴瀹规煡璇� */
loadCodeSecType(){
- this.enumParam.secTypeList = this.getLocalStorageEnum("codeSecType");
+ let enumList = this.getLocalStorageEnum("codeSecType");
+ this.enumParam.secTypeList = enumList.length>0 ? enumList:[];
+ console.log(this.enumParam.secTypeList);
this.loadCodeSecLength();
},
loadCodeSecLength(){
- this.enumParam.codeSecLengthType = this.getLocalStorageEnum("codeSecLength");
+ let enumList = this.getLocalStorageEnum("codeSecLength");
+ this.enumParam.codeSecLengthType = enumList.length>0 ? enumList:[];
},
loadCodeFillType(){
- this.enumParam.codeFillType = this.getLocalStorageEnum("codeFillType");
+ let enumList = this.getLocalStorageEnum("codeFillType");
+ this.enumParam.codeFillType = enumList.length>0 ? enumList:[];
},
loadCodeFillSeparator(){
let enumCach = JSON.parse(localStorage.getItem("codeFillSeparator"));
if(enumCach == null) {
getDictionary("codeFillSeparator").then(res=>{
this.enumParam.codeFillSeparator = res.data.data;
- localStorage.setItem("codeFillSeparator",JSON.stringify(res.data.data));
+ localStorage.setItem('codeFillSeparator',JSON.stringify(res.data.data));
})
}
},
loadCodeLevelType(){
- this.enumParam.codeLevelType = this.getLocalStorageEnum("codeLevelType");
+ let enumList = this.getLocalStorageEnum("codeLevelType");
+ this.enumParam.codeLevelType = enumList.length>0 ? enumList:[];
},
loadCodeCutType(){
- this.enumParam.codeCutType = this.getLocalStorageEnum("codeCutType");
+ let enumList = this.getLocalStorageEnum("codeCutType");
+ this.enumParam.codeCutType = enumList.length>0 ? enumList:[];
},
loadCodeGetValueType(){
- this.enumParam.codeGetValueType = this.getLocalStorageEnum("codeGetValueType");
+ let enumList = this.getLocalStorageEnum("codeGetValueType");
+ this.enumParam.codeGetValueType = enumList.length>0 ? enumList:[];
},
-
+
}
};
</script>
<style>
-
+[class^="icon-"]{
+ font-size: 12px !important;
+}
.code-rule-crud > .avue-crud__search ,.code-basic-crud > .avue-crud__search {
margin-bottom: -15px;
}
--
Gitblit v1.9.3