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

wangyi

2026-01-19 14097136183a66f6d9c8283b6fa2cc045741c702

 src/views/purchase/postockInBack/Kf_POStockInBackBillList.vue

@@ -148,7 +148,7 @@
            </el-collapse>
        </el-form>
        <el-row :gutter="10" class="mb8" style="margin-top: 10px">
              <!-- <el-col :span="1.5">
            <!-- <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddEdit((OperationType = 1))"
                    id="btn-Add">新增</el-button>
            </el-col> -->
@@ -226,21 +226,21 @@
                </template>
            </el-table>
            <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize"
                :pageSizes="pageSizes" @pagination="getList" />
                :pageSizes="pageSizes" @pagination="handleQuery" />
            <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 +257,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,
@@ -362,7 +364,7 @@
    created() {
        // this.fetchData()
        this.riqiChange();
        this.getList();
        this.handleQuery();
    },

    methods: {
@@ -405,7 +407,7 @@
            this.rowHideShow = false;
            this.tableShow = true;
            this.openRowHide = val;
            this.getList();
            this.handleQuery();
        },
        riqiChange() {
            const end = new Date();
@@ -421,18 +423,16 @@
            this.eTime = yyyyE + "-" + mmE + "-" + ddE;
        },
        getList() {
            console.log(this.$route.query.type)
            this.pageSize = 50;
            this.tableShow = false;
            this.loading = true;
            if (this.sTime) {
                this.sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + this.sTime + "'";
                this.sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + this.eTime + "'";
            }
            
            if (this.pageSize == 0) {
                this.pageSize = 50;
            }
            // 列表
            axios.get(this.baseURL + "/Kf_POStockInBackBill/list", {
            axios.get(this.$baseUrl + "/Kf_POStockInBackBill/list", {
                params: {
                    sWhere: this.sWhere,
                    user: sessionStorage["HUserName"],
@@ -535,7 +535,7 @@
        DisPlay_HideColumn(HModName, user, option, dataOption) {
            this.totalNameList = [];
            axios
                .get(this.baseURL + "/Xt_grdAlignment_WMES/grdAlignmentWMESList", {
                .get(this.$baseUrl + "/Xt_grdAlignment_WMES/grdAlignmentWMESList", {
                    params: {
                        HModName: HModName,
                        user: user,
@@ -781,7 +781,6 @@
            if (this.sTime) {
                this.sTime = moment(this.sTime).format("YYYY-MM-DD");
                this.eTime = moment(this.eTime).format("YYYY-MM-DD");
                console.log(this.sTime, this.eTime);
                this.sWhere +=
                    " and CONVERT(varchar(100),日期, 23) >= '" +
                    this.sTime +
@@ -806,22 +805,22 @@
                this.sWhere += " and 物料代码 like '%" + this.queryParams.MaterialCode + "%'";
            }
            if (this.queryParams.MaterialName) {
                this.sWhere += " and 物料名称 like '%" + MaterialName + "%'";
                this.sWhere += " and 物料名称 like '%" + this.queryParams.MaterialName + "%'";
            }
            if (this.queryParams.SpecificationModel) {
                this.sWhere += " and 规格型号 like '%" + SpecificationModel + "%'";
                this.sWhere += " and 规格型号 like '%" + this.queryParams.SpecificationModel + "%'";
            }
            if (this.queryParams.HSourceBillNo) {
                this.sWhere += " and 源单单号 like '%" + HSourceBillNo + "%'";
                this.sWhere += " and 源单单号 like '%" + this.queryParams.HSourceBillNo + "%'";
            }
            if (this.queryParams.Warehouse) {
                this.sWhere += " and 发货仓库 like '%" + Warehouse + "%'";
                this.sWhere += " and 发货仓库 like '%" + this.queryParams.Warehouse + "%'";
            }
            if (this.queryParams.Hmaker) {
                this.sWhere += " and 制单人 like '%" + Hmaker + "%'";
                this.sWhere += " and 制单人 like '%" + this.queryParams.Hmaker + "%'";
            }
            if (this.queryParams.HUSEORGID) {
                this.sWhere += " and HOrgID like '%" + HUSEORGID + "%'";
                this.sWhere += " and HOrgID like '%" + this.queryParams.HUSEORGID + "%'";
            }
            this.getList();
        },
@@ -847,7 +846,7 @@
            };
            this.riqiChange();
            this.resetForm("queryForm");
            this.getList();
            this.handleQuery();
        },

        //退出
@@ -856,7 +855,7 @@
            this.tableShow = true;
            this.openEdit = false;
            this.editShow = false;
            this.getList();
            this.handleQuery();
        },
        //打开新增组件弹窗
        handleAddEdit() {
@@ -875,19 +874,19 @@
            this.open = val;
            this.editShow = false;
            this.openEdit = val;
            this.getList();
            this.handleQuery();
        },
        /** 删除按钮操作 */
        handleDelete() {
            this.$modal.confirm("确认要删除吗，删除后不能恢复").then(() => {
                axios.get(this.baseURL + "/Kf_POStockInBackBill/DeltetKf_POStockInBackBill", {
                axios.get(this.$baseUrl + "/Kf_POStockInBackBill/DeltetKf_POStockInBackBill", {
                    params: {
                        HInterID: this.rowForm.hmainid.toString(),
                        user: sessionStorage["HUserName"],
                    },
                }).then((response) => {
                    if (response.data.count == 1) {
                        this.getList();
                        this.handleQuery();
                        this.$modal.msgSuccess("删除成功");
                    } else {
                        this.$modal.msgError("错误:" + result.code + result.Message);
@@ -899,7 +898,7 @@
        },
        set_CheckBill(num) {
            //逻辑审核方法
            axios.get(this.baseURL + "/Kf_POStockInBackBill/AuditProcessReportList", {
            axios.get(this.$baseUrl + "/Kf_POStockInBackBill/AuditProcessReportList", {
                params: { "HInterID": this.rowForm.hmainid, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
            }).then(response => {
                let result = response.data
@@ -917,7 +916,7 @@
        },
        set_CloseBill(num) {
            //逻辑关闭方法
            axios.get(this.baseURL + "/Kf_POStockInBackBill/CloseKf_POStockInBackBill", {
            axios.get(this.$baseUrl + "/Kf_POStockInBackBill/CloseKf_POStockInBackBill", {
                params: { "HInterID": this.rowForm.hmainid, "Type": num, "CurUserName": sessionStorage["HUserName"] }
            }).then(response => {
                let result = response.data
@@ -935,7 +934,7 @@
        },
        set_DropBill(num) {
            //逻辑作废方法
            axios.get(this.baseURL + "/Kf_POStockInBackBill/DropKf_POStockInBackBill", {
            axios.get(this.$baseUrl + "/Kf_POStockInBackBill/DropKf_POStockInBackBill", {
                params: { "HInterID": this.rowForm.hmainid, "Type": num, "CurUserName": sessionStorage["HUserName"] }
            }).then(response => {
                let result = response.data
@@ -956,9 +955,9 @@
            if (this.ids.length != 1) {
                this.$modal.msgError("请选择一行数据");
            } else {
                 this.printListShow = true;
                            this.openPrintList = true;
                // axios.get(this.baseURL + "/Kf_SellOutBill/CheckSellOutBill_IsExist", {
                this.printListShow = true;
                this.openPrintList = true;
                // axios.get(this.$baseUrl + "/Kf_SellOutBill/CheckSellOutBill_IsExist", {
                //         params: { HInterID: this.rowForm.hmainid },
                //     })
                //     .then((response) => {
@@ -995,4 +994,15 @@
.xsckdBox .el-date-editor.el-input {
    width: 100%;
}

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

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