From bb98d179dd020e0b003446cb35ce422651ab8acd Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 25 九月 2023 09:40:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/code/code.vue | 19 +------------------
1 files changed, 1 insertions(+), 18 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 52edda4..8fe7297 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -1651,7 +1651,6 @@
} else {
this.sendGridCodeBasicSec(conditionMaps, true);
}
- //console.log(conditionMaps);
}
},
/* 鍏紡缂栬緫妗嗗唴瀹规敼鍙�,瀛愮粍浠剁紪杈戝畬鍏紡涔嬪悗鍐呭鍥炴樉鏃惰皟鐢� */
@@ -1660,12 +1659,12 @@
},
/* 寮曠敤鐮佹鍙傜収閰嶇疆,瀛愮粍浠跺~瀹屽弬鐓ч厤缃箣鍚庡唴瀹瑰洖鏄炬椂璋冪敤 */
setReferConfigValue(content) {
- // console.log(content.referTypeName);
this.form.referBtmId = content.referType || "";
this.form.referBtmName = content.referTypeName || content.referType;
//杞崲鎴怞SON瀛楃涓茶繘琛岀埗缁勪欢鍥炴樉
let submitFormJson = JSON.stringify(content);
this.form.referConfig = submitFormJson || "";
+ debugger;
},
/** 寮曠敤鐮佹涓恒�愬弬鐓у紩鐢ㄧ殑涓氬姟绫诲瀷銆戦�夊彇鍊间箣鍚庣殑鍐呭鍥炴樉鏃惰皟鐢� */
echoReferBtmType(content) {
@@ -1677,7 +1676,6 @@
/** 鐖跺垎绫婚�夋嫨瀵硅瘽妗嗭紝绗簩灞傚祵濂楀璇濇锛屽強鍏剁浉鍏虫柟娉� */
/** 淇濆瓨褰撳墠鐖跺垎绫荤爜娈电殑閫変腑琛岋紝骞惰繘琛屽洖鏄� */
saveSelectedParentClassify() {
- //console.log(this.parentClsfyParams.parentClassifySelectionList.length);
if (this.parentClsfyParams.parentClassifySelectionList.length != 1) {
this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�!");
return false;
@@ -1745,7 +1743,6 @@
page.pageSize,
conditionMaps
).then((res) => {
- //console.log(res.data);
const data = res.data.data;
parentClsParam.parentClassifyDataPage.total = data.total;
parentClsParam.parentClassifyData = data.records;
@@ -1763,7 +1760,6 @@
/** 鍔犺浇鍒嗙被杩炴帴灞炴�ц〃鏍兼暟鎹� */
loadlistClassifyLinkAttr() {
let attrParam = this.selectAttrParams;
- //console.log(this.currentSelectTreeData);
this.selectAttrParams.selectAttrOptionLoading = true;
let conditionMaps = {};
if (attrParam.selectAttrQeury) {
@@ -1781,7 +1777,6 @@
this.$nextTick(() => {
this.$refs[attrParam.ref].doLayout();
});
- //console.log(data.data);
this.selectAttrParams.selectAttrData = data.data;
this.selectAttrParams.selectAttrOptionLoading = false;
// 灏嗘悳绱㈡鍐呭缃┖
@@ -1851,13 +1846,11 @@
this.fixedValueOptionLoading = true;
gridCodeFixedValue(1, -1, { codeFixedSecOid: row.oid }).then((res) => {
this.fixedValueData = res.data.data.records;
- //console.log(this.fixedValueData);
this.fixedValueOptionLoading = false;
});
},
/** 鍗曞嚮鍥哄畾鐮佹鐨勭爜鍊艰〃涓鏃惰Е鍙戠殑浜嬩欢*/
selectedCodeValueRow(row) {
- //console.log(row);
this.selectedFixedOrCodeclassifyValue = row;
this.codeFixdForm.id = row.id;
this.codeFixdForm.description = row.description;
@@ -1893,7 +1886,6 @@
}
this.codeClassifyForm.codeClassifySecOid =
this.codefixedsecOrCodeclassifysec.oid;
- // console.log(this.codeClassifyForm);
addSaveCodeClassifyValue(this.codeClassifyForm).then(
() => {
this.loadClassifyValueData({
@@ -1918,7 +1910,6 @@
clearFixedOrClassifyForm(condition) {
//鐐瑰嚮鍙栨秷鏃舵竻绌鸿〃鍗曚笌褰撳墠閫変腑鐨勭爜鍊硷紝骞剁鐢ㄦ寜閽�
this.selectedFixedOrCodeclassifyValue = "";
- //console.log(condition);
if (condition === "close") {
this.codeFixdForm = this.$options.data().codeFixdForm;
this.codeClassifyForm = this.$options.data().codeClassifyForm;
@@ -2471,7 +2462,6 @@
},
/** 娣诲姞*/
rowSave(row, done, loading) {
- console.log(row);
add(row).then(
() => {
this.onLoad(this.page);
@@ -3151,7 +3141,6 @@
},
/** 鐮佹绫诲瀷鏀瑰彉鏃讹紝澧炲姞瀵瑰簲鐨刦orm琛ㄥ崟涓殑灞炴��*/
changeSectypeFormItems(row) {
- //console.log(row);
if (
func.isEmpty(this.enumParam.secTypeList) ||
this.enumParam.secTypeList.length == 0
@@ -3185,7 +3174,6 @@
componentCodeFlag: this.form.componentCodeFlag, //鏄惁鍙備笌缂栫爜
pkCodeRule: this.form.pkCodeRule, //鎵�灞炵紪鐮佽鍒�
};
- //console.log(this.form);
}
if (this.form.secType === "codefixedsec") {
//鍥哄畾鐮佹
@@ -3251,8 +3239,6 @@
? row.customCodeSerialClass
: "", //鑷畾涔夋祦姘寸畻娉�
});
- console.log(this.form);
- console.log(this.enumParam.codeFillType);
this.loadCodeFillType();
this.loadCodeFillSeparator();
} else if (this.form.secType === "codelevelsec") {
@@ -3298,7 +3284,6 @@
: "", //鏃ユ湡鏍煎紡
});
} else if (this.form.secType === "codeclassifysec") {
- //console.log(this.form);
//鍒嗙被鐮佹
this.form = Object.assign({}, this.form, {
codeSecLengthType:
@@ -3341,7 +3326,6 @@
this.loadCodeFillType();
this.loadCodeFillSeparator();
}
- // console.log(this.form);
},
/** 绗竴娆¤姹傜殑鏋氫妇鏁版嵁鏀剧紦瀛�*/
getLocalStorageEnum(enumKey) {
@@ -3398,7 +3382,6 @@
},
// 鏈�澶ф祦姘村彿
maxSerialNum() {
- console.log(this.selectionList);
if (this.selectionList.length === 0) {
this.$message.warning("璇烽�夋嫨涓�鏉$紪鐮佽鍒欙紒");
return;
--
Gitblit v1.9.3