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

陈婷婷

2025-11-24 1e2cec2c74d3bb7c4b1d0ec6a5c16ac52a40534f

 src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue

@@ -15,6 +15,8 @@
            type="date"
            placeholder="开始日期"
            style="width: 150px"
            :disabled="queryParams.HInitTimeCycle != -1"
            value-format="yyyy-MM-dd"
          >
          </el-date-picker>
        </el-form-item>
@@ -24,6 +26,8 @@
            type="date"
            placeholder="结束日期"
            style="width: 150px"
            :disabled="queryParams.HInitTimeCycle != -1"
            value-format="yyyy-MM-dd"
          >
          </el-date-picker>
        </el-form-item>
@@ -608,7 +612,7 @@
import dayjs from "dayjs";

export default {
  name: "GySource",
  name: "cgPoInStockBill",
  components: { RowSettings, gySource },
  props: {
    openPage: { type: String },
@@ -618,7 +622,7 @@
      iframeUrl: "",
      activeSeach: "",
      dateRange: [],
      HModName: "Cg_POOrderBillList",
      HModName: "cgPoInStockBill",
      editShow: false,
      openEdit: false,
      totalNameList: [],
@@ -626,7 +630,7 @@
      openPrintList: false,
      printListShow: false,
      HClassTag: "ForFilteringSchemes", //过滤条件的class类
      HBillType: "1202",
      HBillType: "1103",
      openBtnHide: false,
      btnHideShow: false,
      rowHideShow: false,
@@ -658,6 +662,7 @@
        { label: "近30天", value: 29 },
        { label: "近半年", value: 180 },
        { label: "近一年", value: 365 },
        { label: "任意间隔", value: -1 },
      ],
      hPriceTypeList: ["成本价", "结算价"],
      addBtnShow: false,
@@ -676,7 +681,6 @@
      OperationType: null, //保存类型（新增1修改3）
      HInterID: null,
      baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
      user: "admin",
      currentRow: [],
      lastSelectedRowIndex: null, // 用于记录上次点击的行索引
      lastSelectedRow: null, // 上一次选中的行
@@ -777,7 +781,8 @@
  },
  created() {
    this.riqiChange();
    this.getList();
    // this.getList();
    this.handleQuery();
  },
  beforeDestroy() {
    // 组件销毁时清理全局方法，避免内存泄漏
@@ -859,6 +864,9 @@
      this.getList();
    },
    riqiChange() {
      if (this.queryParams.HInitTimeCycle == -1) {
        return;
      }
      const end = new Date();
      const start = new Date();
      start.setTime(start.getTime() - 3600 * 1000 * 24 * this.queryParams.HInitTimeCycle);
@@ -923,7 +931,7 @@
        let res = await axios.get(this.baseURL + "Cg_POInStockBill/page", {
          params: {
            sWhere: this.sWhere,
            user: this.user,
            user: sessionStorage["HUserName"],
            page: this.page,
            size: this.pageSize,
          },
@@ -1011,7 +1019,12 @@
            }
          }
          option.data = result;
          this.DisPlay_HideColumn(this.HModName, this.user, option, this.dataList);
          this.DisPlay_HideColumn(
            this.HModName,
            sessionStorage["HUserName"],
            option,
            this.dataList
          );
        }
      } catch (err) {
        this.$modal.msgError(`获取收料通知单错误: ${err}`);
@@ -1298,7 +1311,7 @@
        .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
          params: {
            HModName: this.HModName,
            user: this.user,
            user: sessionStorage["HUserName"],
            HOrgID: this.zuzhiId,
          },
        })
@@ -1387,7 +1400,7 @@
                  HQty: this.rowForm.HQty,
                  HSourceInterID: this.rowForm.HSourceInterID,
                  HSourceEntryID: this.rowForm.HSourceEntryID,
                  user: this.user,
                  user: sessionStorage["HUserName"],
                },
              })
              .then((res) => {
@@ -1413,7 +1426,11 @@
      //逻辑审核方法
      axios
        .get(this.baseURL + "/Cg_POInStockBill/AuditCg_POInStockBill", {
          params: { HInterID: InterID, IsAudit: num, CurUserName: this.user },
          params: {
            HInterID: InterID,
            IsAudit: num,
            CurUserName: sessionStorage["HUserName"],
          },
        })
        .then((res) => {
          let result = res.data;
@@ -1438,7 +1455,7 @@
            params: {
              HInterID: HInterID,
              Type: num,
              user: this.user,
              user: sessionStorage["HUserName"],
            },
          }
        );
@@ -1466,7 +1483,7 @@
              HInterID: HInterID,
              HEntryID: HEntryID,
              ISAudit: num,
              CurUserName: this.user,
              CurUserName: sessionStorage["HUserName"],
            },
          }
        );
@@ -1492,7 +1509,7 @@
            params: {
              HInterID: HInterID,
              Type: num,
              user: this.user,
              user: sessionStorage["HUserName"],
            },
          }
        );
@@ -1514,7 +1531,11 @@
      //逻辑审核方法
      axios
        .get(this.baseURL + "/Gy_Employee/StopGy_Employee", {
          params: { HInterID: InterID, IsStop: num, CurUserName: this.user },
          params: {
            HInterID: InterID,
            IsStop: num,
            CurUserName: sessionStorage["HUserName"],
          },
        })
        .then((res) => {
          let result = res.data;
@@ -1580,7 +1601,7 @@
        }
      }
      var sSubStr = JSON.stringify(num);
      var sMainSub = sSubStr + "&和" + this.user;
      var sMainSub = sSubStr + "&和" + sessionStorage["HUserName"];
      axios({
        method: "post",
        url: this.baseURL + "/Gy_Source/Gy_Source_btnSave",