From 426cad0dd0eef1aefb59c6aaa2e2a2448773dc0b Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期一, 24 七月 2023 17:29:24 +0800
Subject: [PATCH] 1、修改查询按钮时的条件，使用编码来查询。 2、增加申请编码时增加设置默认的租户编码。 3、对传入in('条件sql拼接报错问题进行了修改。 4、模板的启用前进行了对分类启用状态的一个判断工作。
---
Source/UBCS-WEB/src/views/code/code.vue | 248 +++++++++++++++++++++++++++----------------------
1 files changed, 138 insertions(+), 110 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index c1a1e3a..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: [],
@@ -933,7 +926,7 @@
/** 鐮佸�肩鐞嗙浉鍏虫暟鎹� */
isShowBasicSecCodeValueMgr: false, //鐮佹鐮佸�肩鐞嗗璇濇
- codefixedsecOrCodeclassifysecOid: '', //瀛樻斁鍩虹鐮佹鐐瑰嚮鐮佸�肩鐞嗘椂鐨勫綋鍓嶈id锛岀敤浜庝繚瀛樼爜鍊兼椂浣跨敤
+ codefixedsecOrCodeclassifysec: '', //瀛樻斁鍩虹鐮佹鐐瑰嚮鐮佸�肩鐞嗘椂鐨勫綋鍓嶈id锛岀敤浜庝繚瀛樼爜鍊兼椂浣跨敤
selectedFixedOrCodeclassifyValue: '', //褰撳墠閫変腑鐨勭爜鍊兼暟鎹�
//鍥哄畾鐮佹鐮佸�艰〃鍗�
codeFixdForm: {
@@ -1201,7 +1194,7 @@
},
/** 鐖跺垎绫婚�夋嫨瀵硅瘽妗嗭紝绗簩灞傚祵濂楀璇濇锛屽強鍏剁浉鍏虫柟娉� */
- // 淇濆瓨褰撳墠鐖跺垎绫荤爜娈电殑閫変腑琛岋紝骞惰繘琛屽洖鏄�
+ /** 淇濆瓨褰撳墠鐖跺垎绫荤爜娈电殑閫変腑琛岋紝骞惰繘琛屽洖鏄� */
saveSelectedParentClassify(){
//console.log(this.parentClsfyParams.parentClassifySelectionList.length);
if(this.parentClsfyParams.parentClassifySelectionList.length != 1){
@@ -1253,7 +1246,9 @@
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(
page.currentPage,
page.pageSize,
@@ -1270,12 +1265,12 @@
/** 鎵撳紑灞炴�ч�夊彇鍊硷紝绗簩灞傚祵濂楀璇濇锛屽強鍏剁浉鍏虫柟娉� */
- // 鑾峰彇褰撳墠琚�変腑鏍戣妭鐐圭殑oid
+ /** 鑾峰彇褰撳墠琚�変腑鏍戣妭鐐圭殑oid */
nodeClick(data) {
this.currentSelectTreeData = data;
this.loadlistClassifyLinkAttr()
},
- // 鍔犺浇鍒嗙被杩炴帴灞炴�ц〃鏍兼暟鎹�
+ /** 鍔犺浇鍒嗙被杩炴帴灞炴�ц〃鏍兼暟鎹� */
loadlistClassifyLinkAttr() {
let attrParam = this.selectAttrParams;
//console.log(this.currentSelectTreeData);
@@ -1300,31 +1295,31 @@
this.selectAttrParams.selectAttrQeury = {};
})
},
- // 鐐瑰嚮鎼滅储鍚庤Е鍙戣浜嬩欢
+ /** 鐐瑰嚮鎼滅储鍚庤Е鍙戣浜嬩欢 */
selectAttrSearchChange(params, done) {
this.selectAttrParams.selectAttrQeury = params;
//console.log(params); //杩欏効闇�瑕佹敼
this.loadlistClassifyLinkAttr();
done();
},
- // 涓哄睘鎬ч�夊�肩晫闈紝鍗曞嚮琛ㄦ牸琛屾椂瑙﹀彂璇ヤ簨浠�
+ /** 涓哄睘鎬ч�夊�肩晫闈紝鍗曞嚮琛ㄦ牸琛屾椂瑙﹀彂璇ヤ簨浠� */
selectionAttrRowClick(row){
this.$refs[this.selectAttrParams.ref].toggleSelection();
this.selectAttrParams.selectionChangeAttrList = row;
this.$refs[this.selectAttrParams.ref].setCurrentRow(row);
this.$refs[this.selectAttrParams.ref].toggleRowSelection(row); //閫変腑褰撳墠琛�
},
- // 灞炴�у彇鍊煎綋鍓嶉�変腑琛屽彂鐢熷彉鍖栨椂瑙﹀彂
+ /** 灞炴�у彇鍊煎綋鍓嶉�変腑琛屽彂鐢熷彉鍖栨椂瑙﹀彂 */
selectionChangeAttr(list){
this.selectAttrParams.selectionChangeAttrList = list;
this.$refs[this.selectAttrParams.ref].setCurrentRow(this.selectAttrParams.selectionChangeAttrList[list.length-1]);
},
- // 閲嶇疆浣嶅睘鎬ч�夊彇鍊艰〃鏍肩殑鎼滅储妗嗕箣鍚庣殑鍥炶皟
+ /** 閲嶇疆浣嶅睘鎬ч�夊彇鍊艰〃鏍肩殑鎼滅储妗嗕箣鍚庣殑鍥炶皟 */
searchAttrReset() {
this.selectAttrParams.selectAttrQeury = {};
this.loadlistClassifyLinkAttr()
},
- // 涓哄睘鎬ч�夊彇鍊间箣鍚庣殑鍥炴樉
+ /** 涓哄睘鎬ч�夊彇鍊间箣鍚庣殑鍥炴樉 */
selectedListClassifyLinkAttr(){
if(this.selectAttrParams.selectionChangeAttrList.length != 1){
this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�!");
@@ -1343,7 +1338,7 @@
/** 鍩虹鐮佹琛ㄤ腑鐨勭爜鍊肩鐞嗙殑鐩稿叧鏂规硶 */
- // 鐮佸�肩鐞嗗脊绐楁帶鍒�
+ /** 鐮佸�肩鐞嗗脊绐楁帶鍒�*/
openBasicSecCodeValueMgr(row){
//褰撳墠涓哄浐瀹氱爜娈电爜鍊肩鐞嗙爜鍊肩鐞�
if(row.secType === "codefixedsec"){
@@ -1354,10 +1349,10 @@
this.isShowFixedForm = false;
this.loadClassifyValueData(row);
}
- this.codefixedsecOrCodeclassifysecOid = row.oid;
+ this.codefixedsecOrCodeclassifysec = row;
this.isShowBasicSecCodeValueMgr = true;
},
- //鍔犺浇鍥哄畾鐮佹鐮佸�艰〃鏁版嵁
+ /** 鍔犺浇鍥哄畾鐮佹鐮佸�艰〃鏁版嵁*/
loadFixedValueTableData(row){
this.fixedValueOptionLoading = true;
gridCodeFixedValue(1, -1, {"codeFixedSecOid":row.oid}).then(res=>{
@@ -1366,7 +1361,7 @@
this.fixedValueOptionLoading = false;
})
},
- //鍗曞嚮鍥哄畾鐮佹鐨勭爜鍊艰〃涓鏃惰Е鍙戠殑浜嬩欢
+ /** 鍗曞嚮鍥哄畾鐮佹鐨勭爜鍊艰〃涓鏃惰Е鍙戠殑浜嬩欢*/
selectedCodeValueRow(row){
//console.log(row);
this.selectedFixedOrCodeclassifyValue = row;
@@ -1374,20 +1369,15 @@
this.codeFixdForm.description = row.description;
this.codeFixdForm.codeFixedSecOid = row.codefixedsecoid;
},
- //鏂板鐮佸��
+ /** 鏂板鐮佸��*/
addCodeSecValue(condition){
if(condition === "codefixedsec"){
- if(this.codeFixdForm.id.trim() == ''){
- this.$message.warning("鐮佸�间笉鑳戒负绌猴紒");
+ if(!this.tipsCodeSecValueMessage(this.codeFixdForm.id)){
return;
}
- if(this.codeFixdForm.id.trim().length >= 12 ){
- this.$message.warning("鐮佸�奸暱搴︿笉鑳藉ぇ浜�12锛�");
- return;
- }
- this.codeFixdForm.codeFixedSecOid = this.codefixedsecOrCodeclassifysecOid;
+ this.codeFixdForm.codeFixedSecOid = this.codefixedsecOrCodeclassifysec.oid;
addSaveCodeFixedValue(this.codeFixdForm).then(() => {
- this.loadFixedValueTableData({"oid":this.codefixedsecOrCodeclassifysecOid});
+ this.loadFixedValueTableData({"oid":this.codefixedsecOrCodeclassifysec.oid});
this.clearFixedOrClassifyForm('codefixedsec');
this.$message({
type: "success",
@@ -1397,18 +1387,13 @@
window.console.log(error);
});
}else {
- if(this.codeClassifyForm.id.trim() == ''){
- this.$message.warning("鐮佸�间笉鑳戒负绌猴紒");
+ if(!this.tipsCodeSecValueMessage(this.codeClassifyForm.id)){
return;
}
- if(this.codeClassifyForm.id.trim().length > 4 ){
- this.$message.warning("鐮佸�奸暱搴︿笉鑳藉ぇ浜�4锛�");
- return;
- }
- this.codeClassifyForm.codeClassifySecOid = this.codefixedsecOrCodeclassifysecOid;
+ this.codeClassifyForm.codeClassifySecOid = this.codefixedsecOrCodeclassifysec.oid;
// console.log(this.codeClassifyForm);
addSaveCodeClassifyValue(this.codeClassifyForm).then(() => {
- this.loadClassifyValueData({"oid":this.codefixedsecOrCodeclassifysecOid});
+ this.loadClassifyValueData({"oid":this.codefixedsecOrCodeclassifysec.oid});
this.clearFixedOrClassifyForm('codeclassifyvaluesec');
this.$message({
type: "success",
@@ -1422,7 +1407,7 @@
});
}
},
- //娓呯┖鐮佸�艰〃鍗�
+ /** 娓呯┖鐮佸�艰〃鍗� */
clearFixedOrClassifyForm(condition){
//鐐瑰嚮鍙栨秷鏃舵竻绌鸿〃鍗曚笌褰撳墠閫変腑鐨勭爜鍊硷紝骞剁鐢ㄦ寜閽�
this.selectedFixedOrCodeclassifyValue = '';
@@ -1438,19 +1423,34 @@
this.codeClassifyForm = this.$options.data().codeClassifyForm;
}
},
- //淇敼鐮佸��
+ /** 娣诲姞鎴栦慨鏀圭爜鍊间箣鍓嶅鐮佸�奸暱搴︽牴鎹鍒欒繘琛屾牎楠� */
+ tipsCodeSecValueMessage(id){
+ if(id.trim() == ''){
+ this.$message.warning("鐮佸�间笉鑳戒负绌猴紒");
+ return false;
+ }
+ if(id.trim().length > this.codefixedsecOrCodeclassifysec.codeSecLength ){
+ this.$message.warning("鐮佸�奸暱搴︿笉鑳藉ぇ浜�" + this.codefixedsecOrCodeclassifysec.codeSecLength);
+ return false;
+ }
+ return true;
+ },
+ /** 淇敼鐮佸�� */
editCodeSecValue(condition){
if(condition=='codefixedsec'){
- //浠ュ墠鏄洿鎺ユ妸褰撳墠閫変腑琛岀殑鎵�鏈夋暟鎹兘杩涜鎻愪氦锛屼絾鍏跺疄鍙渶瑕佷紶杈撲竴浜涙瘮瑕佸弬鏁板嵆鍙紝杩欏効鍋氫簡淇敼锛岄渶瑕佺┛鍏朵粬鍙傛暟鐨勮鑷娣诲姞
+ if(!this.tipsCodeSecValueMessage(this.codeFixdForm.id)){
+ return;
+ }
+ //浠ュ墠鏄洿鎺ユ妸褰撳墠閫変腑琛岀殑鎵�鏈夋暟鎹兘杩涜鎻愪氦锛屼絾鍏跺疄鍙渶瑕佷紶杈撲竴浜涘繀瑕佸弬鏁板嵆鍙紝杩欏効鍋氫簡淇敼锛岄渶瑕佷紶鍏朵粬鍙傛暟鐨勮鑷娣诲姞
let editData = {
- "oid": this.selectedFixedOrCodeclassifyValue.oid,
- "ts": new Date().getTime(),
- "description": this.codeFixdForm.description,
- "id": this.codeFixdForm.id,
- "codeFixedSecOid": this.selectedFixedOrCodeclassifyValue.codefixedsecoid
+ "oid": this.selectedFixedOrCodeclassifyValue.oid,
+ "ts": new Date().getTime(),
+ "description": this.codeFixdForm.description,
+ "id": this.codeFixdForm.id,
+ "codeFixedSecOid": this.selectedFixedOrCodeclassifyValue.codefixedsecoid
}
editCodeFixedValue(editData).then(() => {
- this.loadFixedValueTableData({"oid":this.codefixedsecOrCodeclassifysecOid})
+ this.loadFixedValueTableData({"oid":this.codefixedsecOrCodeclassifysec.oid})
this.$message({
type: "success",
message: "鎿嶄綔鎴愬姛!"
@@ -1459,14 +1459,17 @@
window.console.log(error);
});
}else {
+ if(!this.tipsCodeSecValueMessage(this.codeClassifyForm.id)){
+ return;
+ }
this.codeClassifyForm.oid = this.selectedFixedOrCodeclassifyValue.attributes.oid;
// 鍒嗙被鐮佹锛屽瓙鍒嗙被鍜岀埗鍒嗙被涔嬮棿涓嶈兘鐩镐簰鏇存敼
- if(this.checkClassUpdate(this.codefixedsecOrCodeclassifysecOid,this.codeClassifyForm.codeClassifySecOid)){
+ if(this.checkClassUpdate(this.codefixedsecOrCodeclassifysec.oid,this.codeClassifyForm.codeClassifySecOid)){
return;
}
this.$delete(this.codeClassifyForm,"parentClassifyValueOid");
editCodeClassifyValue(this.codeClassifyForm).then(() => {
- this.loadClassifyValueData({"oid":this.codefixedsecOrCodeclassifysecOid})
+ this.loadClassifyValueData({"oid":this.codefixedsecOrCodeclassifysec.oid})
this.$message({
type: "success",
message: "鎿嶄綔鎴愬姛!"
@@ -1477,7 +1480,7 @@
}
},
- //鍒犻櫎鐮佸��
+ /** 鍒犻櫎鐮佸�� */
delCodeSecValue(condition){
//鍥哄畾鐮佹鐮佸�煎垹闄�
if(condition == 'codefixedsec'){
@@ -1493,7 +1496,7 @@
})
.then(() => {
this.selectedFixedOrCodeclassifyValue = '';
- this.loadFixedValueTableData({"oid":this.codefixedsecOrCodeclassifysecOid})
+ this.loadFixedValueTableData({"oid":this.codefixedsecOrCodeclassifysec.oid})
this.clearFixedOrClassifyForm('codefixedsec');
this.$message({
type: "success",
@@ -1501,7 +1504,7 @@
});
});
}else{
- if(this.checkClassUpdate(this.codefixedsecOrCodeclassifysecOid,this.codeClassifyForm.codeClassifySecOid)){
+ if(this.checkClassUpdate(this.codefixedsecOrCodeclassifysec.oid,this.codeClassifyForm.codeClassifySecOid)){
return;
}
//鍒嗙被鐮佹鐮佸�煎垹闄�
@@ -1516,7 +1519,7 @@
})
.then(() => {
this.selectedFixedOrCodeclassifyValue = '';
- this.loadClassifyValueData({"oid":this.codefixedsecOrCodeclassifysecOid})
+ this.loadClassifyValueData({"oid":this.codefixedsecOrCodeclassifysec.oid})
this.clearFixedOrClassifyForm('codeclassifyvalue');
this.$message({
type: "success",
@@ -1525,7 +1528,7 @@
});
}
},
- //瀵瑰浐瀹氱爜鍊艰〃杩涜锛氫笂绉汇�佷笅绉汇�佺Щ闄ゆ搷浣�
+ /** 瀵瑰浐瀹氱爜鍊艰〃杩涜锛氫笂绉汇�佷笅绉汇�佺Щ闄ゆ搷浣�*/
codeFixedValueOpetion(condition,row){
//console.log(this.fixedValueData[row.$index].orderNum);
const index = row.$index;
@@ -1561,9 +1564,9 @@
}
//console.log(this.fixedValueData);
},
- //瀵瑰垎绫荤爜鍊艰〃杩涜锛氫笂绉汇�佷笅绉汇�佺Щ闄ゆ搷浣�
+ /** 瀵瑰垎绫荤爜鍊艰〃杩涜锛氫笂绉汇�佷笅绉汇�佺Щ闄ゆ搷浣�*/
codeClassifyValueOpetion(condition){
- if(this.checkClassUpdate(this.codefixedsecOrCodeclassifysecOid,this.codeClassifyForm.codeClassifySecOid)){
+ if(this.checkClassUpdate(this.codefixedsecOrCodeclassifysec.oid,this.codeClassifyForm.codeClassifySecOid)){
return;
}
//姝ゅ娑夊強鍒版繁娴呮嫹璐濋棶棰橈紝浣嗘槸鎵ц涓婁笅绉讳繚瀛樻搷浣滀箣鍚庝細閲嶆柊鍔犺浇treedata锛屾墍浠ュ奖鍝嶄笉澶�
@@ -1590,7 +1593,7 @@
}
}
},
- //閫変腑琚皟鏁撮『搴忕殑涓や釜鏍戠殑鑺傜偣
+ /** 閫変腑琚皟鏁撮『搴忕殑涓や釜鏍戠殑鑺傜偣*/
getCodeClassifyValueTreeData(){
const currentNodeTreeData = this.selectedFixedOrCodeclassifyValue;
/**鑰冭檻鍑犵鎯呭喌锛岀涓�绉嶅綋鍓嶄笂绉粅涓嬬Щ鎿嶄綔宸茬粡鏄竟鐣岋紝
@@ -1626,12 +1629,12 @@
}
}
},
- //涓婄Щ涓嬬Щ绛夋搷浣滅殑淇濆瓨
+ /** 涓婄Щ涓嬬Щ绛夋搷浣滅殑淇濆瓨*/
async saveCodeFixedOrClassifyValueOption(condition,editOrderNumdata){
//淇濆瓨瀵瑰浐瀹氱爜娈电爜鍊肩殑涓婄Щ涓嬬Щ绉诲嚭绛夋搷浣�
if(condition == "fixedValue"){
let data = {
- "codeFixedSecOid": this.codefixedsecOrCodeclassifysecOid,
+ "codeFixedSecOid": this.codefixedsecOrCodeclassifysec.oid,
"dtoList": JSON.stringify(this.fixedValueData),
}
saveOrder(data).then(() => {
@@ -1647,7 +1650,7 @@
}else {
//淇濆瓨瀵瑰垎绫荤爜鍊肩爜娈电爜鍊肩殑涓婄Щ涓嬬Щ绉诲嚭绛夋搷浣�
await saveCodeClassifyValueOrder({
- "codeClassifySecOid": this.codefixedsecOrCodeclassifysecOid,
+ "codeClassifySecOid": this.codefixedsecOrCodeclassifysec.oid,
"dtoList": JSON.stringify(editOrderNumdata),
}).then(() => {
this.$message({
@@ -1657,11 +1660,11 @@
}, error => {
window.console.log(error);
});
- this.loadClassifyValueData({"oid":this.codefixedsecOrCodeclassifysecOid});
+ this.loadClassifyValueData({"oid":this.codefixedsecOrCodeclassifysec.oid});
}
},
- //鍒嗙被鐮佸�兼爲data鍔犺浇
+ /** 鍒嗙被鐮佸�兼爲data鍔犺浇*/
loadClassifyValueData(row){
//console.log(row);
let condtionData = {
@@ -1677,7 +1680,7 @@
//console.log(res.data);
});
},
- //鍒嗙被鐮佸�兼爲鍗曞嚮鏃惰Е鍙戠殑浜嬩欢
+ /** 鍒嗙被鐮佸�兼爲鍗曞嚮鏃惰Е鍙戠殑浜嬩欢*/
classisyValueTreeOnodeClick(node){
//console.log(node);
this.selectedFixedOrCodeclassifyValue = node;
@@ -1692,7 +1695,7 @@
* @currentRowClassOid 褰撳墠閫変腑琛宱id
* @updateClassOid 瑕佷慨鏀圭殑鍒嗙被鐮佸�紀id
*/
- checkClassUpdate(currentRowClassOid,updateClassOid){
+ checkClassUpdate(currentRowClassOid,updateClassOid){
if(currentRowClassOid!=updateClassOid){
this.$message({
type: "error",
@@ -1703,7 +1706,7 @@
},
/** 缂栫爜瑙勫垯鐩稿叧鏂规硶 */
- // 鎵撳紑楂樼骇鏌ヨ绐楀彛
+ /** 鎵撳紑楂樼骇鏌ヨ绐楀彛 */
openAdvancedQuery(condition){
if(condition=='codeRule'){
this.advancedQueryParam.options = [
@@ -1772,7 +1775,7 @@
this.advancedQueryParam.currentOpen = condition;
this.advancedQueryParam.advancedQuerySettingBox = true;
},
- // 鏌ヨ浣跨敤鑼冨洿
+ /** 鏌ヨ浣跨敤鑼冨洿*/
handleRange(){
if(!this.tipsMessage(this.selectionList)){
return;
@@ -1780,7 +1783,7 @@
this.codeRangeSettingBox = true;
this.getRangeCodeList()
},
- // 鍔犺浇浣跨敤鑼冨洿鍒楄〃
+ /** 鍔犺浇浣跨敤鑼冨洿鍒楄〃*/
getRangeCodeList(){
this.dialogLoading = true;
if(this.selectionList[0].oid==null){
@@ -1793,13 +1796,13 @@
this.dialogLoading = false;
});
},
- // 鍒锋柊浣跨敤鑼冨洿鍒楄〃
+ /** 鍒锋柊浣跨敤鑼冨洿鍒楄〃*/
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",
@@ -1809,7 +1812,32 @@
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)) {
return;
@@ -1820,7 +1848,7 @@
this.cloneCodeRuleForm.description = this.selectionList[0].description;
this.loadBasic({"oid": this.selectionList[0].oid});
},
- // 鍏嬮殕缂栫爜瑙勫垯淇濆瓨鍔熻兘
+ /** 鍏嬮殕缂栫爜瑙勫垯淇濆瓨鍔熻兘*/
saveCloneCodeRule(){
let form = this.cloneCodeRuleForm;
if(form.id.trim()==''){
@@ -1851,7 +1879,7 @@
});
//console.log(data);
},
- // 鎵撳紑浠庡叾浠栫紪鐮佽鍒欎腑鍏嬮殕鐮佹瀵硅瘽妗�
+ /** 鎵撳紑浠庡叾浠栫紪鐮佽鍒欎腑鍏嬮殕鐮佹瀵硅瘽妗�*/
openOtherCodeRuleDialog(){
if (!this.tipsMessage(this.selectionList)) {
return;
@@ -1862,7 +1890,7 @@
}
this.cloneOtherCodeRuleSettingBox = true;
},
- // 浠庡叾浠栫紪鐮佽鍒欎腑鍏嬮殕鐮佹瀵硅瘽妗�-鍗曞嚮缂栫爜瑙勫垯瀹炵幇琛岄�夋嫨
+ //** 浠庡叾浠栫紪鐮佽鍒欎腑鍏嬮殕鐮佹瀵硅瘽妗�-鍗曞嚮缂栫爜瑙勫垯瀹炵幇琛岄�夋嫨*/
codeOtherCloneRuleRowClick(row) {
this.$refs.crudCloneCodeRuleOther.toggleSelection();
this.selectionOtherCloneCodeRuleList = row;
@@ -1870,14 +1898,14 @@
this.$refs.crudCloneCodeRuleOther.toggleRowSelection(row); //閫変腑褰撳墠琛�
this.loadBasic(row);
},
- // 浠庡叾浠栫紪鐮佽鍒欎腑鍏嬮殕鐮佹瀵硅瘽妗�-鍗曞嚮鍩虹鐮佹瀹炵幇琛岄�夋嫨
+ /** 浠庡叾浠栫紪鐮佽鍒欎腑鍏嬮殕鐮佹瀵硅瘽妗�-鍗曞嚮鍩虹鐮佹瀹炵幇琛岄�夋嫨*/
codeOtherCloneBasicRowClick(row){
this.$refs.crudCloneCodeBasicOther.toggleSelection();
this.selectionOtherCloneCodeBasicList = row;
this.$refs.crudCloneCodeBasicOther.setCurrentRow(row);
this.$refs.crudCloneCodeBasicOther.toggleRowSelection(row); //閫変腑褰撳墠琛�
},
- // 浠庡叾浠栬鍒欏厠闅嗙爜娈电晫闈腑缂栫爜瑙勫垯褰撳墠閫変腑琛屽彉鍖栫殑鏃跺�欒Е鍙�
+ /** 浠庡叾浠栬鍒欏厠闅嗙爜娈电晫闈腑缂栫爜瑙勫垯褰撳墠閫変腑琛屽彉鍖栫殑鏃跺�欒Е鍙�*/
selectionOtherCloneCodeRuleChange(list) {
//console.log(list);
this.selectionOtherCloneCodeRuleList = list;
@@ -1893,7 +1921,7 @@
this.selectionOtherCloneCodeBasicList = list;
this.$refs.crudCloneCodeBasicOther.setCurrentRow(this.selectionOtherCloneCodeBasicList[list.length-1]);
},
- // 浠庡叾浠栫紪鐮佽鍒欎腑鍏嬮殕鐮佹淇℃伅
+ /** 浠庡叾浠栫紪鐮佽鍒欎腑鍏嬮殕鐮佹淇℃伅*/
saveOtherCodeBasic(){
let oid = this.selectionList[0].oid;
let fromDialogPkCodebasic = this.selectionOtherCloneCodeBasicList;
@@ -1929,7 +1957,7 @@
window.console.log(error);
});
},
- // 娓呯┖鐮佸��
+ /** 娓呯┖鐮佸��*/
clearAllCodeSec(){
if(this.selectionList.length == 0){
this.$message.warning("娌℃湁閫夋嫨鏁版嵁!");
@@ -1957,7 +1985,7 @@
});
});
},
- // 娣诲姞
+ /** 娣诲姞*/
rowSave(row, done, loading) {
console.log(row);
add(row).then(() => {
@@ -1975,7 +2003,7 @@
openEdit(row){
this.$refs.crud.rowEdit(row,row.$index);
},
- // 淇敼
+ /** 淇敼*/
rowUpdate(row, index, done, loading) {
row.ts = new Date().getTime;
update(row).then(() => {
@@ -1990,7 +2018,7 @@
console.log(error);
});
},
- // 鍒犻櫎
+ /** 鍒犻櫎*/
handleDelete() {
if(!this.tipsMessage(this.selectionList)){
return;
@@ -2015,7 +2043,7 @@
this.$refs.crud.toggleSelection();
});
},
- // 鎵撳紑淇敼
+ // 鎵撳紑淇敼*/
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
getDetail(this.ruleForm.oid).then(res => {
@@ -2041,7 +2069,7 @@
this.onLoad(this.page);
done();
},
- // 缂栫爜瑙勫垯褰撳墠閫変腑琛屽彉鍖栫殑鏃跺�欒Е鍙�
+ /** 缂栫爜瑙勫垯褰撳墠閫変腑琛屽彉鍖栫殑鏃跺�欒Е鍙�*/
selectionChange(list) {
this.selectionList = list;
//褰撳墠閫変腑琛屼负绌虹殑鏃跺�欏氨灏嗙爜娈电鐞嗚〃鏍兼暟鎹疆绌�,骞剁鐢ㄧ浉鍏冲姛鑳�
@@ -2055,7 +2083,7 @@
this.loadBasic(this.selectionList[list.length-1]);
}
},
- // 鍗曞嚮缂栫爜瑙勫垯瀹炵幇琛岄�夋嫨
+ /** 鍗曞嚮缂栫爜瑙勫垯瀹炵幇琛岄�夋嫨*/
codeRuleRowClick (row) {
// console.log(this.currentRuleLcStatus);
this.$refs.crud.toggleSelection();
@@ -2104,12 +2132,12 @@
/** 鍩虹鐮佹鐩稿叧鏂规硶 */
- //闃叉鎵撳紑杩囩紪杈戠獥鍙ｄ箣鍚庤〃鍗曚腑瀛樺湪鍊硷紝鎵�浠ラ渶瑕佹竻绌�,骞跺垵濮嬪寲form琛ㄥ崟灞炴��
+ /** 闃叉鎵撳紑杩囩紪杈戠獥鍙ｄ箣鍚庤〃鍗曚腑瀛樺湪鍊硷紝鎵�浠ラ渶瑕佹竻绌�,骞跺垵濮嬪寲form琛ㄥ崟灞炴��*/
clearBasicAddForm(){
this.form = this.$options.data().form;
// this.changeSectypeFormItems(null);
},
- // 鎵撳紑鏂板绐楀彛
+ /** 鎵撳紑鏂板绐楀彛*/
openAddBasicCodeSec(){
if(!this.tipsMessage(this.selectionList)){
return;
@@ -2121,7 +2149,7 @@
this.openBasicDialog('add',null);
this.loadCodeSecType();
},
- // 鎵撳紑鏂板鎴栫紪杈戝熀纭�鐮佹瀵硅瘽妗�
+ /** 鎵撳紑鏂板鎴栫紪杈戝熀纭�鐮佹瀵硅瘽妗�*/
openBasicDialog(condition,row){
//console.log(row);
if(condition == 'add') {
@@ -2146,7 +2174,7 @@
this.changeSectypeFormItems(condition == 'add' ? null:row);
this.addBasicCodeSettingBox = true;
},
- // 鏂板鍩虹鐮佹
+ /** 鏂板鍩虹鐮佹*/
async saveOrEditBasicCode(){
if(this.selectionList[0].oid == null || this.selectionList[0].oid == ''){
this.$message.warning('缂哄け蹇呰鍙傛暟锛岃閲嶆柊閫夋嫨缂栫爜瑙勫垯鍚庡啀璇�!');
@@ -2191,7 +2219,7 @@
this.addBasicCodeSettingBox = false
}
},
- // 鍥犱负elementui鐨勮〃鍗曟牎楠岃缃笉涓婃墍浠ラ噰鐢ㄥ垽鏂殑鏂瑰紡鏉ュ仛琛ㄥ崟妫�楠屾柟寮�
+ /** 鍥犱负elementui鐨勮〃鍗曟牎楠岃缃笉涓婃墍浠ラ噰鐢ㄥ垽鏂殑鏂瑰紡鏉ュ仛琛ㄥ崟妫�楠屾柟寮�*/
checkForm(){
let form = this.form;
//console.log(form);
@@ -2372,7 +2400,7 @@
}
return true;
},
- // 鍒ゆ柇鏁版嵁鏄惁閫夋嫨浠ュ強鍙兘閫夋嫨鍗曟潯鏁版嵁
+ /** 鍒ゆ柇鏁版嵁鏄惁閫夋嫨浠ュ強鍙兘閫夋嫨鍗曟潯鏁版嵁*/
tipsMessage(list){
if(list.length != 1){
this.$message.warning("璇烽�夋嫨涓�鏉＄紪鐮佽鍒欐暟鎹�!");
@@ -2380,7 +2408,7 @@
}
return true;
},
- // 鍩虹鐮佹鍒犻櫎
+ /** 鍩虹鐮佹鍒犻櫎*/
deleteBasicCode(){
if(!this.tipsMessage(this.selectionBasicList)){
return;
@@ -2404,7 +2432,7 @@
this.$refs.crudBasic.toggleSelection();
});
},
- // 鐐瑰嚮瑙﹀彂鍔犺浇鍩虹鐮佹淇℃伅
+ /** 鐐瑰嚮瑙﹀彂鍔犺浇鍩虹鐮佹淇℃伅*/
loadBasic(row){
if(this.cloneSettingBox){
this.cloneTableLoading = true;
@@ -2419,7 +2447,7 @@
this.sendGridCodeBasicSec({"pkCodeRule":row.oid},false);
}
},
- // 鍙戦�佸姞杞藉熀纭�鐮佹鐨勮姹�
+ /** 鍙戦�佸姞杞藉熀纭�鐮佹鐨勮姹�*/
sendGridCodeBasicSec(condition,isAdancedQuery/** 鏄惁楂樼骇鏌ヨ */){
// 濡傛灉褰撳墠鍩虹鐮佹琛ㄤ腑鐨勬悳绱㈡寜閽闅愯棌锛屽氨闇�瑕佸湪姝ゅ紑鍚�
if(this.selectionList.length>=0 && !this.$refs.crudBasic.option.column[0].search){
@@ -2448,13 +2476,13 @@
}
});
},
- // 鍩虹鐮佹閫変腑鏃惰Е鍙�
+ /** 鍩虹鐮佹閫変腑鏃惰Е鍙�*/
selectionBasicChange(list) {
this.selectionBasicList = list;
this.$refs.crudBasic.setCurrentRow(this.selectionBasicList[list.length-1]);
//console.log(this.selectionBasicList);
},
- // 鍩虹鐮佹琚崟鍑昏〃鏍艰鏃惰Е鍙�
+ /** 鍩虹鐮佹琚崟鍑昏〃鏍艰鏃惰Е鍙�*/
codeBasicSecRowClick(row){
this.$refs.crudBasic.toggleSelection();
this.selectionBasicList = row;
@@ -2469,7 +2497,7 @@
basicSearchReset(){
this.sendGridCodeBasicSec({"pkCodeRule":this.selectionList[this.selectionList.length-1].oid},false);
},
- // 涓婄Щ涓嬬Щ鍩虹鐮佹
+ /** 涓婄Щ涓嬬Щ鍩虹鐮佹*/
async upOrderNum(row){
if(!this.tipsMessage(this.selectionList)){
return;
@@ -2513,11 +2541,11 @@
});
})
},
- // 鍩虹鐮佹鍒锋柊鏃舵煡璇�
+ /** 鍩虹鐮佹鍒锋柊鏃舵煡璇�*/
refreshChangeBasicSec(){
this.loadBasic(this.selectionList.at(-1));
},
- // 鎿嶄綔鍩虹鐮佹涓悳绱㈡竻绌虹瓑鎸夐挳鐨勬樉绀�/闅愯棌
+ /** 鎿嶄綔鍩虹鐮佹涓悳绱㈡竻绌虹瓑鎸夐挳鐨勬樉绀�/闅愯棌*/
hideBasicTable(hideBoolean){
this.$refs.crudBasic.option.refreshBtn = hideBoolean;
this.$refs.crudBasic.option.column[0].search = hideBoolean;
@@ -2538,7 +2566,7 @@
},
/** 绗竴灞傚璇濇鐩稿叧鏂规硶 */
- // 鎵撳紑浜屽眰瀵硅瘽妗嗘柟娉�
+ /** 鎵撳紑浜屽眰瀵硅瘽妗嗘柟娉�*/
openAttrSelectOrGetValue(condition){
if(condition === 'attr'){
this.isShowSelectAttrOption = true;
@@ -2564,7 +2592,7 @@
}
},
- // 鐐瑰嚮杈撳叆妗嗙殑脳鍙凤紝娓呯┖杈撳叆妗嗕腑鐨勫唴瀹�
+ /** 鐐瑰嚮杈撳叆妗嗙殑脳鍙凤紝娓呯┖杈撳叆妗嗕腑鐨勫唴瀹�*/
clearAttrDataByIcon(condition){
if(condition === 'attr'){
this.form.referAttributeName = '';
@@ -2583,13 +2611,13 @@
this.form.referConfig = '';
}
},
- // 琛ヤ綅鏃剁殑瀛楃锛屽疄鐜板彲杈撳彲閫�
+ /** 琛ヤ綅鏃剁殑瀛楃锛屽疄鐜板彲杈撳彲閫�*/
inputSelectBlur(e){
if (e.target.value) {
this.form.codeFillSeparator = e.target.value;
}
},
- // 鐮佹绫诲瀷鏀瑰彉鏃讹紝澧炲姞瀵瑰簲鐨刦orm琛ㄥ崟涓殑灞炴��
+ /** 鐮佹绫诲瀷鏀瑰彉鏃讹紝澧炲姞瀵瑰簲鐨刦orm琛ㄥ崟涓殑灞炴��*/
changeSectypeFormItems(row){
//console.log(row);
if(this.enumParam.secTypeList.length==0){
@@ -2705,7 +2733,7 @@
}
// console.log(this.form);
},
- // 绗竴娆¤姹傜殑鏋氫妇鏁版嵁鏀剧紦瀛�
+ /** 绗竴娆¤姹傜殑鏋氫妇鏁版嵁鏀剧紦瀛�*/
getLocalStorageEnum(enumKey){
let enumCach = JSON.parse(localStorage.getItem(enumKey));
if(enumCach == null) {
@@ -2716,7 +2744,7 @@
}
return enumCach;
},
- // 缁熶竴鍔犺浇鎵�鏈夋灇涓炬煡璇紝涓昏鏄负閬垮厤鍒囨崲鐮佹绫诲瀷鏃惰繕鏈姞杞藉畬鎴愮殑鎯呭喌
+ /** 缁熶竴鍔犺浇鎵�鏈夋灇涓炬煡璇紝涓昏鏄负閬垮厤鍒囨崲鐮佹绫诲瀷鏃惰繕鏈姞杞藉畬鎴愮殑鎯呭喌*/
loadTotalEnum(){
this.loadCodeSecType();
this.loadCodeSecLength();
@@ -2726,7 +2754,7 @@
this.loadCodeCutType();
this.loadCodeGetValueType();
},
- //鏋氫妇鍜屽彲杈撳彲閫夊唴瀹规煡璇�
+ /** 鏋氫妇鍜屽彲杈撳彲閫夊唴瀹规煡璇� */
loadCodeSecType(){
this.enumParam.secTypeList = this.getLocalStorageEnum("codeSecType");
this.loadCodeSecLength();
--
Gitblit v1.9.3