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

wangyi

2025-11-27 86d627eecb14597a338ee402eab5a0c05ce1bdeb

 src/views/purchase/cgPoOrderBill/cgPoOrderBill.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>
@@ -613,7 +617,7 @@
import dayjs from "dayjs";

export default {
  name: "GySource",
  name: "Cg_POOrderBillList",
  components: { RowSettings, gySource },
  props: {
    openPage: { type: String },
@@ -630,7 +634,7 @@
      openPrintList: false,
      printListShow: false,
      HClassTag: "ForFilteringSchemes", //过滤条件的class类
      HBillType: "1202",
      HBillType: "1102",
      openBtnHide: false,
      btnHideShow: false,
      rowHideShow: false,
@@ -662,6 +666,7 @@
        { label: "近30天", value: 29 },
        { label: "近半年", value: 180 },
        { label: "近一年", value: 365 },
        { label: "任意间隔", value: -1 },
      ],
      hPriceTypeList: ["成本价", "结算价"],
      addBtnShow: false,
@@ -680,7 +685,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, // 上一次选中的行
@@ -781,7 +785,8 @@
  },
  created() {
    this.riqiChange();
    this.getList();
    // this.getList();
    this.handleQuery();
  },
  beforeDestory() {
    delete window.editGyClose;
@@ -861,6 +866,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);
@@ -926,7 +934,7 @@
        .get(this.baseURL + "/Cg_POOrderBill/page", {
          params: {
            sWhere: this.sWhere,
            user: this.user,
            user: sessionStorage["HUserName"],
            page: this.page,
            size: this.pageSize,
          },
@@ -1015,7 +1023,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((error) => {
@@ -1317,7 +1330,7 @@
        .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
          params: {
            HModName: this.HModName,
            user: this.user,
            user: sessionStorage["HUserName"],
            HOrgID: this.zuzhiId,
          },
        })
@@ -1400,7 +1413,10 @@
          if (!this.rowForm.审核人) {
            axios
              .get(this.baseURL + "Cg_POOrderBill/DeltetCg_POOrderBill", {
                params: { HInter: this.rowForm.HInterID.toString(), user: this.user },
                params: {
                  HInter: this.rowForm.HInterID.toString(),
                  user: sessionStorage["HUserName"],
                },
              })
              .then((response) => {
                if (response.data.count == 1) {
@@ -1425,7 +1441,11 @@
      //逻辑审核方法
      axios
        .get(this.baseURL + "/Cg_POOrderBill/AuditCg_POOrderBill", {
          params: { HInterID: InterID, IsAudit: num, CurUserName: this.user },
          params: {
            HInterID: InterID,
            IsAudit: num,
            CurUserName: sessionStorage["HUserName"],
          },
        })
        .then((response) => {
          let result = response.data;
@@ -1448,7 +1468,7 @@
          params: {
            HInterID: HInterID,
            Type: num,
            user: this.user,
            user: sessionStorage["HUserName"],
          },
        });

@@ -1475,7 +1495,7 @@
              HInterID: HInterID,
              HEntryID: HEntryID,
              ISAudit: num,
              CurUserName: this.user,
              CurUserName: sessionStorage["HUserName"],
            },
          }
        );
@@ -1499,7 +1519,7 @@
          params: {
            HInterID: HInterID,
            Type: num,
            user: this.user,
            user: sessionStorage["HUserName"],
          },
        });

@@ -1520,7 +1540,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((response) => {
          let result = response.data;
@@ -1586,7 +1610,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",