From b10c4ade79a1cd3520b6d3b24e3eae236a156bca Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 18 九月 2023 14:56:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/config/website.js | 1
Source/UBCS-WEB/src/components/refer/vciWebRefer.vue | 5
Source/UBCS-WEB/src/page/login/index.vue | 7
Source/UBCS-WEB/src/views/code/code.vue | 27
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 3
Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue | 3
Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue | 41 +
Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue | 853 +++++++++++++++++++++---------------------
Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue | 22 +
Source/UBCS-WEB/src/components/code-dialog-page/referConfigDialog.vue | 3
Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue | 45 +
Source/UBCS-WEB/src/views/modeling/original.vue | 2
Source/UBCS-WEB/src/views/wel/Statistic.vue | 153 +++----
Source/UBCS-WEB/src/components/FormTemplate/index.vue | 4
Source/UBCS-WEB/src/components/refer/vciWebReferTree.vue | 6
15 files changed, 613 insertions(+), 562 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index 14f0c2d..a5cb7ef 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -90,9 +90,13 @@
type: String,
default: "",
},
+ eventList:{
+ type:Array
+ }
},
data() {
return {
+ eventFlag:{},
TreeValueForm:'',
updateIndex: 0,
form: {},
@@ -120,9 +124,12 @@
slotColumnList: [],
};
},
- mounted() {
+ mounted() {
this.handleResize();
},
+ created() {
+
+ },
computed: {
localTrendsSpan() {
if (this.trendsSpan) {
@@ -157,6 +164,16 @@
methods: {
// 娓叉煋琛ㄥ崟妯℃澘
templateRender(formItemList,TreeValue) {
+ if (this.eventList) {
+ this.eventFlag= this.eventList.some(item => {
+ if (item.classifyInvokeEditFlag === 'true') {
+ console.log('even', item);
+ this.eventObject = item;
+ return true;
+ }
+ });
+ // console.log('add',add)
+ }
// 鏃犻渶鍒嗙粍鏁版嵁
let column = [];
let group = [];
@@ -165,6 +182,7 @@
let value=''
formItemList.forEach((formItem) => {
formItem = this.resetFormConfig(formItem);
+ console.log(formItem)
// console.log('formItem.dicData.value',formItem.dicData)
if (formItem.type === "line") {
group.push({
@@ -222,7 +240,7 @@
format: formItem.dateFormate,
keyAttr: formItem.keyAttr,
value: (formItem.dicData && formItem.dicData.length > 0 && formItem.secType == "codefixedsec" ? formItem.dicData[0].id : null) ||
- (formItem.secType == "codedatesec"?formItem.codeDateValue: null) || ( TreeValue&& formItem.secType == "codelevelsec" ? TreeValue : null),
+ (formItem.secType == "codedatesec"?formItem.codeDateValue: null) || ( TreeValue&& formItem.secType == "codelevelsec" ? TreeValue : null) ,
placeholder: formItem.inputTip,
comboxKey: formItem.comboxKey,
tip: formItem.tooltips,
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index 04ea8ba..7c5fdee 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -15,6 +15,7 @@
:type="type"
:TreeValue="TreeValue"
:rowOid="rowOid"
+ :eventList="eventList"
:templateOid="templateOid"
v-if="dialogVisible"
ref="FormTemplate"
@@ -128,6 +129,7 @@
},
data() {
return {
+ eventList:[],
//鐮佸�肩殑绗簩绉嶅彧璇婚殣钘忔儏鍐�
codeValueApplyStatus:'',
loading: false,
@@ -256,6 +258,8 @@
this.$refs.FormTemplate.templateRender(
res.data.formDefineVO.items
);
+ this.eventList=res.data.templateVO.attributes
+ // this.$refs.FormTemplate.$emit('eventList', res.data.templateVO.attributes);
if (Object.keys(this.setForm).length > 0) {
this.$refs.FormTemplate.form = this.setForm;
}
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 8813035..61ebc48 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -182,7 +182,8 @@
},
Treedata: {
type: Array
- }
+ },
+
},
data() {
return {
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 8d0fa1e..b36a114 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigDialog.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigDialog.vue
@@ -37,9 +37,6 @@
},
},
methods: {
- echoReferConfig(value) {
- this.emitData = value;
- },
// 褰撳墠宸插瓨鍦ㄧ紪杈戣繃鐨勫弬鐓ч厤缃紝鎵�浠ョ洿鎺ユ墦寮�鍙傜収閰嶇疆鐣岄潰
openReconfigInterFace(preReferConfigForm){
const form = preReferConfigForm;
diff --git a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
index 9e75512..e5ec5a4 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
@@ -474,431 +474,436 @@
},
// 琛ㄥ崟鐣岄潰鏄剧ず鍐呭閰嶇疆
computed: {
- formOption() {
- /** 妫�楠屾槸鍚︿负鏁板瓧 */
- let validateNumber = "";
- validateNumber = (rule, value,callback) => {
- if(/[^\d]/g.test(value)){
- callback(new Error('绐楀彛鏄剧ず鐨勯珮搴﹀繀椤讳负鏁板�肩被鍨�'));
- }else {
- callback();
+ formOption() {
+ /** 妫�楠屾槸鍚︿负鏁板瓧 */
+ let validateNumber = "";
+ validateNumber = (rule, value, callback) => {
+ if (/[^\d]/g.test(value)) {
+ callback(new Error('绐楀彛鏄剧ず鐨勯珮搴﹀繀椤讳负鏁板�肩被鍨�'));
+ } else {
+ callback();
+ }
+ };
+ return {
+ submitBtn: false,
+ emptyBtn: false,
+ labelWidth: '145', //榛樿鏍囩瀹藉害
+ group: [
+ {
+ // 鍩虹琛ㄥ崟淇℃伅灞曠ず鍖哄煙
+ //display: this.form.type=='default'||this.form.type=='grid',
+ icon: 'el-icon-info',
+ label: '蹇呭～鐨勫弬鐓ч厤缃�',
+ collapse: true,
+ labelWidth: '115',
+ prop: 'groupDdefaultOrGrid',
+ column: [
+ {
+ label: '鍙傜収鐨勪笟鍔＄被鍨�',
+ prop: 'referTypeName',
+ span: 6,
+ labelWidth: '130',
+ disabled: this.referTypeIsReadOnly,
+ clearable: !this.referTypeIsReadOnly,
+ tip: '鍙傜収鏁版嵁鏌ヨ鐨勪笟鍔＄被鍨嬨��',
+ tipPlacement: 'bottom',
+ rules: [{
+ required: true,
+ message: "(鍙傜収鐨勪笟鍔＄被鍨�)蹇呭～椤逛笉鑳戒负绌�",
+ trigger: ["blur", "change"],
+ }],
+ }, {
+ label: '鏄剧ず鐨勫睘鎬�',
+ prop: 'textField',
+ tip: '閫夋嫨鏁版嵁鍚庯紝鏄剧ず鍒板瓧娈典笂鐨勪俊鎭墍灞炵殑灞炴�э紝涓�鑸兘鏄痭ame,濡傛灉鏄涓睘鎬т娇鐢ㄩ�楀彿鍒嗗壊锛屽id,name銆�',
+ tipPlacement: 'bottom',
+ span: 6,
+ value: 'name',
+ rules: [{
+ required: true,
+ message: "(鏄剧ず鐨勫睘鎬�)蹇呭～椤逛笉鑳戒负绌�",
+ trigger: "blur",
+ }],
+ }, {
+ label: '瀛樺偍鍊肩殑灞炴��',
+ prop: 'valueField',
+ tip: '閫夋嫨鏁版嵁鍚庯紝淇濆瓨鍒版暟鎹簱閲岀殑灞炴�э紝涓�鑸兘鏄痮id鎴栬�卛d锛屽鏋滄槸澶氫釜灞炴�т娇鐢ㄩ�楀彿鍒嗗壊锛屽oid ,id',
+ value: 'oid',
+ tipPlacement: 'bottom',
+ span: 6,
+ rules: [{
+ required: true,
+ message: "(瀛樺偍鍊肩殑灞炴��)蹇呭～椤逛笉鑳戒负绌�",
+ trigger: "blur",
+ }],
+ }, {
+ label: '鍙傜収绐楀彛绫诲瀷',
+ prop: 'type',
+ tip: 'default:榛樿鐨勫弬鐓х獥鍙ｆ牱寮�; stand:UI涓婁笅鏂囬厤缃殑鏂瑰紡; classify:鍒嗙被+妗ｆ鐨勬樉绀�; 鑷畾涔夌殑鍙傜収鐩存帴鍐檍s鐨勭粍浠惰矾寰勶紱tree:鏍戝舰灞曠ず;grid:鍒楄〃灞曠ず',
+ tipPlacement: 'bottom',
+ span: 6,
+ value: 'default',
+ type: 'select',
+ dicData: [{
+ label: '榛樿鏍峰紡',
+ value: 'default'
+ }, {
+ label: '骞冲彴閰嶇疆',
+ value: 'stand'
+ }, {
+ label: '鏍戝舰',
+ value: 'tree'
+ }, {
+ label: '鍒楄〃',
+ value: 'grid'
+ }, {
+ label: '閮ㄩ棬鏍�',
+ value: 'refer/OrgDepartmentRefer'
+ }, {
+ label: '閮ㄩ棬鍒楄〃',
+ value: 'refer/OrgDepartmentGridRefers'
+ }, {
+ label: '鐢ㄦ埛',
+ value: 'refer/SmUserRefer'
+ }, {
+ label: '鐢ㄦ埛鍒楄〃',
+ value: 'refer/SmUserGridRefer'
+ }, {
+ label: '瑙掕壊鍒楄〃',
+ value: 'refer/SmRoleRefer'
+ }, {
+ label: '鑱屽姟',
+ value: 'refer/OrgDutyRefer'
+ }, {
+ label: '宸ョ',
+ value: 'refer/SmWorkTypeRefer'
+ }, {
+ label: '娴佺▼妯℃澘',
+ value: 'refer/WfProcessTemplateRefer'
+ }],
+ rules: [{
+ required: true,
+ message: "(鍙傜収绐楀彛绫诲瀷)蹇呭～椤逛笉鑳戒负绌�",
+ trigger: "blur",
+ }],
+ change: ({value, column}) => {
+ // console.log("start",value);
+ // 澶嶅師琛ㄥ崟,鍥犱负鍏朵粬鍒嗙粍涓鏋滃瓨鍦ㄥ�硷紝鍦ㄥ垏鎹㈡椂,浼氫繚鐣欒緭鍏ョ殑瀛楁鍊兼墍浠ラ渶瑕佽繕鍘�
+ let addFrom = {};
+ this.activeName = 'first'; // 榛樿鍒囨崲鑷崇涓�涓猼ab
+ //鏍规嵁绫诲瀷瀵筬orm琛ㄥ崟灞炴�ц繘琛岃皟鏁�
+ if (value == 'stand') {
+ addFrom = {
+ referContent: '',
+ displayTable: '',
+ };
+ this.isDisabledTabs = false;
+ } else if (value == 'default' || value == 'grid') {
+ addFrom = {
+ limit: 15,
+ sortField: '',
+ sortType: 'asc',
+ };
+ this.isDisabledTabs = false;
+ } else if (value == 'tree') {
+ addFrom = {
+ parentFieldName: '',
+ parentUsedField: 'oid',
+ parentValue: '',
+ loadType: 'all',
+ onlyLeaf: false,
+ sortField: '',
+ sortType: 'asc',
+ };
+ // 涓嶇煡閬撲负浠�涔坱ype涓簍ree鐨勬椂鍊欎細瑙﹀彂涓ゆchange浜嬩欢
+ // 瀵艰嚧type鍒囨崲澶辫触
+ this.form.type = 'tree';
+ this.isDisabledTabs = false;
+ } else {
+ this.isDisabledTabs = true;
+ this.activeName = 'second';
+ }
+ // 绫诲瀷鍒囨崲鏃讹紝瀵逛笉闇�瑕佺殑灞炴�ц繘琛岀瓫闄�
+ this.removeFormAttr.forEach(attr => {
+ // console.log(attr);
+ this.$delete(this.form, attr)
+ })
+ // 鍚堝苟涓や釜琛ㄥ崟
+ this.form = Object.assign(addFrom, this.form);
+ // console.log("endFilter",this.form.type);
+ // console.log(this.form);
+ },
+ }, {
+ label: '鏄惁鎸佷箙鍖栧弬鐓ч厤缃�',
+ prop: 'isPersistence',
+ labelWidth: '142',
+ tip: 'true:寮�鍚寔涔呭寲锛屽褰撳墠瀹氫箟鐨勫弬鐓ч厤缃繘琛屾寔涔呭寲瀛樺偍锛屼笅娆″彲鐩存帴閫夊彇锛沠alse:浠呭褰撳墠娆＄爜娈垫柊澧炵敓鏁堛��',
+ tipPlacement: 'bottom',
+ span: 6,
+ type: 'switch',
+ }, {
+ display: this.form.isPersistence || this.form.isPersistence == 'true',
+ label: '鍙傜収閰嶇疆缂栧彿',
+ prop: 'id',
+ tip: '璁剧疆璇ュ弬鐓ч厤缃寔涔呭寲瀛樺偍鏃剁殑缂栧彿銆�',
+ rules: [{
+ required: true,
+ message: "(寮�鍚寔涔呭寲鏃剁紪鍙�)蹇呭～椤逛笉鑳戒负绌�",
+ trigger: "blur",
+ }],
+ span: 6,
+ }, {
+ display: this.form.isPersistence || this.form.isPersistence == 'true',
+ label: '鍙傜収閰嶇疆鍚嶇О',
+ prop: 'name',
+ tip: '璁剧疆璇ュ弬鐓ч厤缃寔涔呭寲瀛樺偍鏃剁殑鍚嶇О銆�',
+ rules: [{
+ required: true,
+ message: "(寮�鍚寔涔呭寲鏃跺悕绉�)蹇呭～椤逛笉鑳戒负绌�",
+ trigger: "blur",
+ }],
+ span: 6,
}
- };
- return {
- submitBtn: false,
- emptyBtn: false,
- labelWidth: '145', //榛樿鏍囩瀹藉害
- group: [
- {
- // 鍩虹琛ㄥ崟淇℃伅灞曠ず鍖哄煙
- //display: this.form.type=='default'||this.form.type=='grid',
- icon: 'el-icon-info',
- label: '蹇呭～鐨勫弬鐓ч厤缃�',
- collapse: true,
- labelWidth: '115',
- prop: 'groupDdefaultOrGrid',
- column: [
- {
- label: '鍙傜収鐨勪笟鍔＄被鍨�',
- prop: 'referTypeName',
- span: 6,
- labelWidth: '130',
- disabled: this.referTypeIsReadOnly,
- clearable: !this.referTypeIsReadOnly,
- tip: '鍙傜収鏁版嵁鏌ヨ鐨勪笟鍔＄被鍨嬨��',
- tipPlacement: 'bottom',
- rules: [{
- required: true,
- message: "(鍙傜収鐨勪笟鍔＄被鍨�)蹇呭～椤逛笉鑳戒负绌�",
- trigger: ["blur","change"],
- }],
- },{
- label: '鏄剧ず鐨勫睘鎬�',
- prop: 'textField',
- tip: '閫夋嫨鏁版嵁鍚庯紝鏄剧ず鍒板瓧娈典笂鐨勪俊鎭墍灞炵殑灞炴�э紝涓�鑸兘鏄痭ame,濡傛灉鏄涓睘鎬т娇鐢ㄩ�楀彿鍒嗗壊锛屽id,name銆�',
- tipPlacement: 'bottom',
- span: 6,
- value: 'name',
- rules: [{
- required: true,
- message: "(鏄剧ず鐨勫睘鎬�)蹇呭～椤逛笉鑳戒负绌�",
- trigger: "blur",
- }],
- },{
- label: '瀛樺偍鍊肩殑灞炴��',
- prop: 'valueField',
- tip: '閫夋嫨鏁版嵁鍚庯紝淇濆瓨鍒版暟鎹簱閲岀殑灞炴�э紝涓�鑸兘鏄痮id鎴栬�卛d锛屽鏋滄槸澶氫釜灞炴�т娇鐢ㄩ�楀彿鍒嗗壊锛屽oid ,id',
- value: 'oid',
- tipPlacement: 'bottom',
- span: 6,
- rules: [{
- required: true,
- message: "(瀛樺偍鍊肩殑灞炴��)蹇呭～椤逛笉鑳戒负绌�",
- trigger: "blur",
- }],
- },{
- label: '鍙傜収绐楀彛绫诲瀷',
- prop: 'type',
- tip: 'default:榛樿鐨勫弬鐓х獥鍙ｆ牱寮�; stand:UI涓婁笅鏂囬厤缃殑鏂瑰紡; classify:鍒嗙被+妗ｆ鐨勬樉绀�; 鑷畾涔夌殑鍙傜収鐩存帴鍐檍s鐨勭粍浠惰矾寰勶紱tree:鏍戝舰灞曠ず;grid:鍒楄〃灞曠ず',
- tipPlacement: 'bottom',
- span: 6,
- value: 'default',
- type: 'select',
- dicData: [{
- label: '榛樿鏍峰紡',
- value: 'default'
- }, {
- label: '骞冲彴閰嶇疆',
- value: 'stand'
- }, {
- label: '鏍戝舰',
- value: 'tree'
- }, {
- label: '鍒楄〃',
- value: 'grid'
- }, {
- label: '閮ㄩ棬鏍�',
- value: 'refer/OrgDepartmentRefer'
- }, {
- label: '閮ㄩ棬鍒楄〃',
- value: 'refer/OrgDepartmentGridRefers'
- }, {
- label: '鐢ㄦ埛',
- value: 'refer/SmUserRefer'
- }, {
- label: '鐢ㄦ埛鍒楄〃',
- value: 'refer/SmUserGridRefer'
- }, {
- label: '瑙掕壊鍒楄〃',
- value: 'refer/SmRoleRefer'
- }, {
- label: '鑱屽姟',
- value: 'refer/OrgDutyRefer'
- }, {
- label: '宸ョ',
- value: 'refer/SmWorkTypeRefer'
- }, {
- label: '娴佺▼妯℃澘',
- value: 'refer/WfProcessTemplateRefer'
- }],
- rules: [{
- required: true,
- message: "(鍙傜収绐楀彛绫诲瀷)蹇呭～椤逛笉鑳戒负绌�",
- trigger: "blur",
- }],
- change: ({ value, column }) => {
- // console.log("start",value);
- // 澶嶅師琛ㄥ崟,鍥犱负鍏朵粬鍒嗙粍涓鏋滃瓨鍦ㄥ�硷紝鍦ㄥ垏鎹㈡椂,浼氫繚鐣欒緭鍏ョ殑瀛楁鍊兼墍浠ラ渶瑕佽繕鍘�
- let addFrom = {};
- this.activeName = 'first'; // 榛樿鍒囨崲鑷崇涓�涓猼ab
- //鏍规嵁绫诲瀷瀵筬orm琛ㄥ崟灞炴�ц繘琛岃皟鏁�
- if(value == 'stand'){
- addFrom = {
- referContent: '',
- displayTable: '',
- };
- this.isDisabledTabs = false;
- } else if(value == 'default' || value == 'grid'){
- addFrom = {
- limit: 15,
- sortField: '',
- sortType: 'asc',
- };
- this.isDisabledTabs = false;
- } else if(value == 'tree'){
- addFrom = {
- parentFieldName: '',
- parentUsedField: 'oid',
- parentValue: '',
- loadType: 'all',
- onlyLeaf: false,
- sortField: '',
- sortType: 'asc',
- };
- // 涓嶇煡閬撲负浠�涔坱ype涓簍ree鐨勬椂鍊欎細瑙﹀彂涓ゆchange浜嬩欢
- // 瀵艰嚧type鍒囨崲澶辫触
- this.form.type = 'tree';
- this.isDisabledTabs = false;
- }else {
- this.isDisabledTabs = true;
- this.activeName = 'second';
- }
- // 绫诲瀷鍒囨崲鏃讹紝瀵逛笉闇�瑕佺殑灞炴�ц繘琛岀瓫闄�
- this.removeFormAttr.forEach(attr=>{
- // console.log(attr);
- this.$delete(this.form,attr)
- })
- // 鍚堝苟涓や釜琛ㄥ崟
- this.form = Object.assign(addFrom,this.form);
- // console.log("endFilter",this.form.type);
- // console.log(this.form);
- },
- },{
- label: '鏄惁鎸佷箙鍖栧弬鐓ч厤缃�',
- prop: 'isPersistence',
- labelWidth: '142',
- tip: 'true:寮�鍚寔涔呭寲锛屽褰撳墠瀹氫箟鐨勫弬鐓ч厤缃繘琛屾寔涔呭寲瀛樺偍锛屼笅娆″彲鐩存帴閫夊彇锛沠alse:浠呭褰撳墠娆＄爜娈垫柊澧炵敓鏁堛��',
- tipPlacement: 'bottom',
- span: 6,
- type: 'switch',
- },{
- display: this.form.isPersistence || this.form.isPersistence=='true',
- label: '鍙傜収閰嶇疆缂栧彿',
- prop: 'id',
- tip: '璁剧疆璇ュ弬鐓ч厤缃寔涔呭寲瀛樺偍鏃剁殑缂栧彿銆�',
- rules: [{
- required: true,
- message: "(寮�鍚寔涔呭寲鏃剁紪鍙�)蹇呭～椤逛笉鑳戒负绌�",
- trigger: "blur",
- }],
- span: 6,
- },{
- display: this.form.isPersistence || this.form.isPersistence=='true',
- label: '鍙傜収閰嶇疆鍚嶇О',
- prop: 'name',
- tip: '璁剧疆璇ュ弬鐓ч厤缃寔涔呭寲瀛樺偍鏃剁殑鍚嶇О銆�',
- rules: [{
- required: true,
- message: "(寮�鍚寔涔呭寲鏃跺悕绉�)蹇呭～椤逛笉鑳戒负绌�",
- trigger: "blur",
- }],
- span: 6,
- }
- ]
- },
+ ]
+ },
+ {
+ icon: 'el-icon-info',
+ label: '椤甸潰鍙傛暟閰嶇疆',
+ collapse: false,
+ prop: 'webConfig',
+ column: [
+ {
+ label: '绐楀彛鏄剧ず鐨勯珮搴�',
+ prop: 'height',
+ tip: '榛樿绌虹潃锛岃缃悗琛ㄧず寮哄埗鏄剧ず杩欐牱鐨勯珮搴�',
+ tipPlacement: 'right',
+ span: 7,
+ rules: [{
+ validator: validateNumber,
+ message: "绐楀彛鏄剧ず鐨勯珮搴﹀繀椤讳负鏁板�肩被鍨�",
+ trigger: "blur",
+ }]
+ }, {
+ label: '杩囨护(绾ц仈)灞炴��',
+ prop: 'useFormKey',
+ tip: '鑾峰彇琛ㄥ崟涓婄殑鍏朵粬灞炴�х殑灞炴�х殑鍊兼潵杩囨护,鎴栬�呬娇鐢ㄦ煇涓睘鎬ф潵绾ц仈閫夋嫨',
+ tipPlacement: 'right',
+ span: 7,
+ }, {
+ label: '杩囨护灞炴�ц姹傚弬鏁�',
+ prop: 'paramForFormKey',
+ tip: '浣跨敤杩囨护灞炴�ф椂锛屽彂閫佺粰鍚庡彴鐨勮姹傚弬鏁�',
+ tipPlacement: 'right',
+ span: 7,
+ }, {
+ label: '鏄犲皠鍏朵粬灞炴��',
+ prop: 'mapFields',
+ tip: '閫夋嫨鏁版嵁鍚庯紝灏嗛�夋嫨鐨勬暟鎹嫹璐濆埌琛ㄥ崟閲岀殑鍏朵粬灞炴�э紝涔﹀啓鏍煎紡涓簕褰撳墠琛ㄥ崟涓婄殑灞炴��:閫夋嫨鏁版嵁閲岀殑灞炴��,"XXXXx":"yyyy"}',
+ tipPlacement: 'right',
+ span: 7,
+ }, {
+ label: '鏄惁寮�鍚叏灞�',
+ prop: 'isOpenGlobal',
+ tip: '寮�鍚叏灞�涔嬪悗瀵瑰叏閮ㄥ弬鐓ч厤缃暟鎹繘琛屾煡璇紝榛樿鏍规嵁绉熸埛杩涜鏌ヨ銆�',
+ tipPlacement: 'right',
+ type: 'switch',
+ span: 7,
+ }, {
+ label: '鏄惁澶氶��',
+ type: 'switch',
+ prop: 'isMuti',
+ value: false,
+ span: 7,
+ row: true,
+ }
+ ]
+ },
+ {
+ icon: 'el-icon-info',
+ label: '鍚庡彴鍙傛暟閰嶇疆',
+ collapse: false,
+ prop: 'backstageConfig',
+ column: [
+ {
+ label: '鑷畾涔夌殑鍚庡彴璺緞',
+ prop: 'url',
+ tip: '閫氬父涓虹┖;濡傛灉鏄垪琛紝鍚庡彴蹇呴』杩斿洖DataGrid锛屽鏋滄槸鏍戯紝鍚庡彴蹇呴』杩斿洖List<Theme>',
+ tipPlacement: 'right',
+ span: 7,
+ }, {
+ label: '鏈嶅姟鐨勫湴鍧�',
+ prop: 'backPath',
+ tip: '閫氬父涓虹┖锛屽湪鏀寔寰湇鍔℃垨鑰呭垎甯冨紡閮ㄧ讲鐨勬椂鍊欐墠閰嶇疆',
+ tipPlacement: 'right',
+ span: 7,
+ }, {
+ label: '璇锋眰鍚庡彴鐨勫崗璁柟寮�',
+ prop: 'method',
+ tip: 'HTTP鐨勫崗璁柟寮忥紝鏀寔POST,PUT,GET锛屼竴鑸兘鏄疓ET',
+ tipPlacement: 'right',
+ span: 7,
+ value: 'GET',
+ type: 'select',
+ dicData: [{
+ label: 'GET', value: "GET"
+ }, {
+ label: 'PUT', value: "PUT"
+ },
{
- icon: 'el-icon-info',
- label: '椤甸潰鍙傛暟閰嶇疆',
- collapse: false,
- prop: 'webConfig',
- column: [
- {
- label: '绐楀彛鏄剧ず鐨勯珮搴�',
- prop: 'height',
- tip: '榛樿绌虹潃锛岃缃悗琛ㄧず寮哄埗鏄剧ず杩欐牱鐨勯珮搴�',
- tipPlacement: 'right',
- span: 7,
- rules:[{
- validator: validateNumber,
- message: "绐楀彛鏄剧ず鐨勯珮搴﹀繀椤讳负鏁板�肩被鍨�",
- trigger: "blur",
- }]
- },{
- label: '杩囨护(绾ц仈)灞炴��',
- prop: 'useFormKey',
- tip: '鑾峰彇琛ㄥ崟涓婄殑鍏朵粬灞炴�х殑灞炴�х殑鍊兼潵杩囨护,鎴栬�呬娇鐢ㄦ煇涓睘鎬ф潵绾ц仈閫夋嫨',
- tipPlacement: 'right',
- span: 7,
- },{
- label: '杩囨护灞炴�ц姹傚弬鏁�',
- prop: 'paramForFormKey',
- tip: '浣跨敤杩囨护灞炴�ф椂锛屽彂閫佺粰鍚庡彴鐨勮姹傚弬鏁�',
- tipPlacement: 'right',
- span: 7,
- },{
- label: '鏄犲皠鍏朵粬灞炴��',
- prop: 'mapFields',
- tip: '閫夋嫨鏁版嵁鍚庯紝灏嗛�夋嫨鐨勬暟鎹嫹璐濆埌琛ㄥ崟閲岀殑鍏朵粬灞炴�э紝涔﹀啓鏍煎紡涓簕褰撳墠琛ㄥ崟涓婄殑灞炴��:閫夋嫨鏁版嵁閲岀殑灞炴��,XXXXx:yyyy}',
- tipPlacement: 'right',
- span: 7,
- },{
- label: '鏄惁寮�鍚叏灞�',
- prop: 'isOpenGlobal',
- tip: '寮�鍚叏灞�涔嬪悗瀵瑰叏閮ㄥ弬鐓ч厤缃暟鎹繘琛屾煡璇紝榛樿鏍规嵁绉熸埛杩涜鏌ヨ銆�',
- tipPlacement: 'right',
- type: 'switch',
- span: 7,
- },{
- label: '鏄惁澶氶��',
- type: 'switch',
- prop: 'isMuti',
- value: false,
- span: 7,
- row: true,
- }
- ]
- },
- {
- icon: 'el-icon-info',
- label: '鍚庡彴鍙傛暟閰嶇疆',
- collapse: false,
- prop: 'backstageConfig',
- column: [
- {
- label: '鑷畾涔夌殑鍚庡彴璺緞',
- prop: 'url',
- tip: '閫氬父涓虹┖;濡傛灉鏄垪琛紝鍚庡彴蹇呴』杩斿洖DataGrid锛屽鏋滄槸鏍戯紝鍚庡彴蹇呴』杩斿洖List<Theme>',
- tipPlacement: 'right',
- span: 7,
- },{
- label: '鏈嶅姟鐨勫湴鍧�',
- prop: 'backPath',
- tip: '閫氬父涓虹┖锛屽湪鏀寔寰湇鍔℃垨鑰呭垎甯冨紡閮ㄧ讲鐨勬椂鍊欐墠閰嶇疆',
- tipPlacement: 'right',
- span: 7,
- },{
- label: '璇锋眰鍚庡彴鐨勫崗璁柟寮�',
- prop: 'method',
- tip: 'HTTP鐨勫崗璁柟寮忥紝鏀寔POST,PUT,GET锛屼竴鑸兘鏄疓ET',
- tipPlacement: 'right',
- span: 7,
- value: 'GET',
- type: 'select',
- dicData: [{
- label:'GET',value: "GET"
- },{
- label:'PUT',value: "PUT"
- },
- {
- label:'POST',value: "POST"
- }],
- },
- ]
- },
- ]
- }
- },
- formOtherOption(){
- return {
- // 鍙樺姩鐨勮〃鍗曞尯鍩�
- submitBtn: false,
- emptyBtn: false,
- labelWidth: '145', //榛樿鏍囩瀹藉害
- group: [
- {
- display: this.form.type=='default'||this.form.type=='grid',
- icon: 'el-icon-info',
- label: this.form.type=='default' ? '榛樿鍙傜収鐨勯厤缃�(涓嬫柟鍒楄〃)':'鍒楄〃鍙傜収鐨勯厤缃紙涓嬫柟鍒楄〃)',
- collapse: true,
- prop: 'groupDdefaultOrGrid',
- column: [
- {
- label: '姣忛〉鏄剧ず鏉℃暟',
- prop: 'limit',
- span: 8,
- tip: '鍒嗛〉鏃舵瘡椤垫樉绀虹殑鏁伴噺锛屼笉鍒嗛〉濉�-1',
- value: 15,
- tipPlacement: 'right',
- },{
- label: '鎺掑簭瀛楁',
- prop: 'sortField',
- span: 8,
- tip: '鏌ヨ鏁版嵁鏃剁殑鎺掑簭瀛楁',
- //clearable: false,
- tipPlacement: 'right',
- },{
- label: '鎺掑簭绫诲瀷',
- prop: 'sortType',
- span: 8,
- dicData: [{
- label: '鍗囧簭', value: 'asc'
- }, {
- label: '闄嶅簭', value: 'desc'
- }],
- //value: 'asc',
- type: 'select',
- tip: '鏌ヨ鏁版嵁鏃剁殑鎺掑簭绫诲瀷',
- tipPlacement: 'right',
- }
- ]
- },
- {
- display: this.form.type=='stand',
- icon: 'el-icon-info',
- label: 'stand(骞冲彴閰嶇疆)鍙傜収',
- collapse: true,
- prop: 'groupStand',
- column: [
- {
- label: '鍙傝�冪殑UI涓婁笅鏂�',
- prop: 'referContent',
- span: 8,
- tip: '鍙湁鍙傜収绐楀彛绫诲瀷鏄痵tand鏃舵墠蹇呴』璁剧疆,涓斿湪stand绫诲瀷涓嬫墠鑳界敓鏁�',
- tipPlacement: 'right',
- },
- {
- label: '骞冲彴鐨勮〃鏍肩紪鍙�',
- prop: 'displayTable',
- span: 8,
- tip: '涓庡弬鐓х殑UI涓婁笅鏂囦簰鏂ワ紝鍙湁鍙傜収绐楀彛绫诲瀷鏄痵tand鏃舵墠蹇呴』璁剧疆锛屼笖鍦╯tand绫诲瀷涓嬫墠鑳界敓鏁�',
- tipPlacement: 'right',
- },
- ]
- },
- {
- display: this.form.type=='tree',
- icon: 'el-icon-info',
- label: '鏍戝舰鍙傜収淇℃伅',
- collapse: true,
- prop: 'groupTree',
- labelWidth: '158',
- column: [
- {
- label: '鏍戝舰鐨勪笂绾у睘鎬�',
- prop: 'parentFieldName',
- span: 7,
- tip: '鏍戝舰灞曠ず鐨勬椂鍊欙紝涓婁笅绾у叧绯绘煡鎵剧殑灞炴�с��',
- tipPlacement: 'right',
- rules: [{
- required: true,
- message: "(鏍戝舰鐨勪笂绾у睘鎬�)蹇呭～椤逛笉鑳戒负绌�",
- trigger: "blur",
- }],
- },{
- label: '涓婄骇灞炴�у�煎搴斿睘鎬�',
- prop: 'parentUsedField',
- span: 7,
- tip: '涓婄骇灞炴�у瓨鍌ㄧ殑鍊�,鏄笂绾ф暟鎹殑浠�涔堝睘鎬с�備竴鑸兘鏄痮id銆�',
- value: 'oid',
- tipPlacement: 'right',
- },{
- label: '鏍硅妭鐐圭殑鍊�',
- prop: 'parentValue',
- span: 7,
- tip: '鏍戝舰灞曠ず鐨勬椂鍊欙紝涓婄骇鐨勫�笺��',
- tipPlacement: 'right',
- },{
- label: '鏍戝姞杞芥柟寮�',
- prop: 'loadType',
- span: 7,
- value: 'all',
- dicData: [{
- label: '鍏ㄩ儴', value: 'all'
- }, {
- label: '閫愮骇鍔犺浇', value: 'node'
- }],
- type: 'select',
- },{
- label: '鎺掑簭瀛楁',
- prop: 'sortField',
- span: 7,
- //type: 'table',
- tip: '鏌ヨ鏁版嵁鏃剁殑鎺掑簭瀛楁',
- tipPlacement: 'right',
- },{
- label: '鎺掑簭绫诲瀷',
- prop: 'sortType',
- span: 7,
- type: 'select',
- value: 'asc',
- dicData: [{
- label: '鍗囧簭', value: 'asc'
- }, {
- label: '闄嶅簭', value: 'desc'
- }],
- },{
- label: '鏄惁鍙兘閫夋嫨鍙跺瓙鑺傜偣',
- prop: 'onlyLeaf',
- span: 7,
- value: false,
- type: 'switch',
- }
- ]
- },
- ],
- }
- },
+ label: 'POST', value: "POST"
+ }],
+ },
+ ]
+ },
+ ]
+ }
+ },
+ formOtherOption() {
+ return {
+ // 鍙樺姩鐨勮〃鍗曞尯鍩�
+ submitBtn: false,
+ emptyBtn: false,
+ labelWidth: '145', //榛樿鏍囩瀹藉害
+ group: [
+ {
+ display: this.form.type == 'default' || this.form.type == 'grid',
+ icon: 'el-icon-info',
+ label: this.form.type == 'default' ? '榛樿鍙傜収鐨勯厤缃�(涓嬫柟鍒楄〃)' : '鍒楄〃鍙傜収鐨勯厤缃紙涓嬫柟鍒楄〃)',
+ collapse: true,
+ prop: 'groupDdefaultOrGrid',
+ column: [
+ {
+ label: '姣忛〉鏄剧ず鏉℃暟',
+ prop: 'limit',
+ span: 8,
+ tip: '鍒嗛〉鏃舵瘡椤垫樉绀虹殑鏁伴噺锛屼笉鍒嗛〉濉�-1',
+ value: 15,
+ rules: [{
+ required: true,
+ message: "蹇呭～椤逛笉鑳戒负绌�",
+ trigger: "blur",
+ }],
+ tipPlacement: 'right',
+ }, {
+ label: '鎺掑簭瀛楁',
+ prop: 'sortField',
+ span: 8,
+ tip: '鏌ヨ鏁版嵁鏃剁殑鎺掑簭瀛楁',
+ //clearable: false,
+ tipPlacement: 'right',
+ }, {
+ label: '鎺掑簭绫诲瀷',
+ prop: 'sortType',
+ span: 8,
+ dicData: [{
+ label: '鍗囧簭', value: 'asc'
+ }, {
+ label: '闄嶅簭', value: 'desc'
+ }],
+ //value: 'asc',
+ type: 'select',
+ tip: '鏌ヨ鏁版嵁鏃剁殑鎺掑簭绫诲瀷',
+ tipPlacement: 'right',
+ }
+ ]
+ },
+ {
+ display: this.form.type == 'stand',
+ icon: 'el-icon-info',
+ label: 'stand(骞冲彴閰嶇疆)鍙傜収',
+ collapse: true,
+ prop: 'groupStand',
+ column: [
+ {
+ label: '鍙傝�冪殑UI涓婁笅鏂�',
+ prop: 'referContent',
+ span: 8,
+ tip: '鍙湁鍙傜収绐楀彛绫诲瀷鏄痵tand鏃舵墠蹇呴』璁剧疆,涓斿湪stand绫诲瀷涓嬫墠鑳界敓鏁�',
+ tipPlacement: 'right',
+ },
+ {
+ label: '骞冲彴鐨勮〃鏍肩紪鍙�',
+ prop: 'displayTable',
+ span: 8,
+ tip: '涓庡弬鐓х殑UI涓婁笅鏂囦簰鏂ワ紝鍙湁鍙傜収绐楀彛绫诲瀷鏄痵tand鏃舵墠蹇呴』璁剧疆锛屼笖鍦╯tand绫诲瀷涓嬫墠鑳界敓鏁�',
+ tipPlacement: 'right',
+ },
+ ]
+ },
+ {
+ display: this.form.type == 'tree',
+ icon: 'el-icon-info',
+ label: '鏍戝舰鍙傜収淇℃伅',
+ collapse: true,
+ prop: 'groupTree',
+ labelWidth: '158',
+ column: [
+ {
+ label: '鏍戝舰鐨勪笂绾у睘鎬�',
+ prop: 'parentFieldName',
+ span: 7,
+ tip: '鏍戝舰灞曠ず鐨勬椂鍊欙紝涓婁笅绾у叧绯绘煡鎵剧殑灞炴�с��',
+ tipPlacement: 'right',
+ rules: [{
+ required: true,
+ message: "(鏍戝舰鐨勪笂绾у睘鎬�)蹇呭～椤逛笉鑳戒负绌�",
+ trigger: "blur",
+ }],
+ }, {
+ label: '涓婄骇灞炴�у�煎搴斿睘鎬�',
+ prop: 'parentUsedField',
+ span: 7,
+ tip: '涓婄骇灞炴�у瓨鍌ㄧ殑鍊�,鏄笂绾ф暟鎹殑浠�涔堝睘鎬с�備竴鑸兘鏄痮id銆�',
+ value: 'oid',
+ tipPlacement: 'right',
+ }, {
+ label: '鏍硅妭鐐圭殑鍊�',
+ prop: 'parentValue',
+ span: 7,
+ tip: '鏍戝舰灞曠ず鐨勬椂鍊欙紝涓婄骇鐨勫�笺��',
+ tipPlacement: 'right',
+ }, {
+ label: '鏍戝姞杞芥柟寮�',
+ prop: 'loadType',
+ span: 7,
+ value: 'all',
+ dicData: [{
+ label: '鍏ㄩ儴', value: 'all'
+ }, {
+ label: '閫愮骇鍔犺浇', value: 'node'
+ }],
+ type: 'select',
+ }, {
+ label: '鎺掑簭瀛楁',
+ prop: 'sortField',
+ span: 7,
+ //type: 'table',
+ tip: '鏌ヨ鏁版嵁鏃剁殑鎺掑簭瀛楁',
+ tipPlacement: 'right',
+ }, {
+ label: '鎺掑簭绫诲瀷',
+ prop: 'sortType',
+ span: 7,
+ type: 'select',
+ value: 'asc',
+ dicData: [{
+ label: '鍗囧簭', value: 'asc'
+ }, {
+ label: '闄嶅簭', value: 'desc'
+ }],
+ }, {
+ label: '鏄惁鍙兘閫夋嫨鍙跺瓙鑺傜偣',
+ prop: 'onlyLeaf',
+ span: 7,
+ value: false,
+ type: 'switch',
+ }
+ ]
+ },
+ ],
+ }
+ },
},
mounted() {
// 浜嬩欢鐩戝惉锛屽疄鐜拌〃鏍艰缂栬緫鐐瑰嚮琛ㄦ牸鍖哄煙澶栧唴瀹规椂閫�鍑虹紪杈戠姸鎬�
@@ -928,7 +933,6 @@
}
},
methods: {
-
// 閫夋嫨瀹屽弬鐓ч厤缃箣鍚庣偣鍑讳繚瀛樻寜閽Е鍙�
async selectedListReferConfig(){
// 鏍囪鎵�鏈夎〃鍗曟槸鍚﹂�氳繃鏍￠獙鐨勫彉閲�
@@ -942,7 +946,6 @@
break;
}
isValid = false;
- //console.log(valid);
}
done();
})
@@ -951,7 +954,6 @@
if (isValid) {
// 鏍规嵁绫诲瀷瀵筬orm琛ㄥ崟涓殑鍙傛暟杩涜杩囨护锛屽彧淇濈暀闈炵┖涓旈渶瑕佺殑灞炴��
let submitForm = this.filterForm();
- // console.log(submitForm);
this.$emit('echoReferConfig', submitForm) // 瑙﹀彂update:data灏嗗瓙缁勪欢鍊间紶閫掔粰鐖剁粍浠�
this.isShowReferConfigForm = false;
}
@@ -959,7 +961,6 @@
// 鍗曞嚮琛ㄦ牸瀹炵幇琛ㄦ牸琛岀紪杈�
clickAttrEdit(row, column, event){
if(this.preClickAttrRow && this.preClickAttrRow != row){
- //console.log(this.codeShowFieldConfigVOS[this.preClickAttrRow.$index]);
this.codeShowFieldConfigVOS[this.preClickAttrRow.$index].$cellEdit = false;
}
row.$cellEdit = true;
diff --git a/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue b/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue
index 0edd298..4294b66 100644
--- a/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue
+++ b/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue
@@ -26,7 +26,8 @@
<el-option label="鏁版嵁鏌ヨ" value="queryData"></el-option>
</el-select>
</el-form-item>
-<!-- 闆嗘垚浠诲姟 鏄惁鎺ㄩ�佹垚鍔� 闆嗘垚鏁版嵁 鏄惁鍒嗚В浠诲姟-->
+<!-- 闆嗘垚浠诲姟 鏄惁鎺ㄩ�佹垚鍔�
+闆嗘垚鏁版嵁 鏄惁鍒嗚В浠诲姟-->
<el-form-item v-if="((status.type == 'task' || status.type == 'data')&& status.stateTaskDataFlag)" size="small">
<el-select v-model="formInline.stateTask" placeholder="璇烽�夋嫨鐘舵��">
<el-option label="鏄�" value="true"></el-option>
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue b/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue
index 7aab2aa..7ecbfa0 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue
@@ -26,10 +26,9 @@
};
},
created() {
- console.log('referer')
- if (!this.referConfig.options) {
+ if (!this.referConfig.options && this.referConfig.options.isMuti==undefined) {
this.referConfig.options = {
- isMuti: false
+ isMuti: this.referConfig.options.muti || false
}
}
},
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
index 4427e05..222c3c0 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
@@ -86,9 +86,11 @@
this.getParams();
},
mounted() {
- if(this.referConfig.options.page){
- this.page.pageSize=this.referConfig.options.page.limit || this.referConfig.options.page.pageSize;
- this.page.currentPage=this.referConfig.options.page.page || this.referConfig.options.page.currentPage;
+ if(this.referConfig.options.tableConfig.page){
+ this.page.pageSize=this.referConfig.options.tableConfig.page.limit || this.referConfig.options.tableConfig.page.pageSize;
+ this.page.currentPage=this.referConfig.options.tableConfig.page.page || this.referConfig.options.tableConfig.page.currentPage;
+ }else if(!validatenull(this.referConfig.options.limit)){
+ this.page.pageSize=this.referConfig.options.limit
}
},
computed:{
@@ -123,6 +125,12 @@
if (this.options.remoteSort && this.options.initSort) {
queryParams['order'] = this.options.initSort.type;//鏂规硶
queryParams['sort'] = this.options.initSort.field;//瀛楁
+ }
+ if(this.options.sortField){
+ queryParams['sort'] = this.options.sortField;//瀛楁
+ }
+ if(this.options.sortType){
+ queryParams['order'] = this.options.sortType;//鏂规硶
}
if (this.options.conditionParams) {
//璇存槑鏄墿灞曞睘鎬�
@@ -248,24 +256,41 @@
if(isMutiValue){
var valueFieldArray = _that.props.value.split(",");
valueFieldArray.forEach((_itemField,_indexField)=>{
- value.push( (item[_itemField] || item['data'][_itemField]) + (_that.referConfig.valueSep?_that.referConfig.valueSep:' '));
+ let itemValue=item[_itemField];
+ if(itemValue==undefined || itemValue == null){
+ itemValue=item['data'][_itemField]
+ }
+ value.push( itemValue + (_that.referConfig.valueSep?_that.referConfig.valueSep:' '));
})
}else {
- value.push(item[_that.props.value] || item['data'][_that.props.value]);
+ let itemValue=item[_that.props.value];
+ if(itemValue==undefined || itemValue == null){
+ itemValue=item['data'][_that.props.value]
+ }
+ value.push(itemValue);
}
if(isMutiRaw) {
var rawFieldArray = _that.props.label.split(",");
rawFieldArray.forEach((_itemField,_indexField)=>{
- text.push((item[_itemField] || item['data'][_itemField]) + (_that.referConfig.textSep?_that.referConfig.textSep:' ')) ;
+ let itemText=item[_itemField];
+ if(itemText==undefined || itemText == null){
+ itemText=item['data'][_itemField]
+ }
+ text.push(itemText + (_that.referConfig.textSep?_that.referConfig.textSep:' ')) ;
})
}else{
- text.push(item[_that.props.label] || item['data'][_that.props.label]);
+ let itemText=item[_that.props.label];
+ if(itemText==undefined || itemText == null){
+ itemText=item['data'][_that.props.label]
+ }
+ text.push(itemText);
}
})
+ let mapFields =Object.assign(this.referConfig.fieldMap,JSON.parse(this.options.mapFields)) ;
this.value=value.join(',');
this.text=text.join(',')
- this.$emit("setValue", {field:this.referConfig.field,showField:this.referConfig.showField,value:this.value,text:this.text,rawData:this.selectionList,fieldMap:this.referConfig.fieldMap});
+ this.$emit("setValue", {field:this.referConfig.field,showField:this.referConfig.showField,value:this.value,text:this.text,rawData:this.selectionList,fieldMap:mapFields});
this.visible=false;
},
searchReset() {
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
index 7bc31f2..f3044e6 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
@@ -88,15 +88,13 @@
},
created() {
this.getParams();
-
- // console.log('referConfig:')
- // console.log(this.referConfig)
},
mounted() {
- console.log('referrTable')
if(this.referConfig.options.page){
- this.page.pageSize=this.referConfig.options.page.limit || this.referConfig.options.page.pageSize;
- this.page.currentPage=this.referConfig.options.page.page || this.referConfig.options.page.currentPage;
+ this.page.pageSize=this.referConfig.options.tableConfig.page.limit || this.referConfig.options.tableConfig.page.pageSize;
+ this.page.currentPage=this.referConfig.options.tableConfig.page.page || this.referConfig.options.tableConfig.page.currentPage;
+ }else if(!validatenull(this.referConfig.options.limit)){
+ this.page.pageSize=this.referConfig.options.limit
}
this.$nextTick(() => {
this.$refs.referCrud.doLayout()
@@ -135,6 +133,12 @@
if (this.options.remoteSort && this.options.initSort) {
queryParams['order'] = this.options.initSort.type;//鏂规硶
queryParams['sort'] = this.options.initSort.field;//瀛楁
+ }
+ if(this.options.sortField){
+ queryParams['sort'] = this.options.sortField;//瀛楁
+ }
+ if(this.options.sortType){
+ queryParams['order'] = this.options.sortType;//鏂规硶
}
if (this.options.conditionParams) {
//璇存槑鏄墿灞曞睘鎬�
@@ -241,7 +245,6 @@
if(!tableConfig){
this.$message.error( '娌℃湁瀹氫箟鍙傜収鐨勮〃鏍奸厤缃�');
}
- this.page.pageSize=tableConfig.page.limit || 10;
if(!paramsData){
paramsData = {
currentUserReferModelKey:this.options.currentUserReferModelKey,
@@ -307,24 +310,40 @@
if(isMutiValue){
var valueFieldArray = _that.props.value.split(",");
valueFieldArray.forEach((_itemField,_indexField)=>{
- value.push( (item[_itemField] || item['data'][_itemField]) + (_that.referConfig.valueSep?_that.referConfig.valueSep:' '));
+ let itemValue=item[_itemField];
+ if(itemValue==undefined || itemValue == null){
+ itemValue=item['data'][_itemField]
+ }
+ value.push( itemValue + (_that.referConfig.valueSep?_that.referConfig.valueSep:' '));
})
}else {
- value.push(item[_that.props.value] || item['data'][_that.props.value]);
+ let itemValue=item[_that.props.value];
+ if(itemValue==undefined || itemValue == null){
+ itemValue=item['data'][_that.props.value]
+ }
+ value.push(itemValue);
}
if(isMutiRaw) {
var rawFieldArray = _that.props.label.split(",");
rawFieldArray.forEach((_itemField,_indexField)=>{
- text.push((item[_itemField] || item['data'][_itemField]) + (_that.referConfig.textSep?_that.referConfig.textSep:' ')) ;
+ let itemText=item[_itemField];
+ if(itemText==undefined || itemText == null){
+ itemText=item['data'][_itemField]
+ }
+ text.push(itemText + (_that.referConfig.textSep?_that.referConfig.textSep:' ')) ;
})
}else{
- text.push(item[_that.props.label] || item['data'][_that.props.label]);
+ let itemText=item[_that.props.label];
+ if(itemText==undefined || itemText == null){
+ itemText=item['data'][_that.props.label]
+ }
+ text.push(itemText);
}
})
-
+ let mapFields =Object.assign(this.referConfig.fieldMap,JSON.parse(this.options.mapFields)) ;
this.value=value.join(',');
this.text=text.join(',')
- this.$emit("setValue", {field:this.referConfig.field,showField:this.referConfig.showField,value:this.value,text:this.text,rawData:this.selectionList,fieldMap:this.referConfig.fieldMap});
+ this.$emit("setValue", {field:this.referConfig.field,showField:this.referConfig.showField,value:this.value,text:this.text,rawData:this.selectionList,fieldMap:mapFields});
this.visible=false;
},
searchReset() {
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferTree.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferTree.vue
index 16756d9..8247fdc 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferTree.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferTree.vue
@@ -88,6 +88,12 @@
queryParams[key] = this.options.rootParams[key];
}
}
+ if(this.options.sortField){
+ queryParams['sort'] = this.options.sortField;//瀛楁
+ }
+ if(this.options.sortType){
+ queryParams['order'] = this.options.sortType;//鏂规硶
+ }
if (this.options.conditionParams) {
//璇存槑鏄墿灞曞睘鎬�
for (var key in this.options.conditionParams) {
diff --git a/Source/UBCS-WEB/src/config/website.js b/Source/UBCS-WEB/src/config/website.js
index cc399fe..b2c93fd 100644
--- a/Source/UBCS-WEB/src/config/website.js
+++ b/Source/UBCS-WEB/src/config/website.js
@@ -46,6 +46,7 @@
// 鎶ヨ〃璁捐鍣ㄥ湴鍧�(cloud绔彛涓�8108,boot绔彛涓�80)
reportUrl: 'http://localhost:8108/ureport',
// 鍗曠偣鐧诲綍绯荤粺璁よ瘉(ubcs-auth鏈嶅姟鐨勫湴)
+ ssoUrl:'',
// 鍗曠偣鐧诲綍鍥炶皟鍦板潃(Saber鏈嶅姟鐨勫湴鍧�)
redirectUri: 'http://localhost:1888',
}
diff --git a/Source/UBCS-WEB/src/page/login/index.vue b/Source/UBCS-WEB/src/page/login/index.vue
index 97f7c74..6a732cd 100644
--- a/Source/UBCS-WEB/src/page/login/index.vue
+++ b/Source/UBCS-WEB/src/page/login/index.vue
@@ -25,7 +25,12 @@
</h4>
<userLogin v-if="activeName==='user'"></userLogin>
<thirdLogin v-else-if="activeName==='third'"></thirdLogin>
-
+ <div class="login-menu">
+ <a href="#" @click.stop="activeName='user'">{{ $t('login.userLogin') }}</a>
+ <!--<a href="#" @click.stop="activeName='code'">{{ $t('login.phoneLogin') }}</a>-->
+ <a href="#" @click.stop="activeName='third'">{{ $t('login.thirdLogin') }}</a>
+ <a :href="website.ssoUrl + website.redirectUri">{{ $t('login.ssoLogin') }}</a>
+ </div>
</div>
</div>
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 942065e..8fe7297 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -1324,6 +1324,7 @@
export default {
data() {
return {
+ crudOption:{...optionRule},
ruleForm: {},
query: {},
loading: true,
@@ -1650,7 +1651,6 @@
} else {
this.sendGridCodeBasicSec(conditionMaps, true);
}
- //console.log(conditionMaps);
}
},
/* 鍏紡缂栬緫妗嗗唴瀹规敼鍙�,瀛愮粍浠剁紪杈戝畬鍏紡涔嬪悗鍐呭鍥炴樉鏃惰皟鐢� */
@@ -1659,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) {
@@ -1676,7 +1676,6 @@
/** 鐖跺垎绫婚�夋嫨瀵硅瘽妗嗭紝绗簩灞傚祵濂楀璇濇锛屽強鍏剁浉鍏虫柟娉� */
/** 淇濆瓨褰撳墠鐖跺垎绫荤爜娈电殑閫変腑琛岋紝骞惰繘琛屽洖鏄� */
saveSelectedParentClassify() {
- //console.log(this.parentClsfyParams.parentClassifySelectionList.length);
if (this.parentClsfyParams.parentClassifySelectionList.length != 1) {
this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�!");
return false;
@@ -1744,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;
@@ -1762,7 +1760,6 @@
/** 鍔犺浇鍒嗙被杩炴帴灞炴�ц〃鏍兼暟鎹� */
loadlistClassifyLinkAttr() {
let attrParam = this.selectAttrParams;
- //console.log(this.currentSelectTreeData);
this.selectAttrParams.selectAttrOptionLoading = true;
let conditionMaps = {};
if (attrParam.selectAttrQeury) {
@@ -1780,7 +1777,6 @@
this.$nextTick(() => {
this.$refs[attrParam.ref].doLayout();
});
- //console.log(data.data);
this.selectAttrParams.selectAttrData = data.data;
this.selectAttrParams.selectAttrOptionLoading = false;
// 灏嗘悳绱㈡鍐呭缃┖
@@ -1850,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;
@@ -1892,7 +1886,6 @@
}
this.codeClassifyForm.codeClassifySecOid =
this.codefixedsecOrCodeclassifysec.oid;
- // console.log(this.codeClassifyForm);
addSaveCodeClassifyValue(this.codeClassifyForm).then(
() => {
this.loadClassifyValueData({
@@ -1917,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;
@@ -2470,7 +2462,6 @@
},
/** 娣诲姞*/
rowSave(row, done, loading) {
- console.log(row);
add(row).then(
() => {
this.onLoad(this.page);
@@ -2546,7 +2537,7 @@
this.query = {};
this.onLoad(this.page);
},
- // 缂栫爜瑙勫垯蹇�熸煡璇�
+ // 缂栫爜瑙勫垯蹇�熸煡璇earchChange
searchChange(params, done) {
this.page.currentPage = 1;
// 澶氫釜conditionMap杩欐牱浼犲弬锛屽揩閫熸煡璇㈤粯璁ら噰鐢ㄦā绯婃煡璇�
@@ -2559,6 +2550,11 @@
}
this.query = requestData;
this.onLoad(this.page, this.query);
+ // console.log( this.findObject(this.optionRule.column,'id'))
+ // console.log(this.crudOption.column[0])
+ // this.crudOption.column && this.crudOption.column.length > 0
+ // ? (this.crudOption.column[0].value = '')
+ // : null;
done();
},
/** 缂栫爜瑙勫垯褰撳墠閫変腑琛屽彉鍖栫殑鏃跺�欒Е鍙�*/
@@ -3145,7 +3141,6 @@
},
/** 鐮佹绫诲瀷鏀瑰彉鏃讹紝澧炲姞瀵瑰簲鐨刦orm琛ㄥ崟涓殑灞炴��*/
changeSectypeFormItems(row) {
- //console.log(row);
if (
func.isEmpty(this.enumParam.secTypeList) ||
this.enumParam.secTypeList.length == 0
@@ -3179,7 +3174,6 @@
componentCodeFlag: this.form.componentCodeFlag, //鏄惁鍙備笌缂栫爜
pkCodeRule: this.form.pkCodeRule, //鎵�灞炵紪鐮佽鍒�
};
- //console.log(this.form);
}
if (this.form.secType === "codefixedsec") {
//鍥哄畾鐮佹
@@ -3245,8 +3239,6 @@
? row.customCodeSerialClass
: "", //鑷畾涔夋祦姘寸畻娉�
});
- console.log(this.form);
- console.log(this.enumParam.codeFillType);
this.loadCodeFillType();
this.loadCodeFillSeparator();
} else if (this.form.secType === "codelevelsec") {
@@ -3292,7 +3284,6 @@
: "", //鏃ユ湡鏍煎紡
});
} else if (this.form.secType === "codeclassifysec") {
- //console.log(this.form);
//鍒嗙被鐮佹
this.form = Object.assign({}, this.form, {
codeSecLengthType:
@@ -3335,7 +3326,6 @@
this.loadCodeFillType();
this.loadCodeFillSeparator();
}
- // console.log(this.form);
},
/** 绗竴娆¤姹傜殑鏋氫妇鏁版嵁鏀剧紦瀛�*/
getLocalStorageEnum(enumKey) {
@@ -3392,7 +3382,6 @@
},
// 鏈�澶ф祦姘村彿
maxSerialNum() {
- console.log(this.selectionList);
if (this.selectionList.length === 0) {
this.$message.warning("璇烽�夋嫨涓�鏉＄紪鐮佽鍒欙紒");
return;
diff --git a/Source/UBCS-WEB/src/views/modeling/original.vue b/Source/UBCS-WEB/src/views/modeling/original.vue
index d701e74..349cb2f 100644
--- a/Source/UBCS-WEB/src/views/modeling/original.vue
+++ b/Source/UBCS-WEB/src/views/modeling/original.vue
@@ -12,7 +12,7 @@
<el-button icon="el-icon-edit" size="small" type="text" @click="updateSave(row,index)">缂栬緫</el-button>
<el-button icon="el-icon-delete" size="small" type="text" @click="deleteSave(row,index)">鍒犻櫎</el-button>
</template>
- <template slot="menuLeft">
+ <template slot="menuLeft">
<el-button size="small" type="primary" icon="el-icon-plus" @click="addSave">鏂� 澧�
</el-button>
<el-button size="small" plain type="primary" icon="el-icon-zoom-in" @click="applyRangeOpen">鏌ョ湅浣跨敤鑼冨洿
diff --git a/Source/UBCS-WEB/src/views/wel/Statistic.vue b/Source/UBCS-WEB/src/views/wel/Statistic.vue
index 0d6556a..81a37cc 100644
--- a/Source/UBCS-WEB/src/views/wel/Statistic.vue
+++ b/Source/UBCS-WEB/src/views/wel/Statistic.vue
@@ -1,13 +1,6 @@
<template>
<div>
- <el-row :gutter="20">
- <el-col :xs="8" :sm="8" :md="8" :lg="6" :xl="4" v-for="item in listMyTask">
- <div class="box" :style="item.style" @click="goto(item)">
- {{item.name}}
- <div><avue-count-up class="value" :end="item.count"></avue-count-up></div>
- </div>
- </el-col>
- </el-row>
+ <avue-data-box :option="option" :animation="true"></avue-data-box>
</div>
</template>
@@ -21,99 +14,91 @@
data(){
return {
countByServer:true,
- listMyTask:[]
+ // listMyTask:[]
+ option: {
+ span:6,
+ data: [
+ {
+ click: this.handleItemAClick,
+ title: '鐗╁搧涓绘暟鎹�',
+ count: 0,
+ icon: 'iconfont iconicon_doc',
+ color: 'rgb(49, 180, 141)',
+ uiUrl: "/MasterData/items?id=wupin@name=鐗╁搧涓绘暟鎹�",
+ countUrl:'priceIndexController/countNeedConfirmPlan'
+ },
+ {
+ click: this.handleItemBClick,
+ title: '浜哄憳涓绘暟鎹�',
+ count: 0,
+ icon: 'iconfont iconicon_dispose',
+ color: 'rgb(56, 161, 242)',
+ uiUrl:'/MasterData/items?id=renyuan@@name=浜哄憳涓绘暟鎹�',
+ countUrl:'priceIndexController/countPricingPlan'
+ },
+ {
+ click: this.handleItemCClick,
+ title: '涓婚搴撳畾涔�',
+ count: 0,
+ icon: 'el-icon-setting',
+ color: 'rgb(117, 56, 199)',
+ uiUrl:'/modeling/classifyTree',
+ countUrl:'priceIndexController/countNeedFeedbackPlan'
+ },
+ {
+ click: this.handleItemDClick,
+ title: '渚涘簲鍟嗕富鏁版嵁',
+ count: 0,
+ icon: 'iconfont iconicon_work',
+ color: 'rgb(255, 102, 51)',
+ uiUrl:'/MasterData/items?id=gongyingshang@@name=渚涘簲鍟嗕富鏁版嵁',
+ countUrl:'priceIndexController/countMyUnCreatePricePlan'
+ },
+ ]
+ },
}
},
created() {
- this.getList();
+ // this.getList();
},
computed(){
},
methods: {
+ handleItemAClick() {
+ this.$router.push({ path: "/MasterData/items?id=wupin@name=鐗╁搧涓绘暟鎹�"} );
+ },
+ handleItemBClick() {
+ this.$router.push({ path: '/MasterData/items?id=renyuan@@name=浜哄憳涓绘暟鎹�'} );
+ },
+ handleItemCClick() {
+ this.$router.push({ path: '/modeling/classifyTree'} );
+ },
+ handleItemDClick() {
+ this.$router.push({ path: '/MasterData/items?id=gongyingshang@@name=渚涘簲鍟嗕富鏁版嵁'} );
+ },
getList() {
- let data = [{
- "backgroundColor": "#FF5722",
- "btmname": "hometask",
- "countUrl": "priceIndexController/countNeedConfirmPlan",
- "name": "鐗╁搧涓绘暟鎹�",
- "nameOid": "",
- "oid": "34aebfde-eb11-4555-87eb-0a779be9aad0",
- "uiUrl": "/MasterData/items?id=wupin@name=鐗╁搧涓绘暟鎹�",
- }, {
- "backgroundColor": "#5FB878",
- "btmname": "hometask",
- "countUrl": "priceIndexController/countPricingPlan",
- "name": "浜哄憳涓绘暟鎹�",
- "nameOid": "2C72EA23-8AA5-E5FC-9BC1-DE4AD182EF7B",
- "oid": "6256ae79-7765-4c66-afc7-f12fad350065",
- "uiUrl": "/MasterData/items?id=renyuan@@name=浜哄憳涓绘暟鎹�",
- },{
- "backgroundColor": "#1E9FFF",
- "btmname": "hometask",
- "countUrl": "priceIndexController/countNeedFeedbackPlan",
- "name": "涓婚搴撳畾涔�",
- "nameOid": "2536978C-CD1B-5B56-6529-A8C3456B5260",
- "oid": "3043cdf1-8479-4c2a-9eab-fc35e9f9d5a7",
- "uiUrl": "/modeling/classifyTree",
- },
- {
- "backgroundColor": "#FF5722",
- "btmname": "hometask",
- "countUrl": "priceIndexController/countMyUnCreatePricePlan",
- "name": "渚涘簲鍟嗕富鏁版嵁",
- "nameOid": "",
- "oid": "529634e7-1854-4f61-b911-a91e3c406757",
- "uiUrl": "/MasterData/items?id=gongyingshang@@name=渚涘簲鍟嗕富鏁版嵁",
- }]
- this.listMyTask = data.map(record => {
- record.style=record.style || ''
- if(record.backgroundColor!=''){
- record.style = 'background-color:'+record.backgroundColor;
- }
- record.count=record.count || 0;
- if(!this.countByServer){
- //鏄墠绔煡璇�
- getList(record.countUrl,{}).then(res=>{
- if(res.data.data.success){
- record.count=res.data.data.obj;
- }else{
- record.count=0
+ Object.values(this.option.data).map(record => {
+ record.count = record.count || 0;
+ if (!this.countByServer) {
+ // 鏄墠绔煡璇�
+ getList(record.countUrl, {}).then(res => {
+ if (res.data.data.success) {
+ record.count = res.data.data.obj;
+ } else {
+ record.count = 0;
}
- })
-
+ });
}
return {
...record
- }
- })
+ };
+ });
},
- goto(item){
- this.$router.push({ path: item.uiUrl });
- }
}
}
</script>
<style scoped>
-.el-col{margin-bottom: 0}
-.box{
- text-align: center;
- background: rgb(235, 238, 245);
- color: #303133;
- height: 70px;
- margin: 10px 0!important;
- padding: 15px 10px;
- position: relative;
- border-radius: 4px;
- box-sizing: border-box;
- font-size: 14px;
-}
-.value{
- font-size: 12px;
- opacity: .69;
- line-height: 20px;
- margin-top: 5px;
- display: block;
-}
+
</style>
--
Gitblit v1.9.3