Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

chenhaozhe

2025-12-03 b5bfca1185e60b954a403ecedd784f50f40fcc80

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

 src/views/component/HSourceReportHtml/index.vue

@@ -306,10 +306,12 @@
                    limit: this.pageSize,
                },
            }).then((response) => {
                console.log(response)
                this.tyResList = response.data.data; //总数据
                let data1 = response.data;

                let option = [];
                if (data1.code == 1) {
                // if (data1.code == 1) {
                    this.btResList = data1.list; //接口表头数据
                    this.total = data1.count;
                    var data = []; //列字段数据
@@ -366,6 +368,9 @@
                    }
                    option.cols = [col];
                    this.dataList = option;
                if (data1.code == 0) {
                    data1.data = []
                }
                    option.data = data1.data;
                    var result = data1.data;
                    option.data = result;
@@ -409,8 +414,9 @@
                            break;
                    }
                    this.DisPlay_HideColumn(this.HModName, sessionStorage["HUserName"], option, this.dataList);
                }
                // }
            }).catch((error) => {
                console.log(error)
                this.$modal.msgError("接口请求失败!");
            });
        },

 src/views/purchase/postockInBack/Kf_POStockInBackBillList.vue

@@ -202,15 +202,22 @@
            </el-col>
        </el-row>
        <div class="tableBox" v-loading="loading">
            <el-row>
                <el-col :span="4">
                    <div class="cgtlType" v-for="(item, index) in backTypeList" :key="index" :class="{ 'cgtlActive': typeIndex==index }" @click="backTypeClick(item,index)">
                        {{item.name}}
                    </div>
                </el-col>
                <el-col :span="20">
            <el-table :data="tableData" ref="tableData" max-height="710" :summary-method="getSummaries"
                @selection-change="handleSelectionChange" show-summary border @row-click="handleRowClick"
                :row-style="rowStyle" @cell-dblclick="handleDblclick" v-if="tableShow">
                <template v-for="(item, index) in btList">
                    <el-table-column type="selection" width="55" align="center" :fixed="item.fixed"
                        v-if="item.type == 'checkbox'" :key="index" />
                    <el-table-column :align="item.align" :prop="item.field" :label="item.title" :width="item.width"
                        :key="item.id" v-else-if="!item.hide && item.type != 'checkbox'" :sortable="item.sort"
                        show-overflow-tooltip :fixed="item.fixed">
                            <el-table-column :align="item.align" :prop="item.field" :label="item.title"
                                :width="item.width" :key="item.id" v-else-if="!item.hide && item.type != 'checkbox'"
                                :sortable="item.sort" show-overflow-tooltip :fixed="item.fixed">
                        <template slot-scope="{ row, column }">
                            <el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
                            <div :style="item.style">
@@ -227,20 +234,24 @@
            </el-table>
            <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize"
                :pageSizes="pageSizes" @pagination="getList" />
                </el-col>

            </el-row>

            <el-dialog title="隐藏列设置" :visible.sync="openRowHide" width="816px" append-to-body>
                <RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
            </el-dialog>
            <!-- 编辑 -->
            <el-dialog title="编辑" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox"
                @close="close">
                <edit :OperationType="OperationType" :linterid="this.rowForm.hmainid"
                    HSouceBillType="0" :copyType="copyType" @editClose="editClose"
                    v-if="editShow" />
                <edit :OperationType="OperationType" :linterid="this.rowForm.hmainid" HSouceBillType="0"
                    :copyType="copyType" @editClose="editClose" v-if="editShow" />
            </el-dialog>
            <PrintList :linterid="this.rowForm.hmainid" :MyMsg="this.rowForm.hmainid" Type="HPOInStockBill"
                HModName="HPOInStockBill" @rowEditClose="rowSetClose" v-if="printListShow" />
            <BarCodeDetail :visible.sync="barCodeDetailShow" ref="barcodeDetail" />
        </div>

    </div>
</template>

@@ -257,8 +268,10 @@
    components: { RowSettings, Edit, PrintList, BarCodeDetail },
    data() {
        return {
            typeIndex:0,
            activeSeach: "",
            HModName: "Kf_StockOutRequestBillList",
            backTypeList: [{ name: ' 采购退料列表(已入库)', value: 1, }, { name: '采购退料列表(未入库)', value: 0, }],
            organizationList: JSON.parse(sessionStorage.getItem('organizationList')),
            editShow: false,
            openEdit: false,
@@ -366,6 +379,9 @@
    },

    methods: {
        backTypeClick(item,index){
            this.typeIndex=index
        },
        getSummaries(param) {
            const { columns, data } = param;
            const sums = [];
@@ -995,4 +1011,15 @@
.xsckdBox .el-date-editor.el-input {
    width: 100%;
}

.cgtlType {
    text-decoration: underline;
    line-height: 36px;
    color: #606266;
    cursor: pointer;
}

.cgtlActive {
    color: blue;
}
</style>