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

llj

2025-11-19 1791a782cad48b6932b2415f5f2ef96bb7238493

 src/views/basic/gyStockPlace/gyStockPlace.vue

@@ -26,7 +26,7 @@
        </el-form-item>
        <el-form-item label="组织">
          <el-select
            v-model="queryParams.HOrgName"
            v-model="queryParams.HOrgID"
            placeholder="请选择"
            class="ForFilteringSchemes"
          >
@@ -34,7 +34,7 @@
              v-for="(item, index) in organizationList"
              :key="index"
              :label="item.Name"
              :value="item.Name"
              :value="item.ID.toString()"
            >
            </el-option>
          </el-select>
@@ -62,8 +62,8 @@
          <el-card class="box-card">
            <div slot="header" class="clearfix"><span>过滤</span></div>
            <div>
              <el-form-item label-width="0">
                <el-row>
              <el-row>
                <el-form-item label-width="0">
                  <el-col :span="7">
                    <el-select
                      v-model="queryParams.ColName1"
@@ -104,10 +104,10 @@
                      class="ForFilteringSchemes"
                    />
                  </el-col>
                </el-row>
              </el-form-item>
              <el-form-item label-width="0">
                <el-row>
                </el-form-item>
              </el-row>
              <el-row>
                <el-form-item label-width="0">
                  <el-col :span="7">
                    <el-select
                      v-model="queryParams.ColName2"
@@ -149,10 +149,10 @@
                      class="ForFilteringSchemes"
                    />
                  </el-col>
                </el-row>
              </el-form-item>
              <el-form-item label-width="0">
                <el-row>
                </el-form-item>
              </el-row>
              <el-row>
                <el-form-item label-width="0">
                  <el-col :span="7">
                    <el-select
                      v-model="queryParams.ColName"
@@ -192,8 +192,8 @@
                      class="ForFilteringSchemes"
                    />
                  </el-col>
                </el-row>
              </el-form-item>
                </el-form-item>
              </el-row>
            </div>
          </el-card>
        </el-collapse-item>
@@ -248,12 +248,12 @@
          >隐藏列设置</el-button
        >
      </el-col>
      <el-col :span="1.5">
      <el-col :span="1.5" class="zy-hidden">
        <el-button type="primary" icon="el-icon-help" size="mini" @click="handleSearch"
          >搜 索</el-button
        >
      </el-col>
      <el-col :span="1.5">
      <el-col :span="1.5" class="zy-hidden">
        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery"
          >重 置</el-button
        >
@@ -303,8 +303,8 @@
                <el-button
                  type="text"
                  @click="handleEdit(row, (OperationType = 3))"
                  v-else-if="column.property == '单据号'"
                  >{{ row.单据号 }}</el-button
                  v-else-if="column.property == '仓位代码'"
                  >{{ row.仓位代码 }}</el-button
                >
                <span v-else>{{ row[column.label] }}</span>
              </div>
@@ -341,6 +341,7 @@
        append-to-body
        class="xsckdBox"
        :before-close="close"
        @close="beforeEditCloseHandler"
      >
        <edit
          :OperationType="OperationType"
@@ -349,6 +350,7 @@
          :copyType="copyType"
          @editCloseGy="editGyClose"
          v-if="editShow"
          ref="editRef"
        />
      </el-dialog>
      <el-dialog
@@ -426,6 +428,8 @@
  },
  data() {
    return {
      editRef: null,
      activeSeach: "",
      HModName: "Gy_Warehouse",
      editShow: false,
      openEdit: false,
@@ -479,7 +483,7 @@
      openData: false, //数据弹窗
      dialogTitle: "",
      zuzhiId: "",
      organizationList: [], //组织列表
      organizationList: JSON.parse(sessionStorage["organizationList"]), //组织列表
      subDisabled: false, //编辑页面保存按钮是否禁用(true禁用，false可用)
      OperationType: null, //保存类型（新增1修改3）
      HInterID: null,
@@ -503,7 +507,7 @@
      dateRange: [],
      // 查询参数
      queryParams: {
        HOrgID: null,
        HOrgID: sessionStorage["OrganizationID"],
        HName: null,
        HNumber: null,
        Comparator1: "",
@@ -528,7 +532,7 @@
      btResList: [],
      tableData: [], //销售出库列表(分页显示)
      dataList: [],
      titleData: ["HItemID", "HParentID"], //不需要显示的字段 可扩展
      titleData: ["HItemID", "HParentID", "选择"], //不需要显示的字段 可扩展
      pageSizes: [50, 100, 500, 5000, 50000],
      page: 1,
      pageSize: 50,
@@ -566,10 +570,13 @@
    };
  },
  created() {
    this.fetchData();
    this.handleQuery();
    this.riqiChange();
  },
  methods: {
    beforeEditCloseHandler() {
      this.$refs.editRef.close();
    },
    // 仓位同步(API中暂时没有对应的API)
    async handleSync() {
      try {
@@ -743,11 +750,10 @@
      this.sWhere += "";
      //仓位列表
      axios
        .get(this.baseURL + "/Gy_StockPlace/list1page", {
        .get(this.baseURL + "/Gy_StockPlace/list2Page", {
          params: {
            sWhere: `${this.sWhere}`,
            user: this.user,
            Organization: "浙江智云迈思",
            page: this.page,
            size: this.pageSize,
          },
@@ -1099,8 +1105,10 @@
      if (this.queryParams.HName) {
        this.sWhere += " and 仓位名称 like '%" + this.queryParams.HName + "%'";
      }
      if (this.queryParams.HOrgName) {
        this.sWhere += " and 组织名称 = '" + this.queryParams.HOrgName + "'";
      if (this.queryParams.HOrgID) {
        let OrgName = this.organizationList.find((e) => e.ID == this.queryParams.HOrgID)
          ?.Name;
        this.sWhere += " and 组织名称 = '" + OrgName + "'";
      }
      // this.sWhere += this.addSWhereByOpenType()
      // this.sWhere += this.getOrgIDByUser()
@@ -1342,4 +1350,7 @@
  flex-direction: row;
  width: 60%;
}
.zy-hidden {
  display: none;
}
</style>