From c73d1e4b05ad210d87b696536a4afde36f10f725 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 11 十二月 2023 18:14:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/ruleBasic/delimiterConfig.vue | 2 +-
Source/UBCS-WEB/src/views/statistic/statisticPage.vue | 32 +++++---------------------------
Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue | 13 ++++++-------
3 files changed, 12 insertions(+), 35 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index 48a5f08..10186c8 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -240,14 +240,13 @@
let slotColumnList = [];
formItemList.forEach((formItem) => {
formItem = this.resetFormConfig(formItem);
- // console.log(formItem)
//灞炴�х爜娈佃鍒�
if (formItem.secType === "codeattrsec") {
this.attrList.push(formItem);
}
- //绯诲垪鍙疯鍒�
+ //鏇存敼鏂瑰紡
if (formItem.field === "codeStandardEditType") {
- if (this.status === "amend") {
+ if (this.status === "amend" ) {
formItem.readOnly = true;
}
}
@@ -260,6 +259,7 @@
});
return;
}
+
if (
formItem.type === "combox" &&
formItem.comboxKey &&
@@ -325,7 +325,7 @@
type: this.columnType[formItem.type],
dicData: this.getDataList(formItem.type, formItem.data),
disabled: this.type === "detail" ? true : formItem.readOnly || (formItem.codeValueApplyStatus && formItem.codeValueApplyStatus == 2 ? true : false) ||
- (this.status === 'amend' ? (formItem.field === "reviseSeries" ? (formItem.value == 'false' ? true : false) : false) : false),
+ ((formItem.name === "绯诲垪鍙�" && this.status && (formItem.field === "reviseSeries" && formItem.value == 'false') ? true : false)),
prepend: this.preOrSufFixShow("text", formItem.prefix),
append: this.preOrSufFixShow("text", formItem.suffix),
prefixIcon: this.preOrSufFixShow("icon", formItem.prefix),
@@ -436,8 +436,7 @@
field: formItem.field,
type: this.columnType[formItem.type],
dicData: this.getDataList(formItem.type, formItem.data),
- disabled: this.type === "detail" ? true : formItem.readOnly || (formItem.codeValueApplyStatus && formItem.codeValueApplyStatus == 2 ? true : false) ||
- (this.status ? (formItem.field === "reviseSeries" ? (formItem.value == 'false' ? true : false) : false) : false),
+ disabled: this.type === "detail" ? true : formItem.readOnly || (formItem.codeValueApplyStatus && formItem.codeValueApplyStatus == 2 ? true : false) ,
prepend: this.preOrSufFixShow("text", formItem.prefix),
append: this.preOrSufFixShow("text", formItem.suffix),
prefixIcon: this.preOrSufFixShow("icon", formItem.prefix),
@@ -557,7 +556,7 @@
type: this.columnType[formItem.type],
dicData: this.getDataList(formItem.type, formItem.data),
disabled: this.type === "detail" ? true : formItem.readOnly || (formItem.codeValueApplyStatus && formItem.codeValueApplyStatus == 2 ? true : false) ||
- (this.status === 'amend' ? (formItem.field === "reviseSeries" ? (formItem.value == 'false' ? true : false) : false) : false),
+ ((formItem.name === "绯诲垪鍙�" && this.status && (formItem.field === "reviseSeries" && formItem.value == 'false') ? true : false)),
prepend: this.preOrSufFixShow("text", formItem.prefix),
append: this.preOrSufFixShow("text", formItem.suffix),
prefixIcon: this.preOrSufFixShow("icon", formItem.prefix),
diff --git a/Source/UBCS-WEB/src/views/ruleBasic/delimiterConfig.vue b/Source/UBCS-WEB/src/views/ruleBasic/delimiterConfig.vue
index 8125016..3e79f27 100644
--- a/Source/UBCS-WEB/src/views/ruleBasic/delimiterConfig.vue
+++ b/Source/UBCS-WEB/src/views/ruleBasic/delimiterConfig.vue
@@ -226,7 +226,7 @@
this.loading = true;
// const targetObject = this.characterReleasedList.find(obj => obj.oid === this.selectValue);
// const chartValue = targetObject.name;
- getList({codeRuleId: this.select, chartType: "fillerChar", chartValue: this.characterValue}).then(res => {
+ getList({codeRuleId: this.select, chartType: "separator", chartValue: this.characterValue}).then(res => {
console.log(res.data.data);
this.tableData = res.data.data;
this.loading = false;
diff --git a/Source/UBCS-WEB/src/views/statistic/statisticPage.vue b/Source/UBCS-WEB/src/views/statistic/statisticPage.vue
index cf4ee2f..0a62428 100644
--- a/Source/UBCS-WEB/src/views/statistic/statisticPage.vue
+++ b/Source/UBCS-WEB/src/views/statistic/statisticPage.vue
@@ -79,7 +79,7 @@
name: "statisticPage",
data() {
return {
- menuList:[],
+ menuList: [],
dataKeyList: [],
addVisible: false,
chartName: "",
@@ -124,37 +124,12 @@
this.dataKeyList = this.selectData.map(obj => obj.code)
const btmName = this.dataKeyList.join(",");
if (btmName) {
- // this.menuList=[
- // {
- // menuData: [
- // [0, 0, 0, 0, 0, 0, 4, 9, 12, 12, 12, 12],
- // [0, 0, 0, 0, 0, 0, 4, 5, 3, 0, 0, 0]
- // ],
- // code:1
- // },
- // {
- // menuData: [
- // [0, 0, 0, 1, 1, 1, 1, 1, 1, 29, 5315, 5315],
- // [0, 0, 0, 1, 0, 0, 0, 0, 0, 28, 5286, 0]
- // ],
- // code:2
- // },
- // {
- // menuData: [
- // [0, 58, 60, 61, 75, 84, 145, 162, 166, 177, 186, 186],
- // [0, 58, 2, 1, 14, 9, 61, 17, 4, 11, 9, 0]
- // ],
- // code:3
- // }
- // ]
- // this.nextSave();
- // this.$message.success('淇濆瓨鎴愬姛')
getStatisticAnalysis({btmNames: btmName}).then(res => {
this.menuList = res.data.data;
this.nextSave();
this.$message.success('淇濆瓨鎴愬姛')
});
- }else {
+ } else {
this.$message.warning('璇烽�夋嫨鏁版嵁锛�')
}
},
@@ -173,6 +148,9 @@
const dataKey = typeList[item.codeType];
if (dataKey) {
this[dataKey].push(item);
+ this[dataKey].forEach(res=>{
+ console.log('res',res)
+ })
hasValidData = true;
}
});
--
Gitblit v1.9.3