调整

zhangyanpeng

2024-08-21 2ab7f4ef54ece0ac8c0a98ffe0222fc5f6c835c8

调整

 js/foundation.js

@@ -467,7 +467,15 @@
        var token = "";
        if (Root) {
            token = Root.getToken();
			
            if (url.indexOf('rootbr/') != -1) {
                token = "0"
                if (url.indexOf("?") > 0) {
                    url = url + "&" + "userId=" + token;
                }
                else {
                    url = url + "?" + "userId=" + token;
                }
            }
            // if(localStorage.getItem("hdtoken") != token) {
            //     window.top.location.href = config.page_timeout;
            //     return

 module/fee/page/fee_execute.html

@@ -259,7 +259,7 @@
                    <div :class="page_title == 'right' ? 'h_page_button_left' : 'h_page_button_right'">
                        <el-button-group style="margin-left: 3px;">
                            <el-button  @click="addData() " :icon="buttonsconfig.add.icon">{{buttonsconfig.add.name}}</el-button>
                            <el-button :disabled="!(selectedrow.id)" @click="editData('edit', selectedrow) " :icon="buttonsconfig.alter.icon">{{buttonsconfig.alter.name}}</el-button>
                            <el-button :disabled="!(selectedrow.id && selectedrow.state_code=='Input')" @click="editData('edit', selectedrow) " :icon="buttonsconfig.alter.icon">{{buttonsconfig.alter.name}}</el-button>
                        </el-button-group>
                        
                        <el-button v-show="cbuttons_r.export ? cbuttons_r.export : false" @click="onDownload" :icon="buttonsconfig.export.icon">{{buttonsconfig.export.name}}</el-button>

 module/fee/page/popup/popup_edit_fee_execute.html

@@ -650,10 +650,10 @@
                                dataname: this.table_dataname,
                                filter: filter_,
                                orderby: "dataNo",
                                page: {
                                    pageno: this.pagenum,
                                    pagesize: this.pagesize
                                },
                                // page: {
                                //     pageno: this.pagenum,
                                //     pagesize: this.pagesize
                                // },
                                attachMeta: false
                            }
                            
@@ -664,7 +664,7 @@
                                if (result && result.data && result.data.entityset) {
                                    var data_ = result.data.entityset;
                                    me.tableData = data_;
                                    me.total = result.data.page ? result.data.page.recordcount : 0;
                                    // me.total = result.data.page ? result.data.page.recordcount : 0;
                                }
                                else {
                                    me.total = 0;
@@ -1003,7 +1003,7 @@
                                    :pagesize="pagesize"
                                    :pagenum="pagenum"
                                    :total="total"
                                    :table-height="dheight - 147 - 64 - (isedit ? 28 : 0)"
                                    :table-height="dheight - 147 - (isedit ? 28 : 0)"
                                    :is-highlight-row="true"
                                    :isdraggableorder="false"
                                    :isbasicfilterfields="false"
@@ -1011,6 +1011,7 @@
                                    :isbasicfilterfields="false"
                                    :isfilterfield="false"
                                    :istablebuttons="false"
                                    :is-pagination="false"
                                    
                                    :table-buttons-click="tablebuttonClick"