chenhaozhe
2025-11-13 bdebbc1c44f33dead8e87a671542355c354be686
修复 组织取不到的问题
6个文件已删除
7个文件已修改
6811 ■■■■■ 已修改文件
src/views/ICMO/ScICMOBillList.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basic/gyEmployee/gyEmployee.vue 42 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basic/gyStockPlace/gyStockPlace.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basic/gyWarehouse/gyWarehouse.vue 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/gyEmployee/edit/index.vue 1310 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/gyEmployee/index.vue 1448 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/gyStockPlace/edit/index.vue 486 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/gyStockPlace/index.vue 1348 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/gyWarehouse/edit/index.vue 616 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/gyWarehouse/index.vue 1450 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sell/XsSeOutStockBackBillList.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sell/XsSeOutStockBill.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sell/xsSeOrderBill/xsSeOrderBill.vue 52 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/ICMO/ScICMOBillList.vue
@@ -872,7 +872,8 @@
  },
  mounted() {},
  created() {
    this.form.Organization = sessionStorage["Organization"];
    // this.form.Organization = sessionStorage["Organization"];
    this.queryParams.HOrgID = sessionStorage["OrganizationID"];
    this.riqiChange();
    this.get_HProjectList();
    this.get_HDeptNameList();
src/views/basic/gyEmployee/gyEmployee.vue
@@ -32,9 +32,9 @@
          >
            <el-option
              v-for="(item, index) in organizationList"
              :key="index"
              :key="item.ID"
              :label="item.Name"
              :value="item.ID"
              :value="item.ID.toString()"
            >
            </el-option>
          </el-select>
@@ -509,6 +509,7 @@
  },
  data() {
    return {
      activeSeach: "",
      HModName: "Gy_Source",
      editShow: false,
      openEdit: false,
@@ -562,7 +563,7 @@
      openData: false, //数据弹窗
      dialogTitle: "",
      zuzhiId: "",
      organizationList: [], //组织列表
      organizationList: JSON.parse(sessionStorage.getItem("organizationList")), //组织列表
      subDisabled: false, //编辑页面保存按钮是否禁用(true禁用,false可用)
      OperationType: null, //保存类型(新增1修改3)
      HInterID: null,
@@ -586,7 +587,7 @@
      dateRange: [],
      // 查询参数
      queryParams: {
        HOrgID: null,
        HOrgID: sessionStorage["OrganizationID"],
        HName: null,
        HNumber: null,
        Comparator1: "",
@@ -649,7 +650,7 @@
    };
  },
  created() {
    this.fetchData();
    this.handleQuery();
    this.riqiChange();
  },
  methods: {
@@ -768,33 +769,6 @@
    deptClickSub() {
      this.dbEmitData(this.deptform, this.dialogTypeNum);
      this.deptform = {};
    },
    fetchData() {
      //登录用户信息
      axios
        .get(
          "http://47.96.97.237/API/Web/GetUser?UserName=001&PassWord=123456&HOrgName=100038"
        )
        .then((response) => {
          let data = response.data.data[0];
          this.zuzhiId = data.HUSEORGID; //根据登录用户获取默认的组织ID
          this.queryParams.HOrgID = data.HUSEORGID;
          this.user = data.Czymc;
          axios
            .get(this.baseURL + "/Web/GetOrganizations", {})
            .then((response) => {
              if (response.data.count == 1) {
                this.organizationList = response.data.data; //组织列表
              }
              this.getList();
            })
            .catch((error) => {
              this.$modal.msgError("接口请求失败!");
            });
        })
        .catch((error) => {
          this.$modal.msgError("接口请求失败!");
        });
    },
    getList() {
      this.tableShow = false;
@@ -1157,10 +1131,10 @@
        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) {
        this.sWhere += " and HUSEORGID = '" + this.queryParams.HOrgID + "'";
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"
            >
            </el-option>
          </el-select>
@@ -479,7 +479,7 @@
      openData: false, //数据弹窗
      dialogTitle: "",
      zuzhiId: "",
      organizationList: [], //组织列表
      organizationList: JSON.parse(sessionStorage.getItem("organizationList")), //组织列表
      subDisabled: false, //编辑页面保存按钮是否禁用(true禁用,false可用)
      OperationType: null, //保存类型(新增1修改3)
      HInterID: null,
@@ -503,7 +503,7 @@
      dateRange: [],
      // 查询参数
      queryParams: {
        HOrgID: null,
        HOrgID: sessionStorage["HOrganizationID"],
        HName: null,
        HNumber: null,
        Comparator1: "",
src/views/basic/gyWarehouse/gyWarehouse.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>
@@ -539,7 +539,7 @@
      openData: false, //数据弹窗
      dialogTitle: "",
      zuzhiId: "",
      organizationList: [], //组织列表
      organizationList: JSON.parse(sessionStorage.getItem("organizationList")), //组织列表
      subDisabled: false, //编辑页面保存按钮是否禁用(true禁用,false可用)
      OperationType: null, //保存类型(新增1修改3)
      HInterID: null,
@@ -563,7 +563,7 @@
      dateRange: [],
      // 查询参数
      queryParams: {
        HOrgID: null,
        HOrgID: sessionStorage["OrganizationID"],
        HName: null,
        HNumber: null,
        Comparator1: "",
@@ -626,6 +626,7 @@
    };
  },
  created() {
    this.HOrgID = sessionStorage["OrganizationID"];
    this.getList();
    this.riqiChange();
  },
@@ -761,33 +762,6 @@
    deptClickSub() {
      this.dbEmitData(this.deptform, this.dialogTypeNum);
      this.deptform = {};
    },
    fetchData() {
      //登录用户信息
      axios
        .get(
          "http://47.96.97.237/API/Web/GetUser?UserName=001&PassWord=123456&HOrgName=100038"
        )
        .then((response) => {
          let data = response.data.data[0];
          this.zuzhiId = data.HUSEORGID; //根据登录用户获取默认的组织ID
          this.queryParams.HOrgID = data.HUSEORGID;
          this.user = data.Czymc;
          axios
            .get(this.baseURL + "/Web/GetOrganizations", {})
            .then((response) => {
              if (response.data.count == 1) {
                this.organizationList = response.data.data; //组织列表
              }
              this.getList();
            })
            .catch((error) => {
              this.$modal.msgError("接口请求失败!");
            });
        })
        .catch((error) => {
          this.$modal.msgError("接口请求失败!");
        });
    },
    getList() {
      this.tableShow = false;
src/views/gyEmployee/edit/index.vue
File was deleted
src/views/gyEmployee/index.vue
File was deleted
src/views/gyStockPlace/edit/index.vue
File was deleted
src/views/gyStockPlace/index.vue
File was deleted
src/views/gyWarehouse/edit/index.vue
File was deleted
src/views/gyWarehouse/index.vue
File was deleted
src/views/sell/XsSeOutStockBackBillList.vue
@@ -49,7 +49,7 @@
          >
            <el-option
              v-for="(item, index) in organizationList"
              :key="index"
              :key="item.ID"
              :label="item.Name"
              :value="item.ID"
            >
@@ -699,7 +699,7 @@
      dateRange: [],
      // 查询参数
      queryParams: {
        HOrgID: null,
        HOrgID: sessionStorage["OrganizationID"],
        HName: null,
        HNumber: null,
        Comparator1: "",
src/views/sell/XsSeOutStockBill.vue
@@ -56,9 +56,9 @@
          >
            <el-option
              v-for="(item, index) in organizationList"
              :key="index"
              :key="item.ID"
              :label="item.Name"
              :value="item.ID"
              :value="item.ID.toString()"
            >
            </el-option>
          </el-select>
@@ -706,7 +706,7 @@
      dateRange: [],
      // 查询参数
      queryParams: {
        HOrgID: null,
        HOrgID: sessionStorage.getItem("OrganizationID"),
        HName: null,
        HNumber: null,
        Comparator1: "",
@@ -775,7 +775,7 @@
  },
  mounted() {},
  created() {
    this.queryParams.HOrgID = sessionStorage["Organization"];
    this.queryParams.HOrgID = sessionStorage["OrganizationID"];
    this.riqiChange();
    this.getList();
  },
src/views/sell/xsSeOrderBill/xsSeOrderBill.vue
@@ -41,6 +41,13 @@
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
        <el-form-item label="项目编号" prop="HProjectNumber">
          <el-input
            v-model="queryParams.HProjectNumber"
            placeholder="请输入项目编号"
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
        <el-form-item label="组织">
          <el-select
            v-model="queryParams.HOrgID"
@@ -49,9 +56,9 @@
          >
            <el-option
              v-for="(item, index) in organizationList"
              :key="index"
              :key="item.ID"
              :label="item.Name"
              :value="item.ID"
              :value="item.ID.toString()"
            >
            </el-option>
          </el-select>
@@ -666,7 +673,7 @@
      openData: false, //数据弹窗
      dialogTitle: "",
      zuzhiId: "",
      organizationList: [], //组织列表
      organizationList: JSON.parse(sessionStorage.getItem("organizationList")), //组织列表
      subDisabled: false, //编辑页面保存按钮是否禁用(true禁用,false可用)
      OperationType: null, //保存类型(新增1修改3)
      HInterID: null,
@@ -690,7 +697,7 @@
      dateRange: [],
      // 查询参数
      queryParams: {
        HOrgID: sessionStorage["Organization"],
        HOrgID: sessionStorage["OrganizationID"],
        HName: null,
        HNumber: null,
        Comparator1: "",
@@ -757,9 +764,7 @@
      uploadTotal: 0,
    };
  },
  mounted() {
    this.queryParams.HOrgID = sessionStorage["Organization"];
  },
  mounted() {},
  created() {
    this.riqiChange();
    this.getList();
@@ -889,35 +894,6 @@
    deptClickSub() {
      this.dbEmitData(this.deptform, this.dialogTypeNum);
      this.deptform = {};
    },
    fetchData() {
      //登录用户信息
      axios
        .get(
          "http://47.96.97.237/API/Web/GetUser?UserName=001&PassWord=123456&HOrgName=100038"
        )
        .then((res) => {
          let data = res.data.data[0];
          this.zuzhiId = data.HUSEORGID; //根据登录用户获取默认的组织ID
          this.queryParams.HOrgID = data.HUSEORGID;
          this.user = data.Czymc;
          axios
            .get(this.baseURL + "/Web/GetOrganizations", {})
            .then((res) => {
              if (res.data.count == 1) {
                this.organizationList = res.data.data; //组织列表
              }
              this.handleQuery();
              // this.getList();
            })
            .catch((error) => {
              this.$modal.msgError("接口请求失败!");
            });
        })
        .catch((error) => {
          this.$modal.msgError("接口请求失败!");
        });
    },
    async getList() {
      this.tableShow = false;
@@ -1295,7 +1271,9 @@
      if (this.queryParams.HMaterName) {
        this.sWhere += " and 物料名称 like ''%" + this.queryParams.HMaterName + "%''";
      }
      if (this.queryParams.HProjectNumber) {
        this.sWhere += " and 项目编码 like ''%" + this.queryParams.HProjectNumber + "%''";
      }
      // if (this.queryParams.HBeginDate && this.queryParams.HEndDate) {
      //   this.sWhere += `  and CONVERT(varchar(100),日期, 23) >= '${this.queryParams.HBeginDate}' and CONVERT(varchar(100),日期, 23) <= '${this.queryParams.HEndDate}'`;
      // }