From 18b3ce08993914c17336ff4e4f70af9a2d0b14c1 Mon Sep 17 00:00:00 2001
From: zhangyanpeng <bob.zhang@highdatas.com>
Date: 星期二, 27 八月 2024 11:38:23 +0800
Subject: [PATCH] 调整
---
module/model/model_iframe.html | 67 +++++----------------------------
module/model/page/table_simple.html | 19 +--------
2 files changed, 14 insertions(+), 72 deletions(-)
diff --git a/module/model/model_iframe.html b/module/model/model_iframe.html
index b5d8b00..07138ab 100644
--- a/module/model/model_iframe.html
+++ b/module/model/model_iframe.html
@@ -25,9 +25,9 @@
name: "sys_model",
dataname: "sys_model",
filter: "",
- isnotoption: false, //true:涓嶆槸閫夐」
- code:"id",//鏄笅鎷夐�夐」鏃惰缃�
- label:"url",//鏄笅鎷夐�夐」鏃惰缃�
+ isnotoption: false,
+ code:"id",
+ label:"url",
},
],
dataRequestObj: {},
@@ -40,11 +40,9 @@
if (window.top.tab.selected.option.page_id) {
let page_id = window.top.tab.selected.option.page_id;
var sys_page_model = {
- name: "sys_page_model", // 椤甸潰瀵瑰簲鐨勬ā鍨�
+ name: "sys_page_model",
dataname: "sys_page_model",
- // url: "root/data/getEntitySet",
- // paramsobj: {dataname: "sys_page_model", filter:"sys_page_model.page_id='" + page_id + "'"},
- isnotoption: true, //true:涓嶆槸閫夐」
+ isnotoption: true,
filter: "sys_page_model.page_id='" + page_id + "'"
}
this.dataRequest.push(sys_page_model);
@@ -57,8 +55,6 @@
var result = {};
this.loadRequestData(this.dataRequest, result, function(data) {
me.dataRequestObj = data;
- //棰勫姞杞芥暟鎹悗缁欏摢浜涘瓧娈佃缃畂ptions鎴杅ormatterjson
-
if (me.dataRequestObj.sys_model) {
me.sys_model_map = me.dataRequestObj.sys_model.map.sys_model;
}
@@ -66,77 +62,37 @@
me.sys_page_model = me.dataRequestObj.sys_page_model[0];
}
- me.initData();
-
- // 浠ユ湇鍔＄殑鏂瑰紡璋冪敤鐨� Loading 闇�瑕佸紓姝ュ叧闂�
me.$nextTick(() => {
hideLoading();
+ me.initData();
});
});
}
else {
- // 浠ユ湇鍔＄殑鏂瑰紡璋冪敤鐨� Loading 闇�瑕佸紓姝ュ叧闂�
this.$nextTick(() => {
hideLoading();
me.initData();
});
}
-
},
methods:{
initData() {
- // if (this.sys_page_model.sys_model__url.substring(0, 18) == "module/model/page/") {
- // this.iframe_url = "./page/" + this.sys_page_model.sys_model__url.substring(18);
- // }
if(this.sys_page_model.sys_model__url.substring(0, 7) == "module/") {
this.iframe_url = window.top.config.url_page + this.sys_page_model.sys_model__url;
}
else {
this.iframe_url = this.sys_page_model.sys_model__url
}
- },
-
- getReportToken() {
- var me = this;
- var param_ = "";
- if (window.top.vue.userinfo.currentactor.actor_type == "Customer") { // 缁忛攢鍟�
- param_ = "&actor=" + window.top.vue.userinfo.currentactor.actor_type + "&accountId=" + window.top.vue.userinfo.currentactor.target_id
- }
- else if (window.top.vue.userinfo.currentactor.actor_type == "Sales") { // 閿�鍞�
- param_ = "&actor=" + window.top.vue.userinfo.currentactor.actor_type + "&positionID=" + window.top.vue.userinfo.currentactor.target_id + "&level=" + window.top.vue.userinfo.position_level_field
- }
- else if (window.top.vue.userinfo.currentactor.actor_type == "Business" || window.top.vue.userinfo.currentactor.actor_type == "Org") { // 鍟嗗姟銆佽繍钀�
- param_ = "&actor=" + window.top.vue.userinfo.currentactor.actor_type //+ "&positionID=" + window.top.vue.userinfo.currentactor.target_id
- }
- else if (window.top.vue.userinfo.currentactor.actor_type == "Admin") { // Admin
- param_ = "&actor=" + window.top.vue.userinfo.currentactor.actor_type
- }
- if (param_) {
- this.reporturl += param_
+
+ if (this.iframe_url.indexOf("?") > 0) {
+ this.iframe_url = this.iframe_url + "&" + "v=" + createCode("v");
}
else {
- this.$message({
- message: '璇ヨ鑹叉病鏈夋姤琛ㄩ〉闈㈡潈闄�',
- type: 'warning'
- });
- return;
+ this.iframe_url = this.iframe_url + "?" + "v=" + createCode("v");
}
-
- var param = {
- type: "get",
- }
- Server.call("rootreport/login/cross/domain?fine_username="+window.top.config.report_user.name+"&fine_password="+window.top.config.report_user.password+"&validity=-2", param, function(result) {
- // 浠ユ湇鍔＄殑鏂瑰紡璋冪敤鐨� Loading 闇�瑕佸紓姝ュ叧闂�
- me.$nextTick(() => {
- hideLoading();
- });
- me.iframe_url = window.top.config.url_root + "rootreport/view/form?" + me.reporturl;
- me.iframe_url = me.sys_page_model.sys_model__url
- // me.iframe_url = window.top.config.url_report + "/view/form?" + me.reporturl;
- });
- }
+ },
}
});
};
@@ -147,7 +103,6 @@
</script>
<style>
- /* 鍦╲ue.js涓� v-cloak 杩欎釜鎸囦护鏄槻姝㈤〉闈㈠姞杞芥椂鍑虹幇 vuejs 鐨勫彉閲忓悕鑰岃璁＄殑 */
[v-cloak] {
display: none !important;
}
diff --git a/module/model/page/table_simple.html b/module/model/page/table_simple.html
index 63f83fd..2a061fb 100644
--- a/module/model/page/table_simple.html
+++ b/module/model/page/table_simple.html
@@ -366,26 +366,13 @@
},
onDownload() {
let me = this;
- var ioname = "";
- var sign = "";
- var filename = '鎶樻墸鏄庣粏瀵煎嚭' + String(new Date().getTime());
+ // var filename = '鎶樻墸鏄庣粏瀵煎嚭' + String(new Date().getTime());
var filter_ = "1 = 1";
filter_ = this.getFilterData(filter_);
- if (me.selectTabObj.code == "qty_detail") {
- ioname = "export_rebate_qty_detail"
- sign = "rebate_qty_detail"
- filename = '涔拌禒鏄庣粏瀵煎嚭' + String(new Date().getTime());
- }
- else if (me.selectTabObj.code == "amt_detail") {
- ioname = "export_rebate_amt_detail"
- sign = "rebate_amt_detail"
- }
let param = {
- sign: sign,
- filename: filename,
filter: filter_,
- ioname:ioname,
- orderby: "",
+ ioname: me.dataname,
+ orderby: me.orderby,
token: Root.getToken()
}
window.top.vue.textdownloadForm(param);
--
Gitblit v1.8.0