wangyi
2026-01-19 7fb0a8f0ab16c149484bf043754cd10cfa94de2f
src/views/basic/gyProperty/gyPropertyList.vue
@@ -8,18 +8,18 @@
      class="searchBox"
    >
      <el-row>
        <el-form-item label="仓库代码" prop="HNumber" style="padding-left: 100px">
        <el-form-item label="辅助属性代码" prop="HNumber" style="padding-left: 100px">
          <el-input
            v-model="queryParams.HNumber"
            placeholder="请输入仓库代码"
            placeholder="请输入辅助属性代码"
            @keyup.enter.native="handleQuery"
            class="ForFilteringSchemes"
          />
        </el-form-item>
        <el-form-item label="仓库名称" prop="HName">
        <el-form-item label="辅助属性名称" prop="HName">
          <el-input
            v-model="queryParams.HName"
            placeholder="请输入仓库名称"
            placeholder="请输入辅助属性名称"
            @keyup.enter.native="handleQuery"
            class="ForFilteringSchemes"
          />
@@ -38,15 +38,6 @@
            >
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="同步" :inline="true">
          <el-input
            v-model="queryParams.HSyncNumber"
            placeholder="请输入仓库代码"
            @keyup.enter.native="handleSync"
          >
            <el-button slot="append" type="primary" @click="handleSync">同步</el-button>
          </el-input>
        </el-form-item>
      </el-row>
      <el-form-item label-width="78px">
@@ -201,7 +192,7 @@
    </el-form>
    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
      <!-- <el-col :span="1.5">
        <el-button
          type="primary"
          icon="el-icon-download"
@@ -209,9 +200,9 @@
          @click="handleImport"
          >导入</el-button
        >
      </el-col>
      <el-col :span="1.5">
        <el-button
      </el-col> -->
       <!-- <el-col :span="1.5">
       <el-button
          type="primary"
          icon="el-icon-plus"
          size="mini"
@@ -219,8 +210,8 @@
          id="btn-Add"
          >新增</el-button
        >
      </el-col>
      <el-col :span="1.5">
      </el-col> -->
      <!-- <el-col :span="1.5">
        <el-button
          type="primary"
          icon="el-icon-edit"
@@ -229,8 +220,8 @@
          @click="handleEdit((row = rowForm), (OperationType = 3))"
          >编辑</el-button
        >
      </el-col>
      <el-col :span="1.5">
      </el-col> -->
      <!-- <el-col :span="1.5">
        <el-button
          type="primary"
          icon="el-icon-edit"
@@ -239,7 +230,7 @@
          @click="handleEdit((row = rowForm), (OperationType = 2))"
          >复制</el-button
        >
      </el-col>
      </el-col> -->
      <el-col :span="1.5">
        <el-button
          type="primary"
@@ -641,7 +632,7 @@
    // 仓库同步
    async handleSync() {
      try {
        let res = await axios.get(this.baseURL + "/Gy_Warehouse/Gy_WarehouseViewApi", {
        let res = await axios.get(this.$baseUrl + "/Gy_Warehouse/Gy_WarehouseViewApi", {
          params: {
            Number: this.queryParams.HSyncNumber,
            Type: "CK",
@@ -691,7 +682,7 @@
    defaintOperationByCompanyName() {
      var result = false;
      axios
        .get(this.baseURL + "/Xt_getInfo/getCompanyName")
        .get(this.$baseUrl + "/Xt_getInfo/getCompanyName")
        .then((response) => {
          var data1 = response.data;
          if (data1.count == 1) {
@@ -780,11 +771,10 @@
      this.sWhere += "";
      //生产资料列表
      axios
        .get(this.baseURL + "/Gy_WareHouse/listpage", {
        .get(this.$baseUrl + "/Gy_Property/listPage", {
          params: {
            sWhere: `${this.sWhere}`,
            user: sessionStorage["HUserName"],
            Organization: "浙江智云迈思",
            page: this.page,
            size: this.pageSize,
          },
@@ -888,7 +878,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,
@@ -1041,7 +1031,7 @@
      this.lastSelectedRowIndex = this.tableData.indexOf(row);
      this.$refs.tableData.toggleRowSelection(row);
      if (this.openPage) {
        this.$emit("deptEmit", row, 2);
        this.$emit("deptEmit", row, 'gyProperty');
      }
    },
    //选中行高亮样式
@@ -1065,7 +1055,7 @@
      }
      this.OperationType = 3;
      if (this.openPage) {
        this.$emit("deptEmitDb", row, 2);
        this.$emit("deptEmitDb", row, 'gyProperty');
      } else {
        this.handleEdit(row);
      }
@@ -1169,16 +1159,14 @@
        this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
      }
      if (this.queryParams.HNumber) {
        this.sWhere += " and 仓库代码 like '%" + this.queryParams.HNumber + "%'";
        this.sWhere += " and 辅助属性代码 like '%" + this.queryParams.HNumber + "%'";
      }
      if (this.queryParams.HName) {
        this.sWhere += " and 仓库名称 like '%" + this.queryParams.HName + "%'";
        this.sWhere += " and 辅助属性名称 like '%" + this.queryParams.HName + "%'";
      }
      if (this.queryParams.HOrgID) {
        let OrgName = this.organizationList.find((e) => e.ID == this.queryParams.HOrgID)
          ?.Name;
        this.sWhere += " and 组织名称 = '" + OrgName + "'";
      }
      // if (this.queryParams.HOrgID) {
      //   this.sWhere += " and HUSEORGID = '" + this.queryParams.HOrgID + "'";
      // }
      // this.sWhere += this.addSWhereByOpenType()
      // this.sWhere += this.getOrgIDByUser()
      this.searchOpen = false;
@@ -1199,7 +1187,7 @@
    getOrgIDByUser() {
      var res = "";
      axios
        .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
        .get(this.$baseUrl + "/Xt_User/getOrgIDListByUser", {
          params: {
            HModName: this.HModName,
            user: sessionStorage["HUserName"],
@@ -1285,7 +1273,7 @@
        .then(() => {
          if (!this.rowForm.审核人) {
            axios
              .get(this.baseURL + "/DeltetGy_Warehouse", {
              .get(this.$baseUrl + "/DeltetGy_Warehouse", {
                params: {
                  HItemID: this.rowForm.HItemID.toString(),
                  user: sessionStorage["HUserName"],
@@ -1313,7 +1301,7 @@
      var InterID = form.HItemID || form.HInterID;
      //逻辑审核方法
      axios
        .get(this.baseURL + "/Gy_Warehouse/AuditGy_Warehouse", {
        .get(this.$baseUrl + "/Gy_Warehouse/AuditGy_Warehouse", {
          params: {
            HInterID: InterID,
            IsAudit: num,
@@ -1338,7 +1326,7 @@
      var InterID = form.HItemID || form.HInterID;
      //逻辑审核方法
      axios
        .get(this.baseURL + "/Gy_Warehouse/StopGy_Warehouse", {
        .get(this.$baseUrl + "/Gy_Warehouse/StopGy_Warehouse", {
          params: {
            HInterID: InterID,
            IsStop: num,
@@ -1412,7 +1400,7 @@
      var sMainSub = sSubStr + "&和" + sessionStorage["HUserName"];
      axios({
        method: "post",
        url: this.baseURL + "/Gy_Warehouse/Gy_Process_Excel",
        url: this.$baseUrl + "/Gy_Warehouse/Gy_Process_Excel",
        data: {
          sMainSub: sMainSub,
        },