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

duhe

2025-11-26 bd7f9985d283a7950c2a29f4d8a2d027f8b45b9d

 src/views/basic/gyWarehouse/gyWarehouse.vue

@@ -360,12 +360,8 @@
                <span v-if="column.property.includes('日期')">{{
                  parseTime(row[column.property], "{y}-{m}-{d}")
                }}</span>
                <el-button
                  type="text"
                  @click="handleEdit(row, (OperationType = 3))"
                  v-else-if="column.property == '仓库代码'"
                  >{{ row.仓库代码 }}</el-button
                >
                <el-button type="text" @click="handleEdit(row, (OperationType = 3))"
                  v-else-if="column.property == '仓库代码'">{{ row.仓库代码 }}</el-button>
                <span v-else>{{ row[column.label] }}</span>
              </div>
            </template>
@@ -394,24 +390,11 @@
        />
      </el-dialog>
      <!-- 编辑 -->
      <el-dialog
        title="编辑仓库"
        :visible.sync="openEdit"
        width="1480px"
        append-to-body
        class="xsckdBox"
        :before-close="close"
        @close="editBeforeCloseHandle"
      >
        <edit
          :OperationType="OperationType"
          :linterid="this.rowForm.HItemID"
          :HSouceBillType="this.rowForm.HSourceBillType"
          :copyType="copyType"
          @editCloseGy="editGyClose"
          v-if="editShow"
          ref="editRef"
        />
      <el-dialog title="编辑仓库" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox"
        :before-close="close" @close="editBeforeCloseHandle">
        <edit :OperationType="OperationType" :linterid="this.rowForm.HItemID"
          :HSouceBillType="this.rowForm.HSourceBillType" :copyType="copyType" @editCloseGy="editGyClose" v-if="editShow"
          ref="editRef" />
      </el-dialog>
      <el-dialog
        :title="upload.title"
@@ -1057,16 +1040,16 @@
    },
    //双击行
    handleDblclick(row, column, cell, event) {
      if (this.checkIsIframe()) {
        // IFrame 双击 返回当前双击的数据
        window.parent.iframeWareHouseCallBack(row);
        return;
      }
      this.OperationType = 3;
      if (this.openPage) {
        this.$emit("deptEmitDb", row, 2);
      } else {
        this.handleEdit();
        if (this.checkIsIframe) {
          // IFrame 双击 返回当前双击的数据
          window.parent.iframeWareHouseCallBack(row);
          return;
        }
          this.handleEdit();
      }
    },
    // 多选框选中数据
@@ -1387,8 +1370,8 @@
      } else {
        this.$alert(
          "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
            response.Message +
            "</div>",
          response.Message +
          "</div>",
          "导入结果",
          { dangerouslyUseHTMLString: true }
        );
@@ -1417,8 +1400,8 @@
        .then((res) => {
          this.$alert(
            "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
              res.data.Message +
              "</div>",
            res.data.Message +
            "</div>",
            "导入结果",
            { dangerouslyUseHTMLString: true }
          );