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

chenhaozhe

2026-01-13 e8fe0d4c7d418104367a0475c68f261ade6446b3

 src/views/logistics/transportGPS/WL_YayBill.vue

@@ -148,7 +148,23 @@
            </el-col>
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
                    @click="set_CheckBill(1, form = rowForm)">返审核</el-button>
                    @click="set_CheckBill(1, form = rowForm)">反审核</el-button>
            </el-col>
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
                    @click="set_CloseBills(1, form = rowForm)">关闭</el-button>
            </el-col>
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
                    @click="set_CloseBills(2, form = rowForm)">反关闭</el-button>
            </el-col>
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
                    @click="set_DropBill(1, form = rowForm)">作废</el-button>
            </el-col>
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
                    @click="set_DropBill(2, form = rowForm)">反作废</el-button>
            </el-col>
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
@@ -198,8 +214,7 @@
                @pagination="handleQuery" />
            <!-- 列设置 -->
            <el-dialog title="隐藏列设置" :visible.sync="openRowHide" width="816px" append-to-body>
                <RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose"
                    v-if="rowHideShow" />
                <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"
@@ -329,7 +344,7 @@
            rowForm: {},                                                  // 当选中的只有一行时，更新数据为该选中的行。

            tyResList: [],                                                // 列表数据，用于导出
            titleData: ["HInterID", "HEntryID", "HBillStatus", "HMaterID", "HPreventErrMouldID","HOrgID"],           // 不需要显示的字段 可扩展
            titleData: ["HInterID", "HEntryID", "HBillStatus", "HMaterID", "HPreventErrMouldID", "HOrgID"],           // 不需要显示的字段 可扩展
            btResList: [],                                                // 列表表头数据。用于列设置
            dataList: [],                                                 // option记录。用于当option数据无效时，用于列设置
        };
@@ -623,22 +638,18 @@
        //#region 删除
        handleDelete() {
            this.$modal.confirm('确认要删除吗，删除后不能恢复').then(() => {
                if (this.rowForm.状态 == "创建") {
                    axios.get(this.baseURL + "/Kf_POStockInBill/DeltetKf_POStockInBill", {
                        params: { 'HInterID': this.rowForm.HInterID.toString(), 'user': sessionStorage["HUserName"] }
                    }).then(response => {
                        if (response.data.count == 1) {
                            this.handleQuery()
                            this.$modal.msgSuccess("删除成功")
                        } else {
                            this.$modal.msgError("错误:" + result.code + result.Message);
                        }
                    }).catch(error => {
                        this.$modal.msgError("接口请求失败!");
                    });
                } else {
                    this.$modal.msgError("此条数据不是创建状态,无法删除!");
                }
                axios.get(this.baseURL + "/Cg_ContractTransportBillListController/DeleteBill", {
                    params: { 'HInterID': this.rowForm.HInterID.toString(), 'user': sessionStorage["HUserName"] }
                }).then(response => {
                    if (response.data.count == 1) {
                        this.handleQuery()
                        this.$modal.msgSuccess("删除成功")
                    } else {
                        this.$modal.msgError("错误:" + result.code + result.Message);
                    }
                }).catch(error => {
                    this.$modal.msgError("接口请求失败!");
                });
            }).catch(() => { })
        },
        //#endregion
@@ -647,12 +658,12 @@
        set_CheckBill(num, form) {
            var InterID = form.hmainid || form.HInterID
            //逻辑审核方法
            axios.get(this.baseURL + "/Kf_POStockInBill/AuditKf_POStockInBill", {
            axios.get(this.baseURL + "/WLYayBillController/AuditWLYayBill", {
                params: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
            }).then(response => {
                let result = response.data
                if (result.code == 1) {
                    this.$modal.msgSuccess('操作成功');
                    this.$modal.msgSuccess(result.Message);
                    this.handleQuery();
                }
                else {
@@ -663,7 +674,46 @@
            });
        },
        //#endregion

        //#region 关闭/反关闭
        set_CloseBills(num) {
            var InterID = form.hmainid || form.HInterID
            //逻辑审核方法
            axios.get(this.baseURL + "/Cg_ContractTransportBillEdit/CloseCg_ContractTransportBillEdit", {
                params: { "HInterID": InterID, "Type": num, "CurUserName": sessionStorage["HUserName"] }
            }).then(response => {
                let result = response.data
                if (result.code == 1) {
                    this.$modal.msgSuccess(result.Message);
                    this.handleQuery();
                }
                else {
                    this.$modal.msgError("错误:" + result.code + result.Message,);
                }
            }).catch(error => {
                this.$modal.msgError("接口请求失败!");
            });
        },
        //#endregion
        //#region 作废/反作废
        set_DropBill(num) {
            var InterID = form.hmainid || form.HInterID
            //逻辑审核方法
            axios.get(this.baseURL + "/Cg_ContractTransportBillEdit/DropCg_ContractTransportBillEdit", {
                params: { "HInterID": InterID, "Type": num, "CurUserName": sessionStorage["HUserName"] }
            }).then(response => {
                let result = response.data
                if (result.code == 1) {
                    this.$modal.msgSuccess(result.Message);
                    this.handleQuery();
                }
                else {
                    this.$modal.msgError("错误:" + result.code + result.Message,);
                }
            }).catch(error => {
                this.$modal.msgError("接口请求失败!");
            });
        },
        //#endregion
        //#region 列设置
        handleRowHide() {
            this.rowHideShow = true