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

chenhaozhe

2025-11-14 7570f18ad0164dcb9bb71808f68e89053aaa2bbf

 src/views/sell/xsSeOrderBill/xsSeOrderBill.vue

@@ -41,12 +41,20 @@
            @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 label="组织">
          <el-select
            v-model="queryParams.HOrgID"
            placeholder="请选择"
            class="ForFilteringSchemes"
          >
            <el-option
              v-for="(item, index) in organizationList"
              :key="index"
              :label="item.Name"
              :value="item.ID"
            >
            </el-option>
          </el-select>
        </el-form-item>
      </el-row>

@@ -270,7 +278,7 @@
          icon="el-icon-delete"
          size="mini"
          :disabled="single"
          @click="handleDelete((row = rowForm))"
          @click="handleDelete"
          >删除
        </el-button>
      </el-col>
@@ -482,7 +490,7 @@
      </el-dialog>
      <!-- 编辑 -->
      <el-dialog
        title="编辑销售订单"
        title="编辑职员"
        :visible.sync="openEdit"
        width="1480px"
        append-to-body
@@ -596,7 +604,7 @@
import dayjs from "dayjs";

export default {
  name: "xsSeOrderBill",
  name: "GySource",
  components: { RowSettings },
  props: {
    openPage: { type: String },
@@ -658,7 +666,7 @@
      openData: false, //数据弹窗
      dialogTitle: "",
      zuzhiId: "",
      organizationList: JSON.parse(sessionStorage.getItem("organizationList")), //组织列表
      organizationList: [], //组织列表
      subDisabled: false, //编辑页面保存按钮是否禁用(true禁用，false可用)
      OperationType: null, //保存类型（新增1修改3）
      HInterID: null,
@@ -682,7 +690,7 @@
      dateRange: [],
      // 查询参数
      queryParams: {
        HOrgID: sessionStorage["OrganizationID"],
        HOrgID: sessionStorage["Organization"],
        HName: null,
        HNumber: null,
        Comparator1: "",
@@ -756,7 +764,9 @@
      uploadTotal: 0,
    };
  },
  mounted() {},
  mounted() {
    this.queryParams.HOrgID = sessionStorage["Organization"];
  },
  created() {
    this.riqiChange();
    this.getList();
@@ -886,6 +896,35 @@
    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;
@@ -1264,9 +1303,7 @@
      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}'`;
      // }
@@ -1370,8 +1407,7 @@
      (this.multiple = true), this.getList();
    },
    /** 删除按钮操作 */
    handleDelete(row) {
      console.log(row);
    handleDelete() {
      this.$modal
        .confirm("确认要删除吗，删除后不能恢复")
        .then(() => {
@@ -1379,7 +1415,7 @@
            axios
              .get(this.baseURL + "Cg_POInStockBill/DeltetPOInStockBill", {
                params: {
                  HInterID: this.rowForm.hmainid.toString(),
                  HInter: this.rowForm.hmainid.toString(),
                  HsupId: this.rowForm.HsupId,
                  HQty: this.rowForm.HQty,
                  HSourceInterID: this.rowForm.HSourceInterID,