zhangyanpeng
2024-08-20 bac1cc1d08c5fa87d986a953e31c85df8a4bf376
调整
4个文件已修改
81 ■■■■ 已修改文件
js/config.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
js/myelement.js 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
module/fee/page/popup/popup_edit_fee_execute.html 53 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
module/system/page/main.html 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
js/config.js
@@ -14,7 +14,7 @@
config = {
    jscssversion: "2024081901", //.js/.css文件的版本号,去除前端缓存的一种机制
    jscssversion: "2024081902", //.js/.css文件的版本号,去除前端缓存的一种机制
    isupgrading: false, //是否升级中
    appName: "TPP",
    title: "营销一体化运营平台",
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"> '+
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"
                                    
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>