From bac1cc1d08c5fa87d986a953e31c85df8a4bf376 Mon Sep 17 00:00:00 2001
From: zhangyanpeng <bob.zhang@highdatas.com>
Date: 星期二, 20 八月 2024 20:20:12 +0800
Subject: [PATCH] 调整
---
js/myelement.js | 6 +-
module/fee/page/popup/popup_edit_fee_execute.html | 53 ++++++++++++++------------
module/system/page/main.html | 20 +++++-----
js/config.js | 2
4 files changed, 42 insertions(+), 39 deletions(-)
diff --git a/js/config.js b/js/config.js
index 3fdb7e8..a0bc394 100644
--- a/js/config.js
+++ b/js/config.js
@@ -14,7 +14,7 @@
config = {
- jscssversion: "2024081901", //.js/.css鏂囦欢鐨勭増鏈彿锛屽幓闄ゅ墠绔紦瀛樼殑涓�绉嶆満鍒�
+ jscssversion: "2024081902", //.js/.css鏂囦欢鐨勭増鏈彿锛屽幓闄ゅ墠绔紦瀛樼殑涓�绉嶆満鍒�
isupgrading: false, //鏄惁鍗囩骇涓�
appName: "TPP",
title: "钀ラ攢涓�浣撳寲杩愯惀骞冲彴",
diff --git a/js/myelement.js b/js/myelement.js
index 02cf998..a7f1ae4 100644
--- a/js/myelement.js
+++ b/js/myelement.js
@@ -1985,16 +1985,16 @@
// 鏁版嵁鍔犺浇鏃剁殑杞湀鍦�
'<div v-loading="istableloading" v-if="istableloading" class="h_table_loading"></div> '+
// 琛ㄦ牸宸ュ叿鏍� - 鏍囬銆佸姛鑳界粍銆佸閫�
- '<div v-if="isshowtool && ((tableAttr.istitle && tableAttr.title) || (istablebuttons && tablebuttons.length) || ((isbasicfilterfields && (tableAttr.toolbarobj && tableAttr.toolbarobj.isbasicfilterfields) && tableBasicFilterFields.length) || (isfilterfield && (tableAttr.toolbarobj && tableAttr.toolbarobj.isfilterfield))) || (tableAttr.tag && tableAttr.tag.name)) || ((tableAttr.toolbarobj && (tableAttr.toolbarobj.more_datalist && tableAttr.toolbarobj.more_datalist.length)) || (isshowShoppingcart && (tableAttr.isSelection || isSelection)) || (tableToolButtons && tableToolButtons.length))" class="h_h_table aaa" :ref="\'h_tabletool\' + href"> '+
+ '<div v-if="isshowtool && ((tableAttr.istitle && tableAttr.title) || (istablebuttons && tablebuttons.length) || ((isbasicfilterfields && (tableAttr.toolbarobj && tableAttr.toolbarobj.isbasicfilterfields) && tableBasicFilterFields.length) || (isfilterfield && (tableAttr.toolbarobj && tableAttr.toolbarobj.isfilterfield))) || (tableAttr.tag && tableAttr.tag.name)) || ((tableAttr.toolbarobj && (tableAttr.toolbarobj.more_datalist && tableAttr.toolbarobj.more_datalist.length)) || (isshowShoppingcart && (tableAttr.isSelection || isSelection)) || (tableToolButtons && tableToolButtons.length))" class="h_h_table" :ref="\'h_tabletool\' + href"> '+
// 琛ㄦ牸鏈韩鍔熻兘锛堟爣棰樸�佸瓧娈甸『搴忋�佽〃鍒锋柊銆佽〃鏍囩锛�
'<div v-if="(tableAttr.istitle && tableAttr.title) || (istablebuttons && tablebuttons.length) || ((isbasicfilterfields && (tableAttr.toolbarobj && tableAttr.toolbarobj.isbasicfilterfields) && tableBasicFilterFields.length) || (isfilterfield && (tableAttr.toolbarobj && tableAttr.toolbarobj.isfilterfield))) || (tableAttr.tag && tableAttr.tag.name)" class="h_table_tool_left">'+
// 鏍囬
- '<div v-if="tableAttr.istitle && tableAttr.title" class="h_table_title">'+
+ '<div v-if="tableAttr.istitle && tableAttr.title" class="h_table_title ">'+
'<i class="iconfont icon-fuzhushuxian" style="color: #0270c1;"></i>'+
'<span style="font-size: 14px;">{{tableAttr.title}}</span>'+
'</div> '+
//琛ㄥ瓧娈甸厤缃�
- '<div v-if="istablebuttons && tablebuttons.length" class="h_table_title"> '+
+ '<div v-if="istablebuttons && tablebuttons.length" class="h_table_title "> '+
'<div v-if="isdraggableorder && doTableFields.length > 0" class="h_table_editfield"> '+
'<h-draggable-order-tree :switchfloat="isdraggableorder_switchfloat" :datalist="doTableFields" :selectdatalist="showTableFields" :identificationfield="identificationfield" '+
':labelfield="orderlabelfield" :isselectfield="orderisselect" :isdraggablegroup="isdraggablegroup" icon="el-icon-setting" title="琛ㄦ牸瀛楁璁剧疆" v-on:save-order="saveOrder"> '+
diff --git a/module/fee/page/popup/popup_edit_fee_execute.html b/module/fee/page/popup/popup_edit_fee_execute.html
index e6f92a0..2db065b 100644
--- a/module/fee/page/popup/popup_edit_fee_execute.html
+++ b/module/fee/page/popup/popup_edit_fee_execute.html
@@ -367,31 +367,33 @@
},
}
- this.tablebuttonClick = [
- {
- // name: "鏂板", // type: "primary", // icon: "el-icon-edit",
- isbuttonshow: me.isedit,
- code: "add", isselected: false, classname: "",
- onclick: function(obj) {
- me.selectDetailPopup(false)
- }
- },
- // {
- // // name: "鍒犻櫎", // type: "primary", // icon: "el-icon-edit",
- // isbuttonshow: me.isedit, type: "danger",
- // code: "delete", isselected: true, classname: "",
- // disabled: function(selectRowList) {
- // var bo_ = true;
- // if (selectRowList[0] && selectRowList[0].state_code == "Input") {
- // bo_ = false;
- // }
- // return bo_
- // },
- // onclick: function(obj) {
- // me.delData()
- // }
- // },
- ]
+ if (me.isedit) {
+ this.tablebuttonClick = [
+ {
+ // name: "鏂板", // type: "primary", // icon: "el-icon-edit",
+ isbuttonshow: me.isedit,
+ code: "add", isselected: false, classname: "",
+ onclick: function(obj) {
+ me.selectDetailPopup(false)
+ }
+ },
+ // {
+ // // name: "鍒犻櫎", // type: "primary", // icon: "el-icon-edit",
+ // isbuttonshow: me.isedit, type: "danger",
+ // code: "delete", isselected: true, classname: "",
+ // disabled: function(selectRowList) {
+ // var bo_ = true;
+ // if (selectRowList[0] && selectRowList[0].state_code == "Input") {
+ // bo_ = false;
+ // }
+ // return bo_
+ // },
+ // onclick: function(obj) {
+ // me.delData()
+ // }
+ // },
+ ]
+ }
},
@@ -1008,6 +1010,7 @@
:isshow-shoppingcart="false"
:isbasicfilterfields="false"
:isfilterfield="false"
+ :istablebuttons="false"
:table-buttons-click="tablebuttonClick"
diff --git a/module/system/page/main.html b/module/system/page/main.html
index 0bd5d9c..5d29588 100644
--- a/module/system/page/main.html
+++ b/module/system/page/main.html
@@ -7,27 +7,27 @@
<meta http-equiv="Cache-control" content="no-cache">
<meta http-equiv="Cache" content="no-cache">
<title>缁堢鎺ㄥ箍骞冲彴</title>
- <link href="../css/main.css?v=2024081901" rel="stylesheet">
- <link href="../../../css/control.css?v=2024081901" rel="stylesheet">
- <link href="../../../css/page.css?v=2024081901" rel="stylesheet">
- <link href="../../../css/icon/iconfont.css?v=2024081901" rel="stylesheet">
+ <link href="../css/main.css?v=2024081902" rel="stylesheet">
+ <link href="../../../css/control.css?v=2024081902" rel="stylesheet">
+ <link href="../../../css/page.css?v=2024081902" rel="stylesheet">
+ <link href="../../../css/icon/iconfont.css?v=2024081902" rel="stylesheet">
<link href="../../../js/vue/element-ui/lib/theme-chalk/index.css" rel="stylesheet">
<link href="../../../img/org/head.png" rel="shortcut icon" type="image/x-icon">
- <link href="../../../css/myelement.css?v=2024081901" rel="stylesheet">
+ <link href="../../../css/myelement.css?v=2024081902" rel="stylesheet">
<script src="../../../js/jquery-3.5.1.min.js"></script>
<script src="../../../js/vue/vue.js"></script>
- <script src="../../../js/config.js?v=2024081901"></script>
+ <script src="../../../js/config.js?v=2024081902"></script>
<script src="../../../data/data.js"></script>
<script src="../../../js/vue/elementDefault.js"></script>
<script src="../../../js/vue/element-ui/lib/index.js"></script>
<script src="../../../js/Sortable.js"></script>
- <script src="../../../js/vue/page.js?v=2024081901"></script>
- <script src="../../../js/foundation.js?v=2024081901"></script>
- <script src="../../../js/control.js?v=2024081901"></script>
+ <script src="../../../js/vue/page.js?v=2024081902"></script>
+ <script src="../../../js/foundation.js?v=2024081902"></script>
+ <script src="../../../js/control.js?v=2024081902"></script>
<script src="../../../js/loadJsCss.js"></script>
- <script src="../../../js/myelement.js?v=2024081901"></script>
+ <script src="../../../js/myelement.js?v=2024081902"></script>
</head>
--
Gitblit v1.8.0